Java: Rewrite inline expectation tests to use parameterized module

Author: jketema

java/ql/integration-tests/all-platforms/kotlin/default-parameter-mad-flow/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/integration-tests/all-platforms/kotlin/default-parameter-mad-flow/test.ql

@@ -19,12 +19,10 @@ module Config implements DataFlow::ConfigSig {
 
 module Flow = TaintTracking::Global<Config>;
 
-class InlineFlowTest extends InlineExpectationsTest {
-  InlineFlowTest() { this = "HasFlowTest" }
+module InlineFlowTest implements TestSig {
+  string getARelevantTag() { result = "flow" }
 
-  override string getARelevantTag() { result = "flow" }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     tag = "flow" and
     exists(DataFlow::Node sink | Flow::flowTo(sink) |
       sink.getLocation() = location and
@@ -33,3 +31,5 @@ class InlineFlowTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<InlineFlowTest>

java/ql/test/library-tests/dataflow/callback-dispatch/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/dataflow/callback-dispatch/test.ql

@@ -12,12 +12,10 @@ module Config implements DataFlow::ConfigSig {
 
 module Flow = DataFlow::Global<Config>;
 
-class HasFlowTest extends InlineExpectationsTest {
-  HasFlowTest() { this = "HasFlowTest" }
+module HasFlowTest implements TestSig {
+  string getARelevantTag() { result = "flow" }
 
-  override string getARelevantTag() { result = "flow" }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     tag = "flow" and
     exists(DataFlow::Node src, DataFlow::Node sink | Flow::flow(src, sink) |
       sink.getLocation() = location and
@@ -26,3 +24,5 @@ class HasFlowTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<HasFlowTest>

java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.ql

@@ -18,12 +18,10 @@ module TaintFlowConfig implements DataFlow::ConfigSig {
 
 module TaintFlow = TaintTracking::Global<TaintFlowConfig>;
 
-class HasFlowTest extends InlineExpectationsTest {
-  HasFlowTest() { this = "HasFlowTest" }
+module HasFlowTest implements TestSig {
+  string getARelevantTag() { result = "hasTaintFlow" }
 
-  override string getARelevantTag() { result = ["hasTaintFlow"] }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     tag = "hasTaintFlow" and
     exists(DataFlow::Node sink | TaintFlow::flowTo(sink) |
       sink.getLocation() = location and
@@ -32,3 +30,5 @@ class HasFlowTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<HasFlowTest>

java/ql/test/library-tests/dataflow/state/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/dataflow/state/test.ql

@@ -59,12 +59,10 @@ module Flow = TaintTracking::GlobalWithState<Config>;
 
 module PartialFlow = Flow::FlowExploration<explorationLimit/0>;
 
-class HasFlowTest extends InlineExpectationsTest {
-  HasFlowTest() { this = "HasFlowTest" }
+module HasFlowTest implements TestSig {
+  string getARelevantTag() { result = ["pFwd", "pRev", "flow"] }
 
-  override string getARelevantTag() { result = ["pFwd", "pRev", "flow"] }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     tag = "flow" and
     exists(Flow::PathNode src, Flow::PathNode sink |
       Flow::flowPath(src, sink) and
@@ -92,3 +90,5 @@ class HasFlowTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<HasFlowTest>

java/ql/test/library-tests/dataflow/taintsources/local.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/dataflow/taintsources/local.ql

@@ -26,12 +26,10 @@ module LocalTaintConfig implements DataFlow::ConfigSig {
 
 module LocalTaintFlow = TaintTracking::Global<LocalTaintConfig>;
 
-class LocalFlowTest extends InlineExpectationsTest {
-  LocalFlowTest() { this = "LocalFlowTest" }
+module LocalFlowTest implements TestSig {
+  string getARelevantTag() { result = ["hasLocalValueFlow", "hasLocalTaintFlow"] }
 
-  override string getARelevantTag() { result = ["hasLocalValueFlow", "hasLocalTaintFlow"] }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     tag = "hasLocalValueFlow" and
     exists(DataFlow::Node sink | LocalValueFlow::flowTo(sink) |
       sink.getLocation() = location and
@@ -49,3 +47,5 @@ class LocalFlowTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<LocalFlowTest>