[wip] Refactor: move test resources to testclasses directories

src/test/java/spoon/support/compiler/jdt/ExtendedStringLiteralTest.java

@@ -13,6 +13,7 @@
 import spoon.reflect.code.CtExpression;
 import spoon.reflect.declaration.CtClass;
 import spoon.reflect.declaration.CtField;
+import spoon.support.compiler.jdt.testclasses.ExtendedStringLiteralTestClass;
 
 public class ExtendedStringLiteralTest {
 
@@ -59,7 +60,7 @@ this.jdtCompiler.requestor, getProblemFactory(), this.out,
 		comp.build();
 
 		CtClass<?> cl =
-			comp.getFactory().Package().get("spoon.support.compiler.jdt").
+			comp.getFactory().Package().get("spoon.support.compiler.jdt.testclasses").
 			getType("ExtendedStringLiteralTestClass");
 		CtField<?> f = cl.getField("extendedStringLiteral");
 		CtExpression<?> de = f.getDefaultExpression();

src/test/java/spoon/support/compiler/jdt/ExtendedStringLiteralTestClass.java → src/test/java/spoon/support/compiler/jdt/testclasses/ExtendedStringLiteralTestClass.java

@@ -1,4 +1,4 @@
-package spoon.support.compiler.jdt;
+package spoon.support.compiler.jdt.testclasses;
 
 public class ExtendedStringLiteralTestClass {
 

src/test/java/spoon/test/arrays/ArraysTest.java

@@ -25,13 +25,13 @@ public class ArraysTest {
 
 	@Test
 	public void testArrayReferences() throws Exception {
-		CtType<?> type = build("spoon.test.arrays", "ArrayClass");
+		CtType<?> type = build("spoon.test.arrays.testclasses", "ArrayClass");
 		assertEquals("ArrayClass", type.getSimpleName());
 		assertEquals("int[][][]", type.getField("i").getType().getSimpleName());
 		assertEquals(3, ((CtArrayTypeReference<?>) type.getField("i").getType()).getDimensionCount());
 		final CtArrayTypeReference<?> arrayTypeReference = (CtArrayTypeReference<?>) type.getField("i").getDefaultExpression().getType();
 		assertEquals(1, arrayTypeReference.getArrayType().getAnnotations().size());
-		assertEquals("@spoon.test.arrays.ArrayClass.TypeAnnotation(integer = 1)", arrayTypeReference.getArrayType().getAnnotations().get(0).toString());
+		assertEquals("@spoon.test.arrays.testclasses.ArrayClass.TypeAnnotation(integer = 1)", arrayTypeReference.getArrayType().getAnnotations().get(0).toString());
 
 		CtField<?> x = type.getField("x");
 		assertTrue(x.getType() instanceof CtArrayTypeReference);

src/test/java/spoon/test/arrays/ArrayClass.java → src/test/java/spoon/test/arrays/testclasses/ArrayClass.java

@@ -1,4 +1,4 @@
-package spoon.test.arrays;
+package spoon.test.arrays.testclasses;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;

src/test/java/spoon/test/casts/CastTest.java

@@ -12,6 +12,7 @@
 import spoon.reflect.visitor.Query;
 import spoon.reflect.visitor.filter.NamedElementFilter;
 import spoon.reflect.visitor.filter.TypeFilter;
+import spoon.test.casts.testclasses.Castings;
 import spoon.testing.utils.ModelUtils;
 
 import static org.junit.Assert.assertEquals;
@@ -75,7 +76,7 @@ public void testCast3() {
 	public void testCase4() throws Exception {
 		// contract: If the invocation is to a method where the returned type is a generic type,
 		// getType returns the actual type bound to this particular invocation.
-		CtType<?> type = build("spoon.test.casts", "Castings");
+		CtType<?> type = build("spoon.test.casts.testclasses", "Castings");
 
 		final CtMethod<?> getValueMethod = type.getMethodsByName("getValue").get(0);
 		final CtInvocation<?> getValueInvocation = Query.getElements(type, new TypeFilter<CtInvocation<?>>(CtInvocation.class) {
@@ -97,6 +98,6 @@ public void testTypeAnnotationOnCast() throws Exception {
 		final CtLocalVariable local = aCastings.getMethod("bar").getElements(new TypeFilter<>(CtLocalVariable.class)).get(0);
 
 		assertEquals(1, ((CtTypeReference) local.getDefaultExpression().getTypeCasts().get(0)).getAnnotations().size());
-		assertEquals("(([email protected](integer = 1)" + System.lineSeparator() + "String) (\"\"))", local.getDefaultExpression().toString());
+		assertEquals("(([email protected].testclasses.Castings.TypeAnnotation(integer = 1)" + System.lineSeparator() + "String) (\"\"))", local.getDefaultExpression().toString());
 	}
 }

src/test/java/spoon/test/casts/Castings.java → src/test/java/spoon/test/casts/testclasses/Castings.java

@@ -1,4 +1,4 @@
-package spoon.test.casts;
+package spoon.test.casts.testclasses;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;

src/test/java/spoon/test/compilation/CompilationTest.java

@@ -43,6 +43,7 @@
 import spoon.support.compiler.jdt.JDTBatchCompiler;
 import spoon.test.compilation.testclasses.Bar;
 import spoon.test.compilation.testclasses.IBar;
+import spoon.test.compilation.testclasses.Ifoo;
 import spoon.testing.utils.ModelUtils;
 
 public class CompilationTest {
@@ -150,7 +151,7 @@ public void testNewInstance() throws Exception {
 		// contract: a ctclass can be instantiated, and each modification results in a new valid object
 		Factory factory = new Launcher().getFactory();
 		CtClass<Ifoo> c = factory.Code().createCodeSnippetStatement(
-				"class X implements spoon.test.compilation.Ifoo { public int foo() {int i=0; return i;} }").compile();
+				"class X implements spoon.test.compilation.testclasses.Ifoo { public int foo() {int i=0; return i;} }").compile();
 		c.addModifier(ModifierKind.PUBLIC); // required otherwise java.lang.IllegalAccessException at runtime when instantiating
 
 		CtBlock body = c.getElements(new TypeFilter<>(CtBlock.class)).get(1);

src/test/java/spoon/test/compilation/testclasses/Ifoo.java

@@ -0,0 +1,5 @@
+package spoon.test.compilation.testclasses;
+
+public interface Ifoo {
+	int foo();
+}

src/test/java/spoon/test/ctCase/SwitchCaseTest.java

@@ -20,7 +20,7 @@ public class SwitchCaseTest {
 
 	@Test
 	public void insertAfterStatementInSwitchCaseWithoutException() throws Exception {
-		String packageName = "spoon.test.ctCase";
+		String packageName = "spoon.test.ctCase.testclasses";
 		String className = "ClassWithSwitchExample";
 		Factory factory = factoryFor(packageName, className);
 		List<CtCase> elements = elementsOfType(CtCase.class, factory);
@@ -37,7 +37,7 @@ public void insertAfterStatementInSwitchCaseWithoutException() throws Exception
 
 	@Test
 	public void insertBeforeStatementInSwitchCaseWithoutException() throws Exception {
-		String packageName = "spoon.test.ctCase";
+		String packageName = "spoon.test.ctCase.testclasses";
 		String className = "ClassWithSwitchExample";
 		Factory factory = factoryFor(packageName, className);
 		List<CtCase> elements = elementsOfType(CtCase.class, factory);

src/test/java/spoon/test/ctCase/ClassWithSwitchExample.java → src/test/java/spoon/test/ctCase/testclasses/ClassWithSwitchExample.java

@@ -1,4 +1,4 @@
-package spoon.test.ctCase;
+package spoon.test.ctCase.testclasses;
 
 public class ClassWithSwitchExample {
 

src/test/java/spoon/test/enums/EnumsTest.java

@@ -17,6 +17,7 @@
 import spoon.test.enums.testclasses.Burritos;
 import spoon.test.enums.testclasses.Foo;
 import spoon.test.enums.testclasses.NestedEnums;
+import spoon.test.enums.testclasses.Regular;
 import spoon.testing.utils.ModelUtils;
 
 import static org.junit.Assert.assertEquals;
@@ -36,7 +37,7 @@ public class EnumsTest {
 
 	@Test
 	public void testModelBuildingEnum() throws Exception {
-		CtEnum<Regular> enumeration = build("spoon.test.enums", "Regular");
+		CtEnum<Regular> enumeration = build("spoon.test.enums.testclasses", "Regular");
 		assertEquals("Regular", enumeration.getSimpleName());
 		assertEquals(3, Regular.values().length);
 		assertEquals(3, enumeration.getEnumValues().size());
@@ -147,7 +148,7 @@ public void testPrintEnumValues() throws IOException {
 
 	@Test
 	public void testEnumValue() {
-		// contract: constructorCall on enumvalues should be implicit if they're not declared
+		// contract: constructorCall on enum values should be implicit if they're not declared
 
 		Launcher launcher = new Launcher();
 		launcher.addInputResource("./src/test/java/spoon/test/comment/testclasses/EnumClass.java");

src/test/java/spoon/test/enums/OpCode.java → src/test/java/spoon/test/enums/testclasses/OpCode.java

@@ -1,4 +1,4 @@
-package spoon.test.enums;
+package spoon.test.enums.testclasses;
 
 import java.util.Stack;
 

src/test/java/spoon/test/enums/Performable.java → src/test/java/spoon/test/enums/testclasses/Performable.java

@@ -1,4 +1,4 @@
-package spoon.test.enums;
+package spoon.test.enums.testclasses;
 
 import java.util.Stack;
 

src/test/java/spoon/test/enums/Regular.java → src/test/java/spoon/test/enums/testclasses/Regular.java

@@ -1,4 +1,4 @@
-package spoon.test.enums;
+package spoon.test.enums.testclasses;
 
 public enum Regular {
 	A, B, C;