diff --git a/org.springframework.context/.classpath b/org.springframework.context/.classpath index a97061c5be6..0ee47d25c89 100644 --- a/org.springframework.context/.classpath +++ b/org.springframework.context/.classpath @@ -31,6 +31,7 @@ + diff --git a/org.springframework.context/ivy.xml b/org.springframework.context/ivy.xml index c317db2af83..63af744c480 100644 --- a/org.springframework.context/ivy.xml +++ b/org.springframework.context/ivy.xml @@ -42,7 +42,6 @@ - @@ -55,6 +54,8 @@ + + diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml new file mode 100644 index 00000000000..85eb3620b0f --- /dev/null +++ b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml similarity index 64% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml index ac060a882b2..0edee0888ed 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml +++ b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml @@ -5,10 +5,6 @@ - - - - boPrototype - - + org.springframework.beans.factory.xml.DummyBo - - - PROPAGATION_REQUIRED - - diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java similarity index 99% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java index ce062645434..1ff8b72fabf 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java +++ b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java @@ -28,8 +28,6 @@ import java.lang.reflect.Method; import java.net.URL; import java.util.Map; -import javax.servlet.ServletException; - import org.apache.commons.logging.LogFactory; import org.junit.Test; import org.springframework.aop.framework.ProxyFactory; @@ -578,10 +576,10 @@ public final class XmlBeanFactoryTests { XmlBeanFactory xbf = new XmlBeanFactory(COMPLEX_FACTORY_CIRCLE_CONTEXT); xbf.getBean("proxy1"); // check that unused instances from autowiring got removed - assertEquals(5, xbf.getSingletonCount()); + assertEquals(4, xbf.getSingletonCount()); // properly create the remaining two instances xbf.getBean("proxy2"); - assertEquals(7, xbf.getSingletonCount()); + assertEquals(5, xbf.getSingletonCount()); } public @Test void testNoSuchFactoryBeanMethod() { @@ -614,7 +612,7 @@ public final class XmlBeanFactoryTests { catch (BeanCreationException ex) { assertTrue(ex.getResourceDescription().indexOf("initializers.xml") != -1); assertEquals("init-method2", ex.getBeanName()); - assertTrue(ex.getCause() instanceof ServletException); + assertTrue(ex.getCause() instanceof IOException); } } @@ -680,7 +678,7 @@ public final class XmlBeanFactoryTests { xbf.getBean("lazy-and-bad"); } catch (BeanCreationException ex) { - assertTrue(ex.getCause() instanceof ServletException); + assertTrue(ex.getCause() instanceof IOException); } } @@ -1387,8 +1385,8 @@ public final class XmlBeanFactoryTests { public static class BadInitializer { /** Init method */ - public void init2() throws ServletException { - throw new ServletException(); + public void init2() throws IOException { + throw new IOException(); } } @@ -1433,7 +1431,7 @@ public final class XmlBeanFactoryTests { } /** Init method */ - public void customInit() throws ServletException { + public void customInit() throws IOException { if (!this.afterPropertiesSetInvoked) { fail(); } diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/test.properties b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/test.properties similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/test.properties rename to org.springframework.context/src/test/java/org/springframework/beans/factory/xml/test.properties diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml deleted file mode 100644 index c99a803abd8..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - PROPAGATION_REQUIRED - - - - - - - - - - - - - - PROPAGATION_REQUIRED - - - - - - - - - - - - - - - - -