diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java deleted file mode 100644 index 2d9f4a2b46b..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright 2002-2005 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -import java.io.Serializable; - -import org.springframework.beans.IndexedTestBean; -import org.springframework.beans.TestBean; - -/** - * Simple bean used to check constructor dependency checking. - * - * @author Juergen Hoeller - * @since 09.11.2003 - */ -public class ConstructorDependenciesBean implements Serializable { - - private int age; - - private String name; - - private TestBean spouse1; - - private TestBean spouse2; - - private IndexedTestBean other; - - public ConstructorDependenciesBean(int age) { - this.age = age; - } - - public ConstructorDependenciesBean(String name) { - this.name = name; - } - - public ConstructorDependenciesBean(TestBean spouse1) { - this.spouse1 = spouse1; - } - - public ConstructorDependenciesBean(TestBean spouse1, TestBean spouse2) { - this.spouse1 = spouse1; - this.spouse2 = spouse2; - } - - public ConstructorDependenciesBean(TestBean spouse1, TestBean spouse2, int age) { - this.spouse1 = spouse1; - this.spouse2 = spouse2; - this.age = age; - } - - public ConstructorDependenciesBean(TestBean spouse1, TestBean spouse2, IndexedTestBean other) { - this.spouse1 = spouse1; - this.spouse2 = spouse2; - this.other = other; - } - - public int getAge() { - return age; - } - - public String getName() { - return name; - } - - public TestBean getSpouse1() { - return spouse1; - } - - public TestBean getSpouse2() { - return spouse2; - } - - public IndexedTestBean getOther() { - return other; - } - - public void setAge(int age) { - this.age = age; - } - - public void setName(String name) { - this.name = name; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/ConstructorInjectedOverrides.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/ConstructorInjectedOverrides.java deleted file mode 100644 index 3bed86420ab..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/ConstructorInjectedOverrides.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2002-2005 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -import org.springframework.beans.ITestBean; - -/** - * Bean testing the ability to use both lookup method overrides - * and constructor injection. - * There is also a property ("setterString") to be set via - * Setter Injection. - * - * @author Rod Johnson - */ -public abstract class ConstructorInjectedOverrides { - - private ITestBean tb; - - private String setterString; - - public ConstructorInjectedOverrides(ITestBean tb) { - this.tb = tb; - } - - public ITestBean getTestBean() { - return this.tb; - } - - - protected abstract FactoryMethods createFactoryMethods(); - - /** - * @return Returns the setterString. - */ - public String getSetterString() { - return setterString; - } - /** - * @param setterString The setterString to set. - */ - public void setSetterString(String setterString) { - this.setterString = setterString; - } -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java index 0ca614e051f..ff45fc57007 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java @@ -22,11 +22,15 @@ import org.springframework.beans.factory.BeanFactoryAware; /** * Simple bean used to test dependency checking. + * + * Note: would be defined within {@link XmlBeanFactoryTestTypes}, but must be a public type + * in order to satisfy test dependencies. * * @author Rod Johnson + * @author Chris Beams * @since 04.09.2003 */ -public class DependenciesBean implements BeanFactoryAware { +public final class DependenciesBean implements BeanFactoryAware { private int age; diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DerivedConstructorDependenciesBean.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DerivedConstructorDependenciesBean.java deleted file mode 100644 index 50bd0e368ff..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DerivedConstructorDependenciesBean.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2002-2005 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -import org.springframework.beans.IndexedTestBean; -import org.springframework.beans.TestBean; - -/** - * Simple bean used to check constructor dependency checking. - * - * @author Juergen Hoeller - * @since 09.11.2003 - */ -class DerivedConstructorDependenciesBean extends ConstructorDependenciesBean { - - boolean initialized; - boolean destroyed; - - DerivedConstructorDependenciesBean(TestBean spouse1, TestBean spouse2, IndexedTestBean other) { - super(spouse1, spouse2, other); - } - - private DerivedConstructorDependenciesBean(TestBean spouse1, Object spouse2, IndexedTestBean other) { - super(spouse1, null, other); - } - - protected DerivedConstructorDependenciesBean(TestBean spouse1, TestBean spouse2, IndexedTestBean other, int age, int otherAge) { - super(spouse1, spouse2, other); - } - - public DerivedConstructorDependenciesBean(TestBean spouse1, TestBean spouse2, IndexedTestBean other, int age, String name) { - super(spouse1, spouse2, other); - setAge(age); - setName(name); - } - - private void init() { - this.initialized = true; - } - - private void destroy() { - this.destroyed = true; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DummyBo.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DummyBo.java deleted file mode 100644 index 6bb51516e4d..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DummyBo.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2002-2005 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -/** - * - * @author Rod Johnson - */ -public interface DummyBo { - - void something(); - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DummyBoImpl.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DummyBoImpl.java deleted file mode 100644 index a03cb3b9e6c..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DummyBoImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2002-2005 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -/** - * - * @author Rod Johnson - */ -public class DummyBoImpl implements DummyBo { - - DummyDao dao; - - public DummyBoImpl(DummyDao dao) { - this.dao = dao; - } - - public void something() { - - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DummyDao.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DummyDao.java deleted file mode 100644 index d0b3176345f..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DummyDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2002-2005 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -import javax.sql.DataSource; - -/** - * - * @author Rod Johnson - */ -public class DummyDao { - - DataSource ds; - - public DummyDao(DataSource ds) { - this.ds = ds; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java deleted file mode 100644 index 94ff6de94ae..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2002-2005 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -import org.springframework.beans.TestBean; -import org.springframework.beans.factory.DummyFactory; - -/** - * @author Juergen Hoeller - * @since 21.07.2003 - */ -public class DummyReferencer { - - private TestBean testBean1; - - private TestBean testBean2; - - private DummyFactory dummyFactory; - - - public DummyReferencer() { - } - - public DummyReferencer(DummyFactory dummyFactory) { - this.dummyFactory = dummyFactory; - } - - public void setDummyFactory(DummyFactory dummyFactory) { - this.dummyFactory = dummyFactory; - } - - public DummyFactory getDummyFactory() { - return dummyFactory; - } - - public void setTestBean1(TestBean testBean1) { - this.testBean1 = testBean1; - } - - public TestBean getTestBean1() { - return testBean1; - } - - public void setTestBean2(TestBean testBean2) { - this.testBean2 = testBean2; - } - - public TestBean getTestBean2() { - return testBean2; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java deleted file mode 100644 index c164d8fae73..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright 2002-2006 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -import java.util.Collections; -import java.util.List; - -import org.springframework.beans.TestBean; - -/** - * Test class for Spring's ability to create objects using static - * factory methods, rather than constructors. - * - * @author Rod Johnson - * @author Juergen Hoeller - */ -public class FactoryMethods { - - public static FactoryMethods nullInstance() { - return null; - } - - public static FactoryMethods defaultInstance() { - TestBean tb = new TestBean(); - tb.setName("defaultInstance"); - return new FactoryMethods(tb, "default", 0); - } - - /** - * Note that overloaded methods are supported. - */ - public static FactoryMethods newInstance(TestBean tb) { - return new FactoryMethods(tb, "default", 0); - } - - protected static FactoryMethods newInstance(TestBean tb, int num, String name) { - if (name == null) { - throw new IllegalStateException("Should never be called with null value"); - } - return new FactoryMethods(tb, name, num); - } - - static FactoryMethods newInstance(TestBean tb, int num, Integer something) { - if (something != null) { - throw new IllegalStateException("Should never be called with non-null value"); - } - return new FactoryMethods(tb, null, num); - } - - private static List listInstance() { - return Collections.EMPTY_LIST; - } - - - private int num = 0; - private String name = "default"; - private TestBean tb; - private String stringValue; - - - /** - * Constructor is private: not for use outside this class, - * even by IoC container. - */ - private FactoryMethods(TestBean tb, String name, int num) { - this.tb = tb; - this.name = name; - this.num = num; - } - - public void setStringValue(String stringValue) { - this.stringValue = stringValue; - } - - public String getStringValue() { - return this.stringValue; - } - - public TestBean getTestBean() { - return this.tb; - } - - protected TestBean protectedGetTestBean() { - return this.tb; - } - - private TestBean privateGetTestBean() { - return this.tb; - } - - public int getNum() { - return num; - } - - public String getName() { - return name; - } - - /** - * Set via Setter Injection once instance is created. - */ - public void setName(String name) { - this.name = name; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/FixedMethodReplacer.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/FixedMethodReplacer.java deleted file mode 100644 index 2ac34def136..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/FixedMethodReplacer.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2002-2005 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -import java.lang.reflect.Method; - -import org.springframework.beans.factory.support.MethodReplacer; - -/** - * Fixed method replacer for String return types - * @author Rod Johnson - */ -public class FixedMethodReplacer implements MethodReplacer { - - public static final String VALUE = "fixedMethodReplacer"; - - public Object reimplement(Object obj, Method method, Object[] args) throws Throwable { - return VALUE; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/MapAndSet.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/MapAndSet.java deleted file mode 100644 index 1d059ea569d..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/MapAndSet.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2002-2006 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.beans.factory.xml; - -import java.util.Map; -import java.util.Set; - -/** - * @author Chris Beams - */ -public class MapAndSet { - - private Object obj; - - public MapAndSet(Map map) { - this.obj = map; - } - - public MapAndSet(Set set) { - this.obj = set; - } - - public Object getObject() { - return obj; - } -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/MethodReplaceCandidate.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/MethodReplaceCandidate.java deleted file mode 100644 index bf104819349..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/MethodReplaceCandidate.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2002-2005 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -/** - * - * @author Rod Johnson - */ -public class MethodReplaceCandidate { - - public String replaceMe(String echo) { - return echo; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/MixedCollectionBean.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/MixedCollectionBean.java deleted file mode 100644 index 8ed5f2517ec..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/MixedCollectionBean.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2002-2006 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -import java.util.Collection; - -/** - * Bean that exposes a simple property that can be set - * to a mix of references and individual values. - * - * @author Rod Johnson - * @since 27.05.2003 - */ -public class MixedCollectionBean { - - private Collection jumble; - - - public void setJumble(Collection jumble) { - this.jumble = jumble; - } - - public Collection getJumble() { - return jumble; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/OverrideInterface.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/OverrideInterface.java deleted file mode 100644 index 4ad5bedd82a..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/OverrideInterface.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2002-2006 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -import org.springframework.beans.TestBean; - -/** - * @author Juergen Hoeller - */ -public interface OverrideInterface { - - TestBean getPrototypeDependency(); - - TestBean getPrototypeDependency(Object someParam); - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/OverrideOneMethod.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/OverrideOneMethod.java deleted file mode 100644 index 6053f68e333..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/OverrideOneMethod.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2002-2006 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -import org.springframework.beans.TestBean; - -/** - * @author Rod Johnson - * @author Juergen Hoeller - */ -public abstract class OverrideOneMethod extends MethodReplaceCandidate implements OverrideInterface { - - protected abstract TestBean protectedOverrideSingleton(); - - public TestBean getPrototypeDependency(Object someParam) { - return new TestBean(); - } - - public TestBean invokesOverridenMethodOnSelf() { - return getPrototypeDependency(); - } - - public String echo(String echo) { - return echo; - } - - /** - * Overloaded form of replaceMe. - */ - public String replaceMe() { - return "replaceMe"; - } - - /** - * Another overloaded form of replaceMe, not getting replaced. - * Must not cause errors when the other replaceMe methods get replaced. - */ - public String replaceMe(int someParam) { - return "replaceMe:" + someParam; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/OverrideOneMethodSubclass.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/OverrideOneMethodSubclass.java deleted file mode 100644 index 95da446ed48..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/OverrideOneMethodSubclass.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2002-2005 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -/** - * Subclass of OverrideOneMethod, to check that overriding is - * supported for inherited methods. - * - * @author Rod Johnson - */ -public abstract class OverrideOneMethodSubclass extends OverrideOneMethod { - - protected void doSomething(String arg) { - // This implementation does nothing! - // It's not overloaded - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java deleted file mode 100644 index 7fef9c31533..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Copyright 2002-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.beans.factory.BeanNameAware; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.config.BeanPostProcessor; - -/** - * Simple test of BeanFactory initialization and lifecycle callbacks. - * - * @author Rod Johnson - * @author Juergen Hoeller - */ -class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, InitializingBean, DisposableBean { - - protected boolean initMethodDeclared = false; - - protected String beanName; - - protected BeanFactory owningFactory; - - protected boolean postProcessedBeforeInit; - - protected boolean inited; - - protected boolean initedViaDeclaredInitMethod; - - protected boolean postProcessedAfterInit; - - protected boolean destroyed; - - - public void setInitMethodDeclared(boolean initMethodDeclared) { - this.initMethodDeclared = initMethodDeclared; - } - - public boolean isInitMethodDeclared() { - return initMethodDeclared; - } - - public void setBeanName(String name) { - this.beanName = name; - } - - public String getBeanName() { - return beanName; - } - - public void setBeanFactory(BeanFactory beanFactory) { - this.owningFactory = beanFactory; - } - - public void postProcessBeforeInit() { - if (this.inited || this.initedViaDeclaredInitMethod) { - throw new RuntimeException("Factory called postProcessBeforeInit after afterPropertiesSet"); - } - if (this.postProcessedBeforeInit) { - throw new RuntimeException("Factory called postProcessBeforeInit twice"); - } - this.postProcessedBeforeInit = true; - } - - public void afterPropertiesSet() { - if (this.owningFactory == null) { - throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean"); - } - if (!this.postProcessedBeforeInit) { - throw new RuntimeException("Factory didn't call postProcessBeforeInit before afterPropertiesSet on lifecycle bean"); - } - if (this.initedViaDeclaredInitMethod) { - throw new RuntimeException("Factory initialized via declared init method before initializing via afterPropertiesSet"); - } - if (this.inited) { - throw new RuntimeException("Factory called afterPropertiesSet twice"); - } - this.inited = true; - } - - public void declaredInitMethod() { - if (!this.inited) { - throw new RuntimeException("Factory didn't call afterPropertiesSet before declared init method"); - } - - if (this.initedViaDeclaredInitMethod) { - throw new RuntimeException("Factory called declared init method twice"); - } - this.initedViaDeclaredInitMethod = true; - } - - public void postProcessAfterInit() { - if (!this.inited) { - throw new RuntimeException("Factory called postProcessAfterInit before afterPropertiesSet"); - } - if (this.initMethodDeclared && !this.initedViaDeclaredInitMethod) { - throw new RuntimeException("Factory called postProcessAfterInit before calling declared init method"); - } - if (this.postProcessedAfterInit) { - throw new RuntimeException("Factory called postProcessAfterInit twice"); - } - this.postProcessedAfterInit = true; - } - - /** - * Dummy business method that will fail unless the factory - * managed the bean's lifecycle correctly - */ - public void businessMethod() { - if (!this.inited || (this.initMethodDeclared && !this.initedViaDeclaredInitMethod) || - !this.postProcessedAfterInit) { - throw new RuntimeException("Factory didn't initialize lifecycle object correctly"); - } - } - - public void destroy() { - if (this.destroyed) { - throw new IllegalStateException("Already destroyed"); - } - this.destroyed = true; - } - - public boolean isDestroyed() { - return destroyed; - } - - - public static class PostProcessor implements BeanPostProcessor { - - public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { - if (bean instanceof ProtectedLifecycleBean) { - ((ProtectedLifecycleBean) bean).postProcessBeforeInit(); - } - return bean; - } - - public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { - if (bean instanceof ProtectedLifecycleBean) { - ((ProtectedLifecycleBean) bean).postProcessAfterInit(); - } - return bean; - } - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/ReverseMethodReplacer.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/ReverseMethodReplacer.java deleted file mode 100644 index 73e364fa267..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/ReverseMethodReplacer.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * The Spring Framework is published under the terms - * of the Apache Software License. - */ - -package org.springframework.beans.factory.xml; - -import java.io.Serializable; -import java.lang.reflect.Method; - -import org.springframework.beans.factory.support.MethodReplacer; - -/** - * @author Rod Johnson - */ -public class ReverseMethodReplacer implements MethodReplacer, Serializable { - - public Object reimplement(Object obj, Method method, Object[] args) throws Throwable { - String s = (String) args[0]; - return new StringBuffer(s).reverse().toString(); - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/SerializableMethodReplacerCandidate.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/SerializableMethodReplacerCandidate.java deleted file mode 100644 index 33150572012..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/SerializableMethodReplacerCandidate.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2002-2005 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -import java.io.Serializable; - -/** - * @author Rod Johnson - */ -public abstract class SerializableMethodReplacerCandidate extends MethodReplaceCandidate implements Serializable { - - //public abstract Point getPoint(); - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/SingleSimpleTypeConstructorBean.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/SingleSimpleTypeConstructorBean.java deleted file mode 100644 index 50ca3486480..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/SingleSimpleTypeConstructorBean.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2002-2005 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.beans.factory.xml; - -/** - * @author Juergen Hoeller - * @since 23.10.2004 - */ -public class SingleSimpleTypeConstructorBean { - - private boolean singleBoolean; - - private boolean secondBoolean; - - private String testString; - - public SingleSimpleTypeConstructorBean(boolean singleBoolean) { - this.singleBoolean = singleBoolean; - } - - public SingleSimpleTypeConstructorBean(String testString, boolean secondBoolean) { - this.testString = testString; - this.secondBoolean = secondBoolean; - } - - public boolean isSingleBoolean() { - return singleBoolean; - } - - public boolean isSecondBoolean() { - return secondBoolean; - } - - public String getTestString() { - return testString; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java new file mode 100644 index 00000000000..581a5653af8 --- /dev/null +++ b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java @@ -0,0 +1,732 @@ +/* + * Copyright 2002-2008 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.beans.factory.xml; + +import java.io.Serializable; +import java.lang.reflect.Method; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.sql.DataSource; + +import org.springframework.beans.BeansException; +import org.springframework.beans.ITestBean; +import org.springframework.beans.IndexedTestBean; +import org.springframework.beans.TestBean; +import org.springframework.beans.factory.BeanFactory; +import org.springframework.beans.factory.BeanFactoryAware; +import org.springframework.beans.factory.BeanNameAware; +import org.springframework.beans.factory.DisposableBean; +import org.springframework.beans.factory.DummyFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.config.BeanPostProcessor; +import org.springframework.beans.factory.support.MethodReplacer; + + +/** + * Types used by {@link XmlBeanFactoryTests} and its attendant XML config files. + * + * @author Chris Beams + */ +final class XmlBeanFactoryTestTypes { } + +/** + * Simple bean used to check constructor dependency checking. + * + * @author Juergen Hoeller + * @since 09.11.2003 + */ +@SuppressWarnings("serial") +class ConstructorDependenciesBean implements Serializable { + + private int age; + + private String name; + + private TestBean spouse1; + + private TestBean spouse2; + + private IndexedTestBean other; + + public ConstructorDependenciesBean(int age) { + this.age = age; + } + + public ConstructorDependenciesBean(String name) { + this.name = name; + } + + public ConstructorDependenciesBean(TestBean spouse1) { + this.spouse1 = spouse1; + } + + public ConstructorDependenciesBean(TestBean spouse1, TestBean spouse2) { + this.spouse1 = spouse1; + this.spouse2 = spouse2; + } + + public ConstructorDependenciesBean(TestBean spouse1, TestBean spouse2, int age) { + this.spouse1 = spouse1; + this.spouse2 = spouse2; + this.age = age; + } + + public ConstructorDependenciesBean(TestBean spouse1, TestBean spouse2, IndexedTestBean other) { + this.spouse1 = spouse1; + this.spouse2 = spouse2; + this.other = other; + } + + public int getAge() { + return age; + } + + public String getName() { + return name; + } + + public TestBean getSpouse1() { + return spouse1; + } + + public TestBean getSpouse2() { + return spouse2; + } + + public IndexedTestBean getOther() { + return other; + } + + public void setAge(int age) { + this.age = age; + } + + public void setName(String name) { + this.name = name; + } + +} + + +/** + * Bean testing the ability to use both lookup method overrides + * and constructor injection. + * There is also a property ("setterString") to be set via + * Setter Injection. + * + * @author Rod Johnson + */ +abstract class ConstructorInjectedOverrides { + + private ITestBean tb; + + private String setterString; + + public ConstructorInjectedOverrides(ITestBean tb) { + this.tb = tb; + } + + public ITestBean getTestBean() { + return this.tb; + } + + + protected abstract FactoryMethods createFactoryMethods(); + + /** + * @return Returns the setterString. + */ + public String getSetterString() { + return setterString; + } + /** + * @param setterString The setterString to set. + */ + public void setSetterString(String setterString) { + this.setterString = setterString; + } +} + + +/** + * Simple bean used to check constructor dependency checking. + * + * @author Juergen Hoeller + * @since 09.11.2003 + */ +@SuppressWarnings("serial") +class DerivedConstructorDependenciesBean extends ConstructorDependenciesBean { + + boolean initialized; + boolean destroyed; + + DerivedConstructorDependenciesBean(TestBean spouse1, TestBean spouse2, IndexedTestBean other) { + super(spouse1, spouse2, other); + } + + private DerivedConstructorDependenciesBean(TestBean spouse1, Object spouse2, IndexedTestBean other) { + super(spouse1, null, other); + } + + protected DerivedConstructorDependenciesBean(TestBean spouse1, TestBean spouse2, IndexedTestBean other, int age, int otherAge) { + super(spouse1, spouse2, other); + } + + public DerivedConstructorDependenciesBean(TestBean spouse1, TestBean spouse2, IndexedTestBean other, int age, String name) { + super(spouse1, spouse2, other); + setAge(age); + setName(name); + } + + private void init() { + this.initialized = true; + } + + private void destroy() { + this.destroyed = true; + } + +} + + +/** + * + * @author Rod Johnson + */ +interface DummyBo { + + void something(); + +} + + +/** + * + * @author Rod Johnson + */ +class DummyBoImpl implements DummyBo { + + DummyDao dao; + + public DummyBoImpl(DummyDao dao) { + this.dao = dao; + } + + public void something() { + + } + +} + + +/** + * @author Rod Johnson + */ +class DummyDao { + + DataSource ds; + + public DummyDao(DataSource ds) { + this.ds = ds; + } + +} + + +/** + * @author Juergen Hoeller + * @since 21.07.2003 + */ +class DummyReferencer { + + private TestBean testBean1; + + private TestBean testBean2; + + private DummyFactory dummyFactory; + + + public DummyReferencer() { + } + + public DummyReferencer(DummyFactory dummyFactory) { + this.dummyFactory = dummyFactory; + } + + public void setDummyFactory(DummyFactory dummyFactory) { + this.dummyFactory = dummyFactory; + } + + public DummyFactory getDummyFactory() { + return dummyFactory; + } + + public void setTestBean1(TestBean testBean1) { + this.testBean1 = testBean1; + } + + public TestBean getTestBean1() { + return testBean1; + } + + public void setTestBean2(TestBean testBean2) { + this.testBean2 = testBean2; + } + + public TestBean getTestBean2() { + return testBean2; + } + +} + + +/** + * Test class for Spring's ability to create objects using static + * factory methods, rather than constructors. + * + * @author Rod Johnson + * @author Juergen Hoeller + */ +class FactoryMethods { + + public static FactoryMethods nullInstance() { + return null; + } + + public static FactoryMethods defaultInstance() { + TestBean tb = new TestBean(); + tb.setName("defaultInstance"); + return new FactoryMethods(tb, "default", 0); + } + + /** + * Note that overloaded methods are supported. + */ + public static FactoryMethods newInstance(TestBean tb) { + return new FactoryMethods(tb, "default", 0); + } + + protected static FactoryMethods newInstance(TestBean tb, int num, String name) { + if (name == null) { + throw new IllegalStateException("Should never be called with null value"); + } + return new FactoryMethods(tb, name, num); + } + + static FactoryMethods newInstance(TestBean tb, int num, Integer something) { + if (something != null) { + throw new IllegalStateException("Should never be called with non-null value"); + } + return new FactoryMethods(tb, null, num); + } + + private static List listInstance() { + return Collections.EMPTY_LIST; + } + + + private int num = 0; + private String name = "default"; + private TestBean tb; + private String stringValue; + + + /** + * Constructor is private: not for use outside this class, + * even by IoC container. + */ + private FactoryMethods(TestBean tb, String name, int num) { + this.tb = tb; + this.name = name; + this.num = num; + } + + public void setStringValue(String stringValue) { + this.stringValue = stringValue; + } + + public String getStringValue() { + return this.stringValue; + } + + public TestBean getTestBean() { + return this.tb; + } + + protected TestBean protectedGetTestBean() { + return this.tb; + } + + private TestBean privateGetTestBean() { + return this.tb; + } + + public int getNum() { + return num; + } + + public String getName() { + return name; + } + + /** + * Set via Setter Injection once instance is created. + */ + public void setName(String name) { + this.name = name; + } + +} + +/** + * Fixed method replacer for String return types + * @author Rod Johnson + */ +class FixedMethodReplacer implements MethodReplacer { + + public static final String VALUE = "fixedMethodReplacer"; + + public Object reimplement(Object obj, Method method, Object[] args) throws Throwable { + return VALUE; + } + +} + + +/** + * @author Chris Beams + */ +class MapAndSet { + + private Object obj; + + public MapAndSet(Map map) { + this.obj = map; + } + + public MapAndSet(Set set) { + this.obj = set; + } + + public Object getObject() { + return obj; + } +} + + +/** + * @author Rod Johnson + */ +class MethodReplaceCandidate { + + public String replaceMe(String echo) { + return echo; + } + +} + + +/** + * Bean that exposes a simple property that can be set + * to a mix of references and individual values. + * + * @author Rod Johnson + * @since 27.05.2003 + */ +class MixedCollectionBean { + + private Collection jumble; + + + public void setJumble(Collection jumble) { + this.jumble = jumble; + } + + public Collection getJumble() { + return jumble; + } + +} + + +/** + * @author Juergen Hoeller + */ +interface OverrideInterface { + + TestBean getPrototypeDependency(); + + TestBean getPrototypeDependency(Object someParam); + +} + + +/** + * @author Rod Johnson + * @author Juergen Hoeller + */ +abstract class OverrideOneMethod extends MethodReplaceCandidate implements OverrideInterface { + + protected abstract TestBean protectedOverrideSingleton(); + + public TestBean getPrototypeDependency(Object someParam) { + return new TestBean(); + } + + public TestBean invokesOverridenMethodOnSelf() { + return getPrototypeDependency(); + } + + public String echo(String echo) { + return echo; + } + + /** + * Overloaded form of replaceMe. + */ + public String replaceMe() { + return "replaceMe"; + } + + /** + * Another overloaded form of replaceMe, not getting replaced. + * Must not cause errors when the other replaceMe methods get replaced. + */ + public String replaceMe(int someParam) { + return "replaceMe:" + someParam; + } + +} + + +/** + * Subclass of OverrideOneMethod, to check that overriding is + * supported for inherited methods. + * + * @author Rod Johnson + */ +abstract class OverrideOneMethodSubclass extends OverrideOneMethod { + + protected void doSomething(String arg) { + // This implementation does nothing! + // It's not overloaded + } + +} + + +/** + * Simple test of BeanFactory initialization and lifecycle callbacks. + * + * @author Rod Johnson + * @author Juergen Hoeller + */ +class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, InitializingBean, DisposableBean { + + protected boolean initMethodDeclared = false; + + protected String beanName; + + protected BeanFactory owningFactory; + + protected boolean postProcessedBeforeInit; + + protected boolean inited; + + protected boolean initedViaDeclaredInitMethod; + + protected boolean postProcessedAfterInit; + + protected boolean destroyed; + + + public void setInitMethodDeclared(boolean initMethodDeclared) { + this.initMethodDeclared = initMethodDeclared; + } + + public boolean isInitMethodDeclared() { + return initMethodDeclared; + } + + public void setBeanName(String name) { + this.beanName = name; + } + + public String getBeanName() { + return beanName; + } + + public void setBeanFactory(BeanFactory beanFactory) { + this.owningFactory = beanFactory; + } + + public void postProcessBeforeInit() { + if (this.inited || this.initedViaDeclaredInitMethod) { + throw new RuntimeException("Factory called postProcessBeforeInit after afterPropertiesSet"); + } + if (this.postProcessedBeforeInit) { + throw new RuntimeException("Factory called postProcessBeforeInit twice"); + } + this.postProcessedBeforeInit = true; + } + + public void afterPropertiesSet() { + if (this.owningFactory == null) { + throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean"); + } + if (!this.postProcessedBeforeInit) { + throw new RuntimeException("Factory didn't call postProcessBeforeInit before afterPropertiesSet on lifecycle bean"); + } + if (this.initedViaDeclaredInitMethod) { + throw new RuntimeException("Factory initialized via declared init method before initializing via afterPropertiesSet"); + } + if (this.inited) { + throw new RuntimeException("Factory called afterPropertiesSet twice"); + } + this.inited = true; + } + + public void declaredInitMethod() { + if (!this.inited) { + throw new RuntimeException("Factory didn't call afterPropertiesSet before declared init method"); + } + + if (this.initedViaDeclaredInitMethod) { + throw new RuntimeException("Factory called declared init method twice"); + } + this.initedViaDeclaredInitMethod = true; + } + + public void postProcessAfterInit() { + if (!this.inited) { + throw new RuntimeException("Factory called postProcessAfterInit before afterPropertiesSet"); + } + if (this.initMethodDeclared && !this.initedViaDeclaredInitMethod) { + throw new RuntimeException("Factory called postProcessAfterInit before calling declared init method"); + } + if (this.postProcessedAfterInit) { + throw new RuntimeException("Factory called postProcessAfterInit twice"); + } + this.postProcessedAfterInit = true; + } + + /** + * Dummy business method that will fail unless the factory + * managed the bean's lifecycle correctly + */ + public void businessMethod() { + if (!this.inited || (this.initMethodDeclared && !this.initedViaDeclaredInitMethod) || + !this.postProcessedAfterInit) { + throw new RuntimeException("Factory didn't initialize lifecycle object correctly"); + } + } + + public void destroy() { + if (this.destroyed) { + throw new IllegalStateException("Already destroyed"); + } + this.destroyed = true; + } + + public boolean isDestroyed() { + return destroyed; + } + + + public static class PostProcessor implements BeanPostProcessor { + + public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { + if (bean instanceof ProtectedLifecycleBean) { + ((ProtectedLifecycleBean) bean).postProcessBeforeInit(); + } + return bean; + } + + public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { + if (bean instanceof ProtectedLifecycleBean) { + ((ProtectedLifecycleBean) bean).postProcessAfterInit(); + } + return bean; + } + } + +} + + +/** + * @author Rod Johnson + */ +@SuppressWarnings("serial") +class ReverseMethodReplacer implements MethodReplacer, Serializable { + + public Object reimplement(Object obj, Method method, Object[] args) throws Throwable { + String s = (String) args[0]; + return new StringBuffer(s).reverse().toString(); + } + +} + + +/** + * @author Rod Johnson + */ +@SuppressWarnings("serial") +abstract class SerializableMethodReplacerCandidate extends MethodReplaceCandidate implements Serializable { + + //public abstract Point getPoint(); + +} + + +/** + * @author Juergen Hoeller + * @since 23.10.2004 + */ +class SingleSimpleTypeConstructorBean { + + private boolean singleBoolean; + + private boolean secondBoolean; + + private String testString; + + public SingleSimpleTypeConstructorBean(boolean singleBoolean) { + this.singleBoolean = singleBoolean; + } + + public SingleSimpleTypeConstructorBean(String testString, boolean secondBoolean) { + this.testString = testString; + this.secondBoolean = secondBoolean; + } + + public boolean isSingleBoolean() { + return singleBoolean; + } + + public boolean isSecondBoolean() { + return secondBoolean; + } + + public String getTestString() { + return testString; + } + +} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/autowire.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml similarity index 88% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/autowire.xml rename to org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml index 0518c7c8c0e..4fcad300bab 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/autowire.xml +++ b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml @@ -47,15 +47,15 @@ - /org/springframework/beans/factory/xml/collections.xml + /org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml - /org/springframework/beans/factory/xml/constructor-arg.xml - /org/springframework/beans/factory/xml/initializers.xml + /org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml + /org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/child.xml b/org.springframework.testsuite/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/child.xml rename to org.springframework.testsuite/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/classNotFound.xml b/org.springframework.testsuite/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/classNotFound.xml rename to org.springframework.testsuite/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/collections.xml b/org.springframework.testsuite/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/collections.xml rename to org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/complexFactoryCircle.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/complexFactoryCircle.xml rename to org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/constructor-arg.xml b/org.springframework.testsuite/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/constructor-arg.xml rename to org.springframework.testsuite/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/constructorOverrides.xml b/org.springframework.testsuite/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/constructorOverrides.xml rename to org.springframework.testsuite/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/default-autowire.xml b/org.springframework.testsuite/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/default-autowire.xml rename to org.springframework.testsuite/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/default-lazy-init.xml b/org.springframework.testsuite/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/default-lazy-init.xml rename to org.springframework.testsuite/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/delegationOverrides.xml b/org.springframework.testsuite/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/delegationOverrides.xml rename to org.springframework.testsuite/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/dependencies-carg.xml b/org.springframework.testsuite/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/dependencies-carg.xml rename to org.springframework.testsuite/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/dependencies-carg-autowire.xml b/org.springframework.testsuite/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/dependencies-carg-autowire.xml rename to org.springframework.testsuite/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/dependencies-carg-inner.xml b/org.springframework.testsuite/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/dependencies-carg-inner.xml rename to org.springframework.testsuite/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/dependencies-dependsOn.xml b/org.springframework.testsuite/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/dependencies-dependsOn.xml rename to org.springframework.testsuite/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/dependencies-dependsOn-inner.xml b/org.springframework.testsuite/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/dependencies-dependsOn-inner.xml rename to org.springframework.testsuite/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/dependenciesMaterializeThis.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/dependenciesMaterializeThis.xml rename to org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/dependencies-prop.xml b/org.springframework.testsuite/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/dependencies-prop.xml rename to org.springframework.testsuite/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/dependencies-prop-autowireByName.xml b/org.springframework.testsuite/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/dependencies-prop-autowireByName.xml rename to org.springframework.testsuite/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/dependencies-prop-autowireByType.xml b/org.springframework.testsuite/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/dependencies-prop-autowireByType.xml rename to org.springframework.testsuite/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/dependencies-prop-inTheMiddle.xml b/org.springframework.testsuite/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/dependencies-prop-inTheMiddle.xml rename to org.springframework.testsuite/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/dependencies-prop-inner.xml b/org.springframework.testsuite/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/dependencies-prop-inner.xml rename to org.springframework.testsuite/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/factoryCircle.xml b/org.springframework.testsuite/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/factoryCircle.xml rename to org.springframework.testsuite/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/initializers.xml b/org.springframework.testsuite/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/initializers.xml rename to org.springframework.testsuite/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/invalid.xml b/org.springframework.testsuite/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/invalid.xml rename to org.springframework.testsuite/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/invalidOverridesNoSuchMethod.xml b/org.springframework.testsuite/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/invalidOverridesNoSuchMethod.xml rename to org.springframework.testsuite/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/local-collections-using-XSD.xml b/org.springframework.testsuite/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/local-collections-using-XSD.xml rename to org.springframework.testsuite/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/no-such-factory-method.xml b/org.springframework.testsuite/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/no-such-factory-method.xml rename to org.springframework.testsuite/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/overrides.xml b/org.springframework.testsuite/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/overrides.xml rename to org.springframework.testsuite/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/parent.xml b/org.springframework.testsuite/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/parent.xml rename to org.springframework.testsuite/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/recursiveImport.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml similarity index 72% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/recursiveImport.xml rename to org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml index 07088881edf..c4383ad9454 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/recursiveImport.xml +++ b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml @@ -3,6 +3,6 @@ - + diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/reftypes.xml b/org.springframework.testsuite/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/reftypes.xml rename to org.springframework.testsuite/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/resource.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml similarity index 89% rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/resource.xml rename to org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml index 0bf9399d30f..3386242887d 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/resource.xml +++ b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml @@ -3,7 +3,7 @@ - + diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/resourceImport.xml b/org.springframework.testsuite/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/resourceImport.xml rename to org.springframework.testsuite/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/satisfiedAllDependencyCheck.xml b/org.springframework.testsuite/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/satisfiedAllDependencyCheck.xml rename to org.springframework.testsuite/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/satisfiedObjectDependencyCheck.xml b/org.springframework.testsuite/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/satisfiedObjectDependencyCheck.xml rename to org.springframework.testsuite/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/satisfiedSimpleDependencyCheck.xml b/org.springframework.testsuite/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/satisfiedSimpleDependencyCheck.xml rename to org.springframework.testsuite/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/testWithDuplicateNameInAlias.xml b/org.springframework.testsuite/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/testWithDuplicateNameInAlias.xml rename to org.springframework.testsuite/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/testWithDuplicateNames.xml b/org.springframework.testsuite/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/testWithDuplicateNames.xml rename to org.springframework.testsuite/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/unsatisfiedAllDependencyCheckMissingObjects.xml b/org.springframework.testsuite/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/unsatisfiedAllDependencyCheckMissingObjects.xml rename to org.springframework.testsuite/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/unsatisfiedAllDependencyCheckMissingSimple.xml b/org.springframework.testsuite/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/unsatisfiedAllDependencyCheckMissingSimple.xml rename to org.springframework.testsuite/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/unsatisfiedObjectDependencyCheck.xml b/org.springframework.testsuite/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/unsatisfiedObjectDependencyCheck.xml rename to org.springframework.testsuite/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/unsatisfiedSimpleDependencyCheck.xml b/org.springframework.testsuite/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/unsatisfiedSimpleDependencyCheck.xml rename to org.springframework.testsuite/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.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java index 55a4e0bbc98..ce062645434 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java @@ -59,7 +59,6 @@ import org.springframework.beans.factory.support.MethodReplacer; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.FileSystemResource; -import org.springframework.core.io.Resource; import org.springframework.core.io.UrlResource; import org.springframework.core.io.support.EncodedResource; import org.springframework.util.FileCopyUtils; @@ -75,14 +74,60 @@ import org.xml.sax.InputSource; * @author Rick Evans * @author Chris Beams */ -public class XmlBeanFactoryTests { +public final class XmlBeanFactoryTests { + + private static final Class CLASS = XmlBeanFactoryTests.class; + private static final String CLASSNAME = CLASS.getSimpleName(); + + private static final ClassPathResource AUTOWIRE_CONTEXT = classPathResource("-autowire.xml"); + private static final ClassPathResource CHILD_CONTEXT = classPathResource("-child.xml"); + private static final ClassPathResource CLASS_NOT_FOUND_CONTEXT = classPathResource("-classNotFound.xml"); + private static final ClassPathResource COMPLEX_FACTORY_CIRCLE_CONTEXT = classPathResource("-complexFactoryCircle.xml"); + private static final ClassPathResource CONSTRUCTOR_ARG_CONTEXT = classPathResource("-constructorArg.xml"); + private static final ClassPathResource CONSTRUCTOR_OVERRIDES_CONTEXT = classPathResource("-constructorOverrides.xml"); + private static final ClassPathResource DELEGATION_OVERRIDES_CONTEXT = classPathResource("-delegationOverrides.xml"); + private static final ClassPathResource DEP_CARG_AUTOWIRE_CONTEXT = classPathResource("-depCargAutowire.xml"); + private static final ClassPathResource DEP_CARG_INNER_CONTEXT = classPathResource("-depCargInner.xml"); + private static final ClassPathResource DEP_CARG_CONTEXT = classPathResource("-depCarg.xml"); + private static final ClassPathResource DEP_DEPENDSON_INNER_CONTEXT = classPathResource("-depDependsOnInner.xml"); + private static final ClassPathResource DEP_DEPENDSON_CONTEXT = classPathResource("-depDependsOn.xml"); + private static final ClassPathResource DEP_PROP = classPathResource("-depProp.xml"); + private static final ClassPathResource DEP_PROP_ABN_CONTEXT = classPathResource("-depPropAutowireByName.xml"); + private static final ClassPathResource DEP_PROP_ABT_CONTEXT = classPathResource("-depPropAutowireByType.xml"); + private static final ClassPathResource DEP_PROP_MIDDLE_CONTEXT = classPathResource("-depPropInTheMiddle.xml"); + private static final ClassPathResource DEP_PROP_INNER_CONTEXT = classPathResource("-depPropInner.xml"); + private static final ClassPathResource DEP_MATERIALIZE_CONTEXT = classPathResource("-depMaterializeThis.xml"); + private static final ClassPathResource FACTORY_CIRCLE_CONTEXT = classPathResource("-factoryCircle.xml"); + private static final ClassPathResource INITIALIZERS_CONTEXT = classPathResource("-initializers.xml"); + private static final ClassPathResource INVALID_CONTEXT = classPathResource("-invalid.xml"); + private static final ClassPathResource INVALID_NO_SUCH_METHOD_CONTEXT = classPathResource("-invalidOverridesNoSuchMethod.xml"); + private static final ClassPathResource COLLECTIONS_XSD_CONTEXT = classPathResource("-localCollectionsUsingXsd.xml"); + private static final ClassPathResource MISSING_CONTEXT = classPathResource("-missing.xml"); + private static final ClassPathResource OVERRIDES_CONTEXT = classPathResource("-overrides.xml"); + private static final ClassPathResource PARENT_CONTEXT = classPathResource("-parent.xml"); + private static final ClassPathResource NO_SUCH_FACTORY_METHOD_CONTEXT = classPathResource("-noSuchFactoryMethod.xml"); + private static final ClassPathResource RECURSIVE_IMPORT_CONTEXT = classPathResource("-recursiveImport.xml"); + private static final ClassPathResource RESOURCE_CONTEXT = classPathResource("-resource.xml"); + private static final ClassPathResource RESOURCE_IMPORT_CONTEXT = classPathResource("-resourceImport.xml"); + private static final ClassPathResource SATISFIED_ALL_DEP_CONTEXT = classPathResource("-satisfiedAllDepCheck.xml"); + private static final ClassPathResource SATISFIED_OBJECT_DEP_CONTEXT = classPathResource("-satisfiedObjectDepCheck.xml"); + private static final ClassPathResource SATISFIED_SIMPLE_DEP_CONTEXT = classPathResource("-satisfiedSimpleDepCheck.xml"); + private static final ClassPathResource TEST_WITH_DUP_NAMES_CONTEXT = classPathResource("-testWithDuplicateNames.xml"); + private static final ClassPathResource TEST_WITH_DUP_NAME_IN_ALIAS_CONTEXT = classPathResource("-testWithDuplicateNameInAlias.xml"); + private static final ClassPathResource UNSATISFIED_ALL_DEP_CONTEXT = classPathResource("-unsatisfiedAllDepCheckMissingObjects.xml"); + private static final ClassPathResource UNSATISFIED_OBJECT_DEP_CONTEXT = classPathResource("-unsatisfiedObjectDepCheck.xml"); + private static final ClassPathResource UNSATISFIED_SIMPLE_DEP_CONTEXT = classPathResource("-unsatisfiedSimpleDepCheck.xml"); + private static final ClassPathResource REFTYPES_CONTEXT = classPathResource("-reftypes.xml"); + private static final ClassPathResource DEFAULT_LAZY_CONTEXT = classPathResource("-defaultLazyInit.xml"); + private static final ClassPathResource DEFAULT_AUTOWIRE_CONTEXT = classPathResource("-defaultAutowire.xml"); + + private static ClassPathResource classPathResource(String suffix) { + return new ClassPathResource(CLASSNAME + suffix, CLASS); + } - /* - * http://opensource.atlassian.com/projects/spring/browse/SPR-2368 - */ + /* SPR-2368 */ public @Test void testCollectionsReferredToAsRefLocals() throws Exception { - XmlBeanFactory factory = new XmlBeanFactory( - new ClassPathResource("local-collections-using-XSD.xml", getClass())); + XmlBeanFactory factory = new XmlBeanFactory(COLLECTIONS_XSD_CONTEXT); factory.preInstantiateSingletons(); } @@ -90,7 +135,7 @@ public class XmlBeanFactoryTests { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE); - reader.loadBeanDefinitions(new ClassPathResource("reftypes.xml", getClass())); + reader.loadBeanDefinitions(REFTYPES_CONTEXT); TestBean emma = (TestBean) xbf.getBean("emma"); TestBean georgia = (TestBean) xbf.getBean("georgia"); @@ -108,8 +153,7 @@ public class XmlBeanFactoryTests { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE); - Resource resource = new ClassPathResource("reftypes.xml", getClass()); - reader.loadBeanDefinitions(new EncodedResource(resource, "ISO-8859-1")); + reader.loadBeanDefinitions(new EncodedResource(REFTYPES_CONTEXT, "ISO-8859-1")); TestBean jen = (TestBean) xbf.getBean("jenny"); TestBean dave = (TestBean) xbf.getBean("david"); @@ -125,7 +169,7 @@ public class XmlBeanFactoryTests { XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE); - InputStream inputStream = getClass().getResourceAsStream("reftypes.xml"); + InputStream inputStream = getClass().getResourceAsStream(REFTYPES_CONTEXT.getPath()); try { reader.loadBeanDefinitions(new InputSource(inputStream)); } @@ -187,7 +231,7 @@ public class XmlBeanFactoryTests { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE); - reader.loadBeanDefinitions(new ClassPathResource("reftypes.xml", getClass())); + reader.loadBeanDefinitions(REFTYPES_CONTEXT); // Let's create the outer bean named "innerBean", // to check whether it doesn't create any conflicts @@ -220,7 +264,7 @@ public class XmlBeanFactoryTests { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE); - reader.loadBeanDefinitions(new ClassPathResource("reftypes.xml", getClass())); + reader.loadBeanDefinitions(REFTYPES_CONTEXT); try { xbf.getBean("failsOnInnerBean"); @@ -244,8 +288,8 @@ public class XmlBeanFactoryTests { } public @Test void testSingletonInheritanceFromParentFactorySingleton() throws Exception { - XmlBeanFactory parent = new XmlBeanFactory(new ClassPathResource("parent.xml", getClass())); - XmlBeanFactory child = new XmlBeanFactory(new ClassPathResource("child.xml", getClass()), parent); + XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT); + XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent); assertEquals(TestBean.class, child.getType("inheritsFromParentFactory")); TestBean inherits = (TestBean) child.getBean("inheritsFromParentFactory"); // Name property value is overridden @@ -257,8 +301,8 @@ public class XmlBeanFactoryTests { } public @Test void testInheritanceWithDifferentClass() throws Exception { - XmlBeanFactory parent = new XmlBeanFactory(new ClassPathResource("parent.xml", getClass())); - XmlBeanFactory child = new XmlBeanFactory(new ClassPathResource("child.xml", getClass()), parent); + XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT); + XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent); assertEquals(DerivedTestBean.class, child.getType("inheritsWithClass")); DerivedTestBean inherits = (DerivedTestBean) child.getBean("inheritsWithDifferentClass"); // Name property value is overridden @@ -269,8 +313,8 @@ public class XmlBeanFactoryTests { } public @Test void testInheritanceWithClass() throws Exception { - XmlBeanFactory parent = new XmlBeanFactory(new ClassPathResource("parent.xml", getClass())); - XmlBeanFactory child = new XmlBeanFactory(new ClassPathResource("child.xml", getClass()), parent); + XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT); + XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent); assertEquals(DerivedTestBean.class, child.getType("inheritsWithClass")); DerivedTestBean inherits = (DerivedTestBean) child.getBean("inheritsWithClass"); // Name property value is overridden @@ -281,8 +325,8 @@ public class XmlBeanFactoryTests { } public @Test void testPrototypeInheritanceFromParentFactoryPrototype() throws Exception { - XmlBeanFactory parent = new XmlBeanFactory(new ClassPathResource("parent.xml", getClass())); - XmlBeanFactory child = new XmlBeanFactory(new ClassPathResource("child.xml", getClass()), parent); + XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT); + XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent); assertEquals(TestBean.class, child.getType("prototypeInheritsFromParentFactoryPrototype")); TestBean inherits = (TestBean) child.getBean("prototypeInheritsFromParentFactoryPrototype"); // Name property value is overridden @@ -298,8 +342,8 @@ public class XmlBeanFactoryTests { } public @Test void testPrototypeInheritanceFromParentFactorySingleton() throws Exception { - XmlBeanFactory parent = new XmlBeanFactory(new ClassPathResource("parent.xml", getClass())); - XmlBeanFactory child = new XmlBeanFactory(new ClassPathResource("child.xml", getClass()), parent); + XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT); + XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent); TestBean inherits = (TestBean) child.getBean("protoypeInheritsFromParentFactorySingleton"); // Name property value is overridden assertTrue(inherits.getName().equals("prototypeOverridesInheritedSingleton")); @@ -316,7 +360,7 @@ public class XmlBeanFactoryTests { public @Test void testAutowireModeNotInherited() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); - reader.loadBeanDefinitions(new ClassPathResource("overrides.xml", getClass())); + reader.loadBeanDefinitions(OVERRIDES_CONTEXT); TestBean david = (TestBean)xbf.getBean("magicDavid"); // the parent bean is autowiring @@ -328,7 +372,7 @@ public class XmlBeanFactoryTests { } public @Test void testAbstractParentBeans() { - XmlBeanFactory parent = new XmlBeanFactory(new ClassPathResource("parent.xml", getClass())); + XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT); parent.preInstantiateSingletons(); assertTrue(parent.isSingleton("inheritedTestBeanWithoutClass")); @@ -352,7 +396,7 @@ public class XmlBeanFactoryTests { } public @Test void testDependenciesMaterializeThis() throws Exception { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("dependenciesMaterializeThis.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(DEP_MATERIALIZE_CONTEXT); assertEquals(2, xbf.getBeansOfType(DummyBo.class, true, false).size()); assertEquals(3, xbf.getBeansOfType(DummyBo.class, true, true).size()); @@ -369,8 +413,8 @@ public class XmlBeanFactoryTests { } public @Test void testChildOverridesParentBean() throws Exception { - XmlBeanFactory parent = new XmlBeanFactory(new ClassPathResource("parent.xml", getClass())); - XmlBeanFactory child = new XmlBeanFactory(new ClassPathResource("child.xml", getClass()), parent); + XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT); + XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent); TestBean inherits = (TestBean) child.getBean("inheritedTestBean"); // Name property value is overridden assertTrue(inherits.getName().equals("overrideParentBean")); @@ -385,8 +429,8 @@ public class XmlBeanFactoryTests { * If a singleton does this the factory will fail to load. */ public @Test void testBogusParentageFromParentFactory() throws Exception { - XmlBeanFactory parent = new XmlBeanFactory(new ClassPathResource("parent.xml", getClass())); - XmlBeanFactory child = new XmlBeanFactory(new ClassPathResource("child.xml", getClass()), parent); + XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT); + XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent); try { child.getBean("bogusParent", TestBean.class); fail(); @@ -404,8 +448,8 @@ public class XmlBeanFactoryTests { * instances even if derived from a prototype */ public @Test void testSingletonInheritsFromParentFactoryPrototype() throws Exception { - XmlBeanFactory parent = new XmlBeanFactory(new ClassPathResource("parent.xml", getClass())); - XmlBeanFactory child = new XmlBeanFactory(new ClassPathResource("child.xml", getClass()), parent); + XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT); + XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent); TestBean inherits = (TestBean) child.getBean("singletonInheritsFromParentFactoryPrototype"); // Name property value is overriden assertTrue(inherits.getName().equals("prototype-override")); @@ -416,16 +460,16 @@ public class XmlBeanFactoryTests { } public @Test void testSingletonFromParent() { - XmlBeanFactory parent = new XmlBeanFactory(new ClassPathResource("parent.xml", getClass())); + XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT); TestBean beanFromParent = (TestBean) parent.getBean("inheritedTestBeanSingleton"); - XmlBeanFactory child = new XmlBeanFactory(new ClassPathResource("child.xml", getClass()), parent); + XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent); TestBean beanFromChild = (TestBean) child.getBean("inheritedTestBeanSingleton"); assertTrue("singleton from parent and child is the same", beanFromParent == beanFromChild); } public @Test void testNestedPropertyValue() { - XmlBeanFactory parent = new XmlBeanFactory(new ClassPathResource("parent.xml", getClass())); - XmlBeanFactory child = new XmlBeanFactory(new ClassPathResource("child.xml", getClass()), parent); + XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT); + XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent); IndexedTestBean bean = (IndexedTestBean) child.getBean("indexedTestBean"); assertEquals("name applied correctly", "myname", bean.getArray()[0].getName()); } @@ -434,7 +478,7 @@ public class XmlBeanFactoryTests { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE); - reader.loadBeanDefinitions(new ClassPathResource("reftypes.xml", getClass())); + reader.loadBeanDefinitions(REFTYPES_CONTEXT); TestBean jenny = (TestBean) xbf.getBean("jenny"); TestBean david = (TestBean) xbf.getBean("david"); TestBean ego = (TestBean) xbf.getBean("ego"); @@ -451,7 +495,7 @@ public class XmlBeanFactoryTests { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE); - reader.loadBeanDefinitions(new ClassPathResource("reftypes.xml", getClass())); + reader.loadBeanDefinitions(REFTYPES_CONTEXT); xbf.getBean("egoBridge"); TestBean complexEgo = (TestBean) xbf.getBean("complexEgo"); assertTrue("Correct circular reference", complexEgo.getSpouse().getSpouse() == complexEgo); @@ -461,7 +505,7 @@ public class XmlBeanFactoryTests { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE); - reader.loadBeanDefinitions(new ClassPathResource("reftypes.xml", getClass())); + reader.loadBeanDefinitions(REFTYPES_CONTEXT); TestBean ego1 = (TestBean) xbf.getBean("ego1"); assertTrue("Correct circular reference", ego1.getSpouse().getSpouse() == ego1); TestBean ego3 = (TestBean) xbf.getBean("ego3"); @@ -473,7 +517,7 @@ public class XmlBeanFactoryTests { xbf.setAllowCircularReferences(false); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE); - reader.loadBeanDefinitions(new ClassPathResource("reftypes.xml", getClass())); + reader.loadBeanDefinitions(REFTYPES_CONTEXT); try { xbf.getBean("jenny"); fail("Should have thrown BeanCreationException"); @@ -487,7 +531,7 @@ public class XmlBeanFactoryTests { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE); - reader.loadBeanDefinitions(new ClassPathResource("reftypes.xml", getClass())); + reader.loadBeanDefinitions(REFTYPES_CONTEXT); xbf.addBeanPostProcessor(new WrappingPostProcessor()); try { xbf.getBean("jenny"); @@ -503,7 +547,7 @@ public class XmlBeanFactoryTests { xbf.setAllowRawInjectionDespiteWrapping(true); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE); - reader.loadBeanDefinitions(new ClassPathResource("reftypes.xml", getClass())); + reader.loadBeanDefinitions(REFTYPES_CONTEXT); xbf.addBeanPostProcessor(new WrappingPostProcessor()); ITestBean jenny = (ITestBean) xbf.getBean("jenny"); @@ -519,19 +563,19 @@ public class XmlBeanFactoryTests { } public @Test void testFactoryReferenceCircle() { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("factoryCircle.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(FACTORY_CIRCLE_CONTEXT); TestBean tb = (TestBean) xbf.getBean("singletonFactory"); DummyFactory db = (DummyFactory) xbf.getBean("&singletonFactory"); assertTrue(tb == db.getOtherTestBean()); } public @Test void testFactoryReferenceWithDoublePrefix() { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("factoryCircle.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(FACTORY_CIRCLE_CONTEXT); assertThat(xbf.getBean("&&singletonFactory"), instanceOf(DummyFactory.class)); } public @Test void testComplexFactoryReferenceCircle() { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("complexFactoryCircle.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(COMPLEX_FACTORY_CIRCLE_CONTEXT); xbf.getBean("proxy1"); // check that unused instances from autowiring got removed assertEquals(5, xbf.getSingletonCount()); @@ -542,7 +586,7 @@ public class XmlBeanFactoryTests { public @Test void testNoSuchFactoryBeanMethod() { try { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("no-such-factory-method.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(NO_SUCH_FACTORY_METHOD_CONTEXT); assertNotNull(xbf.getBean("defaultTestBean")); fail("Should not get invalid bean"); } @@ -552,7 +596,7 @@ public class XmlBeanFactoryTests { } public @Test void testInitMethodIsInvoked() throws Exception { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("initializers.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(INITIALIZERS_CONTEXT); DoubleInitializer in = (DoubleInitializer) xbf.getBean("init-method1"); // Initializer should have doubled value assertEquals(14, in.getNum()); @@ -562,7 +606,7 @@ public class XmlBeanFactoryTests { * Test that if a custom initializer throws an exception, it's handled correctly */ public @Test void testInitMethodThrowsException() { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("initializers.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(INITIALIZERS_CONTEXT); try { xbf.getBean("init-method2"); fail(); @@ -575,7 +619,7 @@ public class XmlBeanFactoryTests { } public @Test void testNoSuchInitMethod() throws Exception { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("initializers.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(INITIALIZERS_CONTEXT); try { xbf.getBean("init-method3"); fail(); @@ -593,7 +637,7 @@ public class XmlBeanFactoryTests { */ public @Test void testInitializingBeanAndInitMethod() throws Exception { InitAndIB.constructed = false; - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("initializers.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(INITIALIZERS_CONTEXT); assertFalse(InitAndIB.constructed); xbf.preInstantiateSingletons(); assertFalse(InitAndIB.constructed); @@ -612,7 +656,7 @@ public class XmlBeanFactoryTests { */ public @Test void testInitializingBeanAndSameInitMethod() throws Exception { InitAndIB.constructed = false; - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("initializers.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(INITIALIZERS_CONTEXT); assertFalse(InitAndIB.constructed); xbf.preInstantiateSingletons(); assertFalse(InitAndIB.constructed); @@ -628,7 +672,7 @@ public class XmlBeanFactoryTests { public @Test void testDefaultLazyInit() throws Exception { InitAndIB.constructed = false; - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("default-lazy-init.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(DEFAULT_LAZY_CONTEXT); assertFalse(InitAndIB.constructed); xbf.preInstantiateSingletons(); assertTrue(InitAndIB.constructed); @@ -642,7 +686,7 @@ public class XmlBeanFactoryTests { public @Test void testNoSuchXmlFile() throws Exception { try { - new XmlBeanFactory(new ClassPathResource("missing.xml", getClass())); + new XmlBeanFactory(MISSING_CONTEXT); fail("Must not create factory from missing XML"); } catch (BeanDefinitionStoreException expected) { @@ -651,7 +695,7 @@ public class XmlBeanFactoryTests { public @Test void testInvalidXmlFile() throws Exception { try { - new XmlBeanFactory(new ClassPathResource("invalid.xml", getClass())); + new XmlBeanFactory(INVALID_CONTEXT); fail("Must not create factory from invalid XML"); } catch (BeanDefinitionStoreException expected) { @@ -660,7 +704,7 @@ public class XmlBeanFactoryTests { public @Test void testUnsatisfiedObjectDependencyCheck() throws Exception { try { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("unsatisfiedObjectDependencyCheck.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(UNSATISFIED_OBJECT_DEP_CONTEXT); xbf.getBean("a", DependenciesBean.class); fail("Must have thrown an UnsatisfiedDependencyException"); } @@ -670,7 +714,7 @@ public class XmlBeanFactoryTests { public @Test void testUnsatisfiedSimpleDependencyCheck() throws Exception { try { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("unsatisfiedSimpleDependencyCheck.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(UNSATISFIED_SIMPLE_DEP_CONTEXT); xbf.getBean("a", DependenciesBean.class); fail("Must have thrown an UnsatisfiedDependencyException"); } @@ -679,21 +723,21 @@ public class XmlBeanFactoryTests { } public @Test void testSatisfiedObjectDependencyCheck() throws Exception { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("satisfiedObjectDependencyCheck.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(SATISFIED_OBJECT_DEP_CONTEXT); DependenciesBean a = (DependenciesBean) xbf.getBean("a"); assertNotNull(a.getSpouse()); assertEquals(xbf, a.getBeanFactory()); } public @Test void testSatisfiedSimpleDependencyCheck() throws Exception { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("satisfiedSimpleDependencyCheck.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(SATISFIED_SIMPLE_DEP_CONTEXT); DependenciesBean a = (DependenciesBean) xbf.getBean("a"); assertEquals(a.getAge(), 33); } public @Test void testUnsatisfiedAllDependencyCheck() throws Exception { try { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("unsatisfiedAllDependencyCheckMissingObjects.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(UNSATISFIED_ALL_DEP_CONTEXT); xbf.getBean("a", DependenciesBean.class); fail("Must have thrown an UnsatisfiedDependencyException"); } @@ -702,7 +746,7 @@ public class XmlBeanFactoryTests { } public @Test void testSatisfiedAllDependencyCheck() throws Exception { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("satisfiedAllDependencyCheck.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(SATISFIED_ALL_DEP_CONTEXT); DependenciesBean a = (DependenciesBean) xbf.getBean("a"); assertEquals(a.getAge(), 33); assertNotNull(a.getName()); @@ -710,14 +754,14 @@ public class XmlBeanFactoryTests { } public @Test void testAutowire() throws Exception { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("autowire.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(AUTOWIRE_CONTEXT); TestBean spouse = new TestBean("kerry", 0); xbf.registerSingleton("spouse", spouse); doTestAutowire(xbf); } public @Test void testAutowireWithParent() throws Exception { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("autowire.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(AUTOWIRE_CONTEXT); DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); MutablePropertyValues pvs = new MutablePropertyValues(); pvs.addPropertyValue("name", "kerry"); @@ -774,7 +818,7 @@ public class XmlBeanFactoryTests { } public @Test void testAutowireWithDefault() throws Exception { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("default-autowire.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(DEFAULT_AUTOWIRE_CONTEXT); DependenciesBean rod1 = (DependenciesBean) xbf.getBean("rod1"); // should have been autowired @@ -795,7 +839,7 @@ public class XmlBeanFactoryTests { } public @Test void testAutowireByConstructor() throws Exception { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("constructor-arg.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT); ConstructorDependenciesBean rod1 = (ConstructorDependenciesBean) xbf.getBean("rod1"); TestBean kerry = (TestBean) xbf.getBean("kerry2"); // should have been autowired @@ -831,7 +875,7 @@ public class XmlBeanFactoryTests { } public @Test void testAutowireByConstructorWithSimpleValues() throws Exception { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("constructor-arg.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT); ConstructorDependenciesBean rod5 = (ConstructorDependenciesBean) xbf.getBean("rod5"); TestBean kerry1 = (TestBean) xbf.getBean("kerry1"); @@ -859,7 +903,7 @@ public class XmlBeanFactoryTests { } public @Test void testRelatedCausesFromConstructorResolution() { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("constructor-arg.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT); try { xbf.getBean("rod2Accessor"); @@ -872,7 +916,7 @@ public class XmlBeanFactoryTests { } public @Test void testConstructorArgResolution() { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("constructor-arg.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT); TestBean kerry1 = (TestBean) xbf.getBean("kerry1"); TestBean kerry2 = (TestBean) xbf.getBean("kerry2"); @@ -914,13 +958,13 @@ public class XmlBeanFactoryTests { } public @Test void testConstructorArgWithSingleMatch() { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("constructor-arg.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT); File file = (File) xbf.getBean("file"); assertEquals(File.separator + "test", file.getPath()); } public @Test void testThrowsExceptionOnTooManyArguments() throws Exception { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("constructor-arg.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT); try { xbf.getBean("rod7", ConstructorDependenciesBean.class); fail("Should have thrown BeanCreationException"); @@ -930,7 +974,7 @@ public class XmlBeanFactoryTests { } public @Test void testThrowsExceptionOnAmbiguousResolution() throws Exception { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("constructor-arg.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT); try { xbf.getBean("rod8", ConstructorDependenciesBean.class); fail("Must have thrown UnsatisfiedDependencyException"); @@ -940,53 +984,53 @@ public class XmlBeanFactoryTests { } public @Test void testDependsOn() { - doTestDependencies("dependencies-dependsOn.xml", 1); + doTestDependencies(DEP_DEPENDSON_CONTEXT, 1); } public @Test void testDependsOnInInnerBean() { - doTestDependencies("dependencies-dependsOn-inner.xml", 4); + doTestDependencies(DEP_DEPENDSON_INNER_CONTEXT, 4); } public @Test void testDependenciesThroughConstructorArguments() { - doTestDependencies("dependencies-carg.xml", 1); + doTestDependencies(DEP_CARG_CONTEXT, 1); } public @Test void testDependenciesThroughConstructorArgumentAutowiring() { - doTestDependencies("dependencies-carg-autowire.xml", 1); + doTestDependencies(DEP_CARG_AUTOWIRE_CONTEXT, 1); } public @Test void testDependenciesThroughConstructorArgumentsInInnerBean() { - doTestDependencies("dependencies-carg-inner.xml", 1); + doTestDependencies(DEP_CARG_INNER_CONTEXT, 1); } public @Test void testDependenciesThroughProperties() { - doTestDependencies("dependencies-prop.xml", 1); + doTestDependencies(DEP_PROP, 1); } public @Test void testDependenciesThroughPropertiesWithInTheMiddle() { - doTestDependencies("dependencies-prop-inTheMiddle.xml", 1); + doTestDependencies(DEP_PROP_MIDDLE_CONTEXT, 1); } public @Test void testDependenciesThroughPropertyAutowiringByName() { - doTestDependencies("dependencies-prop-autowireByName.xml", 1); + doTestDependencies(DEP_PROP_ABN_CONTEXT, 1); } public @Test void testDependenciesThroughPropertyAutowiringByType() { - doTestDependencies("dependencies-prop-autowireByType.xml", 1); + doTestDependencies(DEP_PROP_ABT_CONTEXT, 1); } public @Test void testDependenciesThroughPropertiesInInnerBean() { - doTestDependencies("dependencies-prop-inner.xml", 1); + doTestDependencies(DEP_PROP_INNER_CONTEXT, 1); } - private void doTestDependencies(String filename, int nrOfHoldingBeans) { + private void doTestDependencies(ClassPathResource resource, int nrOfHoldingBeans) { PreparingBean1.prepared = false; PreparingBean1.destroyed = false; PreparingBean2.prepared = false; PreparingBean2.destroyed = false; DependingBean.destroyCount = 0; HoldingBean.destroyCount = 0; - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource(filename, getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(resource); xbf.preInstantiateSingletons(); xbf.destroySingletons(); assertTrue(PreparingBean1.prepared); @@ -1006,7 +1050,7 @@ public class XmlBeanFactoryTests { * must rather only be picked up when the bean is instantiated. */ public @Test void testClassNotFoundWithDefaultBeanClassLoader() { - BeanFactory factory = new XmlBeanFactory(new ClassPathResource("classNotFound.xml", getClass())); + BeanFactory factory = new XmlBeanFactory(CLASS_NOT_FOUND_CONTEXT); // cool, no errors, so the rubbish class name in the bean def was not resolved try { // let's resolve the bean definition; must blow up @@ -1023,12 +1067,12 @@ public class XmlBeanFactoryTests { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(bf); reader.setBeanClassLoader(null); - reader.loadBeanDefinitions(new ClassPathResource("classNotFound.xml", getClass())); + reader.loadBeanDefinitions(CLASS_NOT_FOUND_CONTEXT); assertEquals("WhatALotOfRubbish", bf.getBeanDefinition("classNotFound").getBeanClassName()); } public @Test void testResourceAndInputStream() throws IOException { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("resource.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(RESOURCE_CONTEXT); // comes from "resourceImport.xml" ResourceTestBean resource1 = (ResourceTestBean) xbf.getBean("resource1"); // comes from "resource.xml" @@ -1050,8 +1094,7 @@ public class XmlBeanFactoryTests { } public @Test void testClassPathResourceWithImport() { - XmlBeanFactory xbf = new XmlBeanFactory( - new ClassPathResource("org/springframework/beans/factory/xml/resource.xml")); + XmlBeanFactory xbf = new XmlBeanFactory(RESOURCE_CONTEXT); // comes from "resourceImport.xml" xbf.getBean("resource1", ResourceTestBean.class); // comes from "resource.xml" @@ -1059,7 +1102,7 @@ public class XmlBeanFactoryTests { } public @Test void testUrlResourceWithImport() { - URL url = getClass().getResource("resource.xml"); + URL url = getClass().getResource(RESOURCE_CONTEXT.getPath()); XmlBeanFactory xbf = new XmlBeanFactory(new UrlResource(url)); // comes from "resourceImport.xml" xbf.getBean("resource1", ResourceTestBean.class); @@ -1068,7 +1111,7 @@ public class XmlBeanFactoryTests { } public @Test void testFileSystemResourceWithImport() { - String file = getClass().getResource("resource.xml").getFile(); + String file = getClass().getResource(RESOURCE_CONTEXT.getPath()).getFile(); XmlBeanFactory xbf = new XmlBeanFactory(new FileSystemResource(file)); // comes from "resourceImport.xml" xbf.getBean("resource1", ResourceTestBean.class); @@ -1078,7 +1121,7 @@ public class XmlBeanFactoryTests { public @Test void testRecursiveImport() { try { - new XmlBeanFactory(new ClassPathResource("org/springframework/beans/factory/xml/recursiveImport.xml")); + new XmlBeanFactory(RECURSIVE_IMPORT_CONTEXT); fail("Should have thrown BeanDefinitionStoreException"); } catch (BeanDefinitionStoreException ex) { @@ -1091,7 +1134,7 @@ public class XmlBeanFactoryTests { public @Test void testLookupOverrideMethodsWithSetterInjection() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); - reader.loadBeanDefinitions(new ClassPathResource("overrides.xml", getClass())); + reader.loadBeanDefinitions(OVERRIDES_CONTEXT); testLookupOverrideMethodsWithSetterInjection(xbf, "overrideOneMethod", true); // Should work identically on subclass definition, in which lookup @@ -1156,7 +1199,7 @@ public class XmlBeanFactoryTests { public @Test void testReplaceMethodOverrideWithSetterInjection() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); - reader.loadBeanDefinitions(new ClassPathResource("delegationOverrides.xml", getClass())); + reader.loadBeanDefinitions(DELEGATION_OVERRIDES_CONTEXT); OverrideOneMethod oom = (OverrideOneMethod) xbf.getBean("overrideOneMethod"); @@ -1203,7 +1246,7 @@ public class XmlBeanFactoryTests { public @Test void testLookupOverrideOneMethodWithConstructorInjection() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); - reader.loadBeanDefinitions(new ClassPathResource("constructorOverrides.xml", getClass())); + reader.loadBeanDefinitions(CONSTRUCTOR_OVERRIDES_CONTEXT); ConstructorInjectedOverrides cio = (ConstructorInjectedOverrides) xbf.getBean("constructorOverrides"); @@ -1227,7 +1270,7 @@ public class XmlBeanFactoryTests { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); try { - reader.loadBeanDefinitions(new ClassPathResource("invalidOverridesNoSuchMethod.xml", getClass())); + reader.loadBeanDefinitions(INVALID_NO_SUCH_METHOD_CONTEXT); xbf.getBean("constructorOverrides"); fail("Shouldn't allow override of bogus method"); } @@ -1253,7 +1296,7 @@ public class XmlBeanFactoryTests { public void BUGtestSerializableMethodReplacerAndSuperclass() throws IOException, ClassNotFoundException { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); - reader.loadBeanDefinitions(new ClassPathResource("delegationOverrides.xml", getClass())); + reader.loadBeanDefinitions(DELEGATION_OVERRIDES_CONTEXT); SerializableMethodReplacerCandidate s = (SerializableMethodReplacerCandidate) xbf.getBean("serializableReplacer"); String forwards = "this is forwards"; String backwards = new StringBuffer(forwards).reverse().toString(); @@ -1266,14 +1309,14 @@ public class XmlBeanFactoryTests { public @Test void testInnerBeanInheritsScopeFromConcreteChildDefinition() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); - reader.loadBeanDefinitions(new ClassPathResource("overrides.xml", getClass())); + reader.loadBeanDefinitions(OVERRIDES_CONTEXT); TestBean jenny = (TestBean) xbf.getBean("jennyChild"); assertEquals(1, jenny.getFriends().size()); assertTrue(jenny.getFriends().iterator().next() instanceof TestBean); } public @Test void testConstructorArgWithSingleSimpleTypeMatch() { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("constructor-arg.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT); SingleSimpleTypeConstructorBean bean = (SingleSimpleTypeConstructorBean) xbf.getBean("beanWithBoolean"); assertTrue(bean.isSingleBoolean()); @@ -1283,7 +1326,7 @@ public class XmlBeanFactoryTests { } public @Test void testConstructorArgWithDoubleSimpleTypeMatch() { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("constructor-arg.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT); SingleSimpleTypeConstructorBean bean = (SingleSimpleTypeConstructorBean) xbf.getBean("beanWithBooleanAndString"); assertTrue(bean.isSecondBoolean()); @@ -1295,14 +1338,14 @@ public class XmlBeanFactoryTests { } public @Test void testDoubleBooleanAutowire() { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("constructor-arg.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT); DoubleBooleanConstructorBean bean = (DoubleBooleanConstructorBean) xbf.getBean("beanWithDoubleBoolean"); assertEquals(Boolean.TRUE, bean.boolean1); assertEquals(Boolean.FALSE, bean.boolean2); } public @Test void testDoubleBooleanAutowireWithIndex() { - XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("constructor-arg.xml", getClass())); + XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT); DoubleBooleanConstructorBean bean = (DoubleBooleanConstructorBean) xbf.getBean("beanWithDoubleBooleanAndIndex"); assertEquals(Boolean.FALSE, bean.boolean1); assertEquals(Boolean.TRUE, bean.boolean2); @@ -1310,7 +1353,7 @@ public class XmlBeanFactoryTests { public @Test void testWithDuplicateName() throws Exception { try { - new XmlBeanFactory(new ClassPathResource("testWithDuplicateNames.xml", getClass())); + new XmlBeanFactory(TEST_WITH_DUP_NAMES_CONTEXT); fail("Duplicate name not detected"); } catch (BeansException ex) { @@ -1320,7 +1363,7 @@ public class XmlBeanFactoryTests { public @Test void testWithDuplicateNameInAlias() throws Exception { try { - new XmlBeanFactory(new ClassPathResource("testWithDuplicateNameInAlias.xml", getClass())); + new XmlBeanFactory(TEST_WITH_DUP_NAME_IN_ALIAS_CONTEXT); fail("Duplicate name not detected"); } catch (BeansException e) { diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml deleted file mode 100644 index 5952fa0c540..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - name=props1 - - - - - - name=props2 - - - - \ No newline at end of file diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/beanEvents.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/beanEvents.xml deleted file mode 100644 index 110eb1ebaff..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/beanEvents.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/beanEventsImported.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/beanEventsImported.xml deleted file mode 100644 index bdfc3c4c31e..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/beanEventsImported.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/beanNameGeneration.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/beanNameGeneration.xml deleted file mode 100644 index 813049d1a59..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/beanNameGeneration.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/collectionMerging.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/collectionMerging.xml deleted file mode 100644 index 0bd9225e535..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/collectionMerging.xml +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - - - Rob Harrop - Rod Johnson - - - - - - - - Juergen Hoeller - - - - - - - - - - - - - - - - Rob Harrop - - - - - - - - Sally Greenwood - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Sall - Kerry - - - - - - - - Eva - Sally - - - - - - - - - Rob Harrop - Rod Johnson - - - - - - - - Juergen Hoeller - - - - - - - - - - - - - - - - Rob Harrop - - - - - - - - Sally Greenwood - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Sall - Kerry - - - - - - - - Eva - Sally - - - - - diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml deleted file mode 100644 index 584063fde10..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - 1 - 2 - 3 - - - - - 1 - 2 - 3 - - - - - - - - - - - - - - - - - - 1 - - true - - - - 2 - - false - - - - 3 - - false - - - - 4 - - true - - - - - \ No newline at end of file diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml deleted file mode 100644 index 635df1adc85..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml deleted file mode 100644 index a10029da323..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/invalid-factory.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/invalid-factory.xml deleted file mode 100644 index 4822140c206..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/invalid-factory.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - false - - - \ No newline at end of file diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/invalidPerSchema.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/invalidPerSchema.xml deleted file mode 100644 index 430c8adc7e4..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/invalidPerSchema.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/schemaValidated.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/schemaValidated.xml deleted file mode 100644 index 3a45ffec354..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/schemaValidated.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/shortcutTests.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/shortcutTests.xml deleted file mode 100644 index 2d5762942ff..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/shortcutTests.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/shortcutWithErrorsTests.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/shortcutWithErrorsTests.xml deleted file mode 100644 index d82595bac7a..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/shortcutWithErrorsTests.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/test.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/test.xml deleted file mode 100644 index e67e3101362..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/test.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - I have no properties and I'm happy without them. - - - - - - aliased - - - - - - - - aliased - - - - - - aliased - - - - - - - - - - - - - - Rod - 31 - - - - - - Roderick - - - - - Kerry - 34 - - - - - - Kathy - 28 - - - - - typeMismatch - 34x - - - - - - - - true - - - - true - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - listenerVeto - 66 - - - - - - this is a ]]> - - - diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/testUtilNamespace.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/testUtilNamespace.xml deleted file mode 100644 index 052e27965e7..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/testUtilNamespace.xml +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - My scoped Map - - - - - - - - - Rob Harrop - - - - My scoped List - Rob Harrop - - - - Rob Harrop - - - - My scoped Set - Rob Harrop - - - - - - foo - - - - - bar - - - - - - - bar - - - - - - - - - - - - - - - - - - - - - min - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bar2 - - - - bar2 - - - - local - local2 - - - - local - local2 - - - - local - local2 - - - diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/validateWithDtd.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/validateWithDtd.xml deleted file mode 100644 index 91fdcd879f2..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/validateWithDtd.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/validateWithXsd.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/validateWithXsd.xml deleted file mode 100644 index cb08194ade8..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/validateWithXsd.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/withMeta.xml b/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/withMeta.xml deleted file mode 100644 index 3b8d004cd5f..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/withMeta.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - -