Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reinstate init of Mockito mocks in test execution listener

Browse Source 
Closes gh-42708
This commit is contained in:
Andy Wilkinson
2024-10-16 10:22:31 +01:00
parent 2014176d46
commit 1b6b9efcb2
4 changed files with 79 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/nestedtests/InheritedNestedTestConfigurationTests.java
View File

@@ -16,7 +16,6 @@
package org.springframework.boot.test.context.nestedtests;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
@@ -40,7 +39,6 @@ import static org.mockito.Mockito.times;
*/
@SpringBootTest(classes = AppConfiguration.class)
@Import(ActionPerformer.class)
@Disabled("https://github.com/spring-projects/spring-framework/issues/33676")
class InheritedNestedTestConfigurationTests {
@MockitoBean

1
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerIntegrationTests.java
View File

@@ -54,7 +54,6 @@ import static org.mockito.BDDMockito.given;
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)
@ExtendWith(SpringExtension.class)
@Disabled("https://github.com/spring-projects/spring-framework/issues/33690")
class MockitoTestExecutionListenerIntegrationTests {
@Nested

8
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java
View File

@@ -56,6 +56,14 @@ class MockitoTestExecutionListenerTests {
@Mock
private MockitoPostProcessor postProcessor;
@Test
void prepareTestInstanceShouldInitMockitoAnnotations() throws Exception {
WithMockitoAnnotations instance = new WithMockitoAnnotations();
this.listener.prepareTestInstance(mockTestContext(instance));
assertThat(instance.mock).isNotNull();
assertThat(instance.captor).isNotNull();
}
@Test
void prepareTestInstanceShouldInjectMockBean() throws Exception {
given(this.applicationContext.getBean(MockitoPostProcessor.class)).willReturn(this.postProcessor);