Reorganize Mockito integration tests

Author: sbrannen

…erride/mockito/MockitoMockBeanTests.java …/MockitoBeanConfigurationErrorTests.javaspring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoMockBeanTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanConfigurationErrorTests.java spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoMockBeanTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanConfigurationErrorTests.java

@@ -26,12 +26,12 @@
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 
 /**
- * Tests for {@link MockitoBean}.
+ * Tests for {@link MockitoBean @MockitoBean}.
  *
  * @author Stephane Nicoll
  * @author Sam Brannen
  */
-class MockitoMockBeanTests {
+class MockitoBeanConfigurationErrorTests {
 
 	@Test
 	void cannotOverrideBeanByNameWithNoSuchBeanName() {

…verride/mockito/MockitoSpyBeanTests.java …ckitoSpyBeanConfigurationErrorTests.javaspring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanConfigurationErrorTests.java spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanConfigurationErrorTests.java

@@ -26,11 +26,11 @@
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 
 /**
- * Tests for {@link MockitoSpyBean}.
+ * Tests for {@link MockitoSpyBean @MockitoSpyBean}.
  *
  * @author Stephane Nicoll
  */
-class MockitoSpyBeanTests {
+class MockitoSpyBeanConfigurationErrorTests {
 
 	@Test
 	void contextCustomizerCannotBeCreatedWithNoSuchBeanName() {

…itoBeanAndAsyncInterfaceMethodTests.java …syncInterfaceMethodIntegrationTests.javaspring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndAsyncInterfaceMethodTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndAsyncInterfaceMethodIntegrationTests.java spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndAsyncInterfaceMethodTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndAsyncInterfaceMethodIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.context.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito.integration;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -28,6 +28,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static java.util.concurrent.CompletableFuture.completedFuture;
@@ -43,7 +44,7 @@
  * @since 6.2
  */
 @ExtendWith(SpringExtension.class)
-public class MockitoBeanAndAsyncInterfaceMethodTests {
+public class MockitoBeanAndAsyncInterfaceMethodIntegrationTests {
 
 	@MockitoBean
 	Transformer transformer;

…oBeanAndContextHierarchyParentTests.java …textHierarchyParentIntegrationTests.javaspring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndContextHierarchyParentTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndContextHierarchyParentIntegrationTests.java spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndContextHierarchyParentTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndContextHierarchyParentIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.context.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito.integration;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -24,6 +24,7 @@
 import org.springframework.test.context.ContextHierarchy;
 import org.springframework.test.context.bean.override.example.ExampleService;
 import org.springframework.test.context.bean.override.example.ExampleServiceCaller;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -36,10 +37,10 @@
  * @author Sam Brannen
  * @author Phillip Webb
  * @since 6.2
- * @see MockitoSpyBeanAndContextHierarchyChildTests
+ * @see MockitoSpyBeanAndContextHierarchyChildIntegrationTests
  */
 @SpringJUnitConfig
-public class MockitoBeanAndContextHierarchyParentTests {
+public class MockitoBeanAndContextHierarchyParentIntegrationTests {
 
 	@MockitoBean
 	ExampleService service;

…kito/MockitoBeanAndScopedProxyTests.java …oBeanAndScopedProxyIntegrationTests.javaspring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndScopedProxyTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndScopedProxyIntegrationTests.java spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndScopedProxyTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndScopedProxyIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.context.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito.integration;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -28,6 +28,7 @@
 import org.springframework.test.context.bean.override.example.ExampleService;
 import org.springframework.test.context.bean.override.example.ExampleServiceCaller;
 import org.springframework.test.context.bean.override.example.FailingExampleService;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -43,7 +44,7 @@
  * @see <a href="https://github.com/spring-projects/spring-boot/issues/5724">gh-5724</a>
  */
 @ExtendWith(SpringExtension.class)
-public class MockitoBeanAndScopedProxyTests {
+public class MockitoBeanAndScopedProxyIntegrationTests {
 
 	@MockitoBean
 	// The ExampleService mock should replace the scoped-proxy FailingExampleService

…o/MockitoBeanAndSpringAopProxyTests.java …anAndSpringAopProxyIntegrationTests.javaspring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndSpringAopProxyTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndSpringAopProxyIntegrationTests.java spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndSpringAopProxyTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndSpringAopProxyIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.context.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito.integration;
 
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -30,6 +30,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -46,10 +47,10 @@
  * @author Phillip Webb
  * @since 6.2
  * @see <a href="https://github.com/spring-projects/spring-boot/issues/5837">5837</a>
- * @see MockitoSpyBeanAndSpringAopProxyTests
+ * @see MockitoSpyBeanAndSpringAopProxyIntegrationTests
  */
 @ExtendWith(SpringExtension.class)
-class MockitoBeanAndSpringAopProxyTests {
+class MockitoBeanAndSpringAopProxyIntegrationTests {
 
 	@MockitoBean
 	DateService dateService;

…pyBeanAndContextHierarchyChildTests.java …ntextHierarchyChildIntegrationTests.javaspring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanAndContextHierarchyChildTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanAndContextHierarchyChildIntegrationTests.java spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanAndContextHierarchyChildTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanAndContextHierarchyChildIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.context.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito.integration;
 
 import org.junit.jupiter.api.Test;
 
@@ -27,6 +27,8 @@
 import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.bean.override.example.ExampleService;
 import org.springframework.test.context.bean.override.example.ExampleServiceCaller;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -38,11 +40,12 @@
  * @author Sam Brannen
  * @author Phillip Webb
  * @since 6.2
- * @see MockitoBeanAndContextHierarchyParentTests
+ * @see MockitoBeanAndContextHierarchyParentIntegrationTests
  */
 @ContextHierarchy(@ContextConfiguration)
 @DisabledInAotMode // @ContextHierarchy is not supported in AOT.
-public class MockitoSpyBeanAndContextHierarchyChildTests extends MockitoBeanAndContextHierarchyParentTests {
+public class MockitoSpyBeanAndContextHierarchyChildIntegrationTests extends
+		MockitoBeanAndContextHierarchyParentIntegrationTests {
 
 	@MockitoSpyBean
 	ExampleServiceCaller serviceCaller;

…ockitoSpyBeanAndSpringAopProxyTests.java …anAndSpringAopProxyIntegrationTests.javaspring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanAndSpringAopProxyTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanAndSpringAopProxyIntegrationTests.java spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanAndSpringAopProxyTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanAndSpringAopProxyIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.context.bean.override.mockito;
+package org.springframework.test.context.bean.override.mockito.integration;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
@@ -33,6 +33,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.util.AopTestUtils;
 
@@ -51,10 +52,10 @@
  * @author Phillip Webb
  * @since 6.2
  * @see <a href="https://github.com/spring-projects/spring-boot/issues/5837">5837</a>
- * @see MockitoBeanAndSpringAopProxyTests
+ * @see MockitoBeanAndSpringAopProxyIntegrationTests
  */
 @ExtendWith(SpringExtension.class)
-class MockitoSpyBeanAndSpringAopProxyTests {
+class MockitoSpyBeanAndSpringAopProxyIntegrationTests {
 
 	@MockitoSpyBean
 	DateService dateService;