Put helper classes in the correct enclosing test

The generics methods used to live in ClassUtils, so there were generic
helper classes in ClassUtilsTest to facilitate testing them.

But the methods moved to a dedicated utility class, GenericUtils, and
the unit tests moved along with them to a new GenericUtilsTest.

However, somehow, the helper classes used by those tests did not move
out of ClassUtilsTest and into GenericUtilsTest. Let's do that now.

Author: ctrueden

src/test/java/org/scijava/util/ClassUtilsTest.java

@@ -42,7 +42,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.Serializable;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.jar.JarOutputStream;
@@ -189,24 +188,4 @@ private void assertLoaded(final Class<?> c, final String name) {
 		assertSame(c, ClassUtils.loadClass(name));
 	}
 
-	// -- Helper classes --
-
-	public static class Thing<T> {
-		public T thing;
-	}
-
-	public static class NumberThing<N extends Number> extends Thing<N> {
-		// NB: No implementation needed.
-	}
-
-	public static class IntegerThing extends NumberThing<Integer> {
-		// NB: No implementation needed.
-	}
-
-	public static class ComplexThing<T extends Serializable & Cloneable> extends
-		Thing<T>
-	{
-		// NB: No implementation needed.
-	}
-
 }

src/test/java/org/scijava/util/GenericUtilsTest.java

@@ -42,10 +42,6 @@
 import java.util.List;
 
 import org.junit.Test;
-import org.scijava.util.ClassUtilsTest.ComplexThing;
-import org.scijava.util.ClassUtilsTest.IntegerThing;
-import org.scijava.util.ClassUtilsTest.NumberThing;
-import org.scijava.util.ClassUtilsTest.Thing;
 
 /**
  * Tests {@link GenericUtils}.
@@ -139,6 +135,27 @@ public void testGetGenericType() {
 			Serializable.class, Cloneable.class);
 	}
 
+	// -- Helper classes --
+
+	private static class Thing<T> {
+		@SuppressWarnings("unused")
+		private T thing;
+	}
+
+	private static class NumberThing<N extends Number> extends Thing<N> {
+		// NB: No implementation needed.
+	}
+
+	private static class IntegerThing extends NumberThing<Integer> {
+		// NB: No implementation needed.
+	}
+
+	private static class ComplexThing<T extends Serializable & Cloneable> extends
+		Thing<T>
+	{
+		// NB: No implementation needed.
+	}
+
 	// -- Helper methods --
 
 	/** Convenience method to get the {@link Type} of a field. */