Browse Source

Fix test broken by previous refactoring

pull/595/head
Sam Brannen 12 years ago
parent
commit
dfcb2a2875
  1. 0
      spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests$BareAnnotations-context.xml
  2. 2
      spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java

0
spring-test/src/test/java/org/springframework/test/context/support/AbstractContextLoaderUtilsTests$BareAnnotations-context.xml → spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests$BareAnnotations-context.xml

2
spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java

@ -54,7 +54,7 @@ public class BootstrapTestUtilsMergedConfigTests extends AbstractContextConfigur @@ -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);
}

Loading…
Cancel
Save