root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Adapt to upstream Spring Framework @MockitoBean changes

This commit is contained in:
Phillip Webb 2024-10-23 10:51:36 -07:00
parent 47fa83cafc
commit 0305d1e9d5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-starters/spring-boot-starter-test/build.gradle
View File

@ -24,3 +24,8 @@ dependencies {
exclude group: "javax.xml.bind", module: "jaxb-api" exclude group: "javax.xml.bind", module: "jaxb-api"
} }
} }
checkRuntimeClasspathForConflicts {
ignore { name -> name.startsWith("mockito-extensions/") }
}

5
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverIntegrationTests.java
View File

@ -16,8 +16,10 @@
package org.springframework.boot.test.mock.mockito; package org.springframework.boot.test.mock.mockito;
import org.assertj.core.api.Condition;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.internal.configuration.plugins.Plugins; import org.mockito.internal.configuration.plugins.Plugins;
import org.mockito.plugins.MockResolver;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -33,7 +35,8 @@ class SpringBootMockResolverIntegrationTests {
@Test @Test
void customMockResolverIsRegisteredWithMockito() { void customMockResolverIsRegisteredWithMockito() {
assertThat(Plugins.getMockResolvers()).hasOnlyElementsOfType(SpringBootMockResolver.class); assertThat(Plugins.getMockResolvers()).haveAtLeastOne(new Condition<MockResolver>(
SpringBootMockResolver.class::isInstance, "Spring Boot mock resolver instance"));
} }
} }