Remove duplicate test classes

Prior to this commit many test utility classes and sample beans were
duplicated across projects. This was previously necessary due to the
fact that dependent test sources were not shared during a gradle
build. Since the introduction of the 'test-source-set-dependencies'
gradle plugin this is no longer the case.

This commit attempts to remove as much duplicate code as possible,
co-locating test utilities and beans in the most suitable project.
For example, test beans are now located in the 'spring-beans'
project.

Some of the duplicated code had started to drift apart when
modifications made in one project where not ported to others. All
changes have now been consolidated and when necessary existing tests
have been refactored to account for the differences.

Conflicts:
	spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
	spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
	spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java

spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,8 +33,6 @@ import java.util.Set;
 
 import org.junit.Test;
 
-import org.springframework.beans.factory.annotation.TestAutowired;
-import org.springframework.beans.factory.annotation.TestQualifier;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.core.type.classreading.MetadataReaderFactory;

spring-core/src/test/java/org/springframework/core/type/TestAutowired.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory.annotation;
+package org.springframework.core.type;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

spring-core/src/test/java/org/springframework/core/type/TestQualifier.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory.annotation;
+package org.springframework.core.type;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-core/src/test/java/org/springframework/tests/TestResourceUtils.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2002-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.tests;
+
+import static java.lang.String.format;
+
+import org.springframework.core.io.ClassPathResource;
+
+/**
+ * Convenience utilities for common operations with test resources.
+ *
+ * @author Chris Beams
+ */
+public class TestResourceUtils {
+
+	/**
+	 * Loads a {@link ClassPathResource} qualified by the simple name of clazz,
+	 * and relative to the package for clazz.
+	 *
+	 * <p>Example: given a clazz 'com.foo.BarTests' and a resourceSuffix of 'context.xml',
+	 * this method will return a ClassPathResource representing com/foo/BarTests-context.xml
+	 *
+	 * <p>Intended for use loading context configuration XML files within JUnit tests.
+	 *
+	 * @param clazz
+	 * @param resourceSuffix
+	 */
+	public static ClassPathResource qualifiedResource(Class<?> clazz, String resourceSuffix) {
+			return new ClassPathResource(format("%s-%s", clazz.getSimpleName(), resourceSuffix), clazz);
+	}
+
+}

spring-core/src/test/java/org/springframework/tests/TimeStamped.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2002-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.tests;
+
+/**
+ * This interface can be implemented by cacheable objects or cache entries,
+ * to enable the freshness of objects to be checked.
+ *
+ * @author Rod Johnson
+ */
+public interface TimeStamped {
+
+	/**
+	 * Return the timestamp for this object.
+	 * @return long the timestamp for this object,
+	 * as returned by System.currentTimeMillis()
+	 */
+	long getTimeStamp();
+
+}

spring-core/src/test/java/org/springframework/util/SerializationTestUtils.java

@@ -1,11 +1,21 @@
 /*
- * The Spring Framework is published under the terms
- * of the Apache Software License.
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.springframework.util;
 
-import java.awt.Point;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -13,20 +23,14 @@ import java.io.NotSerializableException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
-import java.io.Serializable;
-
-import junit.framework.TestCase;
-
-import org.springframework.tests.sample.objects.TestObject;
 
 /**
  * Utilities for testing serializability of objects.
  * Exposes static methods for use in other test cases.
- * Extends TestCase only to test itself.
  *
  * @author Rod Johnson
  */
-public class SerializationTestUtils extends TestCase {
+public class SerializationTestUtils {
 
 	public static void testSerialization(Object o) throws IOException {
 		OutputStream baos = new ByteArrayOutputStream();
@@ -55,43 +59,7 @@ public class SerializationTestUtils extends TestCase {
 		ByteArrayInputStream is = new ByteArrayInputStream(bytes);
 		ObjectInputStream ois = new ObjectInputStream(is);
 		Object o2 = ois.readObject();
-
 		return o2;
 	}
 
-	public SerializationTestUtils(String s) {
-		super(s);
-	}
-
-	public void testWithNonSerializableObject() throws IOException {
-		TestObject o = new TestObject();
-		assertFalse(o instanceof Serializable);
-
-		assertFalse(isSerializable(o));
-
-		try {
-			testSerialization(o);
-			fail();
-		}
-		catch (NotSerializableException ex) {
-			// Ok
-		}
-	}
-
-	public void testWithSerializableObject() throws Exception {
-		int x = 5;
-		int y = 10;
-		Point p = new Point(x, y);
-		assertTrue(p instanceof Serializable);
-
-		testSerialization(p);
-
-		assertTrue(isSerializable(p));
-
-		Point p2 = (Point) serializeAndDeserialize(p);
-		assertNotSame(p, p2);
-		assertEquals(x, (int) p2.getX());
-		assertEquals(y, (int) p2.getY());
-	}
-
 }