Skip to content

Commit 2015a93

Browse files
sbrannensbrannen
committed
Merge branch '6.2.x'
2 parents b904753 + aee52b5 commit 2015a93

21 files changed

+319
-108
lines changed

‎spring-test/src/test/java/org/springframework/test/context/aot/TestContextAotGeneratorIntegrationTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.assertj.core.util.Arrays;
2929
import org.easymock.EasyMockSupport;
3030
import org.junit.jupiter.api.Test;
31-
import org.mockito.Mockito;
3231

3332
import org.springframework.aot.AotDetector;
3433
import org.springframework.aot.generate.DefaultGenerationContext;
@@ -80,6 +79,7 @@
8079
import static org.springframework.aot.hint.predicate.RuntimeHintsPredicates.proxies;
8180
import static org.springframework.aot.hint.predicate.RuntimeHintsPredicates.reflection;
8281
import static org.springframework.aot.hint.predicate.RuntimeHintsPredicates.resource;
82+
import static org.springframework.test.mockito.MockitoAssertions.assertIsMock;
8383
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
8484
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
8585
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -377,8 +377,8 @@ private void assertContextForMockitoBeanOverrideTests(ApplicationContext context
377377
GreetingService greetingService = context.getBean(GreetingService.class);
378378
MessageService messageService = context.getBean(MessageService.class);
379379

380-
assertThat(Mockito.mockingDetails(greetingService).isMock()).as("Mockito mock").isTrue();
381-
assertThat(Mockito.mockingDetails(messageService).isMock()).as("Mockito mock").isTrue();
380+
assertIsMock(greetingService, "greetingService");
381+
assertIsMock(messageService, "messageService");
382382
}
383383

384384
private void assertContextForWebTests(WebApplicationContext wac) throws Exception {

‎spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanDuplicateTypeIntegrationTests.java

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
* @author Sam Brannen
3434
* @since 6.2.1
3535
* @see <a href="https://github.com/spring-projects/spring-framework/issues/34025">gh-34025</a>
36+
* @see MockitoSpyBeanDuplicateTypeIntegrationTests
37+
* @see MockitoSpyBeanDuplicateTypeAndNameIntegrationTests
3638
*/
3739
@SpringJUnitConfig
3840
public class MockitoBeanDuplicateTypeIntegrationTests {

‎spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByNameLookupIntegrationTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
import org.junit.jupiter.api.DisplayName;
2020
import org.junit.jupiter.api.Nested;
2121
import org.junit.jupiter.api.Test;
22-
import org.mockito.Mockito;
2322

2423
import org.springframework.context.ApplicationContext;
2524
import org.springframework.context.annotation.Bean;
2625
import org.springframework.context.annotation.Configuration;
2726
import org.springframework.test.context.bean.override.example.ExampleService;
2827
import org.springframework.test.context.bean.override.example.RealExampleService;
2928
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
29+
import org.springframework.test.mockito.MockitoAssertions;
3030

3131
import static org.assertj.core.api.Assertions.assertThat;
3232

@@ -59,7 +59,7 @@ public class MockitoBeanForByNameLookupIntegrationTests {
5959
void fieldAndRenamedFieldHaveSameOverride(ApplicationContext ctx) {
6060
assertThat(ctx.getBean("field"))
6161
.isInstanceOf(ExampleService.class)
62-
.satisfies(o -> assertThat(Mockito.mockingDetails(o).isMock()).as("isMock").isTrue())
62+
.satisfies(MockitoAssertions::assertIsMock)
6363
.isSameAs(this.field)
6464
.isSameAs(this.renamed1);
6565

@@ -71,7 +71,7 @@ void fieldAndRenamedFieldHaveSameOverride(ApplicationContext ctx) {
7171
void fieldIsMockedWhenNoOriginalBean(ApplicationContext ctx) {
7272
assertThat(ctx.getBean("nonExistingBean"))
7373
.isInstanceOf(ExampleService.class)
74-
.satisfies(o -> assertThat(Mockito.mockingDetails(o).isMock()).as("isMock").isTrue())
74+
.satisfies(MockitoAssertions::assertIsMock)
7575
.isSameAs(this.nonExisting1);
7676

7777
assertThat(this.nonExisting1.greeting()).as("mocked greeting").isNull();
@@ -86,7 +86,7 @@ public class MockitoBeanNestedTests {
8686
void fieldAndRenamedFieldHaveSameOverride(ApplicationContext ctx) {
8787
assertThat(ctx.getBean("nestedField"))
8888
.isInstanceOf(ExampleService.class)
89-
.satisfies(o -> assertThat(Mockito.mockingDetails(o).isMock()).as("isMock").isTrue())
89+
.satisfies(MockitoAssertions::assertIsMock)
9090
.isSameAs(nestedField)
9191
.isSameAs(renamed2);
9292
}
@@ -95,7 +95,7 @@ void fieldAndRenamedFieldHaveSameOverride(ApplicationContext ctx) {
9595
void fieldIsMockedWhenNoOriginalBean(ApplicationContext ctx) {
9696
assertThat(ctx.getBean("nestedNonExistingBean"))
9797
.isInstanceOf(ExampleService.class)
98-
.satisfies(o -> assertThat(Mockito.mockingDetails(o).isMock()).as("isMock").isTrue())
98+
.satisfies(MockitoAssertions::assertIsMock)
9999
.isSameAs(nonExisting2);
100100
}
101101
}

‎spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByTypeLookupIntegrationTests.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.springframework.test.context.bean.override.mockito;
1818

1919
import org.junit.jupiter.api.Test;
20-
import org.mockito.Mockito;
2120

2221
import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
2322
import org.springframework.beans.factory.annotation.Qualifier;
@@ -29,6 +28,7 @@
2928
import org.springframework.test.context.bean.override.example.ExampleService;
3029
import org.springframework.test.context.bean.override.example.RealExampleService;
3130
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
31+
import org.springframework.test.mockito.MockitoAssertions;
3232

3333
import static org.assertj.core.api.Assertions.assertThat;
3434
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -37,6 +37,7 @@
3737
import static org.mockito.Mockito.times;
3838
import static org.mockito.Mockito.verify;
3939
import static org.mockito.Mockito.verifyNoMoreInteractions;
40+
import static org.springframework.test.mockito.MockitoAssertions.assertIsMock;
4041

4142
/**
4243
* Integration tests for {@link MockitoBean} that use by-type lookup.
@@ -64,8 +65,7 @@ public class MockitoBeanForByTypeLookupIntegrationTests {
6465

6566
@Test
6667
void mockIsCreatedWhenNoCandidateIsFound() {
67-
assertThat(this.serviceIsNotABean)
68-
.satisfies(o -> assertThat(Mockito.mockingDetails(o).isMock()).as("isMock").isTrue());
68+
assertIsMock(this.serviceIsNotABean);
6969

7070
when(this.serviceIsNotABean.hello()).thenReturn("Mocked hello");
7171

@@ -77,7 +77,7 @@ void mockIsCreatedWhenNoCandidateIsFound() {
7777
@Test
7878
void overrideIsFoundByType(ApplicationContext ctx) {
7979
assertThat(this.anyNameForService)
80-
.satisfies(o -> assertThat(Mockito.mockingDetails(o).isMock()).as("isMock").isTrue())
80+
.satisfies(MockitoAssertions::assertIsMock)
8181
.isSameAs(ctx.getBean("example"))
8282
.isSameAs(ctx.getBean(ExampleService.class));
8383

@@ -91,7 +91,7 @@ void overrideIsFoundByType(ApplicationContext ctx) {
9191
@Test
9292
void overrideIsFoundByTypeAndDisambiguatedByQualifier(ApplicationContext ctx) {
9393
assertThat(this.ambiguous)
94-
.satisfies(o -> assertThat(Mockito.mockingDetails(o).isMock()).as("isMock").isTrue())
94+
.satisfies(MockitoAssertions::assertIsMock)
9595
.isSameAs(ctx.getBean("ambiguous2"));
9696

9797
assertThatExceptionOfType(NoUniqueBeanDefinitionException.class)
@@ -108,7 +108,7 @@ void overrideIsFoundByTypeAndDisambiguatedByQualifier(ApplicationContext ctx) {
108108
@Test
109109
void overrideIsFoundByTypeAndDisambiguatedByMetaQualifier(ApplicationContext ctx) {
110110
assertThat(this.ambiguousMeta)
111-
.satisfies(o -> assertThat(Mockito.mockingDetails(o).isMock()).as("isMock").isTrue())
111+
.satisfies(MockitoAssertions::assertIsMock)
112112
.isSameAs(ctx.getBean("ambiguous1"));
113113

114114
assertThatExceptionOfType(NoUniqueBeanDefinitionException.class)

‎spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanDuplicateTypeAndNameIntegrationTests.java

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
/*
2+
* Copyright 2002-2024 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.test.context.bean.override.mockito;
18+
19+
import java.util.List;
20+
21+
import org.junit.jupiter.api.Test;
22+
23+
import org.springframework.beans.factory.annotation.Autowired;
24+
import org.springframework.context.annotation.Bean;
25+
import org.springframework.context.annotation.Configuration;
26+
import org.springframework.test.context.bean.override.example.ExampleService;
27+
import org.springframework.test.context.bean.override.example.RealExampleService;
28+
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
29+
30+
import static org.assertj.core.api.Assertions.assertThat;
31+
import static org.springframework.test.mockito.MockitoAssertions.assertIsNotSpy;
32+
import static org.springframework.test.mockito.MockitoAssertions.assertIsSpy;
33+
34+
/**
35+
* Integration tests for duplicate {@link MockitoSpyBean @MockitoSpyBean}
36+
* declarations for the same target bean, selected by-name.
37+
*
38+
* @author Sam Brannen
39+
* @since 6.2.1
40+
* @see MockitoBeanDuplicateTypeIntegrationTests
41+
* @see MockitoSpyBeanDuplicateTypeIntegrationTests
42+
*/
43+
@SpringJUnitConfig
44+
public class MockitoSpyBeanDuplicateTypeAndNameIntegrationTests {
45+
46+
@MockitoSpyBean("exampleService1")
47+
ExampleService service1;
48+
49+
@MockitoSpyBean("exampleService1")
50+
ExampleService service2;
51+
52+
@Autowired
53+
ExampleService exampleService2;
54+
55+
@Autowired
56+
List<ExampleService> services;
57+
58+
59+
@Test
60+
void duplicateMocksShouldHaveBeenCreated() {
61+
assertThat(service1).isSameAs(service2);
62+
assertThat(services).containsExactly(service1, exampleService2);
63+
64+
assertIsSpy(service1, "service1");
65+
assertIsNotSpy(exampleService2, "exampleService2");
66+
}
67+
68+
69+
@Configuration(proxyBeanMethods = false)
70+
static class Config {
71+
72+
@Bean
73+
ExampleService exampleService1() {
74+
return new RealExampleService("@Bean 1");
75+
}
76+
77+
@Bean
78+
ExampleService exampleService2() {
79+
return new RealExampleService("@Bean 2");
80+
}
81+
}
82+
83+
}

‎spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanDuplicateTypeIntegrationTests.java

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/*
2+
* Copyright 2002-2024 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.test.context.bean.override.mockito;
18+
19+
import java.util.List;
20+
21+
import org.junit.jupiter.api.Test;
22+
23+
import org.springframework.beans.factory.annotation.Autowired;
24+
import org.springframework.context.annotation.Bean;
25+
import org.springframework.context.annotation.Configuration;
26+
import org.springframework.test.context.bean.override.example.ExampleService;
27+
import org.springframework.test.context.bean.override.example.RealExampleService;
28+
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
29+
30+
import static org.assertj.core.api.Assertions.assertThat;
31+
import static org.springframework.test.mockito.MockitoAssertions.assertIsSpy;
32+
33+
/**
34+
* Integration tests for duplicate {@link MockitoSpyBean @MockitoSpyBean}
35+
* declarations for the same target bean, selected by-type.
36+
*
37+
* @author Sam Brannen
38+
* @since 6.2.1
39+
* @see MockitoBeanDuplicateTypeIntegrationTests
40+
* @see MockitoSpyBeanDuplicateTypeAndNameIntegrationTests
41+
*/
42+
@SpringJUnitConfig
43+
public class MockitoSpyBeanDuplicateTypeIntegrationTests {
44+
45+
@MockitoSpyBean
46+
ExampleService service1;
47+
48+
@MockitoSpyBean
49+
ExampleService service2;
50+
51+
@Autowired
52+
List<ExampleService> services;
53+
54+
55+
@Test
56+
void test() {
57+
assertThat(service1).isSameAs(service2);
58+
assertThat(services).containsExactly(service1);
59+
60+
assertIsSpy(service1, "service1");
61+
}
62+
63+
64+
@Configuration(proxyBeanMethods = false)
65+
static class Config {
66+
67+
@Bean
68+
ExampleService exampleService() {
69+
return new RealExampleService("@Bean");
70+
}
71+
}
72+
73+
}

0 commit comments

Comments
 (0)