Java: Updated expected test output.

Author: michaelnebel

java/ql/test/utils/modelgenerator/dataflow/p/AbstractImplOfExternalSPI.java

@@ -5,9 +5,9 @@
 
 public abstract class AbstractImplOfExternalSPI implements FileFilter {
 
-    @Override
-    public boolean accept(File pathname) {
-        return false;
-    }
-
-}
+  // neutral=p;AbstractImplOfExternalSPI;accept;(File);summary;df-generated
+  @Override
+  public boolean accept(File pathname) {
+    return false;
+  }
+}

java/ql/test/utils/modelgenerator/dataflow/p/ImplOfExternalSPI.java

@@ -6,14 +6,15 @@
 
 public class ImplOfExternalSPI extends AbstractImplOfExternalSPI {
 
-    @Override
-    public boolean accept(File pathname) {
-        try {
-            Files.createFile(pathname.toPath());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return false;
+  // sink=p;AbstractImplOfExternalSPI;true;accept;(File);;Argument[0];path-injection;df-generated
+  // neutral=p;AbstractImplOfExternalSPI;accept;(File);summary;df-generated
+  @Override
+  public boolean accept(File pathname) {
+    try {
+      Files.createFile(pathname.toPath());
+    } catch (IOException e) {
+      e.printStackTrace();
     }
-
-}
+    return false;
+  }
+}

java/ql/test/utils/modelgenerator/dataflow/p/Inheritance.java

@@ -10,7 +10,7 @@ public abstract class BasePublic {
   }
 
   public class AImplBasePrivateImpl extends BasePrivate {
-    // SPURIOUS-summary=p;Inheritance$BasePrivate;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
+    // summary=p;Inheritance$AImplBasePrivateImpl;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
     @Override
     public String id(String s) {
       return s;
@@ -66,7 +66,7 @@ public String id(String s) {
   }
 
   public class CImpl extends C {
-    // SPURIOUS-summary=p;Inheritance$IPrivate1;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
+    // summary=p;Inheritance$C;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
     @Override
     public String id(String s) {
       return s;
@@ -82,7 +82,7 @@ public String id(String s) {
   }
 
   public class EImpl extends E {
-    // SPURIOUS-summary=p;Inheritance$IPrivate2;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
+    // summary=p;Inheritance$EImpl;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
     @Override
     public String id(String s) {
       return s;

java/ql/test/utils/modelgenerator/dataflow/p/MultipleImpls.java

@@ -18,6 +18,7 @@ public String doSomething(String value) {
   // implements in different library should not count as impl
   public static class Strat3 implements Callable<String> {
 
+    // neutral=p;MultipleImpls$Strat3;call;();summary;df-generated
     @Override
     public String call() throws Exception {
       return null;