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

2
spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java
View File

@@ -23,7 +23,7 @@ import org.springframework.beans.factory.parsing.BeanComponentDefinition;
import org.springframework.beans.factory.parsing.ComponentDefinition;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.test.fixtures.beans.CollectingReaderEventListener;
import org.springframework.beans.testfixture.beans.CollectingReaderEventListener;
import org.springframework.core.io.ClassPathResource;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java
View File

@@ -22,7 +22,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.tests.transaction.CallCountingTransactionManager;

4
spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
View File

@@ -21,8 +21,8 @@ import java.lang.reflect.Method;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
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.dao.OptimisticLockingFailureException;
import org.springframework.transaction.CannotCreateTransactionException;
import org.springframework.transaction.MockCallbackPreferringTransactionManager;

6
spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
View File

@@ -31,9 +31,9 @@ import org.springframework.aop.target.HotSwappableTargetSource;
import org.springframework.beans.FatalBeanException;
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.testfixture.beans.DerivedTestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.ClassPathResource;
import org.springframework.lang.Nullable;
import org.springframework.tests.transaction.CallCountingTransactionManager;

2
spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java
View File

@@ -16,7 +16,7 @@
package org.springframework.transaction.interceptor;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
/**
* Test for CGLIB proxying that implements no interfaces

4
spring-tx/src/test/java/org/springframework/transaction/support/SimpleTransactionScopeTests.java
View File

@@ -23,8 +23,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.support.GenericBeanDefinition;
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.support.GenericApplicationContext;
import org.springframework.tests.transaction.CallCountingTransactionManager;

2
spring-tx/src/test/resources/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml
View File

@@ -4,7 +4,7 @@
<beans>
<!-- Simple target -->
<bean id="target" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean">
<bean id="target" class="org.springframework.beans.testfixture.beans.DerivedTestBean">
<property name="name"><value>custom</value></property>
<property name="age"><value>666</value></property>
</bean>

12
spring-tx/src/test/resources/org/springframework/transaction/interceptor/transactionalBeanFactory.xml
View File

@@ -3,12 +3,12 @@
<beans>
<bean id="targetDependency" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="targetDependency" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>dependency</value></property>
</bean>
<!-- Simple target -->
<bean id="target" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" lazy-init="true">
<bean id="target" class="org.springframework.beans.testfixture.beans.DerivedTestBean" lazy-init="true">
<property name="name"><value>custom</value></property>
<property name="age"><value>666</value></property>
<property name="spouse"><ref bean="targetDependency"/></property>
@@ -22,16 +22,16 @@
<property name="transactionManager"><ref bean="mockMan"/></property>
<property name="transactionAttributeSource">
<value>
org.springframework.beans.test.fixtures.beans.ITestBean.s*=PROPAGATION_MANDATORY
org.springframework.beans.test.fixtures.beans.AgeHolder.setAg*=PROPAGATION_REQUIRED
org.springframework.beans.test.fixtures.beans.ITestBean.set*= PROPAGATION_SUPPORTS , readOnly
org.springframework.beans.testfixture.beans.ITestBean.s*=PROPAGATION_MANDATORY
org.springframework.beans.testfixture.beans.AgeHolder.setAg*=PROPAGATION_REQUIRED
org.springframework.beans.testfixture.beans.ITestBean.set*= PROPAGATION_SUPPORTS , readOnly
</value>
</property>
</bean>
<bean id="proxyFactory1" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<value>org.springframework.beans.test.fixtures.beans.ITestBean</value>
<value>org.springframework.beans.testfixture.beans.ITestBean</value>
</property>
<property name="interceptorNames">
<list>

2
spring-tx/src/test/resources/org/springframework/transaction/txNamespaceHandlerTests.xml
View File

@@ -28,6 +28,6 @@
<bean id="transactionManager" class="org.springframework.tests.transaction.CallCountingTransactionManager"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>