C#/Java: Use test utilities shipped with CodeQL.

michaelnebel · michaelnebel · commit e08ab329d6aa · 2025-01-13T14:33:15.000+01:00
diff --git a/csharp/test/TestUtilities/PrettyPrintModels.ql b/csharp/test/TestUtilities/PrettyPrintModels.ql
diff --git a/csharp/test/security/CWE-328/WeakHashingAlgorithms.qlref b/csharp/test/security/CWE-328/WeakHashingAlgorithms.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-328/WeakHashingAlgorithms.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/csharp/test/security/CWE-328/WeakPasswordHashing.qlref b/csharp/test/security/CWE-328/WeakPasswordHashing.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-328/WeakPasswordHashing.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/csharp/test/security/CWE-328/WeakSensitiveDataHashing.qlref b/csharp/test/security/CWE-328/WeakSensitiveDataHashing.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-328/WeakSensitiveDataHashing.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/csharp/test/security/CWE-759/HashWithoutSalt.qlref b/csharp/test/security/CWE-759/HashWithoutSalt.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-759/HashWithoutSalt.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/csharp/test/security/CWE-760/HardcodedSalt.qlref b/csharp/test/security/CWE-760/HardcodedSalt.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-760/HardcodedSalt.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/TestUtilities/InlineExpectationsTest.qll b/java/test/TestUtilities/InlineExpectationsTest.qll
diff --git a/java/test/TestUtilities/InlineFlowTest.qll b/java/test/TestUtilities/InlineFlowTest.qll
diff --git a/java/test/TestUtilities/InlineMadTest.qll b/java/test/TestUtilities/InlineMadTest.qll
diff --git a/java/test/TestUtilities/PrettyPrintModels.ql b/java/test/TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/TestUtilities/internal/InlineExpectationsTestImpl.qll b/java/test/TestUtilities/internal/InlineExpectationsTestImpl.qll
diff --git a/java/test/security/CWE-020/Log4jInjectionTest.qlref b/java/test/security/CWE-020/Log4jInjectionTest.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-020/Log4jJndiInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-022/TaintedPath.ql b/java/test/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>
 
diff --git a/java/test/security/CWE-073/FilePathInjection.qlref b/java/test/security/CWE-073/FilePathInjection.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-073/FilePathInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-078/CommandInjectionRuntimeExecLocal.qlref b/java/test/security/CWE-078/CommandInjectionRuntimeExecLocal.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-078/CommandInjectionRuntimeExecLocal.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-078/CommandInjectionRuntimeExecTest.qlref b/java/test/security/CWE-078/CommandInjectionRuntimeExecTest.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-078/CommandInjectionRuntimeExecTest.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-078/CommandInjectionRuntimeExecTestPath.qlref b/java/test/security/CWE-078/CommandInjectionRuntimeExecTestPath.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-078/CommandInjectionRuntimeExecTestPath.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-078/ExecTainted.qlref b/java/test/security/CWE-078/ExecTainted.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-078/ExecTainted.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-089/src/main/MyBatisAnnotationSqlInjection.qlref b/java/test/security/CWE-089/src/main/MyBatisAnnotationSqlInjection.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-089/MyBatisAnnotationSqlInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-089/src/main/MyBatisMapperXmlSqlInjection.qlref b/java/test/security/CWE-089/src/main/MyBatisMapperXmlSqlInjection.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-089/MyBatisMapperXmlSqlInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-094/BeanShellInjection.qlref b/java/test/security/CWE-094/BeanShellInjection.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-094/BeanShellInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-094/JShellInjection.qlref b/java/test/security/CWE-094/JShellInjection.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-094/JShellInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-094/JakartaExpressionInjection.qlref b/java/test/security/CWE-094/JakartaExpressionInjection.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-094/JakartaExpressionInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-094/JythonInjection.qlref b/java/test/security/CWE-094/JythonInjection.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-094/JythonInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-094/ScriptInjection.qlref b/java/test/security/CWE-094/ScriptInjection.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-094/ScriptInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-1004/SensitiveCookieNotHttpOnly.qlref b/java/test/security/CWE-1004/SensitiveCookieNotHttpOnly.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-1004/SensitiveCookieNotHttpOnly.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-200/InsecureWebResourceResponse.qlref b/java/test/security/CWE-200/InsecureWebResourceResponse.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-200/InsecureWebResourceResponse.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-200/SensitiveAndroidFileLeak.qlref b/java/test/security/CWE-200/SensitiveAndroidFileLeak.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-200/SensitiveAndroidFileLeak.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-208/NotConstantTimeCheckOnSignature/Test.qlref b/java/test/security/CWE-208/NotConstantTimeCheckOnSignature/Test.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-208/PossibleTimingAttackAgainstSignature.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-208/TimingAttackAgainstSignagure/Test.qlref b/java/test/security/CWE-208/TimingAttackAgainstSignagure/Test.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-208/TimingAttackAgainstSignature.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-299/DisabledRevocationChecking.qlref b/java/test/security/CWE-299/DisabledRevocationChecking.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-299/DisabledRevocationChecking.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-326/Base64Encryption.qlref b/java/test/security/CWE-326/Base64Encryption.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-326/Base64Encryption.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-327/UnsafeTlsVersion.qlref b/java/test/security/CWE-327/UnsafeTlsVersion.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-327/UnsafeTlsVersion.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-346/UnvalidatedCors.qlref b/java/test/security/CWE-346/UnvalidatedCors.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-346/UnvalidatedCors.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-347/Auth0NoVerifier.qlref b/java/test/security/CWE-347/Auth0NoVerifier.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-347/Auth0NoVerifier.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.qlref b/java/test/security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-352/JsonpInjection.qlref b/java/test/security/CWE-352/JsonpInjection.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-352/JsonpInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-400/LocalThreadResourceAbuse.qlref b/java/test/security/CWE-400/LocalThreadResourceAbuse.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-400/LocalThreadResourceAbuse.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-400/ThreadResourceAbuse.qlref b/java/test/security/CWE-400/ThreadResourceAbuse.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-400/ThreadResourceAbuse.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-470/LoadClassNoSignatureCheck.qlref b/java/test/security/CWE-470/LoadClassNoSignatureCheck.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-470/LoadClassNoSignatureCheck.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-470/UnsafeReflection.qlref b/java/test/security/CWE-470/UnsafeReflection.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-470/UnsafeReflection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-502/UnsafeDeserializationRmi.qlref b/java/test/security/CWE-502/UnsafeDeserializationRmi.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-502/UnsafeDeserializationRmi.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-522-DecompressionBombs/TestDecompressionBombs.ql b/java/test/security/CWE-522-DecompressionBombs/TestDecompressionBombs.ql
@@ -1,6 +1,6 @@
 import java
 import 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) {
diff --git a/java/test/security/CWE-532/SensitiveInformation.qlref b/java/test/security/CWE-532/SensitiveInformation.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-532/SensitiveInformation.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-598/SensitiveGetQuery.qlref b/java/test/security/CWE-598/SensitiveGetQuery.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-598/SensitiveGetQuery.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-600/UncaughtServletException.qlref b/java/test/security/CWE-600/UncaughtServletException.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-600/UncaughtServletException.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-601/SpringUrlRedirect.qlref b/java/test/security/CWE-601/SpringUrlRedirect.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-601/SpringUrlRedirect.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-611/XXELocal.qlref b/java/test/security/CWE-611/XXELocal.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-611/XXELocal.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-625/PermissiveDotRegex.qlref b/java/test/security/CWE-625/PermissiveDotRegex.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-625/PermissiveDotRegex.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-652/XQueryInjection.qlref b/java/test/security/CWE-652/XQueryInjection.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-652/XQueryInjection.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-755/NFEAndroidDoS.qlref b/java/test/security/CWE-755/NFEAndroidDoS.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-755/NFEAndroidDoS.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-759/HashWithoutSalt.qlref b/java/test/security/CWE-759/HashWithoutSalt.qlref
@@ -1,2 +1,2 @@
 query: security/CWE-759/HashWithoutSalt.ql
-postprocess: TestUtilities/PrettyPrintModels.ql
+postprocess: utils/test/PrettyPrintModels.ql

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`query: security/CWE-328/WeakHashingAlgorithms.ql`
`2`		`-postprocess: TestUtilities/PrettyPrintModels.ql`
	`2`	`+postprocess: utils/test/PrettyPrintModels.ql`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`query: security/CWE-328/WeakPasswordHashing.ql`
`2`		`-postprocess: TestUtilities/PrettyPrintModels.ql`
	`2`	`+postprocess: utils/test/PrettyPrintModels.ql`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`query: security/CWE-328/WeakSensitiveDataHashing.ql`
`2`		`-postprocess: TestUtilities/PrettyPrintModels.ql`
	`2`	`+postprocess: utils/test/PrettyPrintModels.ql`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`query: security/CWE-759/HashWithoutSalt.ql`
`2`		`-postprocess: TestUtilities/PrettyPrintModels.ql`
	`2`	`+postprocess: utils/test/PrettyPrintModels.ql`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`query: security/CWE-760/HardcodedSalt.ql`
`2`		`-postprocess: TestUtilities/PrettyPrintModels.ql`
	`2`	`+postprocess: utils/test/PrettyPrintModels.ql`