From 606709ab8b071a3331f367c5a4c72619c9a96fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 5 Nov 2024 11:59:01 +0900 Subject: [PATCH] Use Spring Framework's MockResolver implementation Closes gh-42957 --- .../org.mockito.plugins.MockResolver | 1 - ...pringBootMockResolverIntegrationTests.java | 42 ------------------- 2 files changed, 43 deletions(-) delete mode 100644 spring-boot-project/spring-boot-test/src/main/resources/mockito-extensions/org.mockito.plugins.MockResolver delete mode 100644 spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test/src/main/resources/mockito-extensions/org.mockito.plugins.MockResolver b/spring-boot-project/spring-boot-test/src/main/resources/mockito-extensions/org.mockito.plugins.MockResolver deleted file mode 100644 index 3646a4b7755..00000000000 --- a/spring-boot-project/spring-boot-test/src/main/resources/mockito-extensions/org.mockito.plugins.MockResolver +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.test.mock.mockito.SpringBootMockResolver \ No newline at end of file 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 deleted file mode 100644 index 04990b5c529..00000000000 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverIntegrationTests.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2012-2024 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -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; - -/** - * Integration tests for {@link SpringBootMockResolver}. - * - * @author Andy Wilkinson - * @deprecated since 3.4.0 for removal in 3.6.0 - */ -@SuppressWarnings("removal") -@Deprecated(since = "3.4.0", forRemoval = true) -class SpringBootMockResolverIntegrationTests { - - @Test - void customMockResolverIsRegisteredWithMockito() { - assertThat(Plugins.getMockResolvers()).haveAtLeastOne(new Condition( - SpringBootMockResolver.class::isInstance, "Spring Boot mock resolver instance")); - } - -}