Move common FactoryMethods to spring-beans test fixtures

See gh-23550

spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java

@@ -25,6 +25,7 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.testfixture.beans.FactoryMethods;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.core.io.ClassPathResource;
 

spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java

@@ -16,6 +16,7 @@
 
 package org.springframework.beans.factory.xml;
 
+import org.springframework.beans.testfixture.beans.FactoryMethods;
 import org.springframework.beans.testfixture.beans.TestBean;
 
 /**

spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml

@@ -3,7 +3,7 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-	<bean id="default" class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="default" class="org.springframework.beans.testfixture.beans.FactoryMethods"
 			factory-method="defaultInstance">
 		<!-- No constructor-arg elements -->
 		<property name="stringValue"><value>setterString</value></property>
@@ -21,48 +21,48 @@
 	<bean id="defaultTestBean.private" factory-bean="default" factory-method="privateGetTestBean"
 			init-method="haveBirthday" destroy-method="destroy"/>
 
-	<bean id="testBeanOnly" class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="testBeanOnly" class="org.springframework.beans.testfixture.beans.FactoryMethods"
 			factory-method="newInstance">
 		<constructor-arg><ref bean="juergen"/></constructor-arg>
 	</bean>
 
-	<bean id="null" class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="null" class="org.springframework.beans.testfixture.beans.FactoryMethods"
 			factory-method="nullInstance" init-method="getName"/>
 
-	<bean id="nullWithProperty" class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="nullWithProperty" class="org.springframework.beans.testfixture.beans.FactoryMethods"
 			factory-method="nullInstance" init-method="getName" scope="prototype">
 		<property name="stringValue"><value>setterString</value></property>
 	</bean>
 
-	<bean id="full" class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="full" class="org.springframework.beans.testfixture.beans.FactoryMethods"
 			factory-method="newInstance">
 		<constructor-arg index="0"><ref bean="juergen"/></constructor-arg>
 		<constructor-arg index="1"><value>27</value></constructor-arg>
 		<constructor-arg index="2"><value>gotcha</value></constructor-arg>
 	</bean>
 
-	<bean id="fullWithNull" class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="fullWithNull" class="org.springframework.beans.testfixture.beans.FactoryMethods"
 			factory-method="newInstance" lazy-init="true">
 		<constructor-arg index="2" type="java.lang.Integer"><null/></constructor-arg>
 		<constructor-arg index="0"><ref bean="juergen"/></constructor-arg>
 		<constructor-arg index="1"><value>27</value></constructor-arg>
 	</bean>
 
-	<bean id="fullWithGenericNull" class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="fullWithGenericNull" class="org.springframework.beans.testfixture.beans.FactoryMethods"
 			factory-method="newInstance" lazy-init="true">
 		<constructor-arg type="java.lang.Integer"><null/></constructor-arg>
 		<constructor-arg><ref bean="juergen"/></constructor-arg>
 		<constructor-arg type="int"><value>27</value></constructor-arg>
 	</bean>
 
-	<bean id="fullWithNamedNull" class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="fullWithNamedNull" class="org.springframework.beans.testfixture.beans.FactoryMethods"
 			factory-method="newInstance" lazy-init="true">
 		<constructor-arg name="something"><null/></constructor-arg>
 		<constructor-arg name="tb"><ref bean="juergen"/></constructor-arg>
 		<constructor-arg name="num"><value>27</value></constructor-arg>
 	</bean>
 
-	<bean id="fullWithAutowire" class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="fullWithAutowire" class="org.springframework.beans.testfixture.beans.FactoryMethods"
 			factory-method="newInstance" autowire="constructor">
 		<constructor-arg index="0" ref="juergen"/>
 		<constructor-arg index="1" value="27"/>
@@ -72,31 +72,31 @@
 		<constructor-arg value="gotchaAutowired"/>
 	</bean>
 
-	<bean id="defaultPrototype" class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="defaultPrototype" class="org.springframework.beans.testfixture.beans.FactoryMethods"
 			scope="prototype" factory-method="defaultInstance">
 		<!-- No constructor-arg elements -->
 		<property name="stringValue"><value>setterString</value></property>
 	</bean>
 
-	<bean id="testBeanOnlyPrototype" class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="testBeanOnlyPrototype" class="org.springframework.beans.testfixture.beans.FactoryMethods"
 			factory-method="newInstance" scope="prototype">
 		<constructor-arg><ref bean="juergen"/></constructor-arg>
 		<property name="stringValue"><value>testBeanOnlyPrototypeDISetterString</value></property>
 	</bean>
 
-	<bean id="invalidPrototype" class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="invalidPrototype" class="org.springframework.beans.testfixture.beans.FactoryMethods"
 		  factory-method="nonExisting" scope="prototype">
 		<constructor-arg><ref bean="juergen"/></constructor-arg>
 	</bean>
 
-	<bean id="fullPrototype" class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="fullPrototype" class="org.springframework.beans.testfixture.beans.FactoryMethods"
 			factory-method="newInstance" scope="prototype">
 		<constructor-arg type="int"><value>27</value></constructor-arg>
 		<constructor-arg><value>gotcha</value></constructor-arg>
 		<constructor-arg><ref bean="juergen"/></constructor-arg>
 	</bean>
 
-	<bean id="noMatchPrototype" class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="noMatchPrototype" class="org.springframework.beans.testfixture.beans.FactoryMethods"
 			factory-method="newInstance" scope="prototype">
 		<constructor-arg index="0"><ref bean="juergen"/></constructor-arg>
 		<constructor-arg index="1"><value>27</value></constructor-arg>
@@ -104,7 +104,7 @@
 		<constructor-arg index="3"><value>bogus</value></constructor-arg>
 	</bean>
 
-	<bean id="listInstance" class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="listInstance" class="org.springframework.beans.testfixture.beans.FactoryMethods"
 		  factory-method="listInstance"/>
 
 	<bean id="juergen" class="org.springframework.beans.testfixture.beans.TestBean">

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/FactoryMethods.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory.xml;
+package org.springframework.beans.testfixture.beans;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.springframework.beans.testfixture.beans.TestBean;
-
 /**
  * Test class for Spring's ability to create objects using static
  * factory methods, rather than constructors.
@@ -47,7 +45,7 @@ public class FactoryMethods {
 		return new FactoryMethods(tb, "default", 0);
 	}
 
-	protected static FactoryMethods newInstance(TestBean tb, int num, String name) {
+	public static FactoryMethods newInstance(TestBean tb, int num, String name) {
 		if (name == null) {
 			throw new IllegalStateException("Should never be called with null value");
 		}

spring-context/src/test/java/org/springframework/aop/config/PrototypeProxyTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -24,10 +24,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
  * @author Juergen Hoeller
  * @author Chris Beams
  */
-public class PrototypeProxyTests {
+class PrototypeProxyTests {
 
 	@Test
-	public void testInjectionBeforeWrappingCheckDoesNotKickInForPrototypeProxy() {
+	@SuppressWarnings("resource")
+	void injectionBeforeWrappingCheckDoesNotKickInForPrototypeProxy() {
 		new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-context.xml", getClass());
 	}
 

spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -20,8 +20,6 @@ import java.beans.ConstructorProperties;
 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;
 
@@ -33,6 +31,7 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.support.MethodReplacer;
+import org.springframework.beans.testfixture.beans.FactoryMethods;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.IndexedTestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
@@ -305,102 +304,6 @@ class DummyReferencer {
 }
 
 
-/**
- * Test class for Spring's ability to create objects using static
- * factory methods, rather than constructors.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-@SuppressWarnings("unused")
-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

spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java

@@ -53,6 +53,7 @@ import org.springframework.beans.factory.support.MethodReplacer;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.testfixture.beans.DependenciesBean;
 import org.springframework.beans.testfixture.beans.DerivedTestBean;
+import org.springframework.beans.testfixture.beans.FactoryMethods;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.IndexedTestBean;
 import org.springframework.beans.testfixture.beans.TestBean;

spring-context/src/test/java/org/springframework/tests/sample/beans/FactoryMethods.java

@@ -1,33 +0,0 @@
-/*
- * Copyright 2002-2012 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
- *
- *      https://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.tests.sample.beans;
-
-/**
- * Test class for Spring's ability to create objects using static
- * factory methods, rather than constructors.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @author Chris Beams
- */
-public class FactoryMethods {
-
-	public static FactoryMethods nullInstance() {
-		return null;
-	}
-
-}

spring-context/src/test/resources/org/springframework/aop/config/PrototypeProxyTests-context.xml

@@ -15,8 +15,6 @@
 		<constructor-arg ref="service"/>
 	</bean>
 
-	<bean id="nullInstance" class="org.springframework.tests.sample.beans.FactoryMethods" factory-method="nullInstance"/>
-
 	<bean id="serviceInterceptor" class="org.springframework.aop.interceptor.DebugInterceptor"/>
 
 	<aop:config proxy-target-class="false">

spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml

@@ -25,7 +25,7 @@
 	</bean>
 
 	<bean id="factoryMethods"
-		class="org.springframework.beans.factory.xml.FactoryMethods"
+		class="org.springframework.beans.testfixture.beans.FactoryMethods"
 		factory-method="newInstance"
 		scope="prototype">
 		<constructor-arg index="0"><ref bean="jenny"/></constructor-arg>

spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml

@@ -16,7 +16,7 @@
 		<property name="age"><value>30</value></property>
 	</bean>
 
-	<bean id="factoryMethods"  class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="factoryMethods"  class="org.springframework.beans.testfixture.beans.FactoryMethods"
 			factory-method="newInstance" scope="prototype">
 		<constructor-arg index="0"><ref bean="jenny"/></constructor-arg>
 	</bean>

spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml

@@ -4,7 +4,7 @@
 <beans>
 
 
-	<bean id="default" class="org.springframework.beans.factory.xml.FactoryMethods"
+	<bean id="default" class="org.springframework.beans.testfixture.beans.FactoryMethods"
 			factory-method="defaultInstance">
 		<!-- No constructor-arg elements -->
 		<property name="stringValue"><value>setterString</value></property>