Java: Update test expected output.

Author: michaelnebel

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

@@ -7,7 +7,7 @@
 public class ImplOfExternalSPI extends AbstractImplOfExternalSPI {
 
   // sink=p;AbstractImplOfExternalSPI;true;accept;(File);;Argument[0];path-injection;df-generated
-  // neutral=p;AbstractImplOfExternalSPI;accept;(File);summary;df-generated
+  // neutral=p;ImplOfExternalSPI;accept;(File);summary;df-generated
   @Override
   public boolean accept(File pathname) {
     try {

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

@@ -94,21 +94,20 @@ public interface INeutral {
   }
 
   public class F implements INeutral {
-    // SPURIOUS-neutral=p;Inheritance$INeutral;id;(String);summary;df-generated
+    // neutral=p;Inheritance$F;id;(String);summary;df-generated
     public String id(String s) {
       return "";
     }
   }
 
   public class G implements INeutral {
-    // SPURIOUS-neutral=p;Inheritance$INeutral;id;(String);summary;df-generated
+    // neutral=p;Inheritance$G;id;(String);summary;df-generated
     public String id(String s) {
       return "";
     }
   }
 
   private class H implements INeutral {
-    // SPURIOUS-neutral=p;Inheritance$INeutral;id;(String);summary;df-generated
     public String id(String s) {
       return "";
     }

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

@@ -45,7 +45,6 @@ public OutputStream openStream() throws IOException {
       return null;
     }
 
-    // neutral=p;PrivateFlowViaPublicInterface$SPI;openStreamNone;();summary;df-generated
     @Override
     public OutputStream openStreamNone() throws IOException {
       return new FileOutputStream(new RandomPojo().someFile);