Merge pull request #17968 from michaelnebel/java/movetestutils

Move test utilities to the query pack.
2026-04-30 19:26:02 +02:00 · 2024-12-16 13:41:30 +01:00
parent 31717524f0 0bfc1b6ea8
commit aaf0cd5dee
667 changed files with 623 additions and 623 deletions
--- a/rust/ql/lib/utils/test/InlineExpectationsTest.qll
+++ b/rust/ql/lib/utils/test/InlineExpectationsTest.qll
--- a/rust/ql/lib/utils/test/InlineExpectationsTestQuery.ql
+++ b/rust/ql/lib/utils/test/InlineExpectationsTestQuery.ql
--- a/rust/ql/lib/utils/test/InlineFlowTest.qll
+++ b/rust/ql/lib/utils/test/InlineFlowTest.qll
--- a/rust/ql/lib/utils/test/PrettyPrintModels.ql
+++ b/rust/ql/lib/utils/test/PrettyPrintModels.ql
--- a/rust/ql/lib/utils/test/ProvenancePathGraph.qll
+++ b/rust/ql/lib/utils/test/ProvenancePathGraph.qll
--- a/rust/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
+++ b/rust/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
--- a/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql
+++ b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql
@@ -3,7 +3,7 @@
 */

 import rust
-import utils.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import ValueFlow::PathGraph

--- a/rust/ql/test/library-tests/dataflow/global/inline-flow.ql
+++ b/rust/ql/test/library-tests/dataflow/global/inline-flow.ql
@@ -3,7 +3,7 @@
 */

 import rust
-import utils.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import ValueFlow::PathGraph

--- a/rust/ql/test/library-tests/dataflow/local/inline-flow.ql
+++ b/rust/ql/test/library-tests/dataflow/local/inline-flow.ql
@@ -3,7 +3,7 @@
 */

 import rust
-import utils.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import ValueFlow::PathGraph

--- a/rust/ql/test/library-tests/dataflow/models/models.ql
+++ b/rust/ql/test/library-tests/dataflow/models/models.ql
@@ -3,7 +3,7 @@
 */

 import rust
-import utils.InlineFlowTest
+import utils.test.InlineFlowTest
 import codeql.rust.dataflow.DataFlow
 import codeql.rust.dataflow.FlowSummary
 import codeql.rust.dataflow.TaintTracking
--- a/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql
+++ b/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql
@@ -1,7 +1,7 @@
 import rust
 import codeql.rust.dataflow.DataFlow
 import codeql.rust.Concepts
-import utils.InlineFlowTest
+import utils.test.InlineFlowTest

 /**
 * Configuration for flow from any threat model source to an argument of the function `sink`.
--- a/rust/ql/test/library-tests/dataflow/sources/TaintSources.qlref
+++ b/rust/ql/test/library-tests/dataflow/sources/TaintSources.qlref
@@ -1,2 +1,2 @@
 query: queries/summary/TaintSources.ql
-postprocess: utils/InlineExpectationsTestQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
--- a/rust/ql/test/library-tests/dataflow/taint/inline-taint-flow.ql
+++ b/rust/ql/test/library-tests/dataflow/taint/inline-taint-flow.ql
@@ -3,7 +3,7 @@
 */

 import rust
-import utils.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph

--- a/rust/ql/test/library-tests/variables/variables.ql
+++ b/rust/ql/test/library-tests/variables/variables.ql
@@ -1,5 +1,5 @@
 import rust
-import utils.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 query predicate variable(Variable v) { any() }

--- a/rust/ql/test/query-tests/security/CWE-089/SqlInjection.qlref
+++ b/rust/ql/test/query-tests/security/CWE-089/SqlInjection.qlref
@@ -1,4 +1,4 @@
 query: queries/security/CWE-089/SqlInjection.ql
 postprocess:
- - utils/PrettyPrintModels.ql
- - utils/InlineExpectationsTestQuery.ql
+ - utils/test/PrettyPrintModels.ql
+ - utils/test/InlineExpectationsTestQuery.ql
--- a/rust/ql/test/query-tests/security/CWE-089/SqlSinks.ql
+++ b/rust/ql/test/query-tests/security/CWE-089/SqlSinks.ql
@@ -1,6 +1,6 @@
 import rust
 import codeql.rust.security.SqlInjectionExtensions
-import utils.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 module SqlSinksTest implements TestSig {
  string getARelevantTag() { result = "sql-sink" }
--- a/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.qlref
+++ b/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.qlref
@@ -1,2 +1,2 @@
 query: queries/security/CWE-696/BadCtorInitialization.ql
-postprocess: utils/InlineExpectationsTestQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
--- a/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref
+++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref
@@ -1,2 +1,2 @@
 query: queries/unusedentities/UnreachableCode.ql
-postprocess: utils/InlineExpectationsTestQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
--- a/rust/ql/test/query-tests/unusedentities/UnusedValue.qlref
+++ b/rust/ql/test/query-tests/unusedentities/UnusedValue.qlref
@@ -1,2 +1,2 @@
 query: queries/unusedentities/UnusedValue.ql
-postprocess: utils/InlineExpectationsTestQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
--- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.qlref
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.qlref
@@ -1,2 +1,2 @@
 query: queries/unusedentities/UnusedVariable.ql
-postprocess: utils/InlineExpectationsTestQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql