Swift: Update all test util paths to point to the new location.

michaelnebel · michaelnebel · commit 9ecacddf7930 · 2024-12-12T13:54:40.000+01:00
diff --git a/swift/ql/src/utils/test/InlineFlowTest.qll b/swift/ql/src/utils/test/InlineFlowTest.qll
@@ -4,7 +4,7 @@
  * Example for a test.ql:
  * ```ql
  * import swift
- * import TestUtilities.InlineFlowTest
+ * import utils.test.InlineFlowTest
  * import DefaultFlowTest
  * import PathGraph
  *
@@ -39,7 +39,7 @@
 import codeql.swift.dataflow.DataFlow
 import codeql.swift.dataflow.ExternalFlow
 import codeql.swift.dataflow.TaintTracking
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 private predicate defaultSource(DataFlow::Node source) {
   source
diff --git a/swift/ql/test/library-tests/dataflow/capture/FlowInline.ql b/swift/ql/test/library-tests/dataflow/capture/FlowInline.ql
@@ -1,2 +1,2 @@
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
diff --git a/swift/ql/test/library-tests/dataflow/dataflow/DataFlowInline.ql b/swift/ql/test/library-tests/dataflow/dataflow/DataFlowInline.ql
@@ -1,4 +1,4 @@
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import FlowConfig
 
 string customTaintFlowTag() { result = "flow" }
diff --git a/swift/ql/test/library-tests/dataflow/flowsources/FlowSourcesInline.ql b/swift/ql/test/library-tests/dataflow/flowsources/FlowSourcesInline.ql
@@ -1,5 +1,5 @@
 import swift
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import FlowConfig
 import codeql.swift.dataflow.TaintTracking
 import codeql.swift.dataflow.DataFlow
diff --git a/swift/ql/test/library-tests/dataflow/taint/core/TaintInline.ql b/swift/ql/test/library-tests/dataflow/taint/core/TaintInline.ql
@@ -1,4 +1,4 @@
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import Taint
 
 string customTaintFlowTag() { result = "tainted" }
diff --git a/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.ql b/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.ql
@@ -1,4 +1,4 @@
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 
 string customTaintFlowTag() { result = "tainted" }
 
diff --git a/swift/ql/test/library-tests/regex/regex.ql b/swift/ql/test/library-tests/regex/regex.ql
@@ -3,7 +3,7 @@ import codeql.swift.regex.Regex
 private import codeql.swift.regex.internal.ParseRegex
 private import codeql.swift.regex.RegexTreeView::RegexTreeView as TreeView
 import codeql.regex.nfa.ExponentialBackTracking::Make<TreeView>
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 bindingset[s]
 string quote(string s) { if s.matches("% %") then result = "\"" + s + "\"" else result = s }
diff --git a/swift/ql/test/query-tests/Security/CWE-022/PathInjection/PathInjectionTest.ql b/swift/ql/test/query-tests/Security/CWE-022/PathInjection/PathInjectionTest.ql
@@ -2,7 +2,7 @@ import swift
 import codeql.swift.dataflow.DataFlow
 import codeql.swift.dataflow.FlowSources
 import codeql.swift.security.PathInjectionQuery
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 module PathInjectionTest implements TestSig {
   string getARelevantTag() { result = "hasPathInjection" }
diff --git a/swift/ql/test/query-tests/Security/CWE-094/UnsafeJsEval.qlref b/swift/ql/test/query-tests/Security/CWE-094/UnsafeJsEval.qlref
@@ -1,2 +1,2 @@
 query: queries/Security/CWE-094/UnsafeJsEval.ql
-postprocess: TestUtilities/InlineExpectationsTestQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/swift/ql/test/query-tests/Security/CWE-312/CleartextLoggingTest.ql b/swift/ql/test/query-tests/Security/CWE-312/CleartextLoggingTest.ql
@@ -1,7 +1,7 @@
 import swift
 import codeql.swift.dataflow.DataFlow
 import codeql.swift.security.CleartextLoggingQuery
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 module CleartextLogging implements TestSig {
   string getARelevantTag() { result = "hasCleartextLogging" }
diff --git a/swift/ql/test/query-tests/Security/CWE-611/XXETest.ql b/swift/ql/test/query-tests/Security/CWE-611/XXETest.ql
@@ -1,7 +1,7 @@
 import swift
 import codeql.swift.dataflow.FlowSources
 import codeql.swift.security.XXEQuery
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 class TestRemoteSource extends RemoteFlowSource {
   TestRemoteSource() { this.asExpr().(ApplyExpr).getStaticTarget().getName().matches("source%") }
diff --git a/swift/ql/test/query-tests/Security/CWE-946/PredicateInjectionTest.ql b/swift/ql/test/query-tests/Security/CWE-946/PredicateInjectionTest.ql
@@ -1,7 +1,7 @@
 import swift
 import codeql.swift.dataflow.DataFlow
 import codeql.swift.security.PredicateInjectionQuery
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 module PredicateInjectionTest implements TestSig {
   string getARelevantTag() { result = "hasPredicateInjection" }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-import TestUtilities.InlineFlowTest`
	`1`	`+import utils.test.InlineFlowTest`
`2`	`2`	`import DefaultFlowTest`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import TestUtilities.InlineFlowTest`
	`1`	`+import utils.test.InlineFlowTest`
`2`	`2`	`import FlowConfig`
`3`	`3`
`4`	`4`	`string customTaintFlowTag() { result = "flow" }`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`query: queries/Security/CWE-094/UnsafeJsEval.ql`
`2`		`-postprocess: TestUtilities/InlineExpectationsTestQuery.ql`
	`2`	`+postprocess: utils/test/InlineExpectationsTestQuery.ql`