Simplified test case / class name;

javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/TypeResolutionWithSameNameTest.java

@@ -7,33 +7,38 @@
 import com.github.javaparser.resolution.types.ResolvedReferenceType;
 import com.github.javaparser.symbolsolver.JavaSymbolSolver;
 import com.github.javaparser.symbolsolver.javaparser.Navigator;
-import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
 import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver;
-import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Path;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 public class TypeResolutionWithSameNameTest extends AbstractResolutionTest {
 
     @Test
     void testTypesWithSameNameInPackageAndNested() throws IOException {
-        Path srcPath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest");
-        JavaParserTypeSolver javaParserTypeSolver = new JavaParserTypeSolver(srcPath);
-        StaticJavaParser.getConfiguration().setSymbolResolver(new JavaSymbolSolver(
-                new CombinedTypeSolver(new ReflectionTypeSolver(), javaParserTypeSolver)));
+        Path srcRootPath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest");
+        Path extendingTypePath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest/testresource/A.java");
 
-        CompilationUnit cu = StaticJavaParser.parse(
-                adaptPath("src/test/resources/TypeResolutionWithSameNameTest/testresource/ExtendingType.java")
-        );
-        ClassOrInterfaceDeclaration extendingType = Navigator.demandClass(cu, "ExtendingType");
-        ClassOrInterfaceType implementedType = extendingType.getImplementedTypes(0);
+        JavaParserTypeSolver javaParserTypeSolver = new JavaParserTypeSolver(srcRootPath);
+        StaticJavaParser
+                .getConfiguration()
+                .setSymbolResolver(new JavaSymbolSolver(javaParserTypeSolver));
 
+        CompilationUnit cu = StaticJavaParser.parse(extendingTypePath);
+        ClassOrInterfaceDeclaration extendingTypeClass = Navigator.demandClass(cu, "A");
+
+        // Attempt to resolve `DuplicateTypeName` from `class ExtendingType implements **DuplicateTypeName**`
+        ClassOrInterfaceType implementedType = extendingTypeClass.getImplementedTypes(0);
         ResolvedReferenceType resolvedImplementedType = implementedType.resolve();
 
-        assertEquals("testresource.DuplicateTypeName", resolvedImplementedType.getQualifiedName());
+        // Verify qualified name matches the non-nested class in the same package.
+        // Note verbose assertions show both the "correct" expected value, and the erroneous value to be avoided.
+        String qualifiedName = resolvedImplementedType.getQualifiedName();
+        assertEquals("testresource.DuplicateTypeName", qualifiedName, "Error - not resolved to interface in separate file.");
+        assertNotEquals("testresource.ExtendingType.DuplicateTypeName", qualifiedName, "Error - resolved to nested class.");
     }
 }

javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/testresource/A.java

@@ -0,0 +1,7 @@
+package testresource;
+
+public class A implements DuplicateTypeName {
+    class DuplicateTypeName extends A {
+
+    }
+}