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

Rename test fixture package in spring-beans

Browse Source 
See gh-23550
This commit is contained in:
Sam Brannen
2019-12-29 17:37:19 +01:00
parent 4260c34b47
commit 7cd4ddf5fc
503 changed files with 1148 additions and 1142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
View File

@@ -24,8 +24,8 @@ import com.sun.net.httpserver.HttpServer;
import org.junit.jupiter.api.Test;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.remoting.RemoteAccessException;
import org.springframework.util.SocketUtils;

4
spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
View File

@@ -37,8 +37,8 @@ import org.aopalliance.intercept.MethodInvocation;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.mock.web.test.MockHttpServletRequest;
import org.springframework.mock.web.test.MockHttpServletResponse;
import org.springframework.remoting.RemoteAccessException;

2
spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.web.bind;
import org.junit.jupiter.api.Test;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.validation.BindException;
import org.springframework.validation.Errors;
import org.springframework.validation.FieldError;

4
spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java
View File

@@ -25,8 +25,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.PropertyValues;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.mock.web.test.MockHttpServletRequest;
import static org.assertj.core.api.Assertions.assertThat;

4
spring-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java
View File

@@ -26,8 +26,8 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.ClassPathResource;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;

4
spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java
View File

@@ -27,8 +27,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.PropertyValues;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.mock.web.test.MockHttpServletRequest;
import org.springframework.mock.web.test.MockMultipartFile;
import org.springframework.mock.web.test.MockMultipartHttpServletRequest;

2
spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java
View File

@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.mock.web.test.MockHttpServletRequest;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.StaticWebApplicationContext;

4
spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java
View File

@@ -25,8 +25,8 @@ import org.springframework.beans.factory.BeanCurrentlyInCreationException;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.test.fixtures.beans.DerivedTestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.DerivedTestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.context.expression.StandardBeanExpressionResolver;
import org.springframework.core.io.ClassPathResource;
import org.springframework.mock.web.test.MockHttpServletRequest;

8
spring-web/src/test/java/org/springframework/web/context/request/RequestScopedProxyTests.java
View File

@@ -24,10 +24,10 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.test.fixtures.beans.DerivedTestBean;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.test.fixtures.beans.factory.DummyFactory;
import org.springframework.beans.testfixture.beans.DerivedTestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.beans.testfixture.beans.factory.DummyFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.mock.web.test.MockHttpServletRequest;

4
spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java
View File

@@ -28,8 +28,8 @@ import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.test.fixtures.beans.DerivedTestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.DerivedTestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.testfixture.io.SerializationTestUtils;
import org.springframework.mock.web.test.MockHttpServletRequest;

2
spring-web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java
View File

@@ -21,7 +21,7 @@ import javax.servlet.ServletContextEvent;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.GenericBeanDefinition;
import org.springframework.beans.test.fixtures.beans.DerivedTestBean;
import org.springframework.beans.testfixture.beans.DerivedTestBean;
import org.springframework.mock.web.test.MockHttpServletRequest;
import org.springframework.mock.web.test.MockServletContext;
import org.springframework.web.context.ContextCleanupListener;

4
spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java
View File

@@ -21,8 +21,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.context.annotation.AnnotationConfigUtils;
import org.springframework.mock.web.test.MockServletContext;
import org.springframework.web.context.WebApplicationContext;

2
spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java
View File

@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.MethodParameter;
import org.springframework.core.annotation.SynthesizingMethodParameter;
import org.springframework.mock.web.test.MockHttpServletRequest;

2
spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java
View File

@@ -21,7 +21,7 @@ import java.util.HashSet;
import org.junit.jupiter.api.Test;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.mock.web.test.MockHttpServletRequest;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.SessionAttributes;

18
spring-web/src/test/resources/org/springframework/web/context/request/requestScopeTests.xml
View File

@@ -4,35 +4,35 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<bean id="requestScopedObject" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<bean id="requestScopedObject" class="org.springframework.beans.testfixture.beans.TestBean" scope="request">
<property name="name" value="#{request.contextPath}"/>
</bean>
<bean id="requestScopedDisposableObject" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" scope="request"/>
<bean id="requestScopedDisposableObject" class="org.springframework.beans.testfixture.beans.DerivedTestBean" scope="request"/>
<bean id="requestScopedFactoryBean" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory" scope="request"/>
<bean id="requestScopedFactoryBean" class="org.springframework.beans.testfixture.beans.factory.DummyFactory" scope="request"/>
<bean id="requestScopedObjectCircle1" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<bean id="requestScopedObjectCircle1" class="org.springframework.beans.testfixture.beans.TestBean" scope="request">
<property name="spouse" ref="requestScopedObjectCircle2"/>
</bean>
<bean id="requestScopedObjectCircle2" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<bean id="requestScopedObjectCircle2" class="org.springframework.beans.testfixture.beans.TestBean" scope="request">
<property name="spouse" ref="requestScopedObjectCircle1"/>
</bean>
<bean id="requestScopedOuterBean" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" scope="request">
<bean id="requestScopedOuterBean" class="org.springframework.beans.testfixture.beans.DerivedTestBean" scope="request">
<property name="name" value="outer"/>
<property name="spouse">
<bean class="org.springframework.beans.test.fixtures.beans.DerivedTestBean">
<bean class="org.springframework.beans.testfixture.beans.DerivedTestBean">
<property name="name" value="inner"/>
</bean>
</property>
</bean>
<bean id="singletonOuterBean" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" lazy-init="true">
<bean id="singletonOuterBean" class="org.springframework.beans.testfixture.beans.DerivedTestBean" lazy-init="true">
<property name="name" value="outer"/>
<property name="spouse">
<bean class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" scope="request">
<bean class="org.springframework.beans.testfixture.beans.DerivedTestBean" scope="request">
<property name="name" value="inner"/>
</bean>
</property>

20
spring-web/src/test/resources/org/springframework/web/context/request/requestScopedProxyTests.xml
View File

@@ -5,47 +5,47 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
<bean id="requestScopedObject" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<bean id="requestScopedObject" class="org.springframework.beans.testfixture.beans.TestBean" scope="request">
<aop:scoped-proxy/>
<property name="name" value="scoped"/>
</bean>
<bean id="requestScopedProxy" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<bean id="requestScopedProxy" class="org.springframework.beans.testfixture.beans.TestBean" scope="request">
<aop:scoped-proxy proxy-target-class="false"/>
<property name="name" value="scoped"/>
</bean>
<bean id="requestScopedDisposableObject" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" scope="request">
<bean id="requestScopedDisposableObject" class="org.springframework.beans.testfixture.beans.DerivedTestBean" scope="request">
<aop:scoped-proxy/>
<property name="name" value="scoped"/>
</bean>
<bean id="requestScopedFactoryBean" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory" scope="request">
<bean id="requestScopedFactoryBean" class="org.springframework.beans.testfixture.beans.factory.DummyFactory" scope="request">
<aop:scoped-proxy/>
</bean>
<bean id="requestScopedObjectCircle1" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<bean id="requestScopedObjectCircle1" class="org.springframework.beans.testfixture.beans.TestBean" scope="request">
<aop:scoped-proxy/>
<property name="spouse" ref="requestScopedObjectCircle2"/>
</bean>
<bean id="requestScopedObjectCircle2" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<bean id="requestScopedObjectCircle2" class="org.springframework.beans.testfixture.beans.TestBean" scope="request">
<aop:scoped-proxy/>
<property name="spouse" ref="requestScopedObjectCircle1"/>
</bean>
<bean id="outerBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="outerBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="spouse">
<bean id="scopedInnerBean" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<bean id="scopedInnerBean" class="org.springframework.beans.testfixture.beans.TestBean" scope="request">
<aop:scoped-proxy/>
<property name="name" value="scoped"/>
</bean>
</property>
</bean>
<bean id="outerBeanWithAnonymousInner" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="outerBeanWithAnonymousInner" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg>
<bean class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<bean class="org.springframework.beans.testfixture.beans.TestBean" scope="request">
<aop:scoped-proxy/>
<property name="name" value="scoped"/>
</bean>

4
spring-web/src/test/resources/org/springframework/web/context/request/sessionScopeTests.xml
View File

@@ -3,8 +3,8 @@
<beans>
<bean id="sessionScopedObject" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="session"/>
<bean id="sessionScopedObject" class="org.springframework.beans.testfixture.beans.TestBean" scope="session"/>
<bean id="sessionScopedDisposableObject" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" scope="session"/>
<bean id="sessionScopedDisposableObject" class="org.springframework.beans.testfixture.beans.DerivedTestBean" scope="session"/>
</beans>