From 0305d1e9d5c7ba1c1530947e213da520350736b1 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 23 Oct 2024 10:51:36 -0700 Subject: [PATCH] Adapt to upstream Spring Framework @MockitoBean changes --- .../spring-boot-starter-test/build.gradle | 5 +++++ .../mock/mockito/SpringBootMockResolverIntegrationTests.java | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-test/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-test/build.gradle index e98d712817..c5a856d8fb 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-test/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-test/build.gradle @@ -24,3 +24,8 @@ dependencies { exclude group: "javax.xml.bind", module: "jaxb-api" } } + +checkRuntimeClasspathForConflicts { + ignore { name -> name.startsWith("mockito-extensions/") } +} + diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverIntegrationTests.java index c6c18e6393..04990b5c52 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverIntegrationTests.java @@ -16,8 +16,10 @@ package org.springframework.boot.test.mock.mockito; +import org.assertj.core.api.Condition; import org.junit.jupiter.api.Test; import org.mockito.internal.configuration.plugins.Plugins; +import org.mockito.plugins.MockResolver; import static org.assertj.core.api.Assertions.assertThat; @@ -33,7 +35,8 @@ class SpringBootMockResolverIntegrationTests { @Test void customMockResolverIsRegisteredWithMockito() { - assertThat(Plugins.getMockResolvers()).hasOnlyElementsOfType(SpringBootMockResolver.class); + assertThat(Plugins.getMockResolvers()).haveAtLeastOne(new Condition( + SpringBootMockResolver.class::isInstance, "Spring Boot mock resolver instance")); } }