Merge pull request #17968 from michaelnebel/java/movetestutils

Move test utilities to the query pack.
github · Dec 16, 2024 · aaf0cd5 · aaf0cd5
2 parents 3171752 + 0bfc1b6
commit aaf0cd5
Show file tree

Hide file tree

Showing 667 changed files with 623 additions and 623 deletions.
diff --git a/.../TestUtilities/InlineExpectationsTest.qll → ...lib/utils/test/InlineExpectationsTest.qll b/.../TestUtilities/InlineExpectationsTest.qll → ...lib/utils/test/InlineExpectationsTest.qll
diff --git a/...tUtilities/InlineExpectationsTestQuery.ql → ...utils/test/InlineExpectationsTestQuery.ql b/...tUtilities/InlineExpectationsTestQuery.ql → ...utils/test/InlineExpectationsTestQuery.ql
diff --git a/...TestUtilities/dataflow/FlowTestCommon.qll → ...ib/utils/test/dataflow/FlowTestCommon.qll b/...TestUtilities/dataflow/FlowTestCommon.qll → ...ib/utils/test/dataflow/FlowTestCommon.qll
@@ -14,7 +14,7 @@
 import cpp
 private import semmle.code.cpp.ir.dataflow.DataFlow::DataFlow as IRDataFlow
 private import semmle.code.cpp.dataflow.DataFlow::DataFlow as AstDataFlow
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 module IRFlowTest<IRDataFlow::GlobalFlowSig Flow> implements TestSig {
   string getARelevantTag() { result = "ir" }

diff --git a/...s/internal/InlineExpectationsTestImpl.qll → ...t/internal/InlineExpectationsTestImpl.qll b/...s/internal/InlineExpectationsTestImpl.qll → ...t/internal/InlineExpectationsTestImpl.qll
diff --git a/cpp/ql/test/library-tests/dataflow/asExpr/test-indirect.ql b/cpp/ql/test/library-tests/dataflow/asExpr/test-indirect.ql
@@ -1,5 +1,5 @@
 import cpp
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.code.cpp.dataflow.new.DataFlow::DataFlow
 
 bindingset[s]

diff --git a/cpp/ql/test/library-tests/dataflow/asExpr/test.ql b/cpp/ql/test/library-tests/dataflow/asExpr/test.ql
@@ -1,5 +1,5 @@
 import cpp
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.code.cpp.dataflow.new.DataFlow::DataFlow
 
 bindingset[s]

diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/guard-condition-regression-test.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/guard-condition-regression-test.ql
@@ -1,4 +1,4 @@
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 private import cpp
 private import semmle.code.cpp.ir.dataflow.DataFlow
 private import semmle.code.cpp.controlflow.IRGuards

diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.ql
@@ -1,4 +1,4 @@
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import cpp
 
 module AstTest {

diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-number-of-outnodes.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-number-of-outnodes.ql
@@ -1,4 +1,4 @@
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import cpp
 
 module AstTest {

diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.ql
@@ -1,3 +1,3 @@
 import TestBase
-import TestUtilities.dataflow.FlowTestCommon
+import utils.test.dataflow.FlowTestCommon
 import MakeTest<MergeTests<AstFlowTest<AstTest::AstFlow>, IRFlowTest<IRTest::IRFlow>>>
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_argument_flow.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_argument_flow.ql
@@ -1,6 +1,6 @@
 import cpp
 import semmle.code.cpp.dataflow.new.DataFlow
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 module TestConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {

diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_parameter_flow.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_parameter_flow.ql
@@ -1,6 +1,6 @@
 import cpp
 import semmle.code.cpp.dataflow.new.DataFlow
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 module TestConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {

diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.ql
@@ -1,4 +1,4 @@
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import cpp
 
 module AstTest {

diff --git a/cpp/ql/test/library-tests/dataflow/external-models/flow.ql b/cpp/ql/test/library-tests/dataflow/external-models/flow.ql
@@ -1,4 +1,4 @@
-import TestUtilities.dataflow.FlowTestCommon
+import utils.test.dataflow.FlowTestCommon
 import cpp
 import semmle.code.cpp.security.FlowSources
 import IRTest::IRFlow::PathGraph

diff --git a/cpp/ql/test/library-tests/dataflow/fields/flow.ql b/cpp/ql/test/library-tests/dataflow/fields/flow.ql
@@ -1,4 +1,4 @@
-import TestUtilities.dataflow.FlowTestCommon
+import utils.test.dataflow.FlowTestCommon
 
 module AstTest {
   import ASTConfiguration

diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/interpretElement.ql b/cpp/ql/test/library-tests/dataflow/models-as-data/interpretElement.ql
@@ -1,4 +1,4 @@
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import testModels
 
 module InterpretElementTest implements TestSig {

diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/taint.ql b/cpp/ql/test/library-tests/dataflow/models-as-data/taint.ql
@@ -1,4 +1,4 @@
-import TestUtilities.dataflow.FlowTestCommon
+import utils.test.dataflow.FlowTestCommon
 import testModels
 
 module IRTest {

diff --git a/cpp/ql/test/library-tests/dataflow/parameters-without-defs/test.ql b/cpp/ql/test/library-tests/dataflow/parameters-without-defs/test.ql
@@ -1,4 +1,4 @@
-import TestUtilities.dataflow.FlowTestCommon
+import utils.test.dataflow.FlowTestCommon
 import semmle.code.cpp.dataflow.new.DataFlow
 
 module ParamConfig implements DataFlow::ConfigSig {

diff --git a/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.ql b/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.ql
@@ -1,4 +1,4 @@
-import TestUtilities.dataflow.FlowTestCommon
+import utils.test.dataflow.FlowTestCommon
 
 module AstTest {
   private import semmle.code.cpp.dataflow.TaintTracking

diff --git a/cpp/ql/test/library-tests/dataflow/source-sink-tests/local-flow.ql b/cpp/ql/test/library-tests/dataflow/source-sink-tests/local-flow.ql
@@ -1,7 +1,7 @@
 /** This tests that we are able to detect local flow sources. */
 
 import cpp
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.code.cpp.security.FlowSources
 
 module LocalFlowSourceTest implements TestSig {

diff --git a/cpp/ql/test/library-tests/dataflow/source-sink-tests/remote-flow.ql b/cpp/ql/test/library-tests/dataflow/source-sink-tests/remote-flow.ql
@@ -1,7 +1,7 @@
 /** This tests that we are able to detect remote flow sources and sinks. */
 
 import cpp
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.code.cpp.security.FlowSources
 
 module RemoteFlowSourceTest implements TestSig {

diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql
@@ -1,4 +1,4 @@
-import TestUtilities.dataflow.FlowTestCommon
+import utils.test.dataflow.FlowTestCommon
 
 module TaintModels {
   class SetMemberFunction extends TaintFunction {

diff --git a/cpp/ql/test/library-tests/ir/modulus-analysis/ModulusAnalysis.ql b/cpp/ql/test/library-tests/ir/modulus-analysis/ModulusAnalysis.ql
@@ -7,7 +7,7 @@ import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysi
 import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysisImpl
 import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticExprSpecific
 import semmle.code.cpp.ir.IR as IR
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 module ModulusAnalysisInstantiated = ModulusAnalysis<SemLocation, Sem, FloatDelta, ConstantBounds>;
 

diff --git a/cpp/ql/test/library-tests/ir/points_to/points_to.ql b/cpp/ql/test/library-tests/ir/points_to/points_to.ql
@@ -1,5 +1,5 @@
 import cpp
-private import TestUtilities.InlineExpectationsTest
+private import utils.test.InlineExpectationsTest
 private import semmle.code.cpp.ir.internal.IntegerConstant as Ints
 
 private predicate ignoreAllocation(string name) {

diff --git a/cpp/ql/test/library-tests/ir/range-analysis/Overflow.ql b/cpp/ql/test/library-tests/ir/range-analysis/Overflow.ql
@@ -1,6 +1,6 @@
 import cpp
 import semmle.code.cpp.rangeanalysis.new.SimpleRangeAnalysis
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 module RangeAnalysisTest implements TestSig {
   string getARelevantTag() { result = "overflow" }

diff --git a/cpp/ql/test/library-tests/ir/range-analysis/RangeAnalysis.ql b/cpp/ql/test/library-tests/ir/range-analysis/RangeAnalysis.ql
@@ -3,7 +3,7 @@ import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysi
 import semmle.code.cpp.rangeanalysis.new.internal.semantic.Semantic
 import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticExprSpecific
 import semmle.code.cpp.ir.IR as IR
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 module RangeAnalysisTest implements TestSig {
   string getARelevantTag() { result = "range" }

diff --git a/cpp/ql/test/library-tests/ir/sign-analysis/SignAnalysis.ql b/cpp/ql/test/library-tests/ir/sign-analysis/SignAnalysis.ql
@@ -5,7 +5,7 @@ import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.FloatDelta
 import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysisRelativeSpecific
 import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticExprSpecific
 import semmle.code.cpp.ir.IR as IR
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 module SignAnalysisInstantiated = SignAnalysis<FloatDelta>;
 

diff --git a/cpp/ql/test/library-tests/ir/types/irtypes.ql b/cpp/ql/test/library-tests/ir/types/irtypes.ql
@@ -1,6 +1,6 @@
 private import cpp
 private import semmle.code.cpp.ir.implementation.raw.IR
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 
 module IRTypesTest implements TestSig {
   string getARelevantTag() { result = "irtype" }

diff --git a/cpp/ql/test/query-tests/Critical/SizeCheck/SizeCheck.qlref b/cpp/ql/test/query-tests/Critical/SizeCheck/SizeCheck.qlref
@@ -1,2 +1,2 @@
 query: Critical/SizeCheck.ql
-postprocess: TestUtilities/InlineExpectationsTestQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/TaintedPath.qlref b/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/TaintedPath.qlref
@@ -1,2 +1,2 @@
 query: Security/CWE/CWE-022/TaintedPath.ql
-postprocess: TestUtilities/InlineExpectationsTestQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-193/AllocationToInvalidPointer.ql b/cpp/ql/test/query-tests/Security/CWE/CWE-193/AllocationToInvalidPointer.ql
@@ -1,6 +1,6 @@
 import cpp
 import semmle.code.cpp.security.InvalidPointerDereference.AllocationToInvalidPointer
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.code.cpp.ir.IR
 import semmle.code.cpp.dataflow.new.DataFlow
 

diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerToDereference.ql b/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerToDereference.ql
@@ -1,6 +1,6 @@
 import cpp
 import semmle.code.cpp.security.InvalidPointerDereference.InvalidPointerToDereference
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import semmle.code.cpp.ir.IR
 import semmle.code.cpp.dataflow.new.DataFlow
 

diff --git a/.../TestUtilities/InlineExpectationsTest.qll → ...lib/utils/test/InlineExpectationsTest.qll b/.../TestUtilities/InlineExpectationsTest.qll → ...lib/utils/test/InlineExpectationsTest.qll
diff --git a/...tUtilities/InlineExpectationsTestQuery.ql → ...utils/test/InlineExpectationsTestQuery.ql b/...tUtilities/InlineExpectationsTestQuery.ql → ...utils/test/InlineExpectationsTestQuery.ql
diff --git a/.../ql/test/TestUtilities/InlineFlowTest.qll → csharp/ql/lib/utils/test/InlineFlowTest.qll b/.../ql/test/TestUtilities/InlineFlowTest.qll → csharp/ql/lib/utils/test/InlineFlowTest.qll
diff --git a/...p/ql/test/TestUtilities/InlineMadTest.qll → csharp/ql/lib/utils/test/InlineMadTest.qll b/...p/ql/test/TestUtilities/InlineMadTest.qll → csharp/ql/lib/utils/test/InlineMadTest.qll
diff --git a/...l/test/TestUtilities/PrettyPrintModels.ql → ...rp/ql/lib/utils/test/PrettyPrintModels.ql b/...l/test/TestUtilities/PrettyPrintModels.ql → ...rp/ql/lib/utils/test/PrettyPrintModels.ql
diff --git a/...est/TestUtilities/ProvenancePathGraph.qll → ...ql/lib/utils/test/ProvenancePathGraph.qll b/...est/TestUtilities/ProvenancePathGraph.qll → ...ql/lib/utils/test/ProvenancePathGraph.qll
diff --git a/...s/internal/InlineExpectationsTestImpl.qll → ...t/internal/InlineExpectationsTestImpl.qll b/...s/internal/InlineExpectationsTestImpl.qll → ...t/internal/InlineExpectationsTestImpl.qll
diff --git a/csharp/ql/test/TestUtilities/inline-tests/PathProblemQuery.qlref b/csharp/ql/test/TestUtilities/inline-tests/PathProblemQuery.qlref
diff --git a/csharp/ql/test/TestUtilities/inline-tests/ProblemQuery.qlref b/csharp/ql/test/TestUtilities/inline-tests/ProblemQuery.qlref
diff --git a/csharp/ql/test/experimental/Security Features/CWE-759/HashWithoutSalt.qlref b/csharp/ql/test/experimental/Security Features/CWE-759/HashWithoutSalt.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security Features/CWE-759/HashWithoutSalt.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/csharp/ql/test/library-tests/dataflow/async/Async.ql b/csharp/ql/test/library-tests/dataflow/async/Async.ql
@@ -1,5 +1,5 @@
 import csharp
-import TestUtilities.ProvenancePathGraph::ShowProvenance<Taint::PathNode, Taint::PathGraph>
+import utils.test.ProvenancePathGraph::ShowProvenance<Taint::PathNode, Taint::PathGraph>
 
 class MySink extends DataFlow::ExprNode {
   MySink() {

diff --git a/csharp/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql b/csharp/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql
@@ -17,7 +17,7 @@ class StringConstCompareBarrier extends DataFlow::Node {
   }
 }
 
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import PathGraph
 
 module FlowConfig implements DataFlow::ConfigSig {

diff --git a/csharp/ql/test/library-tests/dataflow/collections/CollectionFlow.ql b/csharp/ql/test/library-tests/dataflow/collections/CollectionFlow.ql
@@ -3,7 +3,7 @@
  */
 
 import csharp
-import TestUtilities.ProvenancePathGraph::ShowProvenance<ArrayFlow::PathNode, ArrayFlow::PathGraph>
+import utils.test.ProvenancePathGraph::ShowProvenance<ArrayFlow::PathNode, ArrayFlow::PathGraph>
 
 module ArrayFlowConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node src) { src.asExpr() instanceof ObjectCreation }

diff --git a/csharp/ql/test/library-tests/dataflow/constructors/ConstructorFlow.ql b/csharp/ql/test/library-tests/dataflow/constructors/ConstructorFlow.ql
@@ -3,7 +3,7 @@
  */
 
 import csharp
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import ValueFlowTest<DefaultFlowConfig>
 import PathGraph
 

diff --git a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.ql b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.ql
@@ -4,7 +4,7 @@
 
 import csharp
 import semmle.code.csharp.dataflow.internal.ExternalFlow
-import TestUtilities.ProvenancePathGraph::ShowProvenance<Taint::PathNode, Taint::PathGraph>
+import utils.test.ProvenancePathGraph::ShowProvenance<Taint::PathNode, Taint::PathGraph>
 import ModelValidation
 
 module TaintConfig implements DataFlow::ConfigSig {

diff --git a/csharp/ql/test/library-tests/dataflow/fields/FieldFlow.ql b/csharp/ql/test/library-tests/dataflow/fields/FieldFlow.ql
@@ -3,7 +3,7 @@
  */
 
 import csharp
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import PathGraph
 

diff --git a/csharp/ql/test/library-tests/dataflow/flowsources/stored/database/dapper/DatabaseSources.ql b/csharp/ql/test/library-tests/dataflow/flowsources/stored/database/dapper/DatabaseSources.ql
@@ -1,6 +1,6 @@
 import csharp
 import semmle.code.csharp.security.dataflow.flowsources.FlowSources
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import TaintFlowTest<DatabaseConfig>
 
 module DatabaseConfig implements DataFlow::ConfigSig {

diff --git a/csharp/ql/test/library-tests/dataflow/flowsources/stored/file/Files.ql b/csharp/ql/test/library-tests/dataflow/flowsources/stored/file/Files.ql
@@ -1,6 +1,6 @@
 import csharp
 import semmle.code.csharp.security.dataflow.flowsources.FlowSources
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import TaintFlowTest<FilesConfig>
 
 module FilesConfig implements DataFlow::ConfigSig {

diff --git a/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.ql b/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.ql
@@ -4,7 +4,7 @@
 
 import csharp
 import Common
-import TestUtilities.ProvenancePathGraph::ShowProvenance<Flow::PathNode, Flow::PathGraph>
+import utils.test.ProvenancePathGraph::ShowProvenance<Flow::PathNode, Flow::PathGraph>
 
 from Flow::PathNode source, Flow::PathNode sink, string s
 where

diff --git a/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.ql b/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.ql
@@ -4,7 +4,7 @@
 
 import csharp
 import Common
-import TestUtilities.ProvenancePathGraph::ShowProvenance<Taint::PathNode, Taint::PathGraph>
+import utils.test.ProvenancePathGraph::ShowProvenance<Taint::PathNode, Taint::PathGraph>
 
 module Taint = TaintTracking::Global<FlowConfig>;
 

diff --git a/csharp/ql/test/library-tests/dataflow/operators/operatorFlow.ql b/csharp/ql/test/library-tests/dataflow/operators/operatorFlow.ql
@@ -3,7 +3,7 @@
  */
 
 import csharp
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import PathGraph
 

diff --git a/csharp/ql/test/library-tests/dataflow/patterns/PatternFlow.ql b/csharp/ql/test/library-tests/dataflow/patterns/PatternFlow.ql
@@ -3,7 +3,7 @@
  */
 
 import csharp
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import PathGraph
 

diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.ql b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.ql
@@ -3,7 +3,7 @@
  */
 
 import Test
-import TestUtilities.ProvenancePathGraph::ShowProvenance<ThreatModel::PathNode, ThreatModel::PathGraph>
+import utils.test.ProvenancePathGraph::ShowProvenance<ThreatModel::PathNode, ThreatModel::PathGraph>
 
 from ThreatModel::PathNode source, ThreatModel::PathNode sink
 where ThreatModel::flowPath(source, sink)

diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.ql b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.ql
@@ -4,7 +4,7 @@
  */
 
 import Test
-import TestUtilities.ProvenancePathGraph::ShowProvenance<ThreatModel::PathNode, ThreatModel::PathGraph>
+import utils.test.ProvenancePathGraph::ShowProvenance<ThreatModel::PathNode, ThreatModel::PathGraph>
 
 from ThreatModel::PathNode source, ThreatModel::PathNode sink
 where ThreatModel::flowPath(source, sink)

diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.ql b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.ql
@@ -4,7 +4,7 @@
  */
 
 import Test
-import TestUtilities.ProvenancePathGraph::ShowProvenance<ThreatModel::PathNode, ThreatModel::PathGraph>
+import utils.test.ProvenancePathGraph::ShowProvenance<ThreatModel::PathNode, ThreatModel::PathGraph>
 
 from ThreatModel::PathNode source, ThreatModel::PathNode sink
 where ThreatModel::flowPath(source, sink)

diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.ql b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.ql
@@ -3,7 +3,7 @@
  */
 
 import Test
-import TestUtilities.ProvenancePathGraph::ShowProvenance<ThreatModel::PathNode, ThreatModel::PathGraph>
+import utils.test.ProvenancePathGraph::ShowProvenance<ThreatModel::PathNode, ThreatModel::PathGraph>
 
 from ThreatModel::PathNode source, ThreatModel::PathNode sink
 where ThreatModel::flowPath(source, sink)

diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.ql b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.ql
@@ -4,7 +4,7 @@
  */
 
 import Test
-import TestUtilities.ProvenancePathGraph::ShowProvenance<ThreatModel::PathNode, ThreatModel::PathGraph>
+import utils.test.ProvenancePathGraph::ShowProvenance<ThreatModel::PathNode, ThreatModel::PathGraph>
 
 from ThreatModel::PathNode source, ThreatModel::PathNode sink
 where ThreatModel::flowPath(source, sink)

diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.ql b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.ql
@@ -5,7 +5,7 @@
  */
 
 import Test
-import TestUtilities.ProvenancePathGraph::ShowProvenance<ThreatModel::PathNode, ThreatModel::PathGraph>
+import utils.test.ProvenancePathGraph::ShowProvenance<ThreatModel::PathNode, ThreatModel::PathGraph>
 
 from ThreatModel::PathNode source, ThreatModel::PathNode sink
 where ThreatModel::flowPath(source, sink)

diff --git a/csharp/ql/test/library-tests/dataflow/tuples/Tuples.ql b/csharp/ql/test/library-tests/dataflow/tuples/Tuples.ql
@@ -3,7 +3,7 @@
  */
 
 import csharp
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import PathGraph
 

diff --git a/csharp/ql/test/library-tests/dataflow/typeflow-dispatch/TypeFlowDispatch.ql b/csharp/ql/test/library-tests/dataflow/typeflow-dispatch/TypeFlowDispatch.ql
@@ -3,7 +3,7 @@
  */
 
 import csharp
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import PathGraph