Renaming of packages;

javaparser · May 4, 2019 · 0978d70 · 0978d70
1 parent 03bc9d8
commit 0978d70
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 25 deletions.
diff --git a/...st/java/com/github/javaparser/symbolsolver/resolution/TypeResolutionWithSameNameTest.java b/...st/java/com/github/javaparser/symbolsolver/resolution/TypeResolutionWithSameNameTest.java
@@ -19,53 +19,67 @@
 
 public class TypeResolutionWithSameNameTest extends AbstractResolutionTest {
 
+
+    /*
+     * abstract class extends_duplicate.DuplicateTypeName
+     * class extends_duplicate.A extends extends_duplicate.DuplicateTypeName
+     * class extends_duplicate.A.DuplicateTypeName extends extends_duplicate.A
+     */
     @Test
-    void testTypesWithSameNameInPackageAndNested_directImplements() throws IOException {
+    void testTypesWithSameNameInPackageAndNested_directExtends() throws IOException {
-        Path srcRootPath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest/src2");
+        Path srcRootPath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest/src1");
-        Path extendingTypePath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest/src2/testresource/A.java");
+        Path extendsTypePath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest/src1/extends_duplicate/A.java");
 
         JavaParserTypeSolver javaParserTypeSolver = new JavaParserTypeSolver(srcRootPath);
         StaticJavaParser
                 .getConfiguration()
                 .setSymbolResolver(new JavaSymbolSolver(javaParserTypeSolver));
 
-        CompilationUnit cu = StaticJavaParser.parse(extendingTypePath);
+        CompilationUnit cu = StaticJavaParser.parse(extendsTypePath);
         ClassOrInterfaceDeclaration extendingTypeClass = Navigator.demandClass(cu, "A");
 
-        // Attempt to resolve `DuplicateTypeName` from `class ExtendingType implements **DuplicateTypeName**`
+        // Attempt to resolve `DuplicateTypeName` from `class ExtendingType extends **DuplicateTypeName**`
-        assumeTrue(extendingTypeClass.getImplementedTypes().size() > 0);
+        assumeTrue(extendingTypeClass.getExtendedTypes().size() > 0);
-        ClassOrInterfaceType implementedType = extendingTypeClass.getImplementedTypes(0);
+        ClassOrInterfaceType extendedType = extendingTypeClass.getExtendedTypes(0);
-        ResolvedReferenceType resolvedImplementedType = implementedType.resolve();
+        ResolvedReferenceType resolvedExtendedType = extendedType.resolve();
 
         // 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();
+        String qualifiedName = resolvedExtendedType.getQualifiedName();
-        assertEquals("testresource.DuplicateTypeName", qualifiedName, "Error - not resolved to interface in separate file.");
+        assertEquals("extends_duplicate.DuplicateTypeName", qualifiedName, "Error - not resolved to interface in separate file.");
-        assertNotEquals("testresource.ExtendingType.DuplicateTypeName", qualifiedName, "Error - resolved to nested class.");
+        assertNotEquals("extends_duplicate.A.DuplicateTypeName", qualifiedName, "Error - resolved to nested class.");
     }
 
+
+    /*
+     * interface implements_duplicate.DuplicateTypeName
+     * class implements_duplicate.class A implements implements_duplicate.DuplicateTypeName
+     * class implements_duplicate.A.DuplicateTypeName extends implements_duplicate.A
+     */
     @Test
-    void testTypesWithSameNameInPackageAndNested_directExtends() throws IOException {
+    void testTypesWithSameNameInPackageAndNested_directImplements() throws IOException {
-        Path srcRootPath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest/src1");
+        Path srcRootPath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest/src2");
-        Path extendingTypePath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest/src1/testresource/A.java");
+        Path implementingTypePath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest/src2/implements_duplicate/A.java");
 
         JavaParserTypeSolver javaParserTypeSolver = new JavaParserTypeSolver(srcRootPath);
         StaticJavaParser
                 .getConfiguration()
                 .setSymbolResolver(new JavaSymbolSolver(javaParserTypeSolver));
 
-        CompilationUnit cu = StaticJavaParser.parse(extendingTypePath);
+        CompilationUnit cu = StaticJavaParser.parse(implementingTypePath);
-        ClassOrInterfaceDeclaration extendingTypeClass = Navigator.demandClass(cu, "A");
+        ClassOrInterfaceDeclaration implementingTypeClass = Navigator.demandClass(cu, "A");
 
-        // Attempt to resolve `DuplicateTypeName` from `class ExtendingType implements **DuplicateTypeName**`
+        // Attempt to resolve `DuplicateTypeName` from `class ImplementingType implements **DuplicateTypeName**`
-        assumeTrue(extendingTypeClass.getExtendedTypes().size() > 0);
+        assumeTrue(implementingTypeClass.getImplementedTypes().size() > 0);
-        ClassOrInterfaceType implementedType = extendingTypeClass.getExtendedTypes(0);
+        ClassOrInterfaceType implementedType = implementingTypeClass.getImplementedTypes(0);
         ResolvedReferenceType resolvedImplementedType = implementedType.resolve();
 
         // 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.");
+        assertEquals("implements_duplicate.DuplicateTypeName", qualifiedName, "Error - not resolved to interface in separate file.");
-        assertNotEquals("testresource.ExtendingType.DuplicateTypeName", qualifiedName, "Error - resolved to nested class.");
+        assertNotEquals("implements_duplicate.A.DuplicateTypeName", qualifiedName, "Error - resolved to nested class.");
     }
+
+
 }
diff --git a/...WithSameNameTest/src1/testresource/A.java → ...ameNameTest/src1/extends_duplicate/A.java b/...WithSameNameTest/src1/testresource/A.java → ...ameNameTest/src1/extends_duplicate/A.java
@@ -1,4 +1,4 @@
-package testresource;
+package extends_duplicate;
 
 public class A extends DuplicateTypeName {
     class DuplicateTypeName extends A {

diff --git a/.../src1/testresource/DuplicateTypeName.java → .../extends_duplicate/DuplicateTypeName.java b/.../src1/testresource/DuplicateTypeName.java → .../extends_duplicate/DuplicateTypeName.java
@@ -1,4 +1,4 @@
-package testresource;
+package extends_duplicate;
 
 public abstract class DuplicateTypeName {
 

diff --git a/...WithSameNameTest/src2/testresource/A.java → ...NameTest/src2/implements_duplicate/A.java b/...WithSameNameTest/src2/testresource/A.java → ...NameTest/src2/implements_duplicate/A.java
@@ -1,4 +1,4 @@
-package testresource;
+package implements_duplicate;
 
 public class A implements DuplicateTypeName {
     class DuplicateTypeName extends A {

diff --git a/.../src2/testresource/DuplicateTypeName.java → ...plements_duplicate/DuplicateTypeName.java b/.../src2/testresource/DuplicateTypeName.java → ...plements_duplicate/DuplicateTypeName.java
@@ -1,4 +1,4 @@
-package testresource;
+package implements_duplicate;
 
 public interface DuplicateTypeName {