Swift: Use InlineFlowTest.qll in the data flow inline tests, so that we have less code duplication and can use flow labels.

Author: geoffw0

swift/ql/test/library-tests/dataflow/dataflow/DataFlowInline.ql

@@ -1,20 +1,6 @@
-import swift
+import TestUtilities.InlineFlowTest
 import FlowConfig
-import TestUtilities.InlineExpectationsTest
 
-module TaintTest implements TestSig {
-  string getARelevantTag() { result = "flow" }
+string customTaintFlowTag() { result = "flow" }
 
-  predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(DataFlow::Node source, DataFlow::Node sink, Expr sinkExpr |
-      TestFlow::flow(source, sink) and
-      sinkExpr = sink.asExpr() and
-      location = sinkExpr.getLocation() and
-      element = sinkExpr.toString() and
-      tag = "flow" and
-      value = source.asExpr().getLocation().getStartLine().toString()
-    )
-  }
-}
-
-import MakeTest<TaintTest>
+import FlowTest<DefaultFlowConfig, NoFlowConfig, customTaintFlowTag/0, defaultTaintFlowTag/0>

swift/ql/test/library-tests/dataflow/taint/core/TaintInline.ql

@@ -1,20 +1,6 @@
-import swift
+import TestUtilities.InlineFlowTest
 import Taint
-import TestUtilities.InlineExpectationsTest
 
-module TaintTest implements TestSig {
-  string getARelevantTag() { result = "tainted" }
+string customTaintFlowTag() { result = "tainted" }
 
-  predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(DataFlow::Node source, DataFlow::Node sink, Expr sinkExpr |
-      TestFlow::flow(source, sink) and
-      sinkExpr = sink.asExpr() and
-      location = sinkExpr.getLocation() and
-      element = sinkExpr.toString() and
-      tag = "tainted" and
-      value = source.asExpr().getLocation().getStartLine().toString()
-    )
-  }
-}
-
-import MakeTest<TaintTest>
+import FlowTest<NoFlowConfig, DefaultFlowConfig, defaultValueFlowTag/0, customTaintFlowTag/0>

swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.ql

@@ -1,20 +1,6 @@
-import swift
+import TestUtilities.InlineFlowTest
 import Taint
-import TestUtilities.InlineExpectationsTest
 
-module TaintTest implements TestSig {
-  string getARelevantTag() { result = "tainted" }
+string customTaintFlowTag() { result = "tainted" }
 
-  predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(DataFlow::Node source, DataFlow::Node sink, Expr sinkExpr |
-      TestFlow::flow(source, sink) and
-      sinkExpr = sink.asExpr() and
-      location = sinkExpr.getLocation() and
-      element = sinkExpr.toString() and
-      tag = "tainted" and
-      value = source.asExpr().getLocation().getStartLine().toString()
-    )
-  }
-}
-
-import MakeTest<TaintTest>
+import FlowTest<NoFlowConfig, DefaultFlowConfig, defaultValueFlowTag/0, customTaintFlowTag/0>