QL-for-QL: Rewrite inline expectation tests to use parameterized module

jketema · jketema · commit 9633f00ed193 · 2023-06-09T10:42:46.000+02:00
diff --git a/ql/ql/test/dataflow/getAStringValue/getAStringValue.expected b/ql/ql/test/dataflow/getAStringValue/getAStringValue.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/ql/ql/test/dataflow/getAStringValue/getAStringValue.ql b/ql/ql/test/dataflow/getAStringValue/getAStringValue.ql
@@ -2,12 +2,10 @@ import ql
 import codeql_ql.dataflow.DataFlow
 import TestUtilities.InlineExpectationsTest
 
-class GetAStringValueTest extends InlineExpectationsTest {
-  GetAStringValueTest() { this = "getAStringValue" }
+module GetAStringValueTest implements TestSig {
+  string getARelevantTag() { result = "getAStringValue" }
 
-  override string getARelevantTag() { result = "getAStringValue" }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     exists(Expr e |
       e = any(Call c).getAnArgument() and
       tag = "getAStringValue" and
@@ -17,3 +15,5 @@ class GetAStringValueTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<GetAStringValueTest>

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,10 @@ import ql`
`2`	`2`	`import codeql_ql.dataflow.DataFlow`
`3`	`3`	`import TestUtilities.InlineExpectationsTest`
`4`	`4`
`5`		`-class GetAStringValueTest extends InlineExpectationsTest {`
`6`		`- GetAStringValueTest() { this = "getAStringValue" }`
	`5`	`+module GetAStringValueTest implements TestSig {`
	`6`	`+ string getARelevantTag() { result = "getAStringValue" }`
`7`	`7`
`8`		`- override string getARelevantTag() { result = "getAStringValue" }`
`9`		`-`
`10`		`- override predicate hasActualResult(Location location, string element, string tag, string value) {`
	`8`	`+ predicate hasActualResult(Location location, string element, string tag, string value) {`
`11`	`9`	`exists(Expr e \|`
`12`	`10`	`e = any(Call c).getAnArgument() and`
`13`	`11`	`tag = "getAStringValue" and`
`@@ -17,3 +15,5 @@ class GetAStringValueTest extends InlineExpectationsTest {`
`17`	`15`	`)`
`18`	`16`	`}`
`19`	`17`	`}`
	`18`	`+`
	`19`	`+import MakeTest<GetAStringValueTest>`