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

2025-12-16 16:53:25 +01:00 · 2024-11-12 16:38:21 +01:00
parent 91cfb30513
commit 0a1d2d0bbb
226 changed files with 226 additions and 226 deletions
--- a/java/ql/integration-tests/kotlin/all-platforms/default-parameter-mad-flow/test.ql
+++ b/java/ql/integration-tests/kotlin/all-platforms/default-parameter-mad-flow/test.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.TaintTracking
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 private import semmle.code.java.dataflow.ExternalFlow

 module Config implements DataFlow::ConfigSig {
--- a/java/ql/src/utils/flowtestcasegenerator/testHeader.qlfrag
+++ b/java/ql/src/utils/flowtestcasegenerator/testHeader.qlfrag
@@ -1,3 +1,3 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
--- a/java/ql/test-kotlin1/library-tests/dataflow/summaries/test.ql
+++ b/java/ql/test-kotlin1/library-tests/dataflow/summaries/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test-kotlin2/library-tests/dataflow/summaries/test.ql
+++ b/java/ql/test-kotlin2/library-tests/dataflow/summaries/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/experimental/query-tests/security/CWE-020/Log4jInjectionTest.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-020/Log4jInjectionTest.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-020/Log4jJndiInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-022/TaintedPath.ql
+++ b/java/ql/test/experimental/query-tests/security/CWE-022/TaintedPath.ql
@@ -1,5 +1,5 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import semmle.code.java.security.TaintedPathQuery
 import TaintFlowTestArgString<TaintedPathConfig, getArgString/2>

--- a/java/ql/test/experimental/query-tests/security/CWE-073/FilePathInjection.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-073/FilePathInjection.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-073/FilePathInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-078/CommandInjectionRuntimeExecLocal.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-078/CommandInjectionRuntimeExecLocal.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExecLocal.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-078/ExecTainted.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-078/ExecTainted.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-078/ExecTainted.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-089/src/main/MyBatisAnnotationSqlInjection.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-089/src/main/MyBatisAnnotationSqlInjection.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-089/src/main/MyBatisMapperXmlSqlInjection.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-089/src/main/MyBatisMapperXmlSqlInjection.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-094/BeanShellInjection.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-094/BeanShellInjection.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-094/BeanShellInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-094/JShellInjection.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-094/JShellInjection.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-094/JShellInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-094/JakartaExpressionInjection.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-094/JakartaExpressionInjection.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-094/JakartaExpressionInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-094/JythonInjection.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-094/JythonInjection.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-094/JythonInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-094/ScriptInjection.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-094/ScriptInjection.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-094/ScriptInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-200/InsecureWebResourceResponse.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-200/InsecureWebResourceResponse.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-200/InsecureWebResourceResponse.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-200/SensitiveAndroidFileLeak.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-200/SensitiveAndroidFileLeak.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-200/SensitiveAndroidFileLeak.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-208/NotConstantTimeCheckOnSignature/Test.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-208/NotConstantTimeCheckOnSignature/Test.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-208/PossibleTimingAttackAgainstSignature.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-208/TimingAttackAgainstSignagure/Test.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-208/TimingAttackAgainstSignagure/Test.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-208/TimingAttackAgainstSignature.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-299/DisabledRevocationChecking.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-299/DisabledRevocationChecking.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-299/DisabledRevocationChecking.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-327/UnsafeTlsVersion.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-327/UnsafeTlsVersion.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-327/UnsafeTlsVersion.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-346/UnvalidatedCors.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-346/UnvalidatedCors.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-346/UnvalidatedCors.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-347/Auth0NoVerifier.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-347/Auth0NoVerifier.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-347/Auth0NoVerifier.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-348/ClientSuppliedIpUsedInSecurityCheck.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-352/JsonpInjection.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-352/JsonpInjection.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-352/JsonpInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-400/LocalThreadResourceAbuse.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-400/LocalThreadResourceAbuse.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-400/LocalThreadResourceAbuse.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-400/ThreadResourceAbuse.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-470/LoadClassNoSignatureCheck.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-470/LoadClassNoSignatureCheck.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-470/LoadClassNoSignatureCheck.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-470/UnsafeReflection.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-470/UnsafeReflection.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-470/UnsafeReflection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-502/UnsafeDeserializationRmi.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-502/UnsafeDeserializationRmi.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-502/UnsafeDeserializationRmi.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-522-DecompressionBombs/test.ql
+++ b/java/ql/test/experimental/query-tests/security/CWE-522-DecompressionBombs/test.ql
@@ -1,6 +1,6 @@
 import java
 import experimental.semmle.code.java.security.DecompressionBombQuery
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import TaintFlowTestArgString<DecompressionBombsConfig, getArgString/2>

 string getArgString(DataFlow::Node src, DataFlow::Node sink) {
--- a/java/ql/test/experimental/query-tests/security/CWE-598/SensitiveGetQuery.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-598/SensitiveGetQuery.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-598/SensitiveGetQuery.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-600/UncaughtServletException.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-600/UncaughtServletException.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-600/UncaughtServletException.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-601/SpringUrlRedirect.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-601/SpringUrlRedirect.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-601/SpringUrlRedirect.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-625/PermissiveDotRegex.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-625/PermissiveDotRegex.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-625/PermissiveDotRegex.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-652/XQueryInjection.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-652/XQueryInjection.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-652/XQueryInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-755/NFEAndroidDoS.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-755/NFEAndroidDoS.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-755/NFEAndroidDoS.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/experimental/query-tests/security/CWE-759/HashWithoutSalt.qlref
+++ b/java/ql/test/experimental/query-tests/security/CWE-759/HashWithoutSalt.qlref
@@ -1,2 +1,2 @@
 query: experimental/Security/CWE/CWE-759/HashWithoutSalt.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/ext/TestModels/test.ql
+++ b/java/ql/test/ext/TestModels/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/dataflow/callback-dispatch/test.ql
+++ b/java/ql/test/library-tests/dataflow/callback-dispatch/test.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.DataFlow
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 module Config implements DataFlow::ConfigSig {
  predicate isSource(DataFlow::Node n) { n.asExpr().(MethodCall).getMethod().hasName("source") }
--- a/java/ql/test/library-tests/dataflow/callctx/test.ql
+++ b/java/ql/test/library-tests/dataflow/callctx/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/dataflow/capture/inlinetest.ql
+++ b/java/ql/test/library-tests/dataflow/capture/inlinetest.ql
@@ -1,3 +1,3 @@
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/dataflow/collections/containerflow.ql
+++ b/java/ql/test/library-tests/dataflow/collections/containerflow.ql
@@ -1,5 +1,5 @@
 import java
 import semmle.code.java.dataflow.DataFlow
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.ql
+++ b/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.FlowSources
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 class TestRemoteFlowSource extends RemoteFlowSource {
  TestRemoteFlowSource() { this.asParameter().hasName("source") }
--- a/java/ql/test/library-tests/dataflow/field-value/test.ql
+++ b/java/ql/test/library-tests/dataflow/field-value/test.ql
@@ -1,5 +1,5 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest

 module FieldValueConfig implements DataFlow::ConfigSig {
  predicate isSource(DataFlow::Node source) { source instanceof DataFlow::FieldValueNode }
--- a/java/ql/test/library-tests/dataflow/flowfeature/flow.ql
+++ b/java/ql/test/library-tests/dataflow/flowfeature/flow.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.DataFlow
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 module Base {
  predicate isSource(DataFlow::Node n) { n.asExpr().(MethodCall).getMethod().hasName("source") }
--- a/java/ql/test/library-tests/dataflow/fluent-methods/flow.ql
+++ b/java/ql/test/library-tests/dataflow/fluent-methods/flow.ql
@@ -1,7 +1,7 @@
 import java
 import semmle.code.java.dataflow.DataFlow
 import semmle.code.java.dataflow.FlowSteps
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph

--- a/java/ql/test/library-tests/dataflow/implicit-read/test.ql
+++ b/java/ql/test/library-tests/dataflow/implicit-read/test.ql
@@ -1,5 +1,5 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest

 module TestConfig implements DataFlow::ConfigSig {
  predicate isSource(DataFlow::Node source) { DefaultFlowConfig::isSource(source) }
--- a/java/ql/test/library-tests/dataflow/range-analysis-inline/range.ql
+++ b/java/ql/test/library-tests/dataflow/range-analysis-inline/range.ql
@@ -5,7 +5,7 @@

 import java
 import semmle.code.java.dataflow.RangeAnalysis
-private import TestUtilities.InlineExpectationsTest as IET
+private import utils.test.InlineExpectationsTest as IET

 module RangeTest implements IET::TestSig {
  string getARelevantTag() { result = "bound" }
--- a/java/ql/test/library-tests/dataflow/state/test.ql
+++ b/java/ql/test/library-tests/dataflow/state/test.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.TaintTracking
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import DataFlow

 predicate src(Node n, string s) {
--- a/java/ql/test/library-tests/dataflow/stream-collect/test.ql
+++ b/java/ql/test/library-tests/dataflow/stream-collect/test.ql
@@ -1,3 +1,3 @@
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/dataflow/stream-read/test.ql
+++ b/java/ql/test/library-tests/dataflow/stream-read/test.ql
@@ -1,3 +1,3 @@
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/dataflow/subpaths/flow.ql
+++ b/java/ql/test/library-tests/dataflow/subpaths/flow.ql
@@ -1,3 +1,3 @@
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/dataflow/synth-global/test.ql
+++ b/java/ql/test/library-tests/dataflow/synth-global/test.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.ExternalFlow
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import ModelValidation
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/dataflow/taint-format/test.ql
+++ b/java/ql/test/library-tests/dataflow/taint-format/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/dataflow/taint-gson/dataFlow.ql
+++ b/java/ql/test/library-tests/dataflow/taint-gson/dataFlow.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/dataflow/taint-jackson/dataFlow.ql
+++ b/java/ql/test/library-tests/dataflow/taint-jackson/dataFlow.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/dataflow/taintsources/local.ql
+++ b/java/ql/test/library-tests/dataflow/taintsources/local.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.FlowSources
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 predicate isTestSink(DataFlow::Node n) {
  exists(MethodCall ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
--- a/java/ql/test/library-tests/dataflow/taintsources/remote.ql
+++ b/java/ql/test/library-tests/dataflow/taintsources/remote.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.FlowSources
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 predicate isTestSink(DataFlow::Node n) {
  exists(MethodCall ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
--- a/java/ql/test/library-tests/dataflow/taintsources/reversedns.ql
+++ b/java/ql/test/library-tests/dataflow/taintsources/reversedns.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.FlowSources
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 predicate isTestSink(DataFlow::Node n) {
  exists(MethodCall ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
--- a/java/ql/test/library-tests/dataflow/typeflow-dispatch/test.ql
+++ b/java/ql/test/library-tests/dataflow/typeflow-dispatch/test.ql
@@ -1,3 +1,3 @@
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/JaxWs/JaxRs.ql
+++ b/java/ql/test/library-tests/frameworks/JaxWs/JaxRs.ql
@@ -1,7 +1,7 @@
 import java
 import semmle.code.java.frameworks.JaxWS
 import semmle.code.java.security.XSS
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 module JaxRsTest implements TestSig {
  string getARelevantTag() {
--- a/java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql
+++ b/java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql
@@ -1,7 +1,7 @@
 import java
 import semmle.code.java.dataflow.TaintTracking
 import semmle.code.java.dataflow.FlowSources
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest

 module Config implements DataFlow::ConfigSig {
  predicate isSource(DataFlow::Node node) {
--- a/java/ql/test/library-tests/frameworks/JaxWs/JaxWsEndpoint.ql
+++ b/java/ql/test/library-tests/frameworks/JaxWs/JaxWsEndpoint.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.frameworks.JaxWS
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 module JaxWsEndpointTest implements TestSig {
  string getARelevantTag() { result = ["JaxWsEndpoint", "JaxWsEndpointRemoteMethod"] }
--- a/java/ql/test/library-tests/frameworks/JaxWs/UrlRedirect.qlref
+++ b/java/ql/test/library-tests/frameworks/JaxWs/UrlRedirect.qlref
@@ -1,2 +1,2 @@
 query: Security/CWE/CWE-601/UrlRedirect.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
--- a/java/ql/test/library-tests/frameworks/android/asynctask/test.ql
+++ b/java/ql/test/library-tests/frameworks/android/asynctask/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/android/content-provider-summaries/test.ql
+++ b/java/ql/test/library-tests/frameworks/android/content-provider-summaries/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/android/content-provider/test.ql
+++ b/java/ql/test/library-tests/frameworks/android/content-provider/test.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.FlowSources
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest

 module ProviderTaintFlowConfig implements DataFlow::ConfigSig {
  predicate isSource(DataFlow::Node n) { n instanceof ActiveThreatModelSource }
--- a/java/ql/test/library-tests/frameworks/android/external-storage/test.ql
+++ b/java/ql/test/library-tests/frameworks/android/external-storage/test.ql
@@ -1,7 +1,7 @@
 import java
 import semmle.code.java.dataflow.DataFlow
 import semmle.code.java.dataflow.FlowSources
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest

 module Config implements DataFlow::ConfigSig {
  predicate isSource(DataFlow::Node src) { src instanceof ActiveThreatModelSource }
--- a/java/ql/test/library-tests/frameworks/android/flow-steps/test.ql
+++ b/java/ql/test/library-tests/frameworks/android/flow-steps/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/android/intent/test.ql
+++ b/java/ql/test/library-tests/frameworks/android/intent/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/android/notification/test.ql
+++ b/java/ql/test/library-tests/frameworks/android/notification/test.ql
@@ -1,5 +1,5 @@
 import java
 import semmle.code.java.frameworks.android.Intent
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/android/slice/test.ql
+++ b/java/ql/test/library-tests/frameworks/android/slice/test.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.TaintTracking
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import semmle.code.java.dataflow.FlowSources

 module SliceValueFlowConfig implements DataFlow::ConfigSig {
--- a/java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSourceTest.ql
+++ b/java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSourceTest.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.FlowSources
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest

 module SourceValueFlowConfig implements DataFlow::ConfigSig {
  predicate isSource(DataFlow::Node src) { src instanceof ActiveThreatModelSource }
--- a/java/ql/test/library-tests/frameworks/android/taint-database/flowSteps.ql
+++ b/java/ql/test/library-tests/frameworks/android/taint-database/flowSteps.ql
@@ -2,7 +2,7 @@ import semmle.code.java.dataflow.DataFlow
 import semmle.code.java.dataflow.TaintTracking
 import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.security.QueryInjection
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 module Config implements DataFlow::ConfigSig {
  predicate isSource(DataFlow::Node source) {
--- a/java/ql/test/library-tests/frameworks/android/taint-database/sinks.ql
+++ b/java/ql/test/library-tests/frameworks/android/taint-database/sinks.ql
@@ -2,7 +2,7 @@ import semmle.code.java.dataflow.DataFlow
 import semmle.code.java.dataflow.TaintTracking
 import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.security.QueryInjection
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 module Config implements DataFlow::ConfigSig {
  predicate isSource(DataFlow::Node source) {
--- a/java/ql/test/library-tests/frameworks/android/uri/test.ql
+++ b/java/ql/test/library-tests/frameworks/android/uri/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/android/widget/test.ql
+++ b/java/ql/test/library-tests/frameworks/android/widget/test.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.FlowSources
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph

--- a/java/ql/test/library-tests/frameworks/apache-ant/test.ql
+++ b/java/ql/test/library-tests/frameworks/apache-ant/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/apache-collections/test.ql
+++ b/java/ql/test/library-tests/frameworks/apache-collections/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/apache-commons-compress/test.ql
+++ b/java/ql/test/library-tests/frameworks/apache-commons-compress/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/flow.ql
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/flow.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/apache-http/flow.ql
+++ b/java/ql/test/library-tests/frameworks/apache-http/flow.ql
@@ -3,7 +3,7 @@ import semmle.code.java.dataflow.TaintTracking
 import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.security.XSS
 import semmle.code.java.security.UrlRedirect
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest

 module Config implements DataFlow::ConfigSig {
  predicate isSource(DataFlow::Node n) {
--- a/java/ql/test/library-tests/frameworks/gson/test.ql
+++ b/java/ql/test/library-tests/frameworks/gson/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/guava/generated/cache/test.ql
+++ b/java/ql/test/library-tests/frameworks/guava/generated/cache/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/guava/generated/collect/test.ql
+++ b/java/ql/test/library-tests/frameworks/guava/generated/collect/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/guava/handwritten/flow.ql
+++ b/java/ql/test/library-tests/frameworks/guava/handwritten/flow.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.TaintTracking
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 module TaintFlowConfig implements DataFlow::ConfigSig {
  predicate isSource(DataFlow::Node n) { n.asExpr().(MethodCall).getMethod().hasName("taint") }
--- a/java/ql/test/library-tests/frameworks/hudson/test.ql
+++ b/java/ql/test/library-tests/frameworks/hudson/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/jackson/test.ql
+++ b/java/ql/test/library-tests/frameworks/jackson/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/javax-json/test.ql
+++ b/java/ql/test/library-tests/frameworks/javax-json/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/jdk/java.io/test.ql
+++ b/java/ql/test/library-tests/frameworks/jdk/java.io/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/jdk/java.net/test.ql
+++ b/java/ql/test/library-tests/frameworks/jdk/java.net/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/jdk/java.nio.file/test.ql
+++ b/java/ql/test/library-tests/frameworks/jdk/java.nio.file/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/jms/FlowTest.ql
+++ b/java/ql/test/library-tests/frameworks/jms/FlowTest.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.FlowSources
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 module TestConfig implements DataFlow::ConfigSig {
  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
--- a/java/ql/test/library-tests/frameworks/jms/RemoteSourcesTest.ql
+++ b/java/ql/test/library-tests/frameworks/jms/RemoteSourcesTest.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.FlowSources
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 module JmsRemoteSourcesTest implements TestSig {
  string getARelevantTag() { result = "source" }
--- a/java/ql/test/library-tests/frameworks/json-java/test.ql
+++ b/java/ql/test/library-tests/frameworks/json-java/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/java/ql/test/library-tests/frameworks/lastaflute/test.ql
+++ b/java/ql/test/library-tests/frameworks/lastaflute/test.ql
@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.FlowSources
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest

 module Config implements DataFlow::ConfigSig {
  predicate isSource(DataFlow::Node n) { n instanceof RemoteFlowSource }
--- a/java/ql/test/library-tests/frameworks/netty/generated/test.ql
+++ b/java/ql/test/library-tests/frameworks/netty/generated/test.ql
@@ -1,4 +1,4 @@
 import java
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
--- a/Show More
+++ b/Show More