Python: Rewrite inline expectation tests to use parameterized module

jketema · jketema · commit 8f599faf85e2 · 2023-06-09T10:42:29.000+02:00
diff --git a/python/ql/test/experimental/dataflow/calls/DataFlowCallTest.expected b/python/ql/test/experimental/dataflow/calls/DataFlowCallTest.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/python/ql/test/experimental/dataflow/calls/DataFlowCallTest.ql b/python/ql/test/experimental/dataflow/calls/DataFlowCallTest.ql
@@ -4,16 +4,14 @@ import semmle.python.dataflow.new.internal.DataFlowDispatch as DataFlowDispatch
 import TestUtilities.InlineExpectationsTest
 private import semmle.python.dataflow.new.internal.PrintNode
 
-class DataFlowCallTest extends InlineExpectationsTest {
-  DataFlowCallTest() { this = "DataFlowCallTest" }
-
-  override string getARelevantTag() {
+module DataFlowCallTest implements TestSig {
+  string getARelevantTag() {
     result in ["call", "callType"]
     or
     result = "arg[" + any(DataFlowDispatch::ArgumentPosition pos).toString() + "]"
   }
 
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     exists(location.getFile().getRelativePath()) and
     exists(DataFlowDispatch::DataFlowCall call |
       location = call.getLocation() and
@@ -35,3 +33,5 @@ class DataFlowCallTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<DataFlowCallTest>
diff --git a/python/ql/test/experimental/dataflow/global-flow/accesses.expected b/python/ql/test/experimental/dataflow/global-flow/accesses.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/python/ql/test/experimental/dataflow/global-flow/accesses.ql b/python/ql/test/experimental/dataflow/global-flow/accesses.ql
@@ -2,12 +2,10 @@ import python
 import semmle.python.dataflow.new.DataFlow
 import TestUtilities.InlineExpectationsTest
 
-class GlobalReadTest extends InlineExpectationsTest {
-  GlobalReadTest() { this = "GlobalReadTest" }
+module GlobalReadTest implements TestSig {
+  string getARelevantTag() { result = "reads" }
 
-  override string getARelevantTag() { result = "reads" }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     exists(DataFlow::ModuleVariableNode n, DataFlow::Node read |
       read = n.getARead() and
       value = n.getVariable().getId() and
@@ -19,12 +17,10 @@ class GlobalReadTest extends InlineExpectationsTest {
   }
 }
 
-class GlobalWriteTest extends InlineExpectationsTest {
-  GlobalWriteTest() { this = "GlobalWriteTest" }
-
-  override string getARelevantTag() { result = "writes" }
+module GlobalWriteTest implements TestSig {
+  string getARelevantTag() { result = "writes" }
 
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     exists(DataFlow::ModuleVariableNode n, DataFlow::Node read |
       read = n.getAWrite() and
       value = n.getVariable().getId() and
@@ -34,3 +30,5 @@ class GlobalWriteTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<MergeTests<GlobalReadTest, GlobalWriteTest>>
diff --git a/python/ql/test/experimental/dataflow/sensitive-data/TestSensitiveDataSources.expected b/python/ql/test/experimental/dataflow/sensitive-data/TestSensitiveDataSources.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/python/ql/test/experimental/dataflow/sensitive-data/TestSensitiveDataSources.ql b/python/ql/test/experimental/dataflow/sensitive-data/TestSensitiveDataSources.ql
@@ -8,12 +8,10 @@ import TestUtilities.InlineExpectationsTest
 import semmle.python.dataflow.new.SensitiveDataSources
 private import semmle.python.ApiGraphs
 
-class SensitiveDataSourcesTest extends InlineExpectationsTest {
-  SensitiveDataSourcesTest() { this = "SensitiveDataSourcesTest" }
+module SensitiveDataSourcesTest implements TestSig {
+  string getARelevantTag() { result in ["SensitiveDataSource", "SensitiveUse"] }
 
-  override string getARelevantTag() { result in ["SensitiveDataSource", "SensitiveUse"] }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     exists(location.getFile().getRelativePath()) and
     exists(SensitiveDataSource source |
       location = source.getLocation() and
@@ -32,6 +30,8 @@ class SensitiveDataSourcesTest extends InlineExpectationsTest {
   }
 }
 
+import MakeTest<SensitiveDataSourcesTest>
+
 class SensitiveUseConfiguration extends TaintTracking::Configuration {
   SensitiveUseConfiguration() { this = "SensitiveUseConfiguration" }
 
diff --git a/python/ql/test/experimental/dataflow/variable-capture/CaptureTest.expected b/python/ql/test/experimental/dataflow/variable-capture/CaptureTest.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/python/ql/test/experimental/dataflow/variable-capture/CaptureTest.ql b/python/ql/test/experimental/dataflow/variable-capture/CaptureTest.ql
@@ -3,12 +3,10 @@ import semmle.python.dataflow.new.DataFlow
 import TestUtilities.InlineExpectationsTest
 import experimental.dataflow.testConfig
 
-class CaptureTest extends InlineExpectationsTest {
-  CaptureTest() { this = "CaptureTest" }
+module CaptureTest implements TestSig {
+  string getARelevantTag() { result = "captured" }
 
-  override string getARelevantTag() { result = "captured" }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     exists(DataFlow::Node sink | exists(TestConfiguration cfg | cfg.hasFlowTo(sink)) |
       location = sink.getLocation() and
       tag = "captured" and
@@ -17,3 +15,5 @@ class CaptureTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<CaptureTest>
diff --git a/python/ql/test/experimental/import-resolution/importflow.expected b/python/ql/test/experimental/import-resolution/importflow.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/python/ql/test/experimental/import-resolution/importflow.ql b/python/ql/test/experimental/import-resolution/importflow.ql
@@ -72,12 +72,10 @@ private class ImportConfiguration extends DataFlow::Configuration {
   }
 }
 
-class ResolutionTest extends InlineExpectationsTest {
-  ResolutionTest() { this = "ResolutionTest" }
+module ResolutionTest implements TestSig {
+  string getARelevantTag() { result = "prints" }
 
-  override string getARelevantTag() { result = "prints" }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     (
       exists(DataFlow::PathNode source, DataFlow::PathNode sink, ImportConfiguration config |
         config.hasFlowPath(source, sink) and
@@ -105,12 +103,10 @@ private string getTagForVersion(int version) {
   version = major_version()
 }
 
-class VersionSpecificResolutionTest extends InlineExpectationsTest {
-  VersionSpecificResolutionTest() { this = "VersionSpecificResolutionTest" }
-
-  override string getARelevantTag() { result = getTagForVersion(_) }
+module VersionSpecificResolutionTest implements TestSig {
+  string getARelevantTag() { result = getTagForVersion(_) }
 
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     (
       exists(DataFlow::PathNode source, DataFlow::PathNode sink, ImportConfiguration config |
         config.hasFlowPath(source, sink) and
@@ -130,3 +126,5 @@ class VersionSpecificResolutionTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<MergeTests<ResolutionTest, VersionSpecificResolutionTest>>
diff --git a/python/ql/test/experimental/import-resolution/imports.expected b/python/ql/test/experimental/import-resolution/imports.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/python/ql/test/experimental/import-resolution/imports.ql b/python/ql/test/experimental/import-resolution/imports.ql
@@ -18,12 +18,10 @@ private class ImmediateModuleRef extends DataFlow::Node {
   string getAsname() { result = alias }
 }
 
-class ImportTest extends InlineExpectationsTest {
-  ImportTest() { this = "ImportTest" }
+module ImportTest implements TestSig {
+  string getARelevantTag() { result = "imports" }
 
-  override string getARelevantTag() { result = "imports" }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     exists(ImmediateModuleRef ref |
       tag = "imports" and
       location = ref.getLocation() and
@@ -33,12 +31,10 @@ class ImportTest extends InlineExpectationsTest {
   }
 }
 
-class AliasTest extends InlineExpectationsTest {
-  AliasTest() { this = "AliasTest" }
-
-  override string getARelevantTag() { result = "as" }
+module AliasTest implements TestSig {
+  string getARelevantTag() { result = "as" }
 
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     exists(ImmediateModuleRef ref |
       tag = "as" and
       location = ref.getLocation() and
@@ -47,3 +43,5 @@ class AliasTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<MergeTests<ImportTest, AliasTest>>
diff --git a/python/ql/test/experimental/library-tests/CallGraph-implicit-init/InlineCallGraphTest.expected b/python/ql/test/experimental/library-tests/CallGraph-implicit-init/InlineCallGraphTest.expected
@@ -1,4 +1,5 @@
 failures
+testFailures
 debug_callableNotUnique
 pointsTo_found_typeTracker_notFound
 typeTracker_found_pointsTo_notFound
diff --git a/python/ql/test/experimental/library-tests/CallGraph-imports/InlineCallGraphTest.expected b/python/ql/test/experimental/library-tests/CallGraph-imports/InlineCallGraphTest.expected
@@ -1,4 +1,5 @@
 failures
+testFailures
 debug_callableNotUnique
 pointsTo_found_typeTracker_notFound
 typeTracker_found_pointsTo_notFound
diff --git a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
@@ -1,4 +1,5 @@
 failures
+testFailures
 debug_callableNotUnique
 pointsTo_found_typeTracker_notFound
 | code/class_attr_assign.py:10:9:10:27 | ControlFlowNode for Attribute() | my_func |
diff --git a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql
@@ -37,12 +37,10 @@ predicate typeTrackerClassCall(CallNode call, Function callable) {
   )
 }
 
-class CallGraphTest extends InlineExpectationsTest {
-  CallGraphTest() { this = "CallGraphTest" }
+module CallGraphTest implements TestSig {
+  string getARelevantTag() { result in ["pt", "tt"] }
 
-  override string getARelevantTag() { result in ["pt", "tt"] }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     exists(location.getFile().getRelativePath()) and
     exists(CallNode call, Function target |
       tag = "tt" and
@@ -58,6 +56,8 @@ class CallGraphTest extends InlineExpectationsTest {
   }
 }
 
+import MakeTest<CallGraphTest>
+
 bindingset[call, target]
 string getCallEdgeValue(CallNode call, Function target) {
   if call.getLocation().getFile() = target.getLocation().getFile()
diff --git a/python/ql/test/library-tests/ApiGraphs/py2/use.expected b/python/ql/test/library-tests/ApiGraphs/py2/use.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/python/ql/test/library-tests/ApiGraphs/py2/use.ql b/python/ql/test/library-tests/ApiGraphs/py2/use.ql
@@ -3,22 +3,20 @@ import semmle.python.dataflow.new.DataFlow
 import TestUtilities.InlineExpectationsTest
 import semmle.python.ApiGraphs
 
-class ApiUseTest extends InlineExpectationsTest {
-  ApiUseTest() { this = "ApiUseTest" }
-
-  override string getARelevantTag() { result = "use" }
+module ApiUseTest implements TestSig {
+  string getARelevantTag() { result = "use" }
 
   private predicate relevant_node(API::Node a, DataFlow::Node n, Location l) {
     n = a.getAValueReachableFromSource() and l = n.getLocation()
   }
 
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(DataFlow::Node n | this.relevant_node(_, n, location) |
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(DataFlow::Node n | relevant_node(_, n, location) |
       tag = "use" and
       // Only report the longest path on this line:
       value =
         max(API::Node a2, Location l2 |
-          this.relevant_node(a2, _, l2) and
+          relevant_node(a2, _, l2) and
           l2.getFile() = location.getFile() and
           l2.getStartLine() = location.getStartLine()
         |
@@ -28,3 +26,5 @@ class ApiUseTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<ApiUseTest>
diff --git a/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.expected b/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.expected
@@ -1,2 +1,4 @@
+failures
+testFailures
 | test.py:1:1:1:3 | foo | Tag mismatch: Actual result with tag 'foo' that is not part of getARelevantTag() |
 | test.py:4:1:4:3 | foo | Tag mismatch: Actual result with tag 'foo' that is not part of getARelevantTag() |
diff --git a/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.ql b/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.ql
@@ -4,12 +4,10 @@
 import python
 import TestUtilities.InlineExpectationsTest
 
-class MissingRelevantTag extends InlineExpectationsTest {
-  MissingRelevantTag() { this = "MissingRelevantTag" }
+module MissingRelevantTag implements TestSig {
+  string getARelevantTag() { none() }
 
-  override string getARelevantTag() { none() }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     exists(Name name | name.getId() = "foo" |
       location = name.getLocation() and
       element = name.toString() and
@@ -18,3 +16,5 @@ class MissingRelevantTag extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<MissingRelevantTag>
diff --git a/python/ql/test/library-tests/essa/ssa-compute/UseUse.expected b/python/ql/test/library-tests/essa/ssa-compute/UseUse.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/python/ql/test/library-tests/essa/ssa-compute/UseUse.ql b/python/ql/test/library-tests/essa/ssa-compute/UseUse.ql
@@ -2,12 +2,10 @@ import python
 import semmle.python.essa.SsaCompute
 import TestUtilities.InlineExpectationsTest
 
-class UseTest extends InlineExpectationsTest {
-  UseTest() { this = "UseTest" }
+module UseTest implements TestSig {
+  string getARelevantTag() { result in ["use-use", "def-use", "def"] }
 
-  override string getARelevantTag() { result in ["use-use", "def-use", "def"] }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     exists(location.getFile().getRelativePath()) and
     exists(string name | name in ["x", "y"] |
       exists(NameNode nodeTo, Location prevLoc |
@@ -39,3 +37,5 @@ class UseTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<UseTest>
diff --git a/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.expected b/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.ql b/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.ql
@@ -3,12 +3,10 @@ private import semmle.python.dataflow.new.DataFlow
 private import semmle.python.frameworks.internal.PoorMansFunctionResolution
 import TestUtilities.InlineExpectationsTest
 
-class InlinePoorMansFunctionResolutionTest extends InlineExpectationsTest {
-  InlinePoorMansFunctionResolutionTest() { this = "InlinePoorMansFunctionResolutionTest" }
+module InlinePoorMansFunctionResolutionTest implements TestSig {
+  string getARelevantTag() { result = "resolved" }
 
-  override string getARelevantTag() { result = "resolved" }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     exists(location.getFile().getRelativePath()) and
     exists(Function func, DataFlow::Node ref |
       ref = poorMansFunctionTracker(func) and
@@ -26,3 +24,5 @@ class InlinePoorMansFunctionResolutionTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<InlinePoorMansFunctionResolutionTest>
diff --git a/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.expected b/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.ql b/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.ql
@@ -4,21 +4,21 @@ import TestUtilities.InlineExpectationsTest
 import semmle.python.functions.ModificationOfParameterWithDefault
 private import semmle.python.dataflow.new.internal.PrintNode
 
-class ModificationOfParameterWithDefaultTest extends InlineExpectationsTest {
-  ModificationOfParameterWithDefaultTest() { this = "ModificationOfParameterWithDefaultTest" }
+module ModificationOfParameterWithDefaultTest implements TestSig {
+  string getARelevantTag() { result = "modification" }
 
-  override string getARelevantTag() { result = "modification" }
-
-  predicate relevant_node(DataFlow::Node sink) {
+  private predicate relevant_node(DataFlow::Node sink) {
     exists(ModificationOfParameterWithDefault::Configuration cfg | cfg.hasFlowTo(sink))
   }
 
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(DataFlow::Node n | this.relevant_node(n) |
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(DataFlow::Node n | relevant_node(n) |
       n.getLocation() = location and
       tag = "modification" and
       value = prettyNode(n) and
       element = n.toString()
     )
   }
 }
+
+import MakeTest<ModificationOfParameterWithDefaultTest>
diff --git a/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/ExceptionInfo.expected b/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/ExceptionInfo.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/ExceptionInfo.ql b/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/ExceptionInfo.ql

Original file line number	Diff line number	Diff line change
`@@ -4,16 +4,14 @@ import semmle.python.dataflow.new.internal.DataFlowDispatch as DataFlowDispatch`
`4`	`4`	`import TestUtilities.InlineExpectationsTest`
`5`	`5`	`private import semmle.python.dataflow.new.internal.PrintNode`
`6`	`6`
`7`		`-class DataFlowCallTest extends InlineExpectationsTest {`
`8`		`- DataFlowCallTest() { this = "DataFlowCallTest" }`
`9`		`-`
`10`		`- override string getARelevantTag() {`
	`7`	`+module DataFlowCallTest implements TestSig {`
	`8`	`+ string getARelevantTag() {`
`11`	`9`	`result in ["call", "callType"]`
`12`	`10`	`or`
`13`	`11`	`result = "arg[" + any(DataFlowDispatch::ArgumentPosition pos).toString() + "]"`
`14`	`12`	`}`
`15`	`13`
`16`		`- override predicate hasActualResult(Location location, string element, string tag, string value) {`
	`14`	`+ predicate hasActualResult(Location location, string element, string tag, string value) {`
`17`	`15`	`exists(location.getFile().getRelativePath()) and`
`18`	`16`	`exists(DataFlowDispatch::DataFlowCall call \|`
`19`	`17`	`location = call.getLocation() and`
`@@ -35,3 +33,5 @@ class DataFlowCallTest extends InlineExpectationsTest {`
`35`	`33`	`)`
`36`	`34`	`}`
`37`	`35`	`}`
	`36`	`+`
	`37`	`+import MakeTest<DataFlowCallTest>`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,10 @@ import semmle.python.dataflow.new.DataFlow`
`3`	`3`	`import TestUtilities.InlineExpectationsTest`
`4`	`4`	`import experimental.dataflow.testConfig`
`5`	`5`
`6`		`-class CaptureTest extends InlineExpectationsTest {`
`7`		`- CaptureTest() { this = "CaptureTest" }`
	`6`	`+module CaptureTest implements TestSig {`
	`7`	`+ string getARelevantTag() { result = "captured" }`
`8`	`8`
`9`		`- override string getARelevantTag() { result = "captured" }`
`10`		`-`
`11`		`- override predicate hasActualResult(Location location, string element, string tag, string value) {`
	`9`	`+ predicate hasActualResult(Location location, string element, string tag, string value) {`
`12`	`10`	`exists(DataFlow::Node sink \| exists(TestConfiguration cfg \| cfg.hasFlowTo(sink)) \|`
`13`	`11`	`location = sink.getLocation() and`
`14`	`12`	`tag = "captured" and`
`@@ -17,3 +15,5 @@ class CaptureTest extends InlineExpectationsTest {`
`17`	`15`	`)`
`18`	`16`	`}`
`19`	`17`	`}`
	`18`	`+`
	`19`	`+import MakeTest<CaptureTest>`
Original file line number	Diff line number	Diff line change
`@@ -72,12 +72,10 @@ private class ImportConfiguration extends DataFlow::Configuration {`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`		`-class ResolutionTest extends InlineExpectationsTest {`
`76`		`- ResolutionTest() { this = "ResolutionTest" }`
	`75`	`+module ResolutionTest implements TestSig {`
	`76`	`+ string getARelevantTag() { result = "prints" }`
`77`	`77`
`78`		`- override string getARelevantTag() { result = "prints" }`
`79`		`-`
`80`		`- override predicate hasActualResult(Location location, string element, string tag, string value) {`
	`78`	`+ predicate hasActualResult(Location location, string element, string tag, string value) {`
`81`	`79`	`(`
`82`	`80`	`exists(DataFlow::PathNode source, DataFlow::PathNode sink, ImportConfiguration config \|`
`83`	`81`	`config.hasFlowPath(source, sink) and`
`@@ -105,12 +103,10 @@ private string getTagForVersion(int version) {`
`105`	`103`	`version = major_version()`
`106`	`104`	`}`
`107`	`105`
`108`		`-class VersionSpecificResolutionTest extends InlineExpectationsTest {`
`109`		`- VersionSpecificResolutionTest() { this = "VersionSpecificResolutionTest" }`
`110`		`-`
`111`		`- override string getARelevantTag() { result = getTagForVersion(_) }`
	`106`	`+module VersionSpecificResolutionTest implements TestSig {`
	`107`	`+ string getARelevantTag() { result = getTagForVersion(_) }`
`112`	`108`
`113`		`- override predicate hasActualResult(Location location, string element, string tag, string value) {`
	`109`	`+ predicate hasActualResult(Location location, string element, string tag, string value) {`
`114`	`110`	`(`
`115`	`111`	`exists(DataFlow::PathNode source, DataFlow::PathNode sink, ImportConfiguration config \|`
`116`	`112`	`config.hasFlowPath(source, sink) and`
`@@ -130,3 +126,5 @@ class VersionSpecificResolutionTest extends InlineExpectationsTest {`
`130`	`126`	`)`
`131`	`127`	`}`
`132`	`128`	`}`
	`129`	`+`
	`130`	`+import MakeTest<MergeTests<ResolutionTest, VersionSpecificResolutionTest>>`