Merge pull request #35 from LoiNguyenCS/inner-to-nested

Fix bugs with static nested classes

src/main/java/org/checkerframework/specimin/TargetMethodFinderVisitor.java

@@ -130,7 +130,7 @@ public Set<String> getTargetMethods() {
 
   @Override
   public Visitable visit(ClassOrInterfaceDeclaration decl, Void p) {
-    if (decl.isInnerClass()) {
+    if (decl.isNestedType()) {
       this.classFQName += "." + decl.getName().toString();
     } else {
       if (!this.classFQName.equals("")) {
@@ -144,7 +144,7 @@ public Visitable visit(ClassOrInterfaceDeclaration decl, Void p) {
       this.classFQName = decl.getFullyQualifiedName().orElseThrow();
     }
     Visitable result = super.visit(decl, p);
-    if (decl.isInnerClass()) {
+    if (decl.isNestedType()) {
       this.classFQName = this.classFQName.substring(0, this.classFQName.lastIndexOf('.'));
     } else {
       this.classFQName = "";

src/test/java/org/checkerframework/specimin/StaticNestedClass.java

@@ -0,0 +1,21 @@
+package org.checkerframework.specimin;
+
+import java.io.IOException;
+import org.junit.Test;
+
+/**
+ * This test checks that if Specimin will work properly where there are static nested classes in the
+ * input code
+ */
+public class StaticNestedClass {
+  @Test
+  public void runTest() throws IOException {
+    SpeciminTestExecutor.runTestWithoutJarPaths(
+        "staticnestedclass",
+        new String[] {"com/example/OuterFamily.java"},
+        new String[] {
+          "com.example.OuterFamily#getLastName()",
+          "com.example.OuterFamily.InnerFamily#getLastName()"
+        });
+  }
+}

src/test/resources/staticnestedclass/expected/com/example/Maternal.java

@@ -0,0 +1,6 @@
+package com.example;
+
+public class Maternal {
+
+    public String maternalLastName = null;
+}

src/test/resources/staticnestedclass/expected/com/example/OuterFamily.java

@@ -0,0 +1,15 @@
+package com.example;
+
+class OuterFamily extends Maternal {
+
+    static class InnerFamily extends Paternal {
+
+        public String getLastName() {
+            return paternalLastName;
+        }
+    }
+
+    public String getLastName() {
+        return maternalLastName;
+    }
+}

src/test/resources/staticnestedclass/expected/com/example/Paternal.java

@@ -0,0 +1,6 @@
+package com.example;
+
+public class Paternal {
+
+    public String paternalLastName = null;
+}

src/test/resources/staticnestedclass/input/com/example/OuterFamily.java

@@ -0,0 +1,13 @@
+package com.example;
+
+class OuterFamily extends Maternal {
+    static class InnerFamily extends Paternal {
+        public String getLastName() {
+            return paternalLastName;
+        }
+    }
+    // point A
+    public String getLastName() {
+        return maternalLastName;
+    }
+}