From 0978d7027685aec3e16b87d117d70703cb394c58 Mon Sep 17 00:00:00 2001 From: Roger Howell Date: Sat, 4 May 2019 17:18:06 +0100 Subject: [PATCH] Renaming of packages; --- .../TypeResolutionWithSameNameTest.java | 56 ++++++++++++------- .../A.java | 2 +- .../DuplicateTypeName.java | 2 +- .../A.java | 2 +- .../DuplicateTypeName.java | 2 +- 5 files changed, 39 insertions(+), 25 deletions(-) rename javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src1/{testresource => extends_duplicate}/A.java (77%) rename javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src1/{testresource => extends_duplicate}/DuplicateTypeName.java (63%) rename javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src2/{testresource => implements_duplicate}/A.java (76%) rename javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src2/{testresource => implements_duplicate}/DuplicateTypeName.java (57%) diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/TypeResolutionWithSameNameTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/TypeResolutionWithSameNameTest.java index 368f535fa3..ad1e465ff8 100644 --- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/TypeResolutionWithSameNameTest.java +++ b/javaparser-symbol-solver-testing/src/test/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 { - Path srcRootPath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest/src2"); - Path extendingTypePath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest/src2/testresource/A.java"); + void testTypesWithSameNameInPackageAndNested_directExtends() throws IOException { + Path srcRootPath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest/src1"); + 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**` - assumeTrue(extendingTypeClass.getImplementedTypes().size() > 0); - ClassOrInterfaceType implementedType = extendingTypeClass.getImplementedTypes(0); - ResolvedReferenceType resolvedImplementedType = implementedType.resolve(); + // Attempt to resolve `DuplicateTypeName` from `class ExtendingType extends **DuplicateTypeName**` + assumeTrue(extendingTypeClass.getExtendedTypes().size() > 0); + ClassOrInterfaceType extendedType = extendingTypeClass.getExtendedTypes(0); + 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(); - assertEquals("testresource.DuplicateTypeName", qualifiedName, "Error - not resolved to interface in separate file."); - assertNotEquals("testresource.ExtendingType.DuplicateTypeName", qualifiedName, "Error - resolved to nested class."); + String qualifiedName = resolvedExtendedType.getQualifiedName(); + assertEquals("extends_duplicate.DuplicateTypeName", qualifiedName, "Error - not resolved to interface in separate file."); + 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 { - Path srcRootPath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest/src1"); - Path extendingTypePath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest/src1/testresource/A.java"); + void testTypesWithSameNameInPackageAndNested_directImplements() throws IOException { + Path srcRootPath = adaptPath("src/test/resources/TypeResolutionWithSameNameTest/src2"); + 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); - ClassOrInterfaceDeclaration extendingTypeClass = Navigator.demandClass(cu, "A"); + CompilationUnit cu = StaticJavaParser.parse(implementingTypePath); + ClassOrInterfaceDeclaration implementingTypeClass = Navigator.demandClass(cu, "A"); - // Attempt to resolve `DuplicateTypeName` from `class ExtendingType implements **DuplicateTypeName**` - assumeTrue(extendingTypeClass.getExtendedTypes().size() > 0); - ClassOrInterfaceType implementedType = extendingTypeClass.getExtendedTypes(0); + // Attempt to resolve `DuplicateTypeName` from `class ImplementingType implements **DuplicateTypeName**` + assumeTrue(implementingTypeClass.getImplementedTypes().size() > 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."); - assertNotEquals("testresource.ExtendingType.DuplicateTypeName", qualifiedName, "Error - resolved to nested class."); + assertEquals("implements_duplicate.DuplicateTypeName", qualifiedName, "Error - not resolved to interface in separate file."); + assertNotEquals("implements_duplicate.A.DuplicateTypeName", qualifiedName, "Error - resolved to nested class."); } + + } diff --git a/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src1/testresource/A.java b/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src1/extends_duplicate/A.java similarity index 77% rename from javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src1/testresource/A.java rename to javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src1/extends_duplicate/A.java index 69b8d87691..3df88a8a89 100644 --- a/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src1/testresource/A.java +++ b/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/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/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src1/testresource/DuplicateTypeName.java b/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src1/extends_duplicate/DuplicateTypeName.java similarity index 63% rename from javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src1/testresource/DuplicateTypeName.java rename to javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src1/extends_duplicate/DuplicateTypeName.java index d3eaec3027..7f485cb732 100644 --- a/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src1/testresource/DuplicateTypeName.java +++ b/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src1/extends_duplicate/DuplicateTypeName.java @@ -1,4 +1,4 @@ -package testresource; +package extends_duplicate; public abstract class DuplicateTypeName { diff --git a/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src2/testresource/A.java b/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src2/implements_duplicate/A.java similarity index 76% rename from javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src2/testresource/A.java rename to javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src2/implements_duplicate/A.java index 18a56dc1e0..14d2fb085b 100644 --- a/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src2/testresource/A.java +++ b/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/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/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src2/testresource/DuplicateTypeName.java b/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src2/implements_duplicate/DuplicateTypeName.java similarity index 57% rename from javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src2/testresource/DuplicateTypeName.java rename to javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src2/implements_duplicate/DuplicateTypeName.java index 9169116ce1..1b6a7566d8 100644 --- a/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src2/testresource/DuplicateTypeName.java +++ b/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/src2/implements_duplicate/DuplicateTypeName.java @@ -1,4 +1,4 @@ -package testresource; +package implements_duplicate; public interface DuplicateTypeName {