Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move common FactoryMethods to spring-beans test fixtures

Browse Source 
See gh-23550
This commit is contained in:
Sam Brannen
2019-12-31 16:03:56 +01:00
parent 94f8ef08e2
commit 57b771ba92
12 changed files with 30 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

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

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

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

@@ -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">

8
spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/FactoryMethods.java
View File

@@ -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");
}