From dfcb2a2875ada7dbafab497888f0bcc0983a91a6 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 16 Jul 2014 21:51:49 +0200 Subject: [PATCH] Fix test broken by previous refactoring --- ...tContextConfigurationUtilsTests$BareAnnotations-context.xml} | 0 .../context/support/BootstrapTestUtilsMergedConfigTests.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename spring-test/src/test/java/org/springframework/test/context/support/{AbstractContextLoaderUtilsTests$BareAnnotations-context.xml => AbstractContextConfigurationUtilsTests$BareAnnotations-context.xml} (100%) diff --git a/spring-test/src/test/java/org/springframework/test/context/support/AbstractContextLoaderUtilsTests$BareAnnotations-context.xml b/spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests$BareAnnotations-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/support/AbstractContextLoaderUtilsTests$BareAnnotations-context.xml rename to spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests$BareAnnotations-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java index 406dbe911f5..109044be4f4 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java @@ -54,7 +54,7 @@ public class BootstrapTestUtilsMergedConfigTests extends AbstractContextConfigur assertMergedConfig( mergedConfig, testClass, - new String[] { "classpath:org/springframework/test/context/support/AbstractContextLoaderUtilsTests$BareAnnotations-context.xml" }, + new String[] { "classpath:org/springframework/test/context/support/AbstractContextConfigurationUtilsTests$BareAnnotations-context.xml" }, EMPTY_CLASS_ARRAY, DelegatingSmartContextLoader.class); }