Skip to content

Commit 9c91375

Browse files
committed
Remove deprecated GenericPropertiesContextLoader from the TCF
Since GenericPropertiesContextLoader was deprecated in Spring Framework 5.3, we have decided to remove it in Spring Framework 6.0. Closes gh-28911
1 parent b0ab0ed commit 9c91375

10 files changed

+1
-434
lines changed

spring-test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java

Lines changed: 0 additions & 74 deletions
This file was deleted.

spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java

Lines changed: 0 additions & 60 deletions
This file was deleted.

spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java

Lines changed: 0 additions & 61 deletions
This file was deleted.

spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java

Lines changed: 0 additions & 70 deletions
This file was deleted.

spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java

Lines changed: 0 additions & 77 deletions
This file was deleted.

spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4TestSuite.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -93,8 +93,6 @@
9393
RelativePathSpringJUnit4ClassRunnerAppCtxTests.class,//
9494
MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.class,//
9595
InheritedConfigSpringJUnit4ClassRunnerAppCtxTests.class,//
96-
PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.class,//
97-
CustomDefaultContextLoaderClassSpringRunnerTests.class,//
9896
ParameterizedDependencyInjectionTests.class,//
9997
ConcreteTransactionalJUnit4SpringContextTests.class,//
10098
ClassLevelTransactionalSpringRunnerTests.class,//

spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -223,20 +223,6 @@ static class ClassesBar extends ClassesFoo {
223223
static class OverriddenClassesBar extends ClassesFoo {
224224
}
225225

226-
@SuppressWarnings("deprecation")
227-
@ContextConfiguration(locations = "/foo.properties", loader = org.springframework.test.context.support.GenericPropertiesContextLoader.class)
228-
@ActiveProfiles("foo")
229-
static class PropertiesLocationsFoo {
230-
}
231-
232-
// Combining @Configuration classes with a Properties based loader doesn't really make
233-
// sense, but that's OK for unit testing purposes.
234-
@SuppressWarnings("deprecation")
235-
@ContextConfiguration(classes = FooConfig.class, loader = org.springframework.test.context.support.GenericPropertiesContextLoader.class)
236-
@ActiveProfiles("foo")
237-
static class PropertiesClassesFoo {
238-
}
239-
240226
@ContextConfiguration(classes = FooConfig.class, loader = AnnotationConfigContextLoader.class)
241227
@NestedTestConfiguration(INHERIT)
242228
static class OuterTestCase {

0 commit comments

Comments
 (0)