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

Rename test fixture package in spring-context

Browse Source 
See gh-23550
This commit is contained in:
Sam Brannen
2019-12-29 17:41:00 +01:00
parent 7cd4ddf5fc
commit 726b1bb1d0
69 changed files with 139 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
View File

@@ -31,8 +31,8 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.NoSuchMessageException;
import org.springframework.context.test.fixtures.AbstractApplicationContextTests;
import org.springframework.context.test.fixtures.beans.TestApplicationListener;
import org.springframework.context.testfixture.AbstractApplicationContextTests;
import org.springframework.context.testfixture.beans.TestApplicationListener;
import org.springframework.mock.web.test.MockServletContext;
import org.springframework.util.Assert;
import org.springframework.web.context.support.XmlWebApplicationContext;
@@ -96,7 +96,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes
/**
* Overridden as we can't trust superclass method
* @see org.springframework.context.test.fixtures.AbstractApplicationContextTests#testEvents()
* @see org.springframework.context.testfixture.AbstractApplicationContextTests#testEvents()
*/
@Override
protected void doTestEvents(TestApplicationListener listener, TestApplicationListener parentListener,

4
spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/applicationContext.xml
View File

@@ -25,9 +25,9 @@
</bean>
-->
<bean id="beanThatListens" class="org.springframework.context.test.fixtures.beans.BeanThatListens"/>
<bean id="beanThatListens" class="org.springframework.context.testfixture.beans.BeanThatListens"/>
<bean id="parentListener" class="org.springframework.context.test.fixtures.beans.TestApplicationListener"/>
<bean id="parentListener" class="org.springframework.context.testfixture.beans.TestApplicationListener"/>
<!-- Inherited tests -->

6
spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-addition.xml
View File

@@ -3,11 +3,11 @@
<beans>
<bean id="aca" class="org.springframework.context.test.fixtures.beans.ACATester"/>
<bean id="aca" class="org.springframework.context.testfixture.beans.ACATester"/>
<bean id="aca-prototype" class="org.springframework.context.test.fixtures.beans.ACATester" scope="prototype"/>
<bean id="aca-prototype" class="org.springframework.context.testfixture.beans.ACATester" scope="prototype"/>
<bean id="testListener" class="org.springframework.context.test.fixtures.beans.TestApplicationListener"/>
<bean id="testListener" class="org.springframework.context.testfixture.beans.TestApplicationListener"/>
<bean id="roderick" parent="rod">
<property name="name"><value>Roderick</value></property>

6
spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-servlet.xml
View File

@@ -11,9 +11,9 @@
<property name="basenamePrefix"><value>org/springframework/web/context/WEB-INF/test-</value></property>
</bean>
<bean id="aca" class="org.springframework.context.test.fixtures.beans.ACATester"/>
<bean id="aca" class="org.springframework.context.testfixture.beans.ACATester"/>
<bean id="aca-prototype" class="org.springframework.context.test.fixtures.beans.ACATester" scope="prototype"/>
<bean id="aca-prototype" class="org.springframework.context.testfixture.beans.ACATester" scope="prototype"/>
<bean id="rod" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Rod</value></property>
@@ -21,7 +21,7 @@
<property name="spouse"><ref bean="father"/></property>
</bean>
<bean id="testListener" class="org.springframework.context.test.fixtures.beans.TestApplicationListener"/>
<bean id="testListener" class="org.springframework.context.testfixture.beans.TestApplicationListener"/>
<bean id="roderick" parent="rod">
<property name="name"><value>Roderick</value></property>