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

Rename test fixture package in spring-beans

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

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

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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 {
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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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 {
@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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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
View File

@@ -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 {
@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
View File

@@ -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
View File

@@ -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].

2
spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="test3" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="test3" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name"><value>custom</value></property>
<property name="age"><value>25</value></property>
</bean>

4
spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml
View File

@@ -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>
@@ -13,7 +13,7 @@
Check that invoker is automatically added to wrap target.
Non pointcut bean name should be wrapped in invoker.
-->
<bean id="numberTestBean" class="org.springframework.beans.test.fixtures.beans.NumberTestBean"/>
<bean id="numberTestBean" class="org.springframework.beans.testfixture.beans.NumberTestBean"/>
</beans>

12
spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml
View File

@@ -6,21 +6,21 @@
<!--
Just included for the count: not to mean anything in particular
-->
<bean id="something" class="org.springframework.beans.test.fixtures.beans.GenericIntegerBean"/>
<bean id="something" class="org.springframework.beans.testfixture.beans.GenericIntegerBean"/>
<bean id="indexedBean" class="org.springframework.beans.test.fixtures.beans.IndexedTestBean"/>
<bean id="indexedBean" class="org.springframework.beans.testfixture.beans.IndexedTestBean"/>
<bean id="annotatedBean" class="org.springframework.beans.test.fixtures.beans.AnnotatedBean"/>
<bean id="annotatedBean" class="org.springframework.beans.testfixture.beans.AnnotatedBean"/>
<!-- Overridden by next factory -->
<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>25</value></property>
</bean>
<bean id="testFactory1" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory"/>
<bean id="testFactory1" class="org.springframework.beans.testfixture.beans.factory.DummyFactory"/>
<bean id="testFactory2" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory">
<bean id="testFactory2" class="org.springframework.beans.testfixture.beans.factory.DummyFactory">
<property name="singleton"><value>false</value></property>
</bean>

2
spring-beans/src/test/resources/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="someIntegerArray">
<list>
<bean name="java.sql.Connection.TRANSACTION_SERIALIZABLE" class="org.springframework.beans.factory.config.FieldRetrievingFactoryBean"/>

18
spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml
View File

@@ -3,19 +3,19 @@
<beans>
<bean id="tb" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="tb" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="age"><value>10</value></property>
<property name="spouse">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean class="org.springframework.beans.testfixture.beans.TestBean">
<property name="age"><value>11</value></property>
</bean>
</property>
</bean>
<bean id="otb" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="otb" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="age"><value>98</value></property>
<property name="spouse">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean class="org.springframework.beans.testfixture.beans.TestBean">
<property name="age"><value>99</value></property>
</bean>
</property>
@@ -23,7 +23,7 @@
<bean id="propertyPath1" class="org.springframework.beans.factory.config.PropertyPathFactoryBean">
<property name="targetObject">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean class="org.springframework.beans.testfixture.beans.TestBean">
<property name="age"><value>12</value></property>
</bean>
</property>
@@ -46,10 +46,10 @@
<bean id="propertyPath3" class="org.springframework.beans.factory.config.PropertyPathFactoryBean">
<property name="targetBeanName"><value>tb</value></property>
<property name="propertyPath"><value>spouse</value></property>
<property name="resultType"><value>org.springframework.beans.test.fixtures.beans.TestBean</value></property>
<property name="resultType"><value>org.springframework.beans.testfixture.beans.TestBean</value></property>
</bean>
<bean id="tbWithInner" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="tbWithInner" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="age" value="10"/>
<property name="spouse">
<bean name="otb.spouse" class="org.springframework.beans.factory.config.PropertyPathFactoryBean"/>
@@ -59,11 +59,11 @@
</property>
</bean>
<bean id="tbWithNullReference" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="tbWithNullReference" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="spouse" ref="tb.spouse.spouse"/>
</bean>
<bean id="tbWithInnerNull" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="tbWithInnerNull" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="spouse">
<bean name="tb.spouse.spouse" class="org.springframework.beans.factory.config.PropertyPathFactoryBean"/>
</property>

2
spring-beans/src/test/resources/org/springframework/beans/factory/config/SimpleScopeTests-context.xml
View File

@@ -3,6 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<bean id="usesScope" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="myScope"/>
<bean id="usesScope" class="org.springframework.beans.testfixture.beans.TestBean" scope="myScope"/>
</beans>

8
spring-beans/src/test/resources/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml
View File

@@ -6,7 +6,7 @@
<bean id="invalidClass" class="some.class.that.does.not.Exist"/>
<bean id="invalidMapDefinition" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="invalidMapDefinition" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="someMap">
<map>
<entry/>
@@ -14,9 +14,9 @@
</property>
</bean>
<bean id="nestedBeanErrors" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="nestedBeanErrors" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="spouse">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean class="org.springframework.beans.testfixture.beans.TestBean">
<property name="someMap">
<map>
<entry/>
@@ -26,6 +26,6 @@
</property>
</bean>
<bean id="validBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="validBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>

6
spring-beans/src/test/resources/org/springframework/beans/factory/support/genericBeanTests.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="listOfArrays" class="org.springframework.beans.test.fixtures.beans.GenericBean">
<bean id="listOfArrays" class="org.springframework.beans.testfixture.beans.GenericBean">
<property name="listOfArrays">
<list>
<list>
@@ -43,7 +43,7 @@
autowire="constructor">
</bean>
<bean id="integerBean" class="org.springframework.beans.test.fixtures.beans.GenericIntegerBean">
<bean id="integerBean" class="org.springframework.beans.testfixture.beans.GenericIntegerBean">
<property name="genericProperty" value="10"/>
<property name="genericListProperty">
<list>
@@ -53,7 +53,7 @@
</property>
</bean>
<bean id="setOfIntegerBean" class="org.springframework.beans.test.fixtures.beans.GenericSetOfIntegerBean">
<bean id="setOfIntegerBean" class="org.springframework.beans.testfixture.beans.GenericSetOfIntegerBean">
<property name="genericProperty" value="10"/>
<property name="genericListProperty">
<list>

4
spring-beans/src/test/resources/org/springframework/beans/factory/support/lookupMethodTests.xml
View File

@@ -13,9 +13,9 @@
<lookup-method name="getOneArgument" bean="jedi"/>
</bean>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype"/>
<bean id="jedi" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype" autowire-candidate="false">
<bean id="jedi" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype" autowire-candidate="false">
<property name="jedi" value="true"/>
</bean>

2
spring-beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties
View File

@@ -1,3 +1,3 @@
testBean.(class)=org.springframework.beans.test.fixtures.beans.TestBean
testBean.(class)=org.springframework.beans.testfixture.beans.TestBean
testBean.$0=Rob Harrop
testBean.$1=23

4
spring-beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties
View File

@@ -1,5 +1,5 @@
sally.(class)=org.springframework.beans.test.fixtures.beans.TestBean
sally.(class)=org.springframework.beans.testfixture.beans.TestBean
sally.name=Sally
rob.(class)=org.springframework.beans.test.fixtures.beans.TestBean
rob.(class)=org.springframework.beans.testfixture.beans.TestBean
rob.$0(ref)=sally

2
spring-beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties
View File

@@ -1,2 +1,2 @@
testBean.(class)=org.springframework.beans.test.fixtures.beans.TestBean
testBean.(class)=org.springframework.beans.testfixture.beans.TestBean
testBean.$0=Rob Harrop

4
spring-beans/src/test/resources/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml
View File

@@ -4,12 +4,12 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="topLevel"/>
</bean>
<beans>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="nested"/>
</bean>
</beans>

4
spring-beans/src/test/resources/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml
View File

@@ -4,12 +4,12 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="original"/>
</bean>
<!-- STS should raise an error for this duplicate id -->
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="duplicate"/>
</bean>
</beans>

2
spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml
View File

@@ -5,7 +5,7 @@
https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
default-merge="false">
<bean id="abstractTestBean" class="org.springframework.beans.test.fixtures.beans.TestBean" abstract="true">
<bean id="abstractTestBean" class="org.springframework.beans.testfixture.beans.TestBean" abstract="true">
<property name="someList">
<list>
<value>alpha</value>

4
spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml
View File

@@ -3,9 +3,9 @@
<beans>
<bean id="rob" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype" autowire="constructor"/>
<bean id="rob" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype" autowire="constructor"/>
<bean id="sally" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype"/>
<bean id="sally" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype"/>
<bean id="props1" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="properties">

4
spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml
View File

@@ -3,9 +3,9 @@
<beans>
<bean id="rob" class="org.springframework.beans.test.fixtures.beans.TestBean" autowire="byType"/>
<bean id="rob" class="org.springframework.beans.testfixture.beans.TestBean" autowire="byType"/>
<bean id="sally" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="sally" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="props1" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="properties">

4
spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml
View File

@@ -4,9 +4,9 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
default-autowire-candidates="">
<bean id="rob" class="org.springframework.beans.test.fixtures.beans.TestBean" autowire="byType"/>
<bean id="rob" class="org.springframework.beans.testfixture.beans.TestBean" autowire="byType"/>
<bean id="sally" class="org.springframework.beans.test.fixtures.beans.TestBean" autowire-candidate="true"/>
<bean id="sally" class="org.springframework.beans.testfixture.beans.TestBean" autowire-candidate="true"/>
<bean id="props1" class="org.springframework.beans.factory.config.PropertiesFactoryBean" autowire-candidate="true">
<property name="properties">

4
spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml
View File

@@ -4,9 +4,9 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
default-autowire-candidates="props*,*ly">
<bean id="rob" class="org.springframework.beans.test.fixtures.beans.TestBean" autowire="byType"/>
<bean id="rob" class="org.springframework.beans.testfixture.beans.TestBean" autowire="byType"/>
<bean id="sally" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="sally" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="props1" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="properties">

8
spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml
View File

@@ -10,22 +10,22 @@
<alias name="testBean" alias="testBeanAlias2"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg type="java.lang.String" value="Rob Harrop"/>
<property name="friends">
<ref bean="testBean2"/>
</property>
<property name="doctor">
<bean class="org.springframework.beans.test.fixtures.beans.NestedTestBean">
<bean class="org.springframework.beans.testfixture.beans.NestedTestBean">
<constructor-arg type="java.lang.String" value="ACME"/>
</bean>
</property>
</bean>
<bean id="testBean2" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testBean2" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="Juergen Hoeller"/>
<property name="spouse">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="Eva Schallmeiner"/>
</bean>
</property>

28
spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="parentWithList" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="parentWithList" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="someList">
<list>
<value>Rob Harrop</value>
@@ -23,12 +23,12 @@
<bean id="childWithListOfRefs" parent="parentWithList">
<property name="someList">
<list merge="true">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean class="org.springframework.beans.testfixture.beans.TestBean"/>
</list>
</property>
</bean>
<bean id="parentWithSet" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="parentWithSet" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="someSet">
<set>
<value>Rob Harrop</value>
@@ -47,14 +47,14 @@
<bean id="childWithSetOfRefs" parent="parentWithSet">
<property name="someSet">
<set merge="true">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="Sally"/>
</bean>
</set>
</property>
</bean>
<bean id="parentWithMap" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="parentWithMap" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="someMap">
<map>
<entry key="Rob" value="Sall"/>
@@ -76,7 +76,7 @@
<property name="someMap">
<map merge="true">
<entry key="Rob">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="Sally"/>
</bean>
</entry>
@@ -84,7 +84,7 @@
</property>
</bean>
<bean id="parentWithProps" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="parentWithProps" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="someProperties">
<props>
<prop key="Rob">Sall</prop>
@@ -103,7 +103,7 @@
</bean>
<bean id="parentWithListInConstructor" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="parentWithListInConstructor" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg index="0">
<list>
<value>Rob Harrop</value>
@@ -123,12 +123,12 @@
<bean id="childWithListOfRefsInConstructor" parent="parentWithListInConstructor">
<constructor-arg index="0">
<list merge="true">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean class="org.springframework.beans.testfixture.beans.TestBean"/>
</list>
</constructor-arg>
</bean>
<bean id="parentWithSetInConstructor" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="parentWithSetInConstructor" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg index="0">
<set>
<value>Rob Harrop</value>
@@ -147,14 +147,14 @@
<bean id="childWithSetOfRefsInConstructor" parent="parentWithSetInConstructor">
<constructor-arg index="0">
<set merge="true">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="Sally"/>
</bean>
</set>
</constructor-arg>
</bean>
<bean id="parentWithMapInConstructor" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="parentWithMapInConstructor" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg index="0">
<map>
<entry key="Rob" value="Sall"/>
@@ -176,7 +176,7 @@
<constructor-arg index="0">
<map merge="true">
<entry key="Rob">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="Sally"/>
</bean>
</entry>
@@ -184,7 +184,7 @@
</constructor-arg>
</bean>
<bean id="parentWithPropsInConstructor" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="parentWithPropsInConstructor" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg index="0">
<props>
<prop key="Rob">Sall</prop>

54
spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
<bean id="jenny" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="jenny" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
<property name="spouse">
@@ -12,7 +12,7 @@
</property>
</bean>
<bean id="david" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="david" class="org.springframework.beans.testfixture.beans.TestBean">
<description>
Simple bean, without any collections.
</description>
@@ -23,7 +23,7 @@
<property name="age"><value>27</value></property>
</bean>
<bean id="rod" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="rod" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Rod</value></property>
<property name="age"><value>32</value></property>
<property name="friends">
@@ -35,7 +35,7 @@
</property>
</bean>
<bean id="pJenny" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" scope="prototype">
<bean id="pJenny" class="org.springframework.beans.testfixture.beans.DerivedTestBean" scope="prototype">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
<property name="spouse">
@@ -43,13 +43,13 @@
</property>
</bean>
<bean id="pDavid" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" scope="prototype">
<bean id="pDavid" class="org.springframework.beans.testfixture.beans.DerivedTestBean" scope="prototype">
<property name="name"><value>David</value></property>
<property name="age"><value>27</value></property>
<property name="actualSpouse" value="Jen"/>
</bean>
<bean id="pRod" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="pRod" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name"><value>Rod</value></property>
<property name="age"><value>32</value></property>
<property name="friends">
@@ -63,7 +63,7 @@
<!--
Try setting a collection property to a single value
-->
<bean id="loner" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="loner" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>loner</value></property>
<property name="age"><value>26</value></property>
<property name="friends">
@@ -101,26 +101,26 @@
</property>
</bean>
<bean id="verbose" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="verbose" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>verbose</value></property>
</bean>
<bean id="verbose2" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="verbose2" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><idref bean="verbose"/></property>
</bean>
<bean id="verbose3" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="verbose3" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><idref bean="verbose"/></property>
</bean>
<bean id="emptyMap" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="emptyMap" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="map">
<map>
</map>
</property>
</bean>
<bean id="literalMap" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="literalMap" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="map">
<map>
<entry key="foo" value="bar"/>
@@ -130,7 +130,7 @@
</property>
</bean>
<bean id="mixedMap" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="mixedMap" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="map">
<map value-type="java.lang.Integer">
<entry key-ref="fooKey">
@@ -157,7 +157,7 @@
</bean>
<!-- The <description> element below caused parsing exception prior to resolution of SPR-8563 -->
<bean id="mapWithDescriptionInEntry" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="mapWithDescriptionInEntry" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="map">
<map>
<entry key="e1">
@@ -176,7 +176,7 @@
<constructor-arg value="jenny"/>
</bean>
<bean id="pMixedMap" class="org.springframework.beans.test.fixtures.beans.HasMap" scope="prototype">
<bean id="pMixedMap" class="org.springframework.beans.testfixture.beans.HasMap" scope="prototype">
<property name="map">
<map>
<entry key="foo" value="bar"/>
@@ -185,7 +185,7 @@
</property>
</bean>
<bean id="mixedMapWithList" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="mixedMapWithList" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="map">
<map>
<entry>
@@ -217,14 +217,14 @@
</property>
</bean>
<bean id="emptySet" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="emptySet" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="set">
<set>
</set>
</property>
</bean>
<bean id="set" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="set" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="set">
<set>
<value>bar</value>
@@ -234,7 +234,7 @@
</property>
</bean>
<bean id="concurrentSet" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="concurrentSet" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="concurrentSet">
<set>
<value>bar</value>
@@ -244,7 +244,7 @@
</property>
</bean>
<bean id="identityMap" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="identityMap" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="identityMap">
<map>
<entry key="foo" value="bar"/>
@@ -253,7 +253,7 @@
</property>
</bean>
<bean id="emptyProps" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="emptyProps" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="props">
<props>
</props>
@@ -261,7 +261,7 @@
</bean>
<bean id="props" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="props" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="props">
<props>
<prop key="foo">bar</prop>
@@ -270,7 +270,7 @@
</property>
</bean>
<bean id="propsViaMap" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="propsViaMap" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="props">
<map>
<entry key="foo" value="bar"/>
@@ -279,7 +279,7 @@
</property>
</bean>
<bean id="objectArray" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="objectArray" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="objectArray">
<list>
<value>one</value>
@@ -288,7 +288,7 @@
</property>
</bean>
<bean id="integerArray" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="integerArray" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="integerArray">
<list>
<value>0</value>
@@ -298,11 +298,11 @@
</property>
</bean>
<bean id="classArray" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="classArray" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="classArray" value="java.lang.String,java.lang.Exception"/>
</bean>
<bean id="classList" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="classList" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="classList" value="java.lang.String,java.lang.Exception"/>
</bean>

4
spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="someList">
<list value-type="java.lang.Integer">
<value>1</value>
@@ -28,7 +28,7 @@
</property>
</bean>
<bean id="testBean2" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testBean2" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="someMap">
<map key-type="java.lang.Integer" value-type="java.lang.Boolean">
<entry>

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

@@ -107,7 +107,7 @@
<bean id="listInstance" class="org.springframework.beans.factory.xml.FactoryMethods"
factory-method="listInstance"/>
<bean id="juergen" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="juergen" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Juergen</value></property>
</bean>
@@ -130,7 +130,7 @@
<!-- Unnamed bean with factory-bean declaration -->
<bean factory-bean="instanceFactory" factory-method="defaultInstance"/>
<bean id="testBeanWithInnerFactoryMethod" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testBeanWithInnerFactoryMethod" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="friends">
<list>
<!-- Unnamed bean with factory-bean declaration -->

10
spring-beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml
View File

@@ -3,16 +3,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<bean xml:lang="en" id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean xml:lang="en" id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="fooBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="fooBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="spouse">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean class="org.springframework.beans.testfixture.beans.TestBean"/>
</property>
<property name="friends">
<list>
<bean class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean class="org.springframework.beans.testfixture.beans.TestBean"/>
</list>
</property>
</bean>

22
spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml
View File

@@ -5,43 +5,43 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
<!--
<bean id="simple1" class="org.springframework.beans.test.fixtures.beans.DummyBean">
<bean id="simple1" class="org.springframework.beans.testfixture.beans.DummyBean">
<constructor-arg value="name"/>
</bean>
-->
<bean id="simple" class="org.springframework.beans.test.fixtures.beans.DummyBean" c:_="simple"/>
<bean id="simple" class="org.springframework.beans.testfixture.beans.DummyBean" c:_="simple"/>
<!--
<bean id="simple1-ref" class="org.springframework.beans.test.fixtures.beans.DummyBean">
<bean id="simple1-ref" class="org.springframework.beans.testfixture.beans.DummyBean">
<constructor-arg ref="name"/>
</bean>
-->
<bean id="simple-ref" class="org.springframework.beans.test.fixtures.beans.DummyBean" c:_-ref="name"/>
<bean id="simple-ref" class="org.springframework.beans.testfixture.beans.DummyBean" c:_-ref="name"/>
<bean id="name" class="java.lang.String">
<constructor-arg type="java.lang.String" value="some-name" index="0"/>
</bean>
<!--
<bean id="name-value1" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="name-value1" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg name="name" value="foo"/>
<constructor-arg name="age" value="10"/>
</bean>
-->
<bean id="name-value" class="org.springframework.beans.test.fixtures.beans.TestBean" c:age="10" c:name="name-value"/>
<bean id="name-value" class="org.springframework.beans.testfixture.beans.TestBean" c:age="10" c:name="name-value"/>
<!--
<bean id="name-ref1" class="org.springframework.beans.test.fixtures.beans.DummyBean">
<bean id="name-ref1" class="org.springframework.beans.testfixture.beans.DummyBean">
<constructor-arg name="name" ref="name"/>
<constructor-arg name="spouse" ref="name-value"/>
</bean>
-->
<bean id="name-ref" class="org.springframework.beans.test.fixtures.beans.DummyBean" c:name-ref="name" c:spouse-ref="name-value"/>
<bean id="name-ref" class="org.springframework.beans.testfixture.beans.DummyBean" c:name-ref="name" c:spouse-ref="name-value"/>
<bean id="indexed-value" class="org.springframework.beans.test.fixtures.beans.DummyBean" c:_1="austria" c:_0="at" c:_2="10"/>
<bean id="indexed-value" class="org.springframework.beans.testfixture.beans.DummyBean" c:_1="austria" c:_0="at" c:_2="10"/>
<bean id="indexed-ref" class="org.springframework.beans.test.fixtures.beans.DummyBean" c:_0-ref="name" c:_1-ref="name-value"/>
<bean id="indexed-ref" class="org.springframework.beans.testfixture.beans.DummyBean" c:_0-ref="name" c:_1-ref="name-value"/>
<bean id="beanWithRefConstructorArg" class="org.springframework.beans.test.fixtures.beans.DummyBean" c:nameRef="silly name" c:ageRef="10"/>
<bean id="beanWithRefConstructorArg" class="org.springframework.beans.testfixture.beans.DummyBean" c:nameRef="silly name" c:ageRef="10"/>
</beans>

2
spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTestsWithErrors.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="error" class="org.springframework.beans.test.fixtures.beans.TestBean" c:name="error-bean">
<bean id="error" class="org.springframework.beans.testfixture.beans.TestBean" c:name="error-bean">
<constructor-arg name="name" value="error-bean"/>
</bean>

10
spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTests.xml
View File

@@ -4,20 +4,20 @@
xmlns:p="http://www.springframework.org/schema/p"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="rob" class="org.springframework.beans.test.fixtures.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally">
<bean id="rob" class="org.springframework.beans.testfixture.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally">
<property name="age" value="24"/>
</bean>
<bean id="sally" class="org.springframework.beans.test.fixtures.beans.TestBean" p:name="Sally Greenwood" p:spouse-ref="rob"/>
<bean id="sally" class="org.springframework.beans.testfixture.beans.TestBean" p:name="Sally Greenwood" p:spouse-ref="rob"/>
<bean id="sally2" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="sally2" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="spouse">
<bean id="rob2" class="org.springframework.beans.test.fixtures.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally2">
<bean id="rob2" class="org.springframework.beans.testfixture.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally2">
<property name="age" value="24"/>
</bean>
</property>
</bean>
<bean id="derivedSally" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" p:name="Sally Greenwood" p:spouseRef="r"/>
<bean id="derivedSally" class="org.springframework.beans.testfixture.beans.DerivedTestBean" p:name="Sally Greenwood" p:spouseRef="r"/>
</beans>

4
spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTestsWithErrors.xml
View File

@@ -4,10 +4,10 @@
xmlns:p="http://www.springframework.org/schema/p"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="rob" class="org.springframework.beans.test.fixtures.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally">
<bean id="rob" class="org.springframework.beans.testfixture.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally">
<property name="name" value="Rob Harrop"/>
</bean>
<bean id="sally" class="org.springframework.beans.test.fixtures.beans.TestBean" p:name="Sally Greenwood" p:spouse-ref="rob"/>
<bean id="sally" class="org.springframework.beans.testfixture.beans.TestBean" p:name="Sally Greenwood" p:spouse-ref="rob"/>
</beans>

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

@@ -3,7 +3,7 @@
<beans>
<bean id="validEmptyWithDescription" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="validEmptyWithDescription" class="org.springframework.beans.testfixture.beans.TestBean">
<description>
I have no properties and I'm happy without them.
</description>
@@ -12,7 +12,7 @@
<!--
Check automatic creation of alias, to allow for names that are illegal as XML ids.
-->
<bean id="aliased" class=" org.springframework.beans.test.fixtures.beans.TestBean " name="myalias">
<bean id="aliased" class=" org.springframework.beans.testfixture.beans.TestBean " name="myalias">
<property name="name"><value>aliased</value></property>
</bean>
@@ -20,17 +20,17 @@
<alias name="multiAliased" alias="alias3"/>
<bean id="multiAliased" class="org.springframework.beans.test.fixtures.beans.TestBean" name="alias1,alias2">
<bean id="multiAliased" class="org.springframework.beans.testfixture.beans.TestBean" name="alias1,alias2">
<property name="name"><value>aliased</value></property>
</bean>
<alias name="multiAliased" alias="alias4"/>
<bean class="org.springframework.beans.test.fixtures.beans.TestBean" name="aliasWithoutId1,aliasWithoutId2,aliasWithoutId3">
<bean class="org.springframework.beans.testfixture.beans.TestBean" name="aliasWithoutId1,aliasWithoutId2,aliasWithoutId3">
<property name="name"><value>aliased</value></property>
</bean>
<bean class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><null/></property>
</bean>
@@ -40,7 +40,7 @@
<bean class="org.springframework.beans.factory.xml.DummyReferencer"/>
<bean id="rod" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="rod" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value><!-- a comment -->Rod</value></property>
<property name="age"><value>31</value></property>
<property name="spouse"><ref bean="father"/></property>
@@ -52,29 +52,29 @@
<!-- Should inherit age -->
</bean>
<bean id="kerry" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="kerry" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Ker<!-- a comment -->ry</value></property>
<property name="age"><value>34</value></property>
<property name="spouse"><ref bean="rod"/></property>
<property name="touchy"><value></value></property>
</bean>
<bean id="kathy" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="kathy" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name"><value>Kathy</value></property>
<property name="age"><value>28</value></property>
<property name="spouse"><ref bean="father"/></property>
</bean>
<bean id="typeMismatch" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="typeMismatch" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name"><value>typeMismatch</value></property>
<property name="age"><value>34x</value></property>
<property name="spouse"><ref bean="rod"/></property>
</bean>
<!-- Test of lifecycle callbacks -->
<bean id="mustBeInitialized" class="org.springframework.beans.test.fixtures.beans.MustBeInitialized"/>
<bean id="mustBeInitialized" class="org.springframework.beans.testfixture.beans.MustBeInitialized"/>
<bean id="lifecycle" class="org.springframework.beans.test.fixtures.beans.LifecycleBean"
<bean id="lifecycle" class="org.springframework.beans.testfixture.beans.LifecycleBean"
init-method="declaredInitMethod">
<property name="initMethodDeclared"><value>true</value></property>
</bean>
@@ -85,10 +85,10 @@
</bean>
<!-- Factory beans are automatically treated differently -->
<bean id="singletonFactory" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory">
<bean id="singletonFactory" class="org.springframework.beans.testfixture.beans.factory.DummyFactory">
</bean>
<bean id="prototypeFactory" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory">
<bean id="prototypeFactory" class="org.springframework.beans.testfixture.beans.factory.DummyFactory">
<property name="singleton"><value>false</value></property>
</bean>
@@ -113,14 +113,14 @@
<property name="testBean2"><ref bean="kathy"/></property>
</bean>
<bean id="listenerVeto" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="listenerVeto" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>listenerVeto</value></property>
<property name="age"><value>66</value></property>
</bean>
<bean id="validEmpty" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="validEmpty" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="commentsInValue" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="commentsInValue" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>this is<!-- don't mind me --> a <![CDATA[<!--comment-->]]></value></property>
</bean>

20
spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
View File

@@ -17,7 +17,7 @@
name
"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name">
<util:property-path path="configuredBean.name"/>
</property>
@@ -26,13 +26,13 @@
</property>
</bean>
<bean id="constructedTestBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="constructedTestBean" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg index="0">
<util:property-path path="configuredBean.name"/>
</constructor-arg>
</bean>
<bean id="configuredBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="configuredBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="Rob Harrop"/>
</bean>
@@ -50,7 +50,7 @@
</util:map>
<util:map id="mapWithTypes" map-class="org.springframework.util.LinkedCaseInsensitiveMap"
key-type="java.lang.String" value-type="org.springframework.beans.test.fixtures.beans.TestBean">
key-type="java.lang.String" value-type="org.springframework.beans.testfixture.beans.TestBean">
<entry key="bean" value-ref="testBean"/>
</util:map>
@@ -72,7 +72,7 @@
<value>Rob Harrop</value>
</util:set>
<bean id="nestedCollectionsBean" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="nestedCollectionsBean" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="someList">
<util:list>
<value>foo</value>
@@ -94,13 +94,13 @@
</property>
</bean>
<bean id="nestedShortcutCollections" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="nestedShortcutCollections" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="stringArray" value="fooStr"/>
<property name="someList" value="foo"/>
<property name="someSet" value="bar"/>
</bean>
<bean id="nestedCustomTagBean" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="nestedCustomTagBean" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="someList">
<list>
<util:constant static-field="java.lang.Integer.MIN_VALUE"/>
@@ -116,13 +116,13 @@
<map>
<entry>
<key><value>min</value></key>
<util:constant static-field="org.springframework.beans.test.fixtures.beans.CustomEnum.VALUE_1"/>
<util:constant static-field="org.springframework.beans.testfixture.beans.CustomEnum.VALUE_1"/>
</entry>
</map>
</property>
</bean>
<bean id="circularCollectionsBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="circularCollectionsBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="someList">
<util:list>
<ref bean="circularCollectionsBean"/>
@@ -152,7 +152,7 @@
<entry key="foo" value-ref="circularCollectionBeansBean"/>
</util:map>
<bean id="circularCollectionBeansBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="circularCollectionBeansBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="someList" ref="circularList"/>
<property name="someSet" ref="circularSet"/>
<property name="someMap" ref="circularMap"/>

2
spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml
View File

@@ -9,5 +9,5 @@ This is a top level block comment
<!-- more trickery--> <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd"><!-- some nasty stuff -->
<beans>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>

2
spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml
View File

@@ -7,5 +7,5 @@ This is a top level block comment
the parser now --> <!-- <beans>
-->
<!-- more trickery--><beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd"><!-- end -->
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>

6
spring-beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml
View File

@@ -4,15 +4,15 @@
xmlns:spring="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<spring:bean id="testBean1" class="org.springframework.beans.test.fixtures.beans.TestBean">
<spring:bean id="testBean1" class="org.springframework.beans.testfixture.beans.TestBean">
<spring:meta key="foo" value="bar"/>
</spring:bean>
<spring:bean id="testBean2" class="org.springframework.beans.test.fixtures.beans.TestBean" parent="testBean1">
<spring:bean id="testBean2" class="org.springframework.beans.testfixture.beans.TestBean" parent="testBean1">
<spring:meta key="abc" value="123"/>
</spring:bean>
<spring:bean id="testBean3" class="org.springframework.beans.test.fixtures.beans.TestBean">
<spring:bean id="testBean3" class="org.springframework.beans.testfixture.beans.TestBean">
<spring:property name="name" value="Rob">
<spring:meta key="surname" value="Harrop"/>
</spring:property>

2
spring-beans/src/testFixtures/java/org/springframework/beans/test/fixtures/beans/AgeHolder.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/AgeHolder.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.beans.test.fixtures.beans;
package org.springframework.beans.testfixture.beans;
public interface AgeHolder {

2
spring-beans/src/testFixtures/java/org/springframework/beans/test/fixtures/beans/AnnotatedBean.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/AnnotatedBean.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.beans.test.fixtures.beans;
package org.springframework.beans.testfixture.beans;
/**
* @author Stephane Nicoll

2
spring-beans/src/testFixtures/java/org/springframework/beans/test/fixtures/beans/BooleanTestBean.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/BooleanTestBean.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.beans.test.fixtures.beans;
package org.springframework.beans.testfixture.beans;
/**
* @author Juergen Hoeller

2
spring-beans/src/testFixtures/java/org/springframework/beans/test/fixtures/beans/CollectingReaderEventListener.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/CollectingReaderEventListener.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.beans.test.fixtures.beans;
package org.springframework.beans.testfixture.beans;
import java.util.ArrayList;
import java.util.Collection;

2
spring-beans/src/testFixtures/java/org/springframework/beans/test/fixtures/beans/Colour.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/Colour.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.beans.test.fixtures.beans;
package org.springframework.beans.testfixture.beans;
/**
* @author Rob Harrop

2
spring-beans/src/testFixtures/java/org/springframework/beans/test/fixtures/beans/CountingTestBean.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/CountingTestBean.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.beans.test.fixtures.beans;
package org.springframework.beans.testfixture.beans;
/**

2
spring-beans/src/testFixtures/java/org/springframework/beans/test/fixtures/beans/CustomEnum.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/CustomEnum.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.beans.test.fixtures.beans;
package org.springframework.beans.testfixture.beans;
/**
* @author Juergen Hoeller

2
spring-beans/src/testFixtures/java/org/springframework/beans/test/fixtures/beans/DependenciesBean.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/DependenciesBean.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.beans.test.fixtures.beans;
package org.springframework.beans.testfixture.beans;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;

2
spring-beans/src/testFixtures/java/org/springframework/beans/test/fixtures/beans/DerivedTestBean.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/DerivedTestBean.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.beans.test.fixtures.beans;
package org.springframework.beans.testfixture.beans;
import java.io.Serializable;

2
spring-beans/src/testFixtures/java/org/springframework/beans/test/fixtures/beans/DummyBean.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/DummyBean.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.beans.test.fixtures.beans;
package org.springframework.beans.testfixture.beans;
/**
* @author Costin Leau

2
spring-beans/src/testFixtures/java/org/springframework/beans/test/fixtures/beans/DummyFactory.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/DummyFactory.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.beans.test.fixtures.beans;
package org.springframework.beans.testfixture.beans;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;

2
spring-beans/src/testFixtures/java/org/springframework/beans/test/fixtures/beans/Employee.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/Employee.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.beans.test.fixtures.beans;
package org.springframework.beans.testfixture.beans;
public class Employee extends TestBean {

2
spring-beans/src/testFixtures/java/org/springframework/beans/test/fixtures/beans/GenericBean.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/GenericBean.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.beans.test.fixtures.beans;
package org.springframework.beans.testfixture.beans;
import java.util.ArrayList;
import java.util.Collection;

2
spring-beans/src/testFixtures/java/org/springframework/beans/test/fixtures/beans/GenericIntegerBean.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/GenericIntegerBean.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.beans.test.fixtures.beans;
package org.springframework.beans.testfixture.beans;
/**

2
spring-beans/src/testFixtures/java/org/springframework/beans/test/fixtures/beans/GenericSetOfIntegerBean.java → spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/GenericSetOfIntegerBean.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.beans.test.fixtures.beans;
package org.springframework.beans.testfixture.beans;
import java.util.Set;

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