Java: Convert the model generator neutral test to use the combined neutral generator.

Author: michaelnebel

java/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql

@@ -3,7 +3,7 @@ import utils.modelgenerator.internal.CaptureModels
 import utils.test.InlineMadTest
 
 module InlineMadTestConfig implements InlineMadTestConfigSig {
-  string getCapturedModel(Callable c) { result = Heuristic::captureNoFlow(c) }
+  string getCapturedModel(Callable c) { result = captureNeutral(c) }
 
   string getKind() { result = "neutral" }
 }

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

@@ -141,7 +141,6 @@ public void setStringValue1(String value) {
     this.stringValue1 = value;
   }
 
-  // neutral=p;Pojo;copyStringValue;();summary;df-generated
   // contentbased-summary=p;Pojo;false;copyStringValue;();;Argument[this].SyntheticField[p.Pojo.stringValue1];Argument[this].SyntheticField[p.Pojo.stringValue2];value;dfc-generated
   public void copyStringValue() {
     this.stringValue2 = this.stringValue1;