JS: Update testUtilities import

asgerf · asgerf · commit 33e8bd50327b · 2024-12-19T15:25:39.000+01:00
diff --git a/javascript/ql/lib/utils/test/InlineFlowTest.qll b/javascript/ql/lib/utils/test/InlineFlowTest.qll
@@ -11,7 +11,7 @@ private import semmle.javascript.frameworks.data.internal.ApiGraphModelsExtensio
 private import internal.InlineExpectationsTestImpl
 
 private module FlowTestImpl implements InputSig<Location, JSDataFlow> {
-  import testUtilities.InlineFlowTestUtil
+  import utils.test.InlineFlowTestUtil
 
   bindingset[src, sink]
   string getArgString(DataFlow::Node src, DataFlow::Node sink) {
diff --git a/javascript/ql/test/library-tests/Arrays/DataFlow.ql b/javascript/ql/test/library-tests/Arrays/DataFlow.ql
@@ -21,6 +21,6 @@ deprecated class LegacyConfig extends DataFlow::Configuration {
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 query predicate flow = TestFlow::flow/2;
diff --git a/javascript/ql/test/library-tests/Arrays/TaintFlow.ql b/javascript/ql/test/library-tests/Arrays/TaintFlow.ql
@@ -21,6 +21,6 @@ deprecated class LegacyConfig extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 query predicate flow = TestFlow::flow/2;
diff --git a/javascript/ql/test/library-tests/Barriers/SimpleBarrierGuard.ql b/javascript/ql/test/library-tests/Barriers/SimpleBarrierGuard.ql
@@ -45,6 +45,6 @@ deprecated class LegacyConfig extends DataFlow::Configuration {
   }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 query predicate flow = TestFlow::flow/2;
diff --git a/javascript/ql/test/library-tests/Classes/tests.ql b/javascript/ql/test/library-tests/Classes/tests.ql
@@ -77,7 +77,7 @@ deprecated class LegacyConfig extends DataFlow::Configuration {
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 query predicate dataflow = TestFlow::flow/2;
 
diff --git a/javascript/ql/test/library-tests/FlowSummary/test.ql b/javascript/ql/test/library-tests/FlowSummary/test.ql
@@ -1,6 +1,6 @@
 import javascript
-deprecated import testUtilities.ConsistencyChecking
-import testUtilities.InlineSummaries
+deprecated import utils.test.ConsistencyChecking
+import utils.test.InlineSummaries
 
 DataFlow::CallNode getACall(string name) {
   result.getCalleeName() = name
diff --git a/javascript/ql/test/library-tests/Generators/DataFlow.ql b/javascript/ql/test/library-tests/Generators/DataFlow.ql
@@ -19,7 +19,7 @@ deprecated class LegacyConfig extends DataFlow::Configuration {
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 deprecated class Consistency extends ConsistencyConfiguration {
   Consistency() { this = "Consistency" }
diff --git a/javascript/ql/test/library-tests/LabelledBarrierGuards/LabelledBarrierGuards.ql b/javascript/ql/test/library-tests/LabelledBarrierGuards/LabelledBarrierGuards.ql
@@ -93,7 +93,7 @@ deprecated class IsSanitizedGuardLegacy extends IsSanitizedGuard,
   }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 from DataFlow::Node source, DataFlow::Node sink
 where TestFlow::flow(source, sink)
diff --git a/javascript/ql/test/library-tests/Promises/flow.qll b/javascript/ql/test/library-tests/Promises/flow.qll
@@ -1,6 +1,6 @@
 import javascript
 private import semmle.javascript.dataflow.internal.StepSummary
-deprecated import testUtilities.LegacyDataFlowDiff
+deprecated import utils.test.LegacyDataFlowDiff
 
 module ValueFlowConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
diff --git a/javascript/ql/test/library-tests/Routing/test.ql b/javascript/ql/test/library-tests/Routing/test.ql
@@ -33,4 +33,4 @@ deprecated class LegacyConfig extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
diff --git a/javascript/ql/test/library-tests/Security/heuristics/HeuristicSource.ql b/javascript/ql/test/library-tests/Security/heuristics/HeuristicSource.ql
@@ -26,4 +26,4 @@ deprecated class LegacyConfig extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
diff --git a/javascript/ql/test/library-tests/TaintBarriers/tests.ql b/javascript/ql/test/library-tests/TaintBarriers/tests.ql
@@ -25,4 +25,4 @@ query predicate taintedSink(DataFlow::Node source, DataFlow::Node sink) {
   TestFlow::flow(source, sink)
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, ExampleConfiguration>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, ExampleConfiguration>
diff --git a/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.ql b/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.ql
@@ -1,6 +1,6 @@
 import javascript
 import semmle.javascript.dataflow.InferredTypes
-deprecated import testUtilities.ConsistencyChecking
+deprecated import utils.test.ConsistencyChecking
 
 DataFlow::CallNode getACall(string name) {
   result.getCalleeName() = name
@@ -39,7 +39,7 @@ deprecated class LegacyConfig extends TaintTracking::Configuration {
   }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 class BasicSanitizerGuard extends DataFlow::CallNode {
   BasicSanitizerGuard() { this = getACall("isSafe") }
diff --git a/javascript/ql/test/library-tests/TaintTracking/DataFlowTracking.ql b/javascript/ql/test/library-tests/TaintTracking/DataFlowTracking.ql
@@ -39,6 +39,6 @@ deprecated class LegacyConfig extends DataFlow::Configuration {
   }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 query predicate flow = TestFlow::flow/2;
diff --git a/javascript/ql/test/library-tests/TaintedUrlSuffix/test.ql b/javascript/ql/test/library-tests/TaintedUrlSuffix/test.ql
@@ -1,5 +1,5 @@
 import javascript
-import testUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.javascript.security.TaintedUrlSuffix
 
 module TestConfig implements DataFlow::StateConfigSig {
diff --git a/javascript/ql/test/library-tests/TripleDot/test.ql b/javascript/ql/test/library-tests/TripleDot/test.ql
@@ -1,3 +1,3 @@
 import javascript
-import testUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportEquals/tests.ql b/javascript/ql/test/library-tests/TypeScript/ImportEquals/tests.ql
@@ -60,4 +60,4 @@ deprecated class LegacyConfig extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
diff --git a/javascript/ql/test/library-tests/TypeTracking2/test.ql b/javascript/ql/test/library-tests/TypeTracking2/test.ql
@@ -1,6 +1,6 @@
 import javascript
-import testUtilities.InlineSummaries
-import testUtilities.InlineExpectationsTest
+import utils.test.InlineSummaries
+import utils.test.InlineExpectationsTest
 
 private DataFlow::SourceNode typeTrack(DataFlow::TypeTracker t, string name) {
   t.start() and
diff --git a/javascript/ql/test/library-tests/frameworks/Angular2/test.ql b/javascript/ql/test/library-tests/frameworks/Angular2/test.ql
@@ -41,4 +41,4 @@ deprecated class LegacyConfig extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
diff --git a/javascript/ql/test/library-tests/frameworks/AsyncPackage/AsyncTaintTracking.ql b/javascript/ql/test/library-tests/frameworks/AsyncPackage/AsyncTaintTracking.ql
@@ -18,7 +18,7 @@ deprecated class LegacyConfig extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 from DataFlow::Node src, DataFlow::Node sink
 where TestFlow::flow(src, sink)
diff --git a/javascript/ql/test/library-tests/frameworks/Collections/test.ql b/javascript/ql/test/library-tests/frameworks/Collections/test.ql
@@ -22,7 +22,7 @@ deprecated class LegacyConfig extends DataFlow::Configuration {
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 DataFlow::SourceNode trackSource(DataFlow::TypeTracker t, DataFlow::SourceNode start) {
   t.start() and
diff --git a/javascript/ql/test/library-tests/frameworks/ComposedFunctions/compose.ql b/javascript/ql/test/library-tests/frameworks/ComposedFunctions/compose.ql
@@ -23,7 +23,7 @@ deprecated class LegacyConfig extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 from DataFlow::Node source, DataFlow::Node sink
 where TestFlow::flow(source, sink)
diff --git a/javascript/ql/test/library-tests/frameworks/Immutable/tests.ql b/javascript/ql/test/library-tests/frameworks/Immutable/tests.ql
@@ -23,4 +23,4 @@ deprecated class LegacyConfig extends DataFlow::Configuration {
 
 query predicate dataFlow = TestFlow::flow/2;
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
diff --git a/javascript/ql/test/library-tests/frameworks/Next/tests.ql b/javascript/ql/test/library-tests/frameworks/Next/tests.ql
@@ -22,6 +22,6 @@ deprecated class LegacyConfig extends DataFlow::Configuration {
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 query predicate dataFlow = TestFlow::flow/2;
diff --git a/javascript/ql/test/library-tests/frameworks/PropertyProjection/PropertyInjectionTaint.ql b/javascript/ql/test/library-tests/frameworks/PropertyProjection/PropertyInjectionTaint.ql
@@ -23,7 +23,7 @@ deprecated class LegacyConfig extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 from DataFlow::Node source, DataFlow::Node sink
 where TestFlow::flow(source, sink)
diff --git a/javascript/ql/test/library-tests/frameworks/Redux/test.ql b/javascript/ql/test/library-tests/frameworks/Redux/test.ql
@@ -62,7 +62,7 @@ deprecated class LegacyConfig extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 query predicate taintFlow(DataFlow::Node source, DataFlow::Node sink) {
   TestFlow::flow(source, sink)
diff --git a/javascript/ql/test/library-tests/frameworks/Templating/XssDiff.ql b/javascript/ql/test/library-tests/frameworks/Templating/XssDiff.ql
@@ -1,6 +1,6 @@
 import javascript
 import semmle.javascript.security.dataflow.DomBasedXssQuery
-deprecated import testUtilities.LegacyDataFlowDiff
+deprecated import utils.test.LegacyDataFlowDiff
 
 deprecated query predicate legacyDataFlowDifference =
   DataFlowDiff<DomBasedXssFlow, Configuration>::legacyDataFlowDifference/3;
diff --git a/javascript/ql/test/library-tests/frameworks/Vuex/test.ql b/javascript/ql/test/library-tests/frameworks/Vuex/test.ql
@@ -25,4 +25,4 @@ deprecated class LegacyConfig extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
diff --git a/javascript/ql/test/library-tests/frameworks/data/test.ql b/javascript/ql/test/library-tests/frameworks/data/test.ql
@@ -41,7 +41,7 @@ deprecated class LegacyConfig extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 }
 
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 query predicate taintFlow(DataFlow::Node source, DataFlow::Node sink) {
   TestFlow::flow(source, sink)
diff --git a/javascript/ql/test/library-tests/threat-models/sources/TestSources.ql b/javascript/ql/test/library-tests/threat-models/sources/TestSources.ql
@@ -44,4 +44,4 @@ private module InlineTestSources implements TestSig {
 }
 
 import MakeTest<InlineTestSources>
-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/Consistency.ql
@@ -1,6 +1,6 @@
 import javascript
 import semmle.javascript.security.dataflow.ClientSideUrlRedirectQuery
-import testUtilities.ConsistencyChecking
+import utils.test.ConsistencyChecking
 
 deprecated class ClientSideUrlRedirectConsistency extends ConsistencyConfiguration {
   ClientSideUrlRedirectConsistency() { this = "ClientSideUrlRedirectConsistency" }

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ deprecated class LegacyConfig extends DataFlow::Configuration {`
`21`	`21`	`override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }`
`22`	`22`	`}`
`23`	`23`
`24`		`-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>`
	`24`	`+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>`
`25`	`25`
`26`	`26`	`query predicate flow = TestFlow::flow/2;`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,6 @@ deprecated class LegacyConfig extends DataFlow::Configuration {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>`
	`48`	`+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>`
`49`	`49`
`50`	`50`	`query predicate flow = TestFlow::flow/2;`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ deprecated class LegacyConfig extends DataFlow::Configuration {`
`77`	`77`	`override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }`
`78`	`78`	`}`
`79`	`79`
`80`		`-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>`
	`80`	`+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>`
`81`	`81`
`82`	`82`	`query predicate dataflow = TestFlow::flow/2;`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ deprecated class LegacyConfig extends DataFlow::Configuration {`
`19`	`19`	`override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }`
`20`	`20`	`}`
`21`	`21`
`22`		`-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>`
	`22`	`+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>`
`23`	`23`
`24`	`24`	`deprecated class Consistency extends ConsistencyConfiguration {`
`25`	`25`	`Consistency() { this = "Consistency" }`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ deprecated class IsSanitizedGuardLegacy extends IsSanitizedGuard,`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>`
	`96`	`+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>`
`97`	`97`
`98`	`98`	`from DataFlow::Node source, DataFlow::Node sink`
`99`	`99`	`where TestFlow::flow(source, sink)`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,4 @@ deprecated class LegacyConfig extends TaintTracking::Configuration {`
`33`	`33`	`override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }`
`34`	`34`	`}`
`35`	`35`
`36`		`-deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>`
	`36`	`+deprecated import utils.test.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>`