From ab7a2c4e701ec52751075df56be1c514e5c2eba9 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Mon, 2 Mar 2026 16:07:43 +0100 Subject: [PATCH] Rename configuration.interfaces package to config.interfaces This commit renames the org.springframework.test.context.configuration.interfaces package to org.springframework.test.context.config.interfaces in order to colocate "config" related tests under the same package. --- .../interfaces/ActiveProfilesInterfaceTests.java | 2 +- .../interfaces/ActiveProfilesTestInterface.java | 2 +- .../interfaces/BootstrapWithInterfaceTests.java | 2 +- .../interfaces/BootstrapWithTestInterface.java | 4 ++-- .../interfaces/ContextConfigurationInterfaceTests.java | 2 +- .../interfaces/ContextConfigurationTestInterface.java | 4 ++-- .../interfaces/ContextHierarchyInterfaceTests.java | 2 +- .../interfaces/ContextHierarchyTestInterface.java | 2 +- .../interfaces/DirtiesContextInterfaceTests.java | 2 +- .../interfaces/DirtiesContextTestInterface.java | 2 +- .../interfaces/SqlConfigInterfaceTests.java | 2 +- .../interfaces/SqlConfigTestInterface.java | 2 +- .../interfaces/TestPropertySourceInterfaceTests.java | 2 +- .../interfaces/TestPropertySourceTestInterface.java | 2 +- .../interfaces/WebAppConfigurationInterfaceTests.java | 2 +- .../interfaces/WebAppConfigurationTestInterface.java | 4 ++-- 16 files changed, 19 insertions(+), 19 deletions(-) rename spring-test/src/test/java/org/springframework/test/context/{configuration => config}/interfaces/ActiveProfilesInterfaceTests.java (96%) rename spring-test/src/test/java/org/springframework/test/context/{configuration => config}/interfaces/ActiveProfilesTestInterface.java (92%) rename spring-test/src/test/java/org/springframework/test/context/{configuration => config}/interfaces/BootstrapWithInterfaceTests.java (94%) rename spring-test/src/test/java/org/springframework/test/context/{configuration => config}/interfaces/BootstrapWithTestInterface.java (87%) rename spring-test/src/test/java/org/springframework/test/context/{configuration => config}/interfaces/ContextConfigurationInterfaceTests.java (95%) rename spring-test/src/test/java/org/springframework/test/context/{configuration => config}/interfaces/ContextConfigurationTestInterface.java (85%) rename spring-test/src/test/java/org/springframework/test/context/{configuration => config}/interfaces/ContextHierarchyInterfaceTests.java (96%) rename spring-test/src/test/java/org/springframework/test/context/{configuration => config}/interfaces/ContextHierarchyTestInterface.java (94%) rename spring-test/src/test/java/org/springframework/test/context/{configuration => config}/interfaces/DirtiesContextInterfaceTests.java (98%) rename spring-test/src/test/java/org/springframework/test/context/{configuration => config}/interfaces/DirtiesContextTestInterface.java (92%) rename spring-test/src/test/java/org/springframework/test/context/{configuration => config}/interfaces/SqlConfigInterfaceTests.java (96%) rename spring-test/src/test/java/org/springframework/test/context/{configuration => config}/interfaces/SqlConfigTestInterface.java (94%) rename spring-test/src/test/java/org/springframework/test/context/{configuration => config}/interfaces/TestPropertySourceInterfaceTests.java (95%) rename spring-test/src/test/java/org/springframework/test/context/{configuration => config}/interfaces/TestPropertySourceTestInterface.java (92%) rename spring-test/src/test/java/org/springframework/test/context/{configuration => config}/interfaces/WebAppConfigurationInterfaceTests.java (94%) rename spring-test/src/test/java/org/springframework/test/context/{configuration => config}/interfaces/WebAppConfigurationTestInterface.java (85%) diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ActiveProfilesInterfaceTests.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/ActiveProfilesInterfaceTests.java similarity index 96% rename from spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ActiveProfilesInterfaceTests.java rename to spring-test/src/test/java/org/springframework/test/context/config/interfaces/ActiveProfilesInterfaceTests.java index e07ea2c0a2f..fd1f0fc2793 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ActiveProfilesInterfaceTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/ActiveProfilesInterfaceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.configuration.interfaces; +package org.springframework.test.context.config.interfaces; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ActiveProfilesTestInterface.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/ActiveProfilesTestInterface.java similarity index 92% rename from spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ActiveProfilesTestInterface.java rename to spring-test/src/test/java/org/springframework/test/context/config/interfaces/ActiveProfilesTestInterface.java index bfe74562338..c3d459189dd 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ActiveProfilesTestInterface.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/ActiveProfilesTestInterface.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.configuration.interfaces; +package org.springframework.test.context.config.interfaces; import org.springframework.test.context.ActiveProfiles; diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/BootstrapWithInterfaceTests.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/BootstrapWithInterfaceTests.java similarity index 94% rename from spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/BootstrapWithInterfaceTests.java rename to spring-test/src/test/java/org/springframework/test/context/config/interfaces/BootstrapWithInterfaceTests.java index 20d82956702..69ee029d4b1 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/BootstrapWithInterfaceTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/BootstrapWithInterfaceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.configuration.interfaces; +package org.springframework.test.context.config.interfaces; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/BootstrapWithTestInterface.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/BootstrapWithTestInterface.java similarity index 87% rename from spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/BootstrapWithTestInterface.java rename to spring-test/src/test/java/org/springframework/test/context/config/interfaces/BootstrapWithTestInterface.java index 3b7be71d73b..e75239c6bf2 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/BootstrapWithTestInterface.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/BootstrapWithTestInterface.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.test.context.configuration.interfaces; +package org.springframework.test.context.config.interfaces; import java.util.List; import org.springframework.test.context.BootstrapWith; import org.springframework.test.context.ContextCustomizerFactory; -import org.springframework.test.context.configuration.interfaces.BootstrapWithTestInterface.CustomTestContextBootstrapper; +import org.springframework.test.context.config.interfaces.BootstrapWithTestInterface.CustomTestContextBootstrapper; import org.springframework.test.context.support.DefaultTestContextBootstrapper; import static java.util.Collections.singletonList; diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextConfigurationInterfaceTests.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/ContextConfigurationInterfaceTests.java similarity index 95% rename from spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextConfigurationInterfaceTests.java rename to spring-test/src/test/java/org/springframework/test/context/config/interfaces/ContextConfigurationInterfaceTests.java index 8b8b2a522c0..3f8416c4ad9 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextConfigurationInterfaceTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/ContextConfigurationInterfaceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.configuration.interfaces; +package org.springframework.test.context.config.interfaces; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextConfigurationTestInterface.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/ContextConfigurationTestInterface.java similarity index 85% rename from spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextConfigurationTestInterface.java rename to spring-test/src/test/java/org/springframework/test/context/config/interfaces/ContextConfigurationTestInterface.java index 172ccb7bb89..c4541bd41d7 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextConfigurationTestInterface.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/ContextConfigurationTestInterface.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.test.context.configuration.interfaces; +package org.springframework.test.context.config.interfaces; import org.springframework.beans.testfixture.beans.Employee; import org.springframework.context.annotation.Bean; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.configuration.interfaces.ContextConfigurationTestInterface.Config; +import org.springframework.test.context.config.interfaces.ContextConfigurationTestInterface.Config; /** * @author Sam Brannen diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextHierarchyInterfaceTests.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/ContextHierarchyInterfaceTests.java similarity index 96% rename from spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextHierarchyInterfaceTests.java rename to spring-test/src/test/java/org/springframework/test/context/config/interfaces/ContextHierarchyInterfaceTests.java index 1a8973c5812..e1582497bb3 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextHierarchyInterfaceTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/ContextHierarchyInterfaceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.configuration.interfaces; +package org.springframework.test.context.config.interfaces; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextHierarchyTestInterface.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/ContextHierarchyTestInterface.java similarity index 94% rename from spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextHierarchyTestInterface.java rename to spring-test/src/test/java/org/springframework/test/context/config/interfaces/ContextHierarchyTestInterface.java index 957a7f38185..be785e4b518 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/ContextHierarchyTestInterface.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/ContextHierarchyTestInterface.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.configuration.interfaces; +package org.springframework.test.context.config.interfaces; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/DirtiesContextInterfaceTests.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/DirtiesContextInterfaceTests.java similarity index 98% rename from spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/DirtiesContextInterfaceTests.java rename to spring-test/src/test/java/org/springframework/test/context/config/interfaces/DirtiesContextInterfaceTests.java index 70d4895a0bb..cc050d5db9a 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/DirtiesContextInterfaceTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/DirtiesContextInterfaceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.configuration.interfaces; +package org.springframework.test.context.config.interfaces; import java.util.concurrent.atomic.AtomicInteger; diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/DirtiesContextTestInterface.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/DirtiesContextTestInterface.java similarity index 92% rename from spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/DirtiesContextTestInterface.java rename to spring-test/src/test/java/org/springframework/test/context/config/interfaces/DirtiesContextTestInterface.java index 7399444b98a..4be5f0be82d 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/DirtiesContextTestInterface.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/DirtiesContextTestInterface.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.configuration.interfaces; +package org.springframework.test.context.config.interfaces; import org.springframework.test.annotation.DirtiesContext; diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/SqlConfigInterfaceTests.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/SqlConfigInterfaceTests.java similarity index 96% rename from spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/SqlConfigInterfaceTests.java rename to spring-test/src/test/java/org/springframework/test/context/config/interfaces/SqlConfigInterfaceTests.java index 9612acaba94..3dade246667 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/SqlConfigInterfaceTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/SqlConfigInterfaceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.configuration.interfaces; +package org.springframework.test.context.config.interfaces; import javax.sql.DataSource; diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/SqlConfigTestInterface.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/SqlConfigTestInterface.java similarity index 94% rename from spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/SqlConfigTestInterface.java rename to spring-test/src/test/java/org/springframework/test/context/config/interfaces/SqlConfigTestInterface.java index 1032973080e..896b004682d 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/SqlConfigTestInterface.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/SqlConfigTestInterface.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.configuration.interfaces; +package org.springframework.test.context.config.interfaces; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/TestPropertySourceInterfaceTests.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/TestPropertySourceInterfaceTests.java similarity index 95% rename from spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/TestPropertySourceInterfaceTests.java rename to spring-test/src/test/java/org/springframework/test/context/config/interfaces/TestPropertySourceInterfaceTests.java index f605da04d07..67c6c1843c7 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/TestPropertySourceInterfaceTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/TestPropertySourceInterfaceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.configuration.interfaces; +package org.springframework.test.context.config.interfaces; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/TestPropertySourceTestInterface.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/TestPropertySourceTestInterface.java similarity index 92% rename from spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/TestPropertySourceTestInterface.java rename to spring-test/src/test/java/org/springframework/test/context/config/interfaces/TestPropertySourceTestInterface.java index 873d7d0c441..19e446ba95c 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/TestPropertySourceTestInterface.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/TestPropertySourceTestInterface.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.configuration.interfaces; +package org.springframework.test.context.config.interfaces; import org.springframework.test.context.TestPropertySource; diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/WebAppConfigurationInterfaceTests.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/WebAppConfigurationInterfaceTests.java similarity index 94% rename from spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/WebAppConfigurationInterfaceTests.java rename to spring-test/src/test/java/org/springframework/test/context/config/interfaces/WebAppConfigurationInterfaceTests.java index c02e12ee8cb..c59fa3d259d 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/WebAppConfigurationInterfaceTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/WebAppConfigurationInterfaceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.configuration.interfaces; +package org.springframework.test.context.config.interfaces; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/WebAppConfigurationTestInterface.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/WebAppConfigurationTestInterface.java similarity index 85% rename from spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/WebAppConfigurationTestInterface.java rename to spring-test/src/test/java/org/springframework/test/context/config/interfaces/WebAppConfigurationTestInterface.java index ca1ec4c6ff9..b9df1aaa939 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/interfaces/WebAppConfigurationTestInterface.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/WebAppConfigurationTestInterface.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.test.context.configuration.interfaces; +package org.springframework.test.context.config.interfaces; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.configuration.interfaces.WebAppConfigurationTestInterface.Config; +import org.springframework.test.context.config.interfaces.WebAppConfigurationTestInterface.Config; import org.springframework.test.context.web.WebAppConfiguration; /**