root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Use new ConcurrentLruCache#clear() method in TestContextAnnotationUtils

This commit is contained in:
Sam Brannen 2020-10-26 09:48:33 +01:00
parent 1676470729
commit 1247e4a0e8
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-test/src/main/java/org/springframework/test/context/TestContextAnnotationUtils.java
View File

@ -386,6 +386,7 @@ public abstract class TestContextAnnotationUtils {
}
static void clearCaches() {
cachedEnclosingConfigurationModes.clear();
defaultEnclosingConfigurationMode = null;
}

23
spring-test/src/test/java/org/springframework/test/context/TestContextAnnotationUtilsTests.java
View File

@ -69,17 +69,17 @@ class TestContextAnnotationUtilsTests {
@Test
void standardDefaultMode() {
assertThat(searchEnclosingClass(OuterTestCase1.class)).isFalse();
assertThat(searchEnclosingClass(OuterTestCase1.NestedTestCase.class)).isTrue();
assertThat(searchEnclosingClass(OuterTestCase1.NestedTestCase.DoubleNestedTestCase.class)).isTrue();
assertThat(searchEnclosingClass(OuterTestCase.class)).isFalse();
assertThat(searchEnclosingClass(OuterTestCase.NestedTestCase.class)).isTrue();
assertThat(searchEnclosingClass(OuterTestCase.NestedTestCase.DoubleNestedTestCase.class)).isTrue();
}
@Test
void overriddenDefaultMode() {
setGlobalFlag("\t" + OVERRIDE.name().toLowerCase() + " ");
assertThat(searchEnclosingClass(OuterTestCase2.class)).isFalse();
assertThat(searchEnclosingClass(OuterTestCase2.NestedTestCase.class)).isFalse();
assertThat(searchEnclosingClass(OuterTestCase2.NestedTestCase.DoubleNestedTestCase.class)).isFalse();
assertThat(searchEnclosingClass(OuterTestCase.class)).isFalse();
assertThat(searchEnclosingClass(OuterTestCase.NestedTestCase.class)).isFalse();
assertThat(searchEnclosingClass(OuterTestCase.NestedTestCase.DoubleNestedTestCase.class)).isFalse();
}
private void setGlobalFlag(String flag) {
@ -675,16 +675,7 @@ class TestContextAnnotationUtilsTests {
static class MetaAnnotatedAndSuperAnnotatedContextConfigClass extends AnnotatedContextConfigClass {
}
// We need two variants of "OuterTestCase", since the results for searchEnclosingClass() get cached.
static class OuterTestCase1 {
class NestedTestCase {
class DoubleNestedTestCase {
}
}
}
// We need two variants of "OuterTestCase", since the results for searchEnclosingClass() get cached.
static class OuterTestCase2 {
static class OuterTestCase {
class NestedTestCase {
class DoubleNestedTestCase {
}