GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Rename test fixture package in spring-beans 

See gh-23550
pull/24287/head
Sam Brannen 6 years ago
parent
4260c34b47
commit
7cd4ddf5fc
503 changed files with 1148 additions and 1142 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java
  2. 2
      integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
  3. 8
      integration-tests/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml
  4. 10
      integration-tests/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
  5. 26
      spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
  6. 2
      spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
  7. 4
      spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
  8. 4
      spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
  9. 28
      spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
  10. 8
      spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
  11. 4
      spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
  12. 2
      spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
  13. 2
      spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJNamespaceHandlerTests.java
  14. 2
      spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
  15. 4
      spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
  16. 4
      spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
  17. 2
      spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
  18. 6
      spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
  19. 6
      spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
  20. 4
      spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
  21. 4
      spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
  22. 2
      spring-aop/src/test/java/org/springframework/aop/support/AbstractRegexpMethodPointcutTests.java
  23. 2
      spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
  24. 4
      spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java
  25. 2
      spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java
  26. 2
      spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
  27. 4
      spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
  28. 12
      spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
  29. 6
      spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java
  30. 4
      spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
  31. 2
      spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
  32. 6
      spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
  33. 2
      spring-aop/src/test/java/org/springframework/aop/support/RootClassFilterTests.java
  34. 2
      spring-aop/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceProxyTests.java
  35. 6
      spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
  36. 2
      spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
  37. 4
      spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
  38. 2
      spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java
  39. 4
      spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
  40. 2
      spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
  41. 2
      spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
  42. 2
      spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
  43. 10
      spring-aop/src/test/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
  44. 2
      spring-aop/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceProxyTests-context.xml
  45. 4
      spring-aop/src/test/resources/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml
  46. 2
      spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml
  47. 2
      spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml
  48. 4
      spring-aop/src/test/resources/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
  49. 6
      spring-aop/src/test/resources/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml
  50. 10
      spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java
  51. 6
      spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
  52. 4
      spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java
  53. 8
      spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
  54. 2
      spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
  55. 4
      spring-beans/src/test/java/org/springframework/beans/CachedIntrospectionResultsTests.java
  56. 2
      spring-beans/src/test/java/org/springframework/beans/DirectFieldAccessorTests.java
  57. 2
      spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
  58. 12
      spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
  59. 16
      spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
  60. 8
      spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
  61. 8
      spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
  62. 2
      spring-beans/src/test/java/org/springframework/beans/factory/annotation/LookupAnnotationTests.java
  63. 2
      spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
  64. 4
      spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
  65. 4
      spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
  66. 2
      spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java
  67. 4
      spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
  68. 2
      spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
  69. 2
      spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
  70. 2
      spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java
  71. 2
      spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java
  72. 8
      spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
  73. 4
      spring-beans/src/test/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistryTests.java
  74. 2
      spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java
  75. 2
      spring-beans/src/test/java/org/springframework/beans/factory/support/LookupMethodTests.java
  76. 2
      spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
  77. 2
      spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
  78. 2
      spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java
  79. 2
      spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
  80. 2
      spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
  81. 4
      spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
  82. 2
      spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java
  83. 4
      spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java
  84. 2
      spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java
  85. 2
      spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
  86. 2
      spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
  87. 2
      spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java
  88. 2
      spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java
  89. 2
      spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java
  90. 2
      spring-beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java
  91. 4
      spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
  92. 4
      spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java
  93. 2
      spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java
  94. 6
      spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
  95. 4
      spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
  96. 2
      spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java
  97. 10
      spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
  98. 14
      spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
  99. 2
      spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
  100. 4
      spring-beans/src/test/kotlin/org/springframework/beans/factory/annotation/KotlinAutowiredTests.kt
  101. Some files were not shown because too many files have changed in this diff Show More

4
integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java
Unescape View File

@ -21,8 +21,8 @@ import org.junit.jupiter.api.Test; @@ -21,8 +21,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.aop.framework.Advised;
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.factory.annotation.Autowired;
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.testfixture.io.SerializationTestUtils;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpSession;

2
integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
Unescape View File

@ -28,7 +28,7 @@ import org.springframework.aop.support.AopUtils; @@ -28,7 +28,7 @@ import org.springframework.aop.support.AopUtils;
import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.lang.Nullable;
import org.springframework.tests.aop.advice.CountingBeforeAdvice;

8
integration-tests/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml
Unescape View File

@ -11,19 +11,19 @@ @@ -11,19 +11,19 @@
<bean id="advice" class="org.springframework.aop.interceptor.DebugInterceptor"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="singletonScoped" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="singletonScoped" class="org.springframework.beans.testfixture.beans.TestBean">
<aop:scoped-proxy/>
<property name="name" value="Rob Harrop"/>
</bean>
<bean id="requestScoped" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<bean id="requestScoped" class="org.springframework.beans.testfixture.beans.TestBean" scope="request">
<aop:scoped-proxy/>
<property name="name" value="Rob Harrop"/>
</bean>
<bean id="sessionScoped" name="sessionScopedAlias" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="session">
<bean id="sessionScoped" name="sessionScopedAlias" class="org.springframework.beans.testfixture.beans.TestBean" scope="session">
<aop:scoped-proxy proxy-target-class="false"/>
<property name="name" value="Rob Harrop"/>
</bean>

10
integration-tests/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
Unescape View File

@ -74,20 +74,20 @@ @@ -74,20 +74,20 @@
<!-- These two beans would otherwise be eligible for autoproxying -->
<bean id="singletonDependency" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="singleton"/>
<bean id="singletonDependency" class="org.springframework.beans.testfixture.beans.TestBean" scope="singleton"/>
<bean id="prototypeDependency" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype"/>
<bean id="prototypeDependency" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype"/>
<!-- ====== End test for prototype definitions to try to provoke circular references ========================= -->
<bean class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
<property name="advice"><ref bean="countingAdvice"/></property>
<property name="pattern"><value>org.springframework.beans.test.fixtures.beans.ITestBean.getName</value></property>
<property name="pattern"><value>org.springframework.beans.testfixture.beans.ITestBean.getName</value></property>
</bean>
<bean id="countingAdvice" class="org.springframework.tests.aop.advice.CountingAfterReturningAdvice"/>
<bean id="test" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="test" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="age"><value>4</value></property>
</bean>
@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
<!-- The following beans test whether auto-proxying falls over for a null value -->
<bean id="tb" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="tb" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="nullValueReturned" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
<property name="targetObject" ref="tb"/>

26
spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
Unescape View File

@ -31,10 +31,10 @@ import org.springframework.aop.MethodMatcher; @@ -31,10 +31,10 @@ import org.springframework.aop.MethodMatcher;
import org.springframework.aop.Pointcut;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.aop.support.DefaultPointcutAdvisor;
import org.springframework.beans.test.fixtures.beans.IOther;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.test.fixtures.beans.subpkg.DeepBean;
import org.springframework.beans.testfixture.beans.IOther;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.beans.testfixture.beans.subpkg.DeepBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@ -67,7 +67,7 @@ public class AspectJExpressionPointcutTests { @@ -67,7 +67,7 @@ public class AspectJExpressionPointcutTests {
@Test
public void testMatchExplicit() {
String expression = "execution(int org.springframework.beans.test.fixtures.beans.TestBean.getAge())";
String expression = "execution(int org.springframework.beans.testfixture.beans.TestBean.getAge())";
Pointcut pointcut = getPointcut(expression);
ClassFilter classFilter = pointcut.getClassFilter();
@ -117,8 +117,8 @@ public class AspectJExpressionPointcutTests { @@ -117,8 +117,8 @@ public class AspectJExpressionPointcutTests {
* @param which this or target
*/
private void testThisOrTarget(String which) throws SecurityException, NoSuchMethodException {
String matchesTestBean = which + "(org.springframework.beans.test.fixtures.beans.TestBean)";
String matchesIOther = which + "(org.springframework.beans.test.fixtures.beans.IOther)";
String matchesTestBean = which + "(org.springframework.beans.testfixture.beans.TestBean)";
String matchesIOther = which + "(org.springframework.beans.testfixture.beans.IOther)";
AspectJExpressionPointcut testBeanPc = new AspectJExpressionPointcut();
testBeanPc.setExpression(matchesTestBean);
@ -142,7 +142,7 @@ public class AspectJExpressionPointcutTests { @@ -142,7 +142,7 @@ public class AspectJExpressionPointcutTests {
}
private void testWithinPackage(boolean matchSubpackages) throws SecurityException, NoSuchMethodException {
String withinBeansPackage = "within(org.springframework.beans.test.fixtures.beans.";
String withinBeansPackage = "within(org.springframework.beans.testfixture.beans.";
// Subpackages are matched by **
if (matchSubpackages) {
withinBeansPackage += ".";
@ -187,7 +187,7 @@ public class AspectJExpressionPointcutTests { @@ -187,7 +187,7 @@ public class AspectJExpressionPointcutTests {
@Test
public void testMatchWithArgs() throws Exception {
String expression = "execution(void org.springframework.beans.test.fixtures.beans.TestBean.setSomeNumber(Number)) && args(Double)";
String expression = "execution(void org.springframework.beans.testfixture.beans.TestBean.setSomeNumber(Number)) && args(Double)";
Pointcut pointcut = getPointcut(expression);
ClassFilter classFilter = pointcut.getClassFilter();
@ -206,7 +206,7 @@ public class AspectJExpressionPointcutTests { @@ -206,7 +206,7 @@ public class AspectJExpressionPointcutTests {
@Test
public void testSimpleAdvice() {
String expression = "execution(int org.springframework.beans.test.fixtures.beans.TestBean.getAge())";
String expression = "execution(int org.springframework.beans.testfixture.beans.TestBean.getAge())";
CallCountingInterceptor interceptor = new CallCountingInterceptor();
TestBean testBean = getAdvisedProxy(expression, interceptor);
@ -219,7 +219,7 @@ public class AspectJExpressionPointcutTests { @@ -219,7 +219,7 @@ public class AspectJExpressionPointcutTests {
@Test
public void testDynamicMatchingProxy() {
String expression = "execution(void org.springframework.beans.test.fixtures.beans.TestBean.setSomeNumber(Number)) && args(Double)";
String expression = "execution(void org.springframework.beans.testfixture.beans.TestBean.setSomeNumber(Number)) && args(Double)";
CallCountingInterceptor interceptor = new CallCountingInterceptor();
TestBean testBean = getAdvisedProxy(expression, interceptor);
@ -233,7 +233,7 @@ public class AspectJExpressionPointcutTests { @@ -233,7 +233,7 @@ public class AspectJExpressionPointcutTests {
@Test
public void testInvalidExpression() {
String expression = "execution(void org.springframework.beans.test.fixtures.beans.TestBean.setSomeNumber(Number) && args(Double)";
String expression = "execution(void org.springframework.beans.testfixture.beans.TestBean.setSomeNumber(Number) && args(Double)";
assertThatIllegalArgumentException().isThrownBy(
getPointcut(expression)::getClassFilter); // call to getClassFilter forces resolution
}
@ -264,7 +264,7 @@ public class AspectJExpressionPointcutTests { @@ -264,7 +264,7 @@ public class AspectJExpressionPointcutTests {
@Test
public void testWithUnsupportedPointcutPrimitive() {
String expression = "call(int org.springframework.beans.test.fixtures.beans.TestBean.getAge())";
String expression = "call(int org.springframework.beans.testfixture.beans.TestBean.getAge())";
assertThatExceptionOfType(UnsupportedPointcutPrimitiveException.class).isThrownBy(() ->
getPointcut(expression).getClassFilter()) // call to getClassFilter forces resolution...
.satisfies(ex -> assertThat(ex.getUnsupportedPrimitive()).isEqualTo(PointcutPrimitive.CALL));

2
spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
Unescape View File

@ -18,7 +18,7 @@ package org.springframework.aop.aspectj; @@ -18,7 +18,7 @@ package org.springframework.aop.aspectj;
import org.junit.jupiter.api.Test;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;

4
spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
Unescape View File

@ -33,8 +33,8 @@ import org.springframework.aop.framework.AopContext; @@ -33,8 +33,8 @@ import org.springframework.aop.framework.AopContext;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
import org.springframework.aop.support.AopUtils;
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 static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

4
spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
Unescape View File

@ -27,7 +27,7 @@ import test.annotation.EmptySpringAnnotation; @@ -27,7 +27,7 @@ import test.annotation.EmptySpringAnnotation;
import test.annotation.transaction.Tx;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
@ -56,7 +56,7 @@ public class TigerAspectJExpressionPointcutTests { @@ -56,7 +56,7 @@ public class TigerAspectJExpressionPointcutTests {
@Test
public void testMatchGenericArgument() {
String expression = "execution(* set*(java.util.List<org.springframework.beans.test.fixtures.beans.TestBean>) )";
String expression = "execution(* set*(java.util.List<org.springframework.beans.testfixture.beans.TestBean>) )";
AspectJExpressionPointcut ajexp = new AspectJExpressionPointcut();
ajexp.setExpression(expression);

28
spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
Unescape View File

@ -20,11 +20,11 @@ import org.junit.jupiter.api.Test; @@ -20,11 +20,11 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.test.fixtures.beans.CountingTestBean;
import org.springframework.beans.test.fixtures.beans.IOther;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.test.fixtures.beans.subpkg.DeepBean;
import org.springframework.beans.testfixture.beans.CountingTestBean;
import org.springframework.beans.testfixture.beans.IOther;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.beans.testfixture.beans.subpkg.DeepBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@ -57,7 +57,7 @@ class TypePatternClassFilterTests { @@ -57,7 +57,7 @@ class TypePatternClassFilterTests {
@Test
void validPatternMatching() {
TypePatternClassFilter tpcf = new TypePatternClassFilter("org.springframework.beans.test.fixtures.beans.*");
TypePatternClassFilter tpcf = new TypePatternClassFilter("org.springframework.beans.testfixture.beans.*");
assertThat(tpcf.matches(TestBean.class)).as("Must match: in package").isTrue();
assertThat(tpcf.matches(ITestBean.class)).as("Must match: in package").isTrue();
@ -70,7 +70,7 @@ class TypePatternClassFilterTests { @@ -70,7 +70,7 @@ class TypePatternClassFilterTests {
@Test
void subclassMatching() {
TypePatternClassFilter tpcf = new TypePatternClassFilter("org.springframework.beans.test.fixtures.beans.ITestBean+");
TypePatternClassFilter tpcf = new TypePatternClassFilter("org.springframework.beans.testfixture.beans.ITestBean+");
assertThat(tpcf.matches(TestBean.class)).as("Must match: in package").isTrue();
assertThat(tpcf.matches(ITestBean.class)).as("Must match: in package").isTrue();
@ -98,8 +98,8 @@ class TypePatternClassFilterTests { @@ -98,8 +98,8 @@ class TypePatternClassFilterTests {
@Test
void testEquals() {
TypePatternClassFilter filter1 = new TypePatternClassFilter("org.springframework.beans.test.fixtures.beans.*");
TypePatternClassFilter filter2 = new TypePatternClassFilter("org.springframework.beans.test.fixtures.beans.*");
TypePatternClassFilter filter1 = new TypePatternClassFilter("org.springframework.beans.testfixture.beans.*");
TypePatternClassFilter filter2 = new TypePatternClassFilter("org.springframework.beans.testfixture.beans.*");
TypePatternClassFilter filter3 = new TypePatternClassFilter("org.springframework.tests.*");
assertThat(filter1).isEqualTo(filter2);
@ -108,8 +108,8 @@ class TypePatternClassFilterTests { @@ -108,8 +108,8 @@ class TypePatternClassFilterTests {
@Test
void testHashCode() {
TypePatternClassFilter filter1 = new TypePatternClassFilter("org.springframework.beans.test.fixtures.beans.*");
TypePatternClassFilter filter2 = new TypePatternClassFilter("org.springframework.beans.test.fixtures.beans.*");
TypePatternClassFilter filter1 = new TypePatternClassFilter("org.springframework.beans.testfixture.beans.*");
TypePatternClassFilter filter2 = new TypePatternClassFilter("org.springframework.beans.testfixture.beans.*");
TypePatternClassFilter filter3 = new TypePatternClassFilter("org.springframework.tests.*");
assertThat(filter1.hashCode()).isEqualTo(filter2.hashCode());
@ -118,11 +118,11 @@ class TypePatternClassFilterTests { @@ -118,11 +118,11 @@ class TypePatternClassFilterTests {
@Test
void testToString() {
TypePatternClassFilter filter1 = new TypePatternClassFilter("org.springframework.beans.test.fixtures.beans.*");
TypePatternClassFilter filter2 = new TypePatternClassFilter("org.springframework.beans.test.fixtures.beans.*");
TypePatternClassFilter filter1 = new TypePatternClassFilter("org.springframework.beans.testfixture.beans.*");
TypePatternClassFilter filter2 = new TypePatternClassFilter("org.springframework.beans.testfixture.beans.*");
assertThat(filter1.toString())
.isEqualTo("org.springframework.aop.aspectj.TypePatternClassFilter: org.springframework.beans.test.fixtures.beans.*");
.isEqualTo("org.springframework.aop.aspectj.TypePatternClassFilter: org.springframework.beans.testfixture.beans.*");
assertThat(filter1.toString()).isEqualTo(filter2.toString());
}

8
spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
Unescape View File

@ -50,8 +50,8 @@ import org.springframework.aop.framework.AopConfigException; @@ -50,8 +50,8 @@ import org.springframework.aop.framework.AopConfigException;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
import org.springframework.aop.support.AopUtils;
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.OrderComparator;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
@ -590,7 +590,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests { @@ -590,7 +590,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
}
@Aspect("pertypewithin(org.springframework.beans.test.fixtures.beans.IOther+)")
@Aspect("pertypewithin(org.springframework.beans.testfixture.beans.IOther+)")
public static class PerTypeWithinAspect {
public int count;
@ -931,7 +931,7 @@ abstract class AbstractMakeModifiable { @@ -931,7 +931,7 @@ abstract class AbstractMakeModifiable {
@Aspect
class MakeITestBeanModifiable extends AbstractMakeModifiable {
@DeclareParents(value = "org.springframework.beans.test.fixtures.beans.ITestBean+",
@DeclareParents(value = "org.springframework.beans.testfixture.beans.ITestBean+",
defaultImpl=ModifiableImpl.class)
public static MutableModifiable mixin;

4
spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
Unescape View File

@ -27,8 +27,8 @@ import org.aspectj.lang.annotation.Pointcut; @@ -27,8 +27,8 @@ import org.aspectj.lang.annotation.Pointcut;
import org.junit.jupiter.api.Test;
import org.springframework.aop.aspectj.AspectJAdviceParameterNameDiscoverer;
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 static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

2
spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
Unescape View File

@ -23,7 +23,7 @@ import org.springframework.aop.Pointcut; @@ -23,7 +23,7 @@ import org.springframework.aop.Pointcut;
import org.springframework.aop.aspectj.AspectJExpressionPointcut;
import org.springframework.aop.aspectj.AspectJExpressionPointcutTests;
import org.springframework.aop.framework.AopConfigException;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

2
spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJNamespaceHandlerTests.java
Unescape View File

@ -29,7 +29,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; @@ -29,7 +29,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.factory.xml.XmlReaderContext;
import org.springframework.beans.test.fixtures.beans.CollectingReaderEventListener;
import org.springframework.beans.testfixture.beans.CollectingReaderEventListener;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
Unescape View File

@ -29,7 +29,7 @@ import org.springframework.beans.factory.parsing.ComponentDefinition; @@ -29,7 +29,7 @@ import org.springframework.beans.factory.parsing.ComponentDefinition;
import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
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.Resource;
import static org.assertj.core.api.Assertions.assertThat;

4
spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
Unescape View File

@ -23,8 +23,8 @@ import java.util.List; @@ -23,8 +23,8 @@ import java.util.List;
import org.junit.jupiter.api.Test;
import org.springframework.aop.SpringProxy;
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 static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

4
spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
Unescape View File

@ -19,8 +19,8 @@ package org.springframework.aop.framework; @@ -19,8 +19,8 @@ package org.springframework.aop.framework;
import org.junit.jupiter.api.Test;
import org.springframework.aop.support.DelegatingIntroductionInterceptor;
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.util.StopWatch;
/**

2
spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
Unescape View File

@ -23,7 +23,7 @@ import java.util.List; @@ -23,7 +23,7 @@ import java.util.List;
import org.aopalliance.intercept.MethodInterceptor;
import org.junit.jupiter.api.Test;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;

6
spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
Unescape View File

@ -34,9 +34,9 @@ import org.springframework.aop.support.AopUtils; @@ -34,9 +34,9 @@ import org.springframework.aop.support.AopUtils;
import org.springframework.aop.support.DefaultIntroductionAdvisor;
import org.springframework.aop.support.DefaultPointcutAdvisor;
import org.springframework.aop.support.DelegatingIntroductionInterceptor;
import org.springframework.beans.test.fixtures.beans.IOther;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.IOther;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
import org.springframework.core.annotation.Order;
import org.springframework.core.testfixture.TimeStamped;

6
spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
Unescape View File

@ -22,9 +22,9 @@ import org.junit.jupiter.api.Test; @@ -22,9 +22,9 @@ import org.junit.jupiter.api.Test;
import org.springframework.aop.framework.Advised;
import org.springframework.aop.framework.ProxyFactory;
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.testfixture.io.SerializationTestUtils;
import static org.assertj.core.api.Assertions.assertThat;

4
spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
Unescape View File

@ -20,8 +20,8 @@ import org.junit.jupiter.api.Test; @@ -20,8 +20,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.factory.NamedBean;
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 static org.assertj.core.api.Assertions.assertThat;

4
spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
Unescape View File

@ -21,8 +21,8 @@ import org.junit.jupiter.api.Test; @@ -21,8 +21,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
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 static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.core.testfixture.io.ResourceTestUtils.qualifiedResource;

2
spring-aop/src/test/java/org/springframework/aop/support/AbstractRegexpMethodPointcutTests.java
Unescape View File

@ -21,7 +21,7 @@ import java.io.IOException; @@ -21,7 +21,7 @@ import java.io.IOException;
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.testfixture.io.SerializationTestUtils;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
Unescape View File

@ -25,7 +25,7 @@ import org.springframework.aop.MethodMatcher; @@ -25,7 +25,7 @@ import org.springframework.aop.MethodMatcher;
import org.springframework.aop.Pointcut;
import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
import org.springframework.aop.target.EmptyTargetSource;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.testfixture.io.SerializationTestUtils;
import org.springframework.lang.Nullable;
import org.springframework.tests.aop.interceptor.NopInterceptor;

4
spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java
Unescape View File

@ -19,8 +19,8 @@ package org.springframework.aop.support; @@ -19,8 +19,8 @@ package org.springframework.aop.support;
import org.junit.jupiter.api.Test;
import org.springframework.aop.ClassFilter;
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.NestedRuntimeException;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java
Unescape View File

@ -18,7 +18,7 @@ package org.springframework.aop.support; @@ -18,7 +18,7 @@ package org.springframework.aop.support;
import org.junit.jupiter.api.Test;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.util.ClassUtils;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
Unescape View File

@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.aop.ClassFilter;
import org.springframework.aop.MethodMatcher;
import org.springframework.aop.Pointcut;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.NestedRuntimeException;
import org.springframework.lang.Nullable;

4
spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
Unescape View File

@ -20,8 +20,8 @@ import org.junit.jupiter.api.Test; @@ -20,8 +20,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.aop.Pointcut;
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.tests.aop.interceptor.NopInterceptor;
import static org.assertj.core.api.Assertions.assertThat;

12
spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
Unescape View File

@ -24,12 +24,12 @@ import org.junit.jupiter.api.Test; @@ -24,12 +24,12 @@ import org.junit.jupiter.api.Test;
import org.springframework.aop.IntroductionAdvisor;
import org.springframework.aop.IntroductionInterceptor;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.test.fixtures.beans.INestedTestBean;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.NestedTestBean;
import org.springframework.beans.test.fixtures.beans.Person;
import org.springframework.beans.test.fixtures.beans.SerializablePerson;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.INestedTestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.NestedTestBean;
import org.springframework.beans.testfixture.beans.Person;
import org.springframework.beans.testfixture.beans.SerializablePerson;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.testfixture.TimeStamped;
import org.springframework.core.testfixture.io.SerializationTestUtils;
import org.springframework.tests.aop.interceptor.SerializableNopInterceptor;

6
spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java
Unescape View File

@ -21,9 +21,9 @@ import java.lang.reflect.Method; @@ -21,9 +21,9 @@ import java.lang.reflect.Method;
import org.junit.jupiter.api.Test;
import org.springframework.aop.MethodMatcher;
import org.springframework.beans.test.fixtures.beans.IOther;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.IOther;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.testfixture.io.SerializationTestUtils;
import org.springframework.lang.Nullable;

4
spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
Unescape View File

@ -21,8 +21,8 @@ import org.junit.jupiter.api.Test; @@ -21,8 +21,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.aop.framework.Advised;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.test.fixtures.beans.Person;
import org.springframework.beans.test.fixtures.beans.SerializablePerson;
import org.springframework.beans.testfixture.beans.Person;
import org.springframework.beans.testfixture.beans.SerializablePerson;
import org.springframework.core.testfixture.io.SerializationTestUtils;
import org.springframework.tests.aop.interceptor.NopInterceptor;
import org.springframework.tests.aop.interceptor.SerializableNopInterceptor;

2
spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
Unescape View File

@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.aop.ClassFilter;
import org.springframework.aop.Pointcut;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.lang.Nullable;
import static org.assertj.core.api.Assertions.assertThat;

6
spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
Unescape View File

@ -21,9 +21,9 @@ import org.junit.jupiter.api.Test; @@ -21,9 +21,9 @@ import org.junit.jupiter.api.Test;
import org.springframework.aop.framework.Advised;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.Person;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.Person;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.Resource;
import org.springframework.core.testfixture.io.SerializationTestUtils;
import org.springframework.tests.aop.interceptor.NopInterceptor;

2
spring-aop/src/test/java/org/springframework/aop/support/RootClassFilterTests.java
Unescape View File

@ -19,7 +19,7 @@ package org.springframework.aop.support; @@ -19,7 +19,7 @@ package org.springframework.aop.support;
import org.junit.jupiter.api.Test;
import org.springframework.aop.ClassFilter;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-aop/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceProxyTests.java
Unescape View File

@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.core.io.Resource;
import static org.assertj.core.api.Assertions.assertThat;

6
spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
Unescape View File

@ -25,9 +25,9 @@ import org.springframework.aop.framework.ProxyFactory; @@ -25,9 +25,9 @@ import org.springframework.aop.framework.ProxyFactory;
import org.springframework.aop.support.DefaultPointcutAdvisor;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.test.fixtures.beans.Person;
import org.springframework.beans.test.fixtures.beans.SerializablePerson;
import org.springframework.beans.test.fixtures.beans.SideEffectBean;
import org.springframework.beans.testfixture.beans.Person;
import org.springframework.beans.testfixture.beans.SerializablePerson;
import org.springframework.beans.testfixture.beans.SideEffectBean;
import org.springframework.core.testfixture.io.SerializationTestUtils;
import org.springframework.tests.aop.interceptor.SerializableNopInterceptor;

2
spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
Unescape View File

@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.core.io.Resource;
import static org.assertj.core.api.Assertions.assertThat;

4
spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
Unescape View File

@ -23,8 +23,8 @@ import org.springframework.beans.MutablePropertyValues; @@ -23,8 +23,8 @@ import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.test.fixtures.beans.SerializablePerson;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.SerializablePerson;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.testfixture.io.SerializationTestUtils;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java
Unescape View File

@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.test.fixtures.beans.SideEffectBean;
import org.springframework.beans.testfixture.beans.SideEffectBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.core.testfixture.io.ResourceTestUtils.qualifiedResource;

4
spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
Unescape View File

@ -21,8 +21,8 @@ import org.junit.jupiter.api.Test; @@ -21,8 +21,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.SideEffectBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.SideEffectBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.core.testfixture.io.ResourceTestUtils.qualifiedResource;

2
spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
Unescape View File

@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
<bean id="getAgeCounter" class="org.springframework.aop.framework.CountingBeforeAdvice"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>

2
spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
Unescape View File

@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
<bean id="getAgeCounter" class="org.springframework.aop.framework.CountingBeforeAdvice"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>

2
spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
Unescape View File

@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
<bean id="getAgeCounter" class="org.springframework.aop.framework.CountingBeforeAdvice"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>

10
spring-aop/src/test/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
Unescape View File

@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
<beans>
<!-- Simple target -->
<bean id="test" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="test" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>custom</value></property>
<property name="age"><value>666</value></property>
</bean>
@ -21,15 +21,15 @@ @@ -21,15 +21,15 @@
</bean>
<bean id="settersAdvised" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
<property name="target"><ref bean="test"/></property>
<property name="interceptorNames"><value>settersAdvisor</value></property>
</bean>
<bean id="serializableSettersAdvised" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"><value>org.springframework.beans.test.fixtures.beans.Person</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.testfixture.beans.Person</value></property>
<property name="target">
<bean class="org.springframework.beans.test.fixtures.beans.SerializablePerson">
<bean class="org.springframework.beans.testfixture.beans.SerializablePerson">
<property name="name"><value>serializableSettersAdvised</value></property>
</bean>
</property>
@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
</bean>
<bean id="settersAndAbsquatulateAdvised" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
<!-- Force CGLIB so we can cast to TestBean -->
<property name="proxyTargetClass"><value>true</value></property>
<property name="target"><ref bean="test"/></property>

2
spring-aop/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceProxyTests-context.xml
Unescape View File

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
<beans>
<bean id="testBeanTarget" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype"/>
<bean id="testBeanTarget" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype"/>
<bean id="targetSource" class="org.springframework.aop.target.CommonsPool2TargetSource">
<property name="targetBeanName" value="testBeanTarget"/>

4
spring-aop/src/test/resources/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml
Unescape View File

@ -4,11 +4,11 @@ @@ -4,11 +4,11 @@
<beans>
<!-- Simple target -->
<bean id="target1" class="org.springframework.beans.test.fixtures.beans.SideEffectBean">
<bean id="target1" class="org.springframework.beans.testfixture.beans.SideEffectBean">
<property name="count"><value>10</value></property>
</bean>
<bean id="target2" class="org.springframework.beans.test.fixtures.beans.SideEffectBean" scope="singleton">
<bean id="target2" class="org.springframework.beans.testfixture.beans.SideEffectBean" scope="singleton">
<property name="count"><value>20</value></property>
</bean>

2
spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml
Unescape View File

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
<beans>
<bean id="target" class="org.springframework.beans.test.fixtures.beans.TestBean" lazy-init="true">
<bean id="target" class="org.springframework.beans.testfixture.beans.TestBean" lazy-init="true">
<property name="age"><value>10</value></property>
</bean>

2
spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml
Unescape View File

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
<beans>
<bean id="target" class="org.springframework.beans.test.fixtures.beans.TestBean" lazy-init="true">
<bean id="target" class="org.springframework.beans.testfixture.beans.TestBean" lazy-init="true">
<property name="age"><value>10</value></property>
</bean>

4
spring-aop/src/test/resources/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
Unescape View File

@ -4,11 +4,11 @@ @@ -4,11 +4,11 @@
<beans>
<!-- Simple target -->
<bean id="test" class="org.springframework.beans.test.fixtures.beans.SideEffectBean">
<bean id="test" class="org.springframework.beans.testfixture.beans.SideEffectBean">
<property name="count"><value>10</value></property>
</bean>
<bean id="prototypeTest" class="org.springframework.beans.test.fixtures.beans.SideEffectBean" scope="prototype">
<bean id="prototypeTest" class="org.springframework.beans.testfixture.beans.SideEffectBean" scope="prototype">
<property name="count"><value>10</value></property>
</bean>

6
spring-aop/src/test/resources/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml
Unescape View File

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
<beans>
<bean id="prototypeTest" class="org.springframework.beans.test.fixtures.beans.SideEffectBean" scope="prototype">
<bean id="prototypeTest" class="org.springframework.beans.testfixture.beans.SideEffectBean" scope="prototype">
<property name="count"><value>10</value></property>
</bean>
@ -34,12 +34,12 @@ @@ -34,12 +34,12 @@
<!-- ================ Definitions for second ThreadLocalTargetSource ====== -->
<bean id="test" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="test" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name"><value>Rod</value></property>
<property name="spouse"><ref bean="wife"/></property>
</bean>
<bean id="wife" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="wife" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Kerry</value></property>
</bean>

10
spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java
Unescape View File

@ -43,11 +43,11 @@ import org.springframework.beans.propertyeditors.CustomNumberEditor; @@ -43,11 +43,11 @@ import org.springframework.beans.propertyeditors.CustomNumberEditor;
import org.springframework.beans.propertyeditors.StringArrayPropertyEditor;
import org.springframework.beans.propertyeditors.StringTrimmerEditor;
import org.springframework.beans.support.DerivedFromProtectedBaseBean;
import org.springframework.beans.test.fixtures.beans.BooleanTestBean;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.IndexedTestBean;
import org.springframework.beans.test.fixtures.beans.NumberTestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.BooleanTestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.IndexedTestBean;
import org.springframework.beans.testfixture.beans.NumberTestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.convert.ConversionFailedException;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.support.DefaultConversionService;

6
spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
Unescape View File

@ -34,9 +34,9 @@ import org.junit.jupiter.params.provider.ValueSource; @@ -34,9 +34,9 @@ import org.junit.jupiter.params.provider.ValueSource;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.propertyeditors.CustomDateEditor;
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.Resource;
import org.springframework.core.io.ResourceEditor;
import org.springframework.lang.Nullable;

4
spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java
Unescape View File

@ -21,8 +21,8 @@ import java.util.Map; @@ -21,8 +21,8 @@ import java.util.Map;
import org.junit.jupiter.api.Test;
import org.springframework.beans.test.fixtures.beans.CustomEnum;
import org.springframework.beans.test.fixtures.beans.GenericBean;
import org.springframework.beans.testfixture.beans.CustomEnum;
import org.springframework.beans.testfixture.beans.GenericBean;
import org.springframework.core.convert.support.DefaultConversionService;
import static org.assertj.core.api.Assertions.assertThat;

8
spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
Unescape View File

@ -33,10 +33,10 @@ import org.junit.jupiter.api.Test; @@ -33,10 +33,10 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.propertyeditors.CustomNumberEditor;
import org.springframework.beans.propertyeditors.StringTrimmerEditor;
import org.springframework.beans.test.fixtures.beans.GenericBean;
import org.springframework.beans.test.fixtures.beans.GenericIntegerBean;
import org.springframework.beans.test.fixtures.beans.GenericSetOfIntegerBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.GenericBean;
import org.springframework.beans.testfixture.beans.GenericIntegerBean;
import org.springframework.beans.testfixture.beans.GenericSetOfIntegerBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.UrlResource;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
Unescape View File

@ -22,7 +22,7 @@ import java.util.Optional; @@ -22,7 +22,7 @@ import java.util.Optional;
import org.junit.jupiter.api.Test;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

4
spring-beans/src/test/java/org/springframework/beans/CachedIntrospectionResultsTests.java
Unescape View File

@ -22,7 +22,7 @@ import java.util.ArrayList; @@ -22,7 +22,7 @@ import java.util.ArrayList;
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.OverridingClassLoader;
import static org.assertj.core.api.Assertions.assertThat;
@ -42,7 +42,7 @@ public class CachedIntrospectionResultsTests { @@ -42,7 +42,7 @@ public class CachedIntrospectionResultsTests {
assertThat(CachedIntrospectionResults.strongClassCache.containsKey(TestBean.class)).isTrue();
ClassLoader child = new OverridingClassLoader(getClass().getClassLoader());
Class<?> tbClass = child.loadClass("org.springframework.beans.test.fixtures.beans.TestBean");
Class<?> tbClass = child.loadClass("org.springframework.beans.testfixture.beans.TestBean");
assertThat(CachedIntrospectionResults.strongClassCache.containsKey(tbClass)).isFalse();
CachedIntrospectionResults.acceptClassLoader(child);
bw = new BeanWrapperImpl(tbClass);

2
spring-beans/src/test/java/org/springframework/beans/DirectFieldAccessorTests.java
Unescape View File

@ -18,7 +18,7 @@ package org.springframework.beans; @@ -18,7 +18,7 @@ package org.springframework.beans;
import org.junit.jupiter.api.Test;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
Unescape View File

@ -25,7 +25,7 @@ import java.math.BigDecimal; @@ -25,7 +25,7 @@ import java.math.BigDecimal;
import org.junit.jupiter.api.Test;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;

12
spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
Unescape View File

@ -26,12 +26,12 @@ import org.junit.jupiter.api.Test; @@ -26,12 +26,12 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.StaticListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.test.fixtures.beans.AnnotatedBean;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.IndexedTestBean;
import org.springframework.beans.test.fixtures.beans.TestAnnotation;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.test.fixtures.beans.factory.DummyFactory;
import org.springframework.beans.testfixture.beans.AnnotatedBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.IndexedTestBean;
import org.springframework.beans.testfixture.beans.TestAnnotation;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.beans.testfixture.beans.factory.DummyFactory;
import org.springframework.cglib.proxy.NoOp;
import org.springframework.core.io.Resource;
import org.springframework.util.ObjectUtils;

16
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
Unescape View File

@ -78,14 +78,14 @@ import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader; @@ -78,14 +78,14 @@ import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.factory.xml.ConstructorDependenciesBean;
import org.springframework.beans.propertyeditors.CustomNumberEditor;
import org.springframework.beans.test.fixtures.beans.DependenciesBean;
import org.springframework.beans.test.fixtures.beans.DerivedTestBean;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.LifecycleBean;
import org.springframework.beans.test.fixtures.beans.NestedTestBean;
import org.springframework.beans.test.fixtures.beans.SideEffectBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.test.fixtures.beans.factory.DummyFactory;
import org.springframework.beans.testfixture.beans.DependenciesBean;
import org.springframework.beans.testfixture.beans.DerivedTestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.LifecycleBean;
import org.springframework.beans.testfixture.beans.NestedTestBean;
import org.springframework.beans.testfixture.beans.SideEffectBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.beans.testfixture.beans.factory.DummyFactory;
import org.springframework.core.MethodParameter;
import org.springframework.core.ResolvableType;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;

8
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
Unescape View File

@ -64,10 +64,10 @@ import org.springframework.beans.factory.support.AutowireCandidateQualifier; @@ -64,10 +64,10 @@ import org.springframework.beans.factory.support.AutowireCandidateQualifier;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.GenericBeanDefinition;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.IndexedTestBean;
import org.springframework.beans.test.fixtures.beans.NestedTestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.IndexedTestBean;
import org.springframework.beans.testfixture.beans.NestedTestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.Ordered;
import org.springframework.core.ResolvableType;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;

8
spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
Unescape View File

@ -40,10 +40,10 @@ import org.springframework.beans.factory.support.AutowireCandidateQualifier; @@ -40,10 +40,10 @@ import org.springframework.beans.factory.support.AutowireCandidateQualifier;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.GenericBeanDefinition;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.IndexedTestBean;
import org.springframework.beans.test.fixtures.beans.NestedTestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.IndexedTestBean;
import org.springframework.beans.testfixture.beans.NestedTestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.testfixture.io.SerializationTestUtils;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-beans/src/test/java/org/springframework/beans/factory/annotation/LookupAnnotationTests.java
Unescape View File

@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

2
spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
Unescape View File

@ -33,7 +33,7 @@ import org.springframework.beans.PropertyEditorRegistry; @@ -33,7 +33,7 @@ import org.springframework.beans.PropertyEditorRegistry;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.propertyeditors.CustomDateEditor;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;

4
spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
Unescape View File

@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.core.testfixture.io.ResourceTestUtils.qualifiedResource;
@ -115,7 +115,7 @@ public class FieldRetrievingFactoryBeanTests { @@ -115,7 +115,7 @@ public class FieldRetrievingFactoryBeanTests {
@Test
public void testWithConstantOnClassWithPackageLevelVisibility() throws Exception {
FieldRetrievingFactoryBean fr = new FieldRetrievingFactoryBean();
fr.setBeanName("org.springframework.beans.test.fixtures.beans.PackageLevelVisibleBean.CONSTANT");
fr.setBeanName("org.springframework.beans.testfixture.beans.PackageLevelVisibleBean.CONSTANT");
fr.afterPropertiesSet();
assertThat(fr.getObject()).isEqualTo("Wuby");
}

4
spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
Unescape View File

@ -20,8 +20,8 @@ import org.junit.jupiter.api.Test; @@ -20,8 +20,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
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.Resource;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java
Unescape View File

@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;

4
spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
Unescape View File

@ -39,8 +39,8 @@ import org.springframework.beans.factory.support.ManagedList; @@ -39,8 +39,8 @@ import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.support.ManagedMap;
import org.springframework.beans.factory.support.ManagedSet;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.test.fixtures.beans.IndexedTestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.IndexedTestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.Resource;
import org.springframework.util.StringUtils;

2
spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
Unescape View File

@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.ObjectFactory;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.core.testfixture.io.ResourceTestUtils.qualifiedResource;

2
spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
Unescape View File

@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.core.testfixture.io.ResourceTestUtils.qualifiedResource;

2
spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java
Unescape View File

@ -21,7 +21,7 @@ import java.util.Arrays; @@ -21,7 +21,7 @@ import java.util.Arrays;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java
Unescape View File

@ -19,7 +19,7 @@ package org.springframework.beans.factory.support; @@ -19,7 +19,7 @@ package org.springframework.beans.factory.support;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;

8
spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
Unescape View File

@ -43,10 +43,10 @@ import org.springframework.beans.factory.ObjectProvider; @@ -43,10 +43,10 @@ import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.config.TypedStringValue;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.propertyeditors.CustomNumberEditor;
import org.springframework.beans.test.fixtures.beans.GenericBean;
import org.springframework.beans.test.fixtures.beans.GenericIntegerBean;
import org.springframework.beans.test.fixtures.beans.GenericSetOfIntegerBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.GenericBean;
import org.springframework.beans.testfixture.beans.GenericIntegerBean;
import org.springframework.beans.testfixture.beans.GenericSetOfIntegerBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.OverridingClassLoader;
import org.springframework.core.ResolvableType;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;

4
spring-beans/src/test/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistryTests.java
Unescape View File

@ -20,8 +20,8 @@ import org.junit.jupiter.api.Test; @@ -20,8 +20,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.ObjectFactory;
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 static org.assertj.core.api.Assertions.assertThat;

2
spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java
Unescape View File

@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-beans/src/test/java/org/springframework/beans/factory/support/LookupMethodTests.java
Unescape View File

@ -20,7 +20,7 @@ import org.junit.jupiter.api.BeforeEach; @@ -20,7 +20,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.ClassPathResource;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
Unescape View File

@ -18,7 +18,7 @@ package org.springframework.beans.factory.support; @@ -18,7 +18,7 @@ package org.springframework.beans.factory.support;
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.io.ClassPathResource;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
Unescape View File

@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

2
spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java
Unescape View File

@ -22,7 +22,7 @@ import org.springframework.beans.factory.config.PropertiesFactoryBean; @@ -22,7 +22,7 @@ import org.springframework.beans.factory.config.PropertiesFactoryBean;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
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.core.io.ClassPathResource;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
Unescape View File

@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test; @@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.BeanDefinitionReader;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.ClassPathResource;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
Unescape View File

@ -22,7 +22,7 @@ import java.util.Map; @@ -22,7 +22,7 @@ import java.util.Map;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.ClassPathResource;
import static org.assertj.core.api.Assertions.assertThat;

4
spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
Unescape View File

@ -18,8 +18,8 @@ package org.springframework.beans.factory.xml; @@ -18,8 +18,8 @@ package org.springframework.beans.factory.xml;
import java.io.Serializable;
import org.springframework.beans.test.fixtures.beans.IndexedTestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.IndexedTestBean;
import org.springframework.beans.testfixture.beans.TestBean;
/**
* Simple bean used to check constructor dependency checking.

2
spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java
Unescape View File

@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
package org.springframework.beans.factory.xml;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
/**
* @author Juergen Hoeller

4
spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java
Unescape View File

@ -17,8 +17,8 @@ @@ -17,8 +17,8 @@
package org.springframework.beans.factory.xml;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.test.fixtures.beans.factory.DummyFactory;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.beans.testfixture.beans.factory.DummyFactory;
/**
* @author Juergen Hoeller

2
spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java
Unescape View File

@ -19,7 +19,7 @@ package org.springframework.beans.factory.xml; @@ -19,7 +19,7 @@ package org.springframework.beans.factory.xml;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.ClassPathResource;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
Unescape View File

@ -30,7 +30,7 @@ import org.springframework.beans.factory.parsing.ComponentDefinition; @@ -30,7 +30,7 @@ import org.springframework.beans.factory.parsing.ComponentDefinition;
import org.springframework.beans.factory.parsing.ImportDefinition;
import org.springframework.beans.factory.parsing.PassThroughSourceExtractor;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
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-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
Unescape View File

@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; @@ -25,7 +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.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.ClassPathResource;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java
Unescape View File

@ -19,7 +19,7 @@ package org.springframework.beans.factory.xml; @@ -19,7 +19,7 @@ package org.springframework.beans.factory.xml;
import java.util.Collections;
import java.util.List;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
/**
* Test class for Spring's ability to create objects using static

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

@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
package org.springframework.beans.factory.xml;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
/**
* Test class for Spring's ability to create objects using

2
spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java
Unescape View File

@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.ClassPathResource;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java
Unescape View File

@ -21,7 +21,7 @@ import org.xml.sax.SAXParseException; @@ -21,7 +21,7 @@ import org.xml.sax.SAXParseException;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.ClassPathResource;
import static org.assertj.core.api.Assertions.assertThat;

4
spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
Unescape View File

@ -20,8 +20,8 @@ import org.junit.jupiter.api.Test; @@ -20,8 +20,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.test.fixtures.beans.DummyBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.DummyBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.ClassPathResource;
import static org.assertj.core.api.Assertions.assertThat;

4
spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java
Unescape View File

@ -20,8 +20,8 @@ import org.junit.jupiter.api.Test; @@ -20,8 +20,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
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 static org.assertj.core.api.Assertions.assertThat;

2
spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java
Unescape View File

@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
package org.springframework.beans.factory.xml;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
/**
* Test class for Spring's ability to create

6
spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
Unescape View File

@ -32,9 +32,9 @@ import org.springframework.beans.factory.config.PropertiesFactoryBean; @@ -32,9 +32,9 @@ import org.springframework.beans.factory.config.PropertiesFactoryBean;
import org.springframework.beans.factory.parsing.ComponentDefinition;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.test.fixtures.beans.CollectingReaderEventListener;
import org.springframework.beans.test.fixtures.beans.CustomEnum;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.CollectingReaderEventListener;
import org.springframework.beans.testfixture.beans.CustomEnum;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.ClassPathResource;
import org.springframework.util.LinkedCaseInsensitiveMap;

4
spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
Unescape View File

@ -38,8 +38,8 @@ import org.springframework.beans.factory.config.ListFactoryBean; @@ -38,8 +38,8 @@ import org.springframework.beans.factory.config.ListFactoryBean;
import org.springframework.beans.factory.config.MapFactoryBean;
import org.springframework.beans.factory.config.SetFactoryBean;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.test.fixtures.beans.HasMap;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.HasMap;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.ClassPathResource;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java
Unescape View File

@ -25,7 +25,7 @@ import org.springframework.beans.factory.BeanDefinitionStoreException; @@ -25,7 +25,7 @@ import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.SimpleBeanDefinitionRegistry;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.InputStreamResource;
import org.springframework.core.io.Resource;

10
spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
Unescape View File

@ -30,11 +30,11 @@ import org.springframework.beans.factory.BeanFactory; @@ -30,11 +30,11 @@ import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.LifecycleBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.test.fixtures.beans.factory.DummyFactory;
import org.springframework.beans.test.fixtures.factory.xml.AbstractListableBeanFactoryTests;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.LifecycleBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.beans.testfixture.beans.factory.DummyFactory;
import org.springframework.beans.testfixture.factory.xml.AbstractListableBeanFactoryTests;
import org.springframework.core.io.ClassPathResource;
import static org.assertj.core.api.Assertions.assertThat;

14
spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
Unescape View File

@ -43,11 +43,11 @@ import org.springframework.beans.BeanWrapperImpl; @@ -43,11 +43,11 @@ import org.springframework.beans.BeanWrapperImpl;
import org.springframework.beans.BeansException;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.test.fixtures.beans.BooleanTestBean;
import org.springframework.beans.test.fixtures.beans.ITestBean;
import org.springframework.beans.test.fixtures.beans.IndexedTestBean;
import org.springframework.beans.test.fixtures.beans.NumberTestBean;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.BooleanTestBean;
import org.springframework.beans.testfixture.beans.ITestBean;
import org.springframework.beans.testfixture.beans.IndexedTestBean;
import org.springframework.beans.testfixture.beans.NumberTestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@ -593,9 +593,9 @@ public class CustomEditorTests { @@ -593,9 +593,9 @@ public class CustomEditorTests {
@Test
public void testClassEditorWithArray() {
PropertyEditor classEditor = new ClassEditor();
classEditor.setAsText("org.springframework.beans.test.fixtures.beans.TestBean[]");
classEditor.setAsText("org.springframework.beans.testfixture.beans.TestBean[]");
assertThat(classEditor.getValue()).isEqualTo(TestBean[].class);
assertThat(classEditor.getAsText()).isEqualTo("org.springframework.beans.test.fixtures.beans.TestBean[]");
assertThat(classEditor.getAsText()).isEqualTo("org.springframework.beans.testfixture.beans.TestBean[]");
}
/*

2
spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
Unescape View File

@ -21,7 +21,7 @@ import java.util.List; @@ -21,7 +21,7 @@ import java.util.List;
import org.junit.jupiter.api.Test;
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;

4
spring-beans/src/test/kotlin/org/springframework/beans/factory/annotation/KotlinAutowiredTests.kt
Unescape View File

@ -22,8 +22,8 @@ import org.junit.jupiter.api.Test @@ -22,8 +22,8 @@ import org.junit.jupiter.api.Test
import org.springframework.beans.factory.BeanCreationException
import org.springframework.beans.factory.support.DefaultListableBeanFactory
import org.springframework.beans.factory.support.RootBeanDefinition
import org.springframework.beans.test.fixtures.beans.Colour
import org.springframework.beans.test.fixtures.beans.TestBean
import org.springframework.beans.testfixture.beans.Colour
import org.springframework.beans.testfixture.beans.TestBean
/**
* Tests for Kotlin support with [Autowired].

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save