Java: Inline models as data expected output as comments in the java files and add a test.

Author: michaelnebel

java/ql/test/utils/modelgenerator/dataflow/CaptureModels.expected

@@ -0,0 +1,2 @@
+unexpectedSummary
+expectedSummary

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

@@ -0,0 +1,11 @@
+import java
+import utils.modelgenerator.internal.CaptureSummaryFlowQuery
+import TestUtilities.InlineMadTest
+
+module InlineMadTestConfig implements InlineMadTestConfigSig {
+  string getComment() { result = any(Javadoc doc).getChild(0).toString() }
+
+  string getCapturedSummary() { result = captureFlow(_) }
+}
+
+import InlineMadTest<InlineMadTestConfig>

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

@@ -2,29 +2,31 @@
 
 public final class Factory {
 
-    private String value;
-
-    private int intValue;
-
-    public static Factory create(String value, int foo) {
-        return new Factory(value, foo);
-    }
-
-    public static Factory create(String value) {
-        return new Factory(value, 0);
-    }
-
-    private Factory(String value, int intValue) {
-        this.value = value;
-        this.intValue = intValue;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public int getIntValue() {
-        return intValue;
-    }
-
-}
+  private String value;
+
+  private int intValue;
+
+  // MaD=p;Factory;false;create;(String,int);;Argument[0];ReturnValue;taint;df-generated
+  public static Factory create(String value, int foo) {
+    return new Factory(value, foo);
+  }
+
+  // MaD=p;Factory;false;create;(String);;Argument[0];ReturnValue;taint;df-generated
+  public static Factory create(String value) {
+    return new Factory(value, 0);
+  }
+
+  private Factory(String value, int intValue) {
+    this.value = value;
+    this.intValue = intValue;
+  }
+
+  // MaD=p;Factory;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
+  public String getValue() {
+    return value;
+  }
+
+  public int getIntValue() {
+    return intValue;
+  }
+}

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

@@ -2,14 +2,14 @@
 
 public final class FinalClass {
 
-    private static final String C = "constant";
+  private static final String C = "constant";
 
-    public String returnsInput(String input) {
-        return input;
-    }
+  // MaD=p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;taint;df-generated
+  public String returnsInput(String input) {
+    return input;
+  }
 
-    public String returnsConstant() {
-        return C;
-    }
-
-}
+  public String returnsConstant() {
+    return C;
+  }
+}

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

@@ -2,14 +2,14 @@
 
 public final class FluentAPI {
 
-    public FluentAPI returnsThis(String input) {
-        return this;
+  // MaD=p;FluentAPI;false;returnsThis;(String);;Argument[this];ReturnValue;value;df-generated
+  public FluentAPI returnsThis(String input) {
+    return this;
+  }
+
+  public class Inner {
+    public FluentAPI notThis(String input) {
+      return FluentAPI.this;
     }
-
-    public class Inner {
-        public FluentAPI notThis(String input) {
-            return FluentAPI.this;
-        }
-    }
-
-}
+  }
+}

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

@@ -2,25 +2,28 @@
 
 public final class ImmutablePojo {
 
-    private final String value;
-
-    private final long x;
-
-    public ImmutablePojo(String value, int x) {
-        this.value = value;
-        this.x = x;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public long getX() {
-        return x;
-    }
-
-    public String or(String defaultValue) {
-        return value != null ? value : defaultValue;
-    }
-
-}
+  private final String value;
+
+  private final long x;
+
+  // MaD=p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[this];taint;df-generated
+  public ImmutablePojo(String value, int x) {
+    this.value = value;
+    this.x = x;
+  }
+
+  // MaD=p;ImmutablePojo;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
+  public String getValue() {
+    return value;
+  }
+
+  public long getX() {
+    return x;
+  }
+
+  // MaD=p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;taint;df-generated
+  // MaD=p;ImmutablePojo;false;or;(String);;Argument[this];ReturnValue;taint;df-generated
+  public String or(String defaultValue) {
+    return value != null ? value : defaultValue;
+  }
+}

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

@@ -1,21 +1,22 @@
 package p;
 
 public class InnerClasses {
-    
-    class IgnoreMe {
-        public String no(String input) {
-            return input;
-        }
-    }
-    
-    public class CaptureMe {
-        public String yesCm(String input) {
-            return input;
-        }
+
+  class IgnoreMe {
+    public String no(String input) {
+      return input;
     }
+  }
 
-    public String yes(String input) {
-        return input;
+  public class CaptureMe {
+    // MaD=p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;taint;df-generated
+    public String yesCm(String input) {
+      return input;
     }
+  }
 
+  // MaD=p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;taint;df-generated
+  public String yes(String input) {
+    return input;
+  }
 }

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

@@ -2,36 +2,39 @@
 
 public final class InnerHolder {
 
-    private class Context {
-        private String value;
+  private class Context {
+    private String value;
 
-        Context(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
+    Context(String value) {
+      this.value = value;
     }
 
-    private Context context = null;
+    public String getValue() {
+      return value;
+    }
+  }
 
-    private StringBuilder sb = new StringBuilder();
+  private Context context = null;
 
-    public void setContext(String value) {
-        context = new Context(value);
-    }
+  private StringBuilder sb = new StringBuilder();
 
-    public void explicitSetContext(String value) {
-        this.context = new Context(value);
-    }
+  // MaD=p;InnerHolder;false;setContext;(String);;Argument[0];Argument[this];taint;df-generated
+  public void setContext(String value) {
+    context = new Context(value);
+  }
 
-    public void append(String value) {
-        sb.append(value);
-    }
+  // MaD=p;InnerHolder;false;explicitSetContext;(String);;Argument[0];Argument[this];taint;df-generated
+  public void explicitSetContext(String value) {
+    this.context = new Context(value);
+  }
 
-    public String getValue() {
-        return context.getValue();
-    }
+  // MaD=p;InnerHolder;false;append;(String);;Argument[0];Argument[this];taint;df-generated
+  public void append(String value) {
+    sb.append(value);
+  }
 
-}
+  // MaD=p;InnerHolder;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
+  public String getValue() {
+    return context.getValue();
+  }
+}