Merge pull request #12789 from jketema/inline

jketema · web-flow · commit ee36d32ef02d · 2023-05-23T14:58:48.000+02:00
Turn inline expectation test into a parameterized module
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.ql
@@ -5,12 +5,10 @@ module AstTest {
   private import semmle.code.cpp.dataflow.DataFlow::DataFlow
   private import semmle.code.cpp.dataflow.internal.DataFlowPrivate
 
-  class AstParameterDefTest extends InlineExpectationsTest {
-    AstParameterDefTest() { this = "AstParameterDefTest" }
+  module AstParameterDefTest implements TestSig {
+    string getARelevantTag() { result = "ast-def" }
 
-    override string getARelevantTag() { result = "ast-def" }
-
-    override predicate hasActualResult(Location location, string element, string tag, string value) {
+    predicate hasActualResult(Location location, string element, string tag, string value) {
       exists(Function f, Parameter p, RefParameterFinalValueNode n |
         p.isNamed() and
         n.getParameter() = p and
@@ -33,12 +31,10 @@ module IRTest {
     (if k = 0 then result = "" else result = "*" + stars(k - 1))
   }
 
-  class IRParameterDefTest extends InlineExpectationsTest {
-    IRParameterDefTest() { this = "IRParameterDefTest" }
-
-    override string getARelevantTag() { result = "ir-def" }
+  module IRParameterDefTest implements TestSig {
+    string getARelevantTag() { result = "ir-def" }
 
-    override predicate hasActualResult(Location location, string element, string tag, string value) {
+    predicate hasActualResult(Location location, string element, string tag, string value) {
       exists(Function f, Parameter p, FinalParameterNode n |
         p.isNamed() and
         n.getParameter() = p and
@@ -51,3 +47,5 @@ module IRTest {
     }
   }
 }
+
+import MakeTest<MergeTests<AstTest::AstParameterDefTest, IRTest::IRParameterDefTest>>
diff --git a/cpp/ql/test/library-tests/dataflow/source-sink-tests/local-flow.expected b/cpp/ql/test/library-tests/dataflow/source-sink-tests/local-flow.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/cpp/ql/test/library-tests/dataflow/source-sink-tests/local-flow.ql b/cpp/ql/test/library-tests/dataflow/source-sink-tests/local-flow.ql
@@ -4,12 +4,10 @@ import cpp
 import TestUtilities.InlineExpectationsTest
 import semmle.code.cpp.security.FlowSources
 
-class LocalFlowSourceTest extends InlineExpectationsTest {
-  LocalFlowSourceTest() { this = "LocalFlowSourceTest" }
+module LocalFlowSourceTest implements TestSig {
+  string getARelevantTag() { result = "local_source" }
 
-  override string getARelevantTag() { result = "local_source" }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     tag = "local_source" and
     exists(LocalFlowSource node, int n |
       n =
@@ -30,3 +28,5 @@ class LocalFlowSourceTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<LocalFlowSourceTest>
diff --git a/shared/util/codeql/util/test/InlineExpectationsTest.qll b/shared/util/codeql/util/test/InlineExpectationsTest.qll

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,10 @@ import cpp`
`4`	`4`	`import TestUtilities.InlineExpectationsTest`
`5`	`5`	`import semmle.code.cpp.security.FlowSources`
`6`	`6`
`7`		`-class LocalFlowSourceTest extends InlineExpectationsTest {`
`8`		`- LocalFlowSourceTest() { this = "LocalFlowSourceTest" }`
	`7`	`+module LocalFlowSourceTest implements TestSig {`
	`8`	`+ string getARelevantTag() { result = "local_source" }`
`9`	`9`
`10`		`- override string getARelevantTag() { result = "local_source" }`
`11`		`-`
`12`		`- override predicate hasActualResult(Location location, string element, string tag, string value) {`
	`10`	`+ predicate hasActualResult(Location location, string element, string tag, string value) {`
`13`	`11`	`tag = "local_source" and`
`14`	`12`	`exists(LocalFlowSource node, int n \|`
`15`	`13`	`n =`
`@@ -30,3 +28,5 @@ class LocalFlowSourceTest extends InlineExpectationsTest {`
`30`	`28`	`)`
`31`	`29`	`}`
`32`	`30`	`}`
	`31`	`+`
	`32`	`+import MakeTest<LocalFlowSourceTest>`