Rename test fixture package in spring-beans

See gh-23550

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/AgeHolder.java

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

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/AnnotatedBean.java

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

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/BooleanTestBean.java

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

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/CollectingReaderEventListener.java

@@ -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;

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/Colour.java

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

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/CountingTestBean.java

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

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/CustomEnum.java

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

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/DependenciesBean.java

@@ -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;

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/DerivedTestBean.java

@@ -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;
 

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/DummyBean.java

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

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/DummyFactory.java

@@ -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;

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/Employee.java

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

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/GenericBean.java

@@ -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;

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/GenericIntegerBean.java

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

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/GenericSetOfIntegerBean.java

@@ -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;
 

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/HasMap.java

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

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/INestedTestBean.java

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

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/IOther.java

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

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/ITestBean.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.test.fixtures.beans;
+package org.springframework.beans.testfixture.beans;
 
 import java.io.IOException;
 
 /**
- * Interface used for {@link org.springframework.beans.test.fixtures.beans.TestBean}.
+ * Interface used for {@link org.springframework.beans.testfixture.beans.TestBean}.
  *
  * <p>Two methods are the same as on Person, but if this
  * extends person it breaks quite a few tests..

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/IndexedTestBean.java

@@ -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;

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/LifecycleBean.java

@@ -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;

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/MustBeInitialized.java

@@ -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.InitializingBean;
 

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/NestedTestBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.test.fixtures.beans;
+package org.springframework.beans.testfixture.beans;
 
 /**
  * Simple nested test bean used for testing bean factories, AOP framework etc.

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/NumberTestBean.java

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

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/PackageLevelVisibleBean.java

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

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/Person.java

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

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/Pet.java

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

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/SerializablePerson.java

@@ -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;
 

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/SideEffectBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.test.fixtures.beans;
+package org.springframework.beans.testfixture.beans;
 
 /**
  * Bean that changes state on a business invocation, so that

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/TestAnnotation.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.test.fixtures.beans;
+package org.springframework.beans.testfixture.beans;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/TestBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.test.fixtures.beans;
+package org.springframework.beans.testfixture.beans;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -421,7 +421,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 
 
 	/**
-	 * @see org.springframework.beans.test.fixtures.beans.ITestBean#exceptional(Throwable)
+	 * @see org.springframework.beans.testfixture.beans.ITestBean#exceptional(Throwable)
 	 */
 	@Override
 	public void exceptional(Throwable t) throws Throwable {
@@ -435,7 +435,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		throw new IOException();
 	}
 	/**
-	 * @see org.springframework.beans.test.fixtures.beans.ITestBean#returnsThis()
+	 * @see org.springframework.beans.testfixture.beans.ITestBean#returnsThis()
 	 */
 	@Override
 	public Object returnsThis() {
@@ -443,7 +443,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	}
 
 	/**
-	 * @see org.springframework.beans.test.fixtures.beans.IOther#absquatulate()
+	 * @see org.springframework.beans.testfixture.beans.IOther#absquatulate()
 	 */
 	@Override
 	public void absquatulate() {

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/DummyFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.test.fixtures.beans.factory;
+package org.springframework.beans.testfixture.beans.factory;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
@@ -24,7 +24,7 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
-import org.springframework.beans.test.fixtures.beans.TestBean;
+import org.springframework.beans.testfixture.beans.TestBean;
 
 /**
  * Simple factory to allow testing of FactoryBean support in AbstractBeanFactory.

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/package-info.java

@@ -1,4 +1,4 @@
 /**
  * General purpose sample beans that can be used with tests.
  */
-package org.springframework.beans.test.fixtures.beans;
+package org.springframework.beans.testfixture.beans;

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/subpkg/DeepBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.test.fixtures.beans.subpkg;
+package org.springframework.beans.testfixture.beans.subpkg;
 
 /**
  * Used for testing pointcut matching.

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.test.fixtures.factory.xml;
+package org.springframework.beans.testfixture.factory.xml;
 
 import java.beans.PropertyEditorSupport;
 import java.util.StringTokenizer;
@@ -29,10 +29,10 @@ import org.springframework.beans.factory.BeanIsNotAFactoryException;
 import org.springframework.beans.factory.BeanNotOfRequiredTypeException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.beans.test.fixtures.beans.LifecycleBean;
-import org.springframework.beans.test.fixtures.beans.MustBeInitialized;
-import org.springframework.beans.test.fixtures.beans.TestBean;
-import org.springframework.beans.test.fixtures.beans.factory.DummyFactory;
+import org.springframework.beans.testfixture.beans.LifecycleBean;
+import org.springframework.beans.testfixture.beans.MustBeInitialized;
+import org.springframework.beans.testfixture.beans.TestBean;
+import org.springframework.beans.testfixture.beans.factory.DummyFactory;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractListableBeanFactoryTests.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.test.fixtures.factory.xml;
+package org.springframework.beans.testfixture.factory.xml;
 
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.ListableBeanFactory;
-import org.springframework.beans.test.fixtures.beans.TestBean;
+import org.springframework.beans.testfixture.beans.TestBean;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -55,13 +55,13 @@ public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFacto
 
 	protected void assertTestBeanCount(int count) {
 		String[] defNames = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, false);
-		assertThat(defNames.length == count).as("We should have " + count + " beans for class org.springframework.beans.test.fixtures.beans.TestBean, not " +
+		assertThat(defNames.length == count).as("We should have " + count + " beans for class org.springframework.beans.testfixture.beans.TestBean, not " +
 				defNames.length).isTrue();
 
 		int countIncludingFactoryBeans = count + 2;
 		String[] names = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, true);
 		assertThat(names.length == countIncludingFactoryBeans).as("We should have " + countIncludingFactoryBeans +
-				" beans for class org.springframework.beans.test.fixtures.beans.TestBean, not " + names.length).isTrue();
+				" beans for class org.springframework.beans.testfixture.beans.TestBean, not " + names.length).isTrue();
 	}
 
 	@Test