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

2026-04-30 19:26:02 +02:00 · 2024-12-11 13:29:16 +01:00
parent 1490400ab0
commit 2321ca59f6
60 changed files with 64 additions and 64 deletions
--- a/python/ql/test/library-tests/ApiGraphs/py2/use.ql
+++ b/python/ql/test/library-tests/ApiGraphs/py2/use.ql
@@ -1,6 +1,6 @@
 import python
 import semmle.python.dataflow.new.DataFlow
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.python.ApiGraphs

 module ApiUseTest implements TestSig {
--- a/python/ql/test/library-tests/ApiGraphs/py2/verifyApiGraphs.ql
+++ b/python/ql/test/library-tests/ApiGraphs/py2/verifyApiGraphs.ql
@@ -1 +1 @@
-import TestUtilities.VerifyApiGraphs
+import utils.test.VerifyApiGraphs
--- a/python/ql/test/library-tests/ApiGraphs/py3/verifyApiGraphs.ql
+++ b/python/ql/test/library-tests/ApiGraphs/py3/verifyApiGraphs.ql
@@ -1,6 +1,6 @@
 // Note: This is not using standard inline-expectation tests, so will not alert if you
 // have not manually added an annotation to a line!
-import TestUtilities.VerifyApiGraphs
+import utils.test.VerifyApiGraphs

 class CustomEntryPoint extends API::EntryPoint {
  CustomEntryPoint() { this = "CustomEntryPoint" }
--- a/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.ql
+++ b/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.ql
@@ -2,7 +2,7 @@
 // right values for `getARelevantTag`. We want to alert on this,
 // so it gets fixed!
 import python
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 module MissingRelevantTag implements TestSig {
  string getARelevantTag() { none() }
--- a/python/ql/test/library-tests/dataflow/basic/callGraph.ql
+++ b/python/ql/test/library-tests/dataflow/basic/callGraph.ql
@@ -1,4 +1,4 @@
-import TestUtilities.dataflow.callGraphConfig
+import utils.test.dataflow.callGraphConfig

 from DataFlow::Node source, DataFlow::Node sink
 where
--- a/python/ql/test/library-tests/dataflow/basic/callGraphSinks.ql
+++ b/python/ql/test/library-tests/dataflow/basic/callGraphSinks.ql
@@ -1,4 +1,4 @@
-import TestUtilities.dataflow.callGraphConfig
+import utils.test.dataflow.callGraphConfig

 from DataFlow::Node sink
 where
--- a/python/ql/test/library-tests/dataflow/basic/callGraphSources.ql
+++ b/python/ql/test/library-tests/dataflow/basic/callGraphSources.ql
@@ -1,4 +1,4 @@
-import TestUtilities.dataflow.callGraphConfig
+import utils.test.dataflow.callGraphConfig

 from DataFlow::Node source
 where
--- a/python/ql/test/library-tests/dataflow/basic/localFlowStepTest.ql
+++ b/python/ql/test/library-tests/dataflow/basic/localFlowStepTest.ql
@@ -1 +1 @@
-import TestUtilities.dataflow.LocalFlowStepTest
+import utils.test.dataflow.LocalFlowStepTest
--- a/python/ql/test/library-tests/dataflow/basic/maximalFlowTest.ql
+++ b/python/ql/test/library-tests/dataflow/basic/maximalFlowTest.ql
@@ -1 +1 @@
-import TestUtilities.dataflow.MaximalFlowTest
+import utils.test.dataflow.MaximalFlowTest
--- a/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.ql
+++ b/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.ql
@@ -1,7 +1,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.internal.DataFlowDispatch as DataFlowDispatch
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 private import semmle.python.dataflow.new.internal.PrintNode

 module DataFlowCallTest implements TestSig {
--- a/python/ql/test/library-tests/dataflow/coverage/NormalDataflowTest.ql
+++ b/python/ql/test/library-tests/dataflow/coverage/NormalDataflowTest.ql
@@ -1,2 +1,2 @@
 import python
-import TestUtilities.dataflow.NormalDataflowTest
+import utils.test.dataflow.NormalDataflowTest
--- a/python/ql/test/library-tests/dataflow/coverage/argumentRoutingTest.ql
+++ b/python/ql/test/library-tests/dataflow/coverage/argumentRoutingTest.ql
@@ -1,7 +1,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 private import semmle.python.dataflow.new.internal.DataFlowPrivate as DataFlowPrivate
-import TestUtilities.dataflow.RoutingTest
+import utils.test.dataflow.RoutingTest

 module Argument1RoutingTest implements RoutingTestSig {
  class Argument = Unit;
--- a/python/ql/test/library-tests/dataflow/exceptions/NormalDataflowTest.ql
+++ b/python/ql/test/library-tests/dataflow/exceptions/NormalDataflowTest.ql
@@ -1,2 +1,2 @@
 import python
-import TestUtilities.dataflow.NormalDataflowTest
+import utils.test.dataflow.NormalDataflowTest
--- a/python/ql/test/library-tests/dataflow/fieldflow/NormalDataflowTest.ql
+++ b/python/ql/test/library-tests/dataflow/fieldflow/NormalDataflowTest.ql
@@ -1,2 +1,2 @@
 import python
-import TestUtilities.dataflow.NormalDataflowTest
+import utils.test.dataflow.NormalDataflowTest
--- a/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.ql
+++ b/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.ql
@@ -1,5 +1,5 @@
 import python
-import TestUtilities.dataflow.UnresolvedCalls
+import utils.test.dataflow.UnresolvedCalls
 private import semmle.python.dataflow.new.DataFlow

 module IgnoreDictMethod implements UnresolvedCallExpectationsSig {
--- a/python/ql/test/library-tests/dataflow/global-flow/accesses.ql
+++ b/python/ql/test/library-tests/dataflow/global-flow/accesses.ql
@@ -1,6 +1,6 @@
 import python
 import semmle.python.dataflow.new.DataFlow
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 module GlobalReadTest implements TestSig {
  string getARelevantTag() { result = "reads" }
--- a/python/ql/test/library-tests/dataflow/match/NormalDataflowTest.ql
+++ b/python/ql/test/library-tests/dataflow/match/NormalDataflowTest.ql
@@ -1,2 +1,2 @@
 import python
-import TestUtilities.dataflow.NormalDataflowTest
+import utils.test.dataflow.NormalDataflowTest
--- a/python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.ql
+++ b/python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.ql
@@ -1,2 +1,2 @@
 import python
-import TestUtilities.dataflow.NormalDataflowTest
+import utils.test.dataflow.NormalDataflowTest
--- a/python/ql/test/library-tests/dataflow/module-initialization/localFlow.ql
+++ b/python/ql/test/library-tests/dataflow/module-initialization/localFlow.ql
@@ -1,6 +1,6 @@
 // This query should be more focused yet.
 import python
-import TestUtilities.dataflow.FlowTest
+import utils.test.dataflow.FlowTest
 private import semmle.python.dataflow.new.internal.PrintNode
 private import semmle.python.dataflow.new.internal.DataFlowPrivate as DP

--- a/python/ql/test/library-tests/dataflow/path-graph/PathNodes.ql
+++ b/python/ql/test/library-tests/dataflow/path-graph/PathNodes.ql
@@ -5,8 +5,8 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
-import TestUtilities.dataflow.testConfig
-import TestUtilities.InlineExpectationsTest
+import utils.test.dataflow.testConfig
+import utils.test.InlineExpectationsTest

 module TestTaintFlow = TaintTracking::Global<TestConfig>;

--- a/python/ql/test/library-tests/dataflow/regression/dataflow.ql
+++ b/python/ql/test/library-tests/dataflow/regression/dataflow.ql
@@ -6,7 +6,7 @@
 */

 import python
-import TestUtilities.dataflow.testConfig
+import utils.test.dataflow.testConfig

 from DataFlow::Node source, DataFlow::Node sink
 where TestFlow::flow(source, sink)
--- a/python/ql/test/library-tests/dataflow/sensitive-data/TestSensitiveDataSources.ql
+++ b/python/ql/test/library-tests/dataflow/sensitive-data/TestSensitiveDataSources.ql
@@ -4,7 +4,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.python.dataflow.new.SensitiveDataSources
 private import semmle.python.ApiGraphs

--- a/python/ql/test/library-tests/dataflow/summaries/NormalTaintTrackingTest.ql
+++ b/python/ql/test/library-tests/dataflow/summaries/NormalTaintTrackingTest.ql
@@ -1,3 +1,3 @@
 import python
 private import TestSummaries
-import TestUtilities.dataflow.NormalTaintTrackingTest
+import utils.test.dataflow.NormalTaintTrackingTest
--- a/python/ql/test/library-tests/dataflow/summaries/summaries.ql
+++ b/python/ql/test/library-tests/dataflow/summaries/summaries.ql
@@ -8,7 +8,7 @@ import TestFlow::PathGraph
 import semmle.python.dataflow.new.TaintTracking
 import semmle.python.dataflow.new.internal.FlowSummaryImpl
 import semmle.python.ApiGraphs
-import TestUtilities.dataflow.testTaintConfig
+import utils.test.dataflow.testTaintConfig
 private import TestSummaries

 query predicate invalidSpecComponent(SummarizedCallable sc, string s, string c) {
--- a/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/NormalDataflowTest.ql
+++ b/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/NormalDataflowTest.ql
@@ -1,2 +1,2 @@
 import python
-import TestUtilities.dataflow.NormalDataflowTest
+import utils.test.dataflow.NormalDataflowTest
--- a/python/ql/test/library-tests/dataflow/typetracking-summaries/tracked.ql
+++ b/python/ql/test/library-tests/dataflow/typetracking-summaries/tracked.ql
@@ -1,7 +1,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TypeTracking
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.python.ApiGraphs
 import TestSummaries

--- a/python/ql/test/library-tests/dataflow/typetracking/tracked.ql
+++ b/python/ql/test/library-tests/dataflow/typetracking/tracked.ql
@@ -1,7 +1,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TypeTracking
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.python.ApiGraphs
 private import semmle.python.dataflow.new.internal.DataFlowPrivate as DP

--- a/python/ql/test/library-tests/dataflow/variable-capture/CaptureTest.ql
+++ b/python/ql/test/library-tests/dataflow/variable-capture/CaptureTest.ql
@@ -1,7 +1,7 @@
 import python
 import semmle.python.dataflow.new.DataFlow
-import TestUtilities.InlineExpectationsTest
-import TestUtilities.dataflow.testConfig
+import utils.test.InlineExpectationsTest
+import utils.test.dataflow.testConfig

 module CaptureTest implements TestSig {
  string getARelevantTag() { result = "captured" }
--- a/python/ql/test/library-tests/essa/ssa-compute/UseUse.ql
+++ b/python/ql/test/library-tests/essa/ssa-compute/UseUse.ql
@@ -1,6 +1,6 @@
 import python
 import semmle.python.essa.SsaCompute
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 module UseTest implements TestSig {
  string getARelevantTag() { result in ["use-use", "def-use", "def"] }
--- a/python/ql/test/library-tests/frameworks/django-orm/NormalDataflowTest.ql
+++ b/python/ql/test/library-tests/frameworks/django-orm/NormalDataflowTest.ql
@@ -1,2 +1,2 @@
 import python
-import TestUtilities.dataflow.NormalDataflowTest
+import utils.test.dataflow.NormalDataflowTest
--- a/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.ql
+++ b/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.ql
@@ -1,7 +1,7 @@
 private import python
 private import semmle.python.dataflow.new.DataFlow
 private import semmle.python.frameworks.internal.PoorMansFunctionResolution
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 module InlinePoorMansFunctionResolutionTest implements TestSig {
  string getARelevantTag() { result = "resolved" }
--- a/python/ql/test/library-tests/regex/SubstructureTests.ql
+++ b/python/ql/test/library-tests/regex/SubstructureTests.ql
@@ -1,5 +1,5 @@
 import python
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 private import semmle.python.regex

 module CharacterSetTest implements TestSig {
--- a/python/ql/test/library-tests/regexparser/Locations.ql
+++ b/python/ql/test/library-tests/regexparser/Locations.ql
@@ -1,6 +1,6 @@
 import python
 import semmle.python.regexp.RegexTreeView::RegexTreeView
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 private import semmle.python.dataflow.new.internal.PrintNode

 module RegexLocationTest implements TestSig {