Java: Update the flow test case generator to emit data extension like model data.

michaelnebel · michaelnebel · commit 48290c95a79e · 2022-11-29T12:54:54.000+01:00
diff --git a/java/ql/src/utils/flowtestcasegenerator/FlowTestCaseSupportMethods.qll b/java/ql/src/utils/flowtestcasegenerator/FlowTestCaseSupportMethods.qll
@@ -97,12 +97,12 @@ abstract class SupportMethod extends string {
   int getPriority() { result = 50 }
 
   /**
-   * Gets the CSV row describing this support method if it is needed to set up the output for this test.
+   * Gets the data extension row describing this support method if it is needed to set up the output for this test.
    *
-   * For example, `newWithMapValue` will propagate a value from `Argument[0]` to `MapValue of ReturnValue`, and `getMapValue`
+   * For example, `newWithMapValue` will propagate a value from `Argument[0]` to `ReturnValue.MapValue`, and `getMapValue`
    * will do the opposite.
    */
-  string getCsvModel() { none() }
+  string getDataExtensionModel() { none() }
 }
 
 /**
@@ -162,10 +162,11 @@ private class DefaultGetMethod extends GetMethod {
     result = "Object get" + contentToken(c) + "Default(Object container) { return null; }"
   }
 
-  override string getCsvModel() {
+  override string getDataExtensionModel() {
     result =
-      "generatedtest;Test;false;" + this.getName() + ";(Object);;Argument[0]." +
-        getComponentSpec(SummaryComponent::content(c)) + ";ReturnValue;value;manual"
+      "\"generatedtest\", \"Test\", False, \"" + this.getName() +
+        "\", \"(Object)\", \"\", \"Argument[0]." + getComponentSpec(SummaryComponent::content(c)) +
+        "\", \"ReturnValue\", \"value\", \"manual\""
   }
 }
 
@@ -358,10 +359,11 @@ private class DefaultGenMethod extends GenMethod {
     result = "Object newWith" + contentToken(c) + "Default(Object element) { return null; }"
   }
 
-  override string getCsvModel() {
+  override string getDataExtensionModel() {
     result =
-      "generatedtest;Test;false;" + this.getName() + ";(Object);;Argument[0];ReturnValue." +
-        getComponentSpec(SummaryComponent::content(c)) + ";value;manual"
+      "\"generatedtest\", \"Test\", False, \"" + this.getName() +
+        "\", \"(Object)\", \"\", \"Argument[0]\", \"ReturnValue." +
+        getComponentSpec(SummaryComponent::content(c)) + "\", \"value\", \"manual\""
   }
 }
 
diff --git a/java/ql/src/utils/flowtestcasegenerator/GenerateFlowTestCase.qll b/java/ql/src/utils/flowtestcasegenerator/GenerateFlowTestCase.qll
@@ -85,12 +85,12 @@ SupportMethod getASupportMethod() {
 }
 
 /**
- * Returns a CSV specification of the taint-/value-propagation behavior of a test support method (`get` or `newWith` method).
+ * Returns a data extension specification of the taint-/value-propagation behavior of a test support method (`get` or `newWith` method).
  */
-query string getASupportMethodModel() { result = getASupportMethod().getCsvModel() }
+query string getASupportMethodModel() { result = getASupportMethod().getDataExtensionModel() }
 
 /**
- * Gets a Java file body testing all requested CSV rows against whatever classes and methods they resolve against.
+ * Gets a Java file body testing all requested Models as Data rows against whatever classes and methods they resolve against.
  */
 query string getTestCase() {
   result =

Original file line number	Diff line number	Diff line change
`@@ -97,12 +97,12 @@ abstract class SupportMethod extends string {`
`97`	`97`	`int getPriority() { result = 50 }`
`98`	`98`
`99`	`99`	`/**`
`100`		`- * Gets the CSV row describing this support method if it is needed to set up the output for this test.`
	`100`	`+ * Gets the data extension row describing this support method if it is needed to set up the output for this test.`
`101`	`101`	`*`
`102`		- * For example, `newWithMapValue` will propagate a value from `Argument[0]` to `MapValue of ReturnValue`, and `getMapValue`
	`102`	+ * For example, `newWithMapValue` will propagate a value from `Argument[0]` to `ReturnValue.MapValue`, and `getMapValue`
`103`	`103`	`* will do the opposite.`
`104`	`104`	`*/`
`105`		`- string getCsvModel() { none() }`
	`105`	`+ string getDataExtensionModel() { none() }`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`/**`
`@@ -162,10 +162,11 @@ private class DefaultGetMethod extends GetMethod {`
`162`	`162`	`result = "Object get" + contentToken(c) + "Default(Object container) { return null; }"`
`163`	`163`	`}`
`164`	`164`
`165`		`- override string getCsvModel() {`
	`165`	`+ override string getDataExtensionModel() {`
`166`	`166`	`result =`
`167`		`- "generatedtest;Test;false;" + this.getName() + ";(Object);;Argument[0]." +`
`168`		`- getComponentSpec(SummaryComponent::content(c)) + ";ReturnValue;value;manual"`
	`167`	`+ "\"generatedtest\", \"Test\", False, \"" + this.getName() +`
	`168`	`+ "\", \"(Object)\", \"\", \"Argument[0]." + getComponentSpec(SummaryComponent::content(c)) +`
	`169`	`+ "\", \"ReturnValue\", \"value\", \"manual\""`
`169`	`170`	`}`
`170`	`171`	`}`
`171`	`172`
`@@ -358,10 +359,11 @@ private class DefaultGenMethod extends GenMethod {`
`358`	`359`	`result = "Object newWith" + contentToken(c) + "Default(Object element) { return null; }"`
`359`	`360`	`}`
`360`	`361`
`361`		`- override string getCsvModel() {`
	`362`	`+ override string getDataExtensionModel() {`
`362`	`363`	`result =`
`363`		`- "generatedtest;Test;false;" + this.getName() + ";(Object);;Argument[0];ReturnValue." +`
`364`		`- getComponentSpec(SummaryComponent::content(c)) + ";value;manual"`
	`364`	`+ "\"generatedtest\", \"Test\", False, \"" + this.getName() +`
	`365`	`+ "\", \"(Object)\", \"\", \"Argument[0]\", \"ReturnValue." +`
	`366`	`+ getComponentSpec(SummaryComponent::content(c)) + "\", \"value\", \"manual\""`
`365`	`367`	`}`
`366`	`368`	`}`
`367`	`369`