review: test: add new test for shadow enums

src/test/java/spoon/test/enums/EnumsTypeTest.java

@@ -10,6 +10,7 @@
 import spoon.Launcher;
 import spoon.compiler.SpoonResource;
 import spoon.compiler.SpoonResourceHelper;
+import spoon.reflect.CtModel;
 import spoon.reflect.code.CtAssignment;
 import spoon.reflect.declaration.CtEnum;
 import spoon.reflect.declaration.CtType;
@@ -25,15 +26,45 @@ public void testEnumsType() throws Exception {
 		// contract: shadow enum should still be considered as an enum
 		Launcher launcher = new Launcher();
 		launcher.addInputResource("./src/test/resources/reference-test/EnumsRef.java");
-		
+
 		Factory factory = launcher.getFactory();
 		List<SpoonResource> classpath = SpoonResourceHelper.resources("./src/test/resources/reference-test/EnumJar.jar");
 		String[] dependencyClasspath = new String[] { classpath.get(0).getPath() };
 		factory.getEnvironment().setSourceClasspath(dependencyClasspath);
 		assertEquals(1, classpath.size());
-		
+
 		launcher.buildModel();
-
+
+		List<CtAssignment> assignments = Query.getElements(factory, new TypeFilter<>(CtAssignment.class));
+
+		CtTypeReference typeRefFromSource = assignments.get(0).getType();
+		CtType typeFromSource = typeRefFromSource.getTypeDeclaration();
+		assertTrue(typeRefFromSource.isEnum());
+		assertTrue(typeFromSource.isEnum());
+		assertTrue(typeFromSource instanceof CtEnum);
+
+		CtTypeReference typeRefFromJar = assignments.get(1).getType();
+		CtType typeFromJar = typeRefFromJar.getTypeDeclaration();
+		assertTrue(typeRefFromJar.isEnum());
+		assertTrue(typeFromJar.isEnum());
+		assertTrue(typeFromJar instanceof CtEnum);
+	}
+
+	@Test
+	public void testEnumsFromInterface() throws Exception {
+		// contract: shadow enum from an interface should still be considered as an enum
+		Launcher launcher = new Launcher();
+		launcher.addInputResource("./src/test/resources/reference-test/InterfaceWithEnum.java");
+		launcher.addInputResource("./src/test/resources/reference-test/InterfaceEnumRef.java");
+
+		Factory factory = launcher.getFactory();
+		List<SpoonResource> classpath = SpoonResourceHelper.resources("./src/test/resources/reference-test/InterfaceWithEnumJar.jar");
+		String[] dependencyClasspath = new String[] { classpath.get(0).getPath() };
+		factory.getEnvironment().setSourceClasspath(dependencyClasspath);
+		assertEquals(1, classpath.size());
+
+		launcher.buildModel();
+
 		List<CtAssignment> assignments = Query.getElements(factory, new TypeFilter<>(CtAssignment.class));
 
 		CtTypeReference typeRefFromSource = assignments.get(0).getType();

src/test/resources/reference-test/InterfaceEnumRef.java

@@ -0,0 +1,11 @@
+
+public class InterfaceEnumRef {
+
+	void testEnumFromInterface() {
+		InterfaceWithEnum.Colors x;
+		x = InterfaceWithEnum.Colors.Black;
+
+		InterfaceWithEnumJar.Colors y;
+		y = InterfaceWithEnumJar.Colors.Black;
+	}
+}

src/test/resources/reference-test/InterfaceWithEnum.java

@@ -0,0 +1,6 @@
+
+public interface InterfaceWithEnum {
+
+	public static enum Colors { Red, Black, White };
+	String someMethod();
+}