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

2025-12-16 16:53:25 +01:00 · 2024-11-13 09:27:45 +01:00
parent c4b4be9372
commit 82f8a796e1
63 changed files with 64 additions and 64 deletions
--- a/Features/CWE-759/HashWithoutSalt.qlref
+++ b/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
--- 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() {
--- 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 {
--- 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 }
--- 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

--- 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 {
--- 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

--- 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 {
--- 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 {
--- 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
--- 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>;

--- 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

--- 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

--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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

--- 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

--- a/csharp/ql/test/library-tests/dataflow/types/Types.ql
+++ b/csharp/ql/test/library-tests/dataflow/types/Types.ql
@@ -3,7 +3,7 @@
 */

 import csharp
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import PathGraph

 module TypesConfig implements DataFlow::ConfigSig {
--- a/csharp/ql/test/library-tests/frameworks/EntityFramework/Dataflow.ql
+++ b/csharp/ql/test/library-tests/frameworks/EntityFramework/Dataflow.ql
@@ -3,7 +3,7 @@
 */

 import csharp
-import TestUtilities.ProvenancePathGraph::ShowProvenance<Taint::PathNode, Taint::PathGraph>
+import utils.test.ProvenancePathGraph::ShowProvenance<Taint::PathNode, Taint::PathGraph>

 module TaintConfig implements DataFlow::ConfigSig {
  predicate isSource(DataFlow::Node node) { node.asExpr().getValue() = "tainted" }
--- a/Features/CWE-020/UntrustedDataToExternalAPI.qlref
+++ b/Features/CWE-020/UntrustedDataToExternalAPI.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-020/UntrustedDataToExternalAPI.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-022/TaintedPath/TaintedPath.qlref
+++ b/Features/CWE-022/TaintedPath/TaintedPath.qlref
@@ -1,3 +1,3 @@
 query: Security Features/CWE-022/TaintedPath.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql

--- a/Features/CWE-022/ZipSlip/ZipSlip.qlref
+++ b/Features/CWE-022/ZipSlip/ZipSlip.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-022/ZipSlip.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-078/CommandInjection.qlref
+++ b/Features/CWE-078/CommandInjection.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-078/CommandInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-079/StoredXSS/StoredXSS.qlref
+++ b/Features/CWE-079/StoredXSS/StoredXSS.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-079/XSS.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/csharp/ql/test/query-tests/Security
+++ b/csharp/ql/test/query-tests/Security
@@ -1,4 +1,4 @@
 query: Security Features/CWE-079/XSS.ql
 postprocess:
-  - TestUtilities/PrettyPrintModels.ql
-  - TestUtilities/InlineExpectationsTestQuery.ql
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
--- a/csharp/ql/test/query-tests/Security
+++ b/csharp/ql/test/query-tests/Security
@@ -1,2 +1,2 @@
 query: Security Features/CWE-079/XSS.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-089/SqlInjection.qlref
+++ b/Features/CWE-089/SqlInjection.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-089/SqlInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-090/LDAPInjection.qlref
+++ b/Features/CWE-090/LDAPInjection.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-090/LDAPInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-091/XMLInjection/XMLInjection.qlref
+++ b/Features/CWE-091/XMLInjection/XMLInjection.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-091/XMLInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-094/CodeInjection.qlref
+++ b/Features/CWE-094/CodeInjection.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-094/CodeInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-099/ResourceInjection.qlref
+++ b/Features/CWE-099/ResourceInjection.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-099/ResourceInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-112/MissingXMLValidation.qlref
+++ b/Features/CWE-112/MissingXMLValidation.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-112/MissingXMLValidation.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-114/AssemblyPathInjection/AssemblyPathInjection.qlref
+++ b/Features/CWE-114/AssemblyPathInjection/AssemblyPathInjection.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-114/AssemblyPathInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/csharp/ql/test/query-tests/Security
+++ b/csharp/ql/test/query-tests/Security
@@ -1,2 +1,2 @@
 query: Security Features/CWE-117/LogForging.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-134/UncontrolledFormatString.qlref
+++ b/Features/CWE-134/UncontrolledFormatString.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-134/UncontrolledFormatString.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-201/ExposureInTransmittedData/ExposureInTransmittedData.qlref
+++ b/Features/CWE-201/ExposureInTransmittedData/ExposureInTransmittedData.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-201/ExposureInTransmittedData.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-209/ExceptionInformationExposure.qlref
+++ b/Features/CWE-209/ExceptionInformationExposure.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-209/ExceptionInformationExposure.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-321/HardcodedSymmetricEncryptionKey/HardcodedSymmetricEncryptionKey.qlref
+++ b/Features/CWE-321/HardcodedSymmetricEncryptionKey/HardcodedSymmetricEncryptionKey.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-321/HardcodedEncryptionKey.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-338/InsecureRandomness.qlref
+++ b/Features/CWE-338/InsecureRandomness.qlref
@@ -1,2 +1,2 @@
 query: Security Features/InsecureRandomness.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-502/UnsafeDeserializationUntrustedInput/UnsafeDeserializationUntrustedInput.qlref
+++ b/Features/CWE-502/UnsafeDeserializationUntrustedInput/UnsafeDeserializationUntrustedInput.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-502/UnsafeDeserializationUntrustedInput.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-502/UnsafeDeserializationUntrustedInputNewtonsoftJson/UnsafeDeserializationUntrustedInput.qlref
+++ b/Features/CWE-502/UnsafeDeserializationUntrustedInputNewtonsoftJson/UnsafeDeserializationUntrustedInput.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-502/UnsafeDeserializationUntrustedInput.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-601/UrlRedirect/UrlRedirect.qlref
+++ b/Features/CWE-601/UrlRedirect/UrlRedirect.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-601/UrlRedirect.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-611/UntrustedDataInsecureXml.qlref
+++ b/Features/CWE-611/UntrustedDataInsecureXml.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-611/UntrustedDataInsecureXml.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-611/UseXmlSecureResolver.qlref
+++ b/Features/CWE-611/UseXmlSecureResolver.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-611/UseXmlSecureResolver.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-643/XPathInjection.qlref
+++ b/Features/CWE-643/XPathInjection.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-643/XPathInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/csharp/ql/test/query-tests/Security
+++ b/csharp/ql/test/query-tests/Security
@@ -1,2 +1,2 @@
 query: Security Features/CWE-730/ReDoS.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-730/ReDoSGlobalTimeout/ReDoS.qlref
+++ b/Features/CWE-730/ReDoSGlobalTimeout/ReDoS.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-730/ReDoS.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-730/RegexInjection/RegexInjection.qlref
+++ b/Features/CWE-730/RegexInjection/RegexInjection.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-730/RegexInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-807/ConditionalBypass.qlref
+++ b/Features/CWE-807/ConditionalBypass.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-807/ConditionalBypass.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Features/CWE-838/InappropriateEncoding.qlref
+++ b/Features/CWE-838/InappropriateEncoding.qlref
@@ -1,2 +1,2 @@
 query: Security Features/CWE-838/InappropriateEncoding.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/Code/UnusedLabel/UnusedLabel.qlref
+++ b/Code/UnusedLabel/UnusedLabel.qlref
@@ -1,2 +1,2 @@
 query: Useless code/UnusedLabel.ql
-postprocess: TestUtilities/InlineExpectationsTestQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
--- a/csharp/ql/test/utils/inline-tests/PathProblemQuery.qlref
+++ b/csharp/ql/test/utils/inline-tests/PathProblemQuery.qlref
@@ -1,2 +1,2 @@
 query: utils/inline-tests/queries/PathProblemQuery.ql
-postprocess: TestUtilities/InlineExpectationsTestQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
--- a/csharp/ql/test/utils/inline-tests/ProblemQuery.qlref
+++ b/csharp/ql/test/utils/inline-tests/ProblemQuery.qlref
@@ -1,2 +1,2 @@
 query: utils/inline-tests/queries/ProblemQuery.ql
-postprocess: TestUtilities/InlineExpectationsTestQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
--- a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql
+++ b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql
@@ -1,6 +1,6 @@
 import csharp
 import utils.modelgenerator.internal.CaptureModels
-import TestUtilities.InlineMadTest
+import utils.test.InlineMadTest

 module InlineMadTestConfig implements InlineMadTestConfigSig {
  string getCapturedModel(Callable c) { result = ContentSensitive::captureFlow(c, _) }
--- a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql
+++ b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql
@@ -1,6 +1,6 @@
 import csharp
 import utils.modelgenerator.internal.CaptureModels
-import TestUtilities.InlineMadTest
+import utils.test.InlineMadTest

 module InlineMadTestConfig implements InlineMadTestConfigSig {
  string getCapturedModel(Callable c) { result = captureNoFlow(c) }
--- a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSinkModels.ql
+++ b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSinkModels.ql
@@ -1,6 +1,6 @@
 import csharp
 import utils.modelgenerator.internal.CaptureModels
-import TestUtilities.InlineMadTest
+import utils.test.InlineMadTest

 module InlineMadTestConfig implements InlineMadTestConfigSig {
  string getCapturedModel(Callable c) { result = captureSink(c) }
--- a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSourceModels.ql
+++ b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSourceModels.ql
@@ -1,6 +1,6 @@
 import csharp
 import utils.modelgenerator.internal.CaptureModels
-import TestUtilities.InlineMadTest
+import utils.test.InlineMadTest

 module InlineMadTestConfig implements InlineMadTestConfigSig {
  string getCapturedModel(Callable c) { result = captureSource(c) }
--- a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql
+++ b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql
@@ -1,6 +1,6 @@
 import csharp
 import utils.modelgenerator.internal.CaptureModels
-import TestUtilities.InlineMadTest
+import utils.test.InlineMadTest

 module InlineMadTestConfig implements InlineMadTestConfigSig {
  string getCapturedModel(Callable c) { result = captureFlow(c) }
--- a/csharp/ql/test/utils/modelgenerator/typebasedflow/CaptureTypeBasedSummaryModels.ql
+++ b/csharp/ql/test/utils/modelgenerator/typebasedflow/CaptureTypeBasedSummaryModels.ql
@@ -1,5 +1,5 @@
 import csharp
-import TestUtilities.InlineMadTest
+import utils.test.InlineMadTest
 import utils.modelgenerator.internal.CaptureTypeBasedSummaryModels

 module InlineMadTestConfig implements InlineMadTestConfigSig {