Merge pull request #17968 from michaelnebel/java/movetestutils

Move test utilities to the query pack.
2025-12-17 01:03:14 +01:00 · 2024-12-16 13:41:30 +01:00
parent 31717524f0 0bfc1b6ea8
commit aaf0cd5dee
667 changed files with 623 additions and 623 deletions
--- a/ruby/ql/test/TestUtilities/InlineExpectationsTest.qll
+++ b/ruby/ql/test/TestUtilities/InlineExpectationsTest.qll
--- a/ruby/ql/test/TestUtilities/InlineExpectationsTestQuery.ql
+++ b/ruby/ql/test/TestUtilities/InlineExpectationsTestQuery.ql
--- a/ruby/ql/test/TestUtilities/InlineFlowTest.qll
+++ b/ruby/ql/test/TestUtilities/InlineFlowTest.qll
@@ -12,7 +12,7 @@ private import codeql.ruby.frameworks.data.internal.ApiGraphModelsExtensions as
 private import internal.InlineExpectationsTestImpl

 private module FlowTestImpl implements InputSig<Location, RubyDataFlow> {
-  import TestUtilities.InlineFlowTestUtil
+  import utils.test.InlineFlowTestUtil

  bindingset[src, sink]
  string getArgString(DataFlow::Node src, DataFlow::Node sink) {
--- a/ruby/ql/test/TestUtilities/InlineFlowTestUtil.qll
+++ b/ruby/ql/test/TestUtilities/InlineFlowTestUtil.qll
--- a/ruby/ql/test/TestUtilities/InlineTypeTrackingFlowTest.qll
+++ b/ruby/ql/test/TestUtilities/InlineTypeTrackingFlowTest.qll
@@ -1,6 +1,6 @@
 import ruby
-import TestUtilities.InlineExpectationsTest
-import TestUtilities.InlineFlowTestUtil
+import utils.test.InlineExpectationsTest
+import utils.test.InlineFlowTestUtil
 private import codeql.ruby.typetracking.TypeTracking

 private DataFlow::LocalSourceNode track(TypeTracker t, DataFlow::CallNode source) {
--- a/ruby/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll
+++ b/ruby/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll
--- a/ruby/ql/test/library-tests/concepts/CryptographicOperation.ql
+++ b/ruby/ql/test/library-tests/concepts/CryptographicOperation.ql
@@ -1,6 +1,6 @@
 import codeql.ruby.AST
 import codeql.ruby.Concepts
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 module CryptographicOperationTest implements TestSig {
  string getARelevantTag() {
--- a/ruby/ql/test/library-tests/dataflow/api-graphs/VerifyApiGraphExpectations.ql
+++ b/ruby/ql/test/library-tests/dataflow/api-graphs/VerifyApiGraphExpectations.ql
@@ -3,7 +3,7 @@ import codeql.dataflow.internal.AccessPathSyntax
 import codeql.ruby.ast.internal.TreeSitter
 import codeql.ruby.frameworks.data.internal.ApiGraphModels as ApiGraphModels
 import codeql.ruby.ApiGraphs
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 private predicate accessPathRange(string s) { hasExpectationWithValue(_, s) }

--- a/ruby/ql/test/library-tests/dataflow/array-flow/array-flow.ql
+++ b/ruby/ql/test/library-tests/dataflow/array-flow/array-flow.ql
@@ -4,7 +4,7 @@

 import codeql.ruby.AST
 import codeql.ruby.CFG
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import ValueFlow::PathGraph

--- a/ruby/ql/test/library-tests/dataflow/array-flow/type-tracking-array-flow.ql
+++ b/ruby/ql/test/library-tests/dataflow/array-flow/type-tracking-array-flow.ql
@@ -3,4 +3,4 @@
 // only that type-tracking cannot follow the flow in your test. If the dataflow
 // test (`array-flow.ql`) shows no failures, then that may be sufficient
 // (depending on your use case).
-import TestUtilities.InlineTypeTrackingFlowTest
+import utils.test.InlineTypeTrackingFlowTest
--- a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql
+++ b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql
@@ -4,7 +4,7 @@

 import codeql.ruby.AST
 import codeql.ruby.CFG
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import codeql.ruby.dataflow.BarrierGuards
 import PathGraph

--- a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql
+++ b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql
@@ -5,7 +5,7 @@ import codeql.ruby.controlflow.CfgNodes
 import codeql.ruby.controlflow.ControlFlowGraph
 import codeql.ruby.controlflow.BasicBlocks
 import codeql.ruby.DataFlow
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 query predicate newStyleBarrierGuards(DataFlow::Node n) {
  n instanceof StringConstCompareBarrier or
--- a/ruby/ql/test/library-tests/dataflow/call-sensitivity/call-sensitivity.ql
+++ b/ruby/ql/test/library-tests/dataflow/call-sensitivity/call-sensitivity.ql
@@ -4,7 +4,7 @@

 import codeql.ruby.AST
 import codeql.ruby.DataFlow
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph
 import codeql.ruby.dataflow.internal.DataFlowDispatch as DataFlowDispatch
--- a/ruby/ql/test/library-tests/dataflow/erb/erb.ql
+++ b/ruby/ql/test/library-tests/dataflow/erb/erb.ql
@@ -4,7 +4,7 @@

 import codeql.ruby.AST
 import codeql.ruby.CFG
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import ValueFlowTest<DefaultFlowConfig>
 import ValueFlow::PathGraph

--- a/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.ql
+++ b/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.ql
@@ -4,7 +4,7 @@
 */

 import codeql.ruby.AST
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import PathGraph
 private import codeql.ruby.dataflow.FlowSummary
--- a/ruby/ql/test/library-tests/dataflow/global/Flow.ql
+++ b/ruby/ql/test/library-tests/dataflow/global/Flow.ql
@@ -4,7 +4,7 @@

 import codeql.ruby.AST
 import codeql.ruby.DataFlow
-private import TestUtilities.InlineFlowTest
+private import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph

--- a/ruby/ql/test/library-tests/dataflow/global/TypeTrackingInlineTest.ql
+++ b/ruby/ql/test/library-tests/dataflow/global/TypeTrackingInlineTest.ql
@@ -1 +1 @@
-import TestUtilities.InlineTypeTrackingFlowTest
+import utils.test.InlineTypeTrackingFlowTest
--- a/ruby/ql/test/library-tests/dataflow/hash-flow/hash-flow.ql
+++ b/ruby/ql/test/library-tests/dataflow/hash-flow/hash-flow.ql
@@ -4,7 +4,7 @@

 import codeql.ruby.AST
 import codeql.ruby.CFG
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import ValueFlow::PathGraph

--- a/ruby/ql/test/library-tests/dataflow/hash-flow/type-tracking-hash-flow.ql
+++ b/ruby/ql/test/library-tests/dataflow/hash-flow/type-tracking-hash-flow.ql
@@ -3,4 +3,4 @@
 // only that type-tracking cannot follow the flow in your test. If the dataflow
 // test (`hash-flow.ql`) shows no failures, then that may be sufficient
 // (depending on your use case).
-import TestUtilities.InlineTypeTrackingFlowTest
+import utils.test.InlineTypeTrackingFlowTest
--- a/ruby/ql/test/library-tests/dataflow/local/InlineFlowTest.ql
+++ b/ruby/ql/test/library-tests/dataflow/local/InlineFlowTest.ql
@@ -3,7 +3,7 @@
 */

 import codeql.ruby.AST
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph

--- a/ruby/ql/test/library-tests/dataflow/params/params-flow.ql
+++ b/ruby/ql/test/library-tests/dataflow/params/params-flow.ql
@@ -3,7 +3,7 @@
 */

 import codeql.ruby.AST
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import ValueFlowTest<DefaultFlowConfig>
 import ValueFlow::PathGraph

--- a/ruby/ql/test/library-tests/dataflow/pathname-flow/pathame-flow.ql
+++ b/ruby/ql/test/library-tests/dataflow/pathname-flow/pathame-flow.ql
@@ -3,7 +3,7 @@
 */

 import codeql.ruby.AST
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import ValueFlow::PathGraph

--- a/ruby/ql/test/library-tests/dataflow/ssa-flow/ssa-flow.ql
+++ b/ruby/ql/test/library-tests/dataflow/ssa-flow/ssa-flow.ql
@@ -3,7 +3,7 @@
 */

 import codeql.ruby.AST
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import ValueFlow::PathGraph

--- a/ruby/ql/test/library-tests/dataflow/string-flow/string-flow.ql
+++ b/ruby/ql/test/library-tests/dataflow/string-flow/string-flow.ql
@@ -3,7 +3,7 @@
 */

 import codeql.ruby.AST
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import ValueFlow::PathGraph

--- a/ruby/ql/test/library-tests/dataflow/summaries/Summaries.ql
+++ b/ruby/ql/test/library-tests/dataflow/summaries/Summaries.ql
@@ -8,7 +8,7 @@ import codeql.ruby.dataflow.FlowSummary
 import codeql.ruby.TaintTracking
 import codeql.ruby.dataflow.internal.FlowSummaryImpl
 import codeql.ruby.frameworks.data.ModelsAsData
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import PathGraph

 query predicate invalidSpecComponent(SummarizedCallable sc, string s, string c) {
--- a/ruby/ql/test/library-tests/frameworks/action_controller/params-flow.ql
+++ b/ruby/ql/test/library-tests/frameworks/action_controller/params-flow.ql
@@ -3,7 +3,7 @@
 */

 import ruby
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import TaintFlow::PathGraph
 import codeql.ruby.frameworks.Rails

--- a/ruby/ql/test/library-tests/frameworks/action_mailer/params-flow.ql
+++ b/ruby/ql/test/library-tests/frameworks/action_mailer/params-flow.ql
@@ -3,7 +3,7 @@
 */

 import ruby
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import TaintFlow::PathGraph
 import codeql.ruby.frameworks.Rails

--- a/ruby/ql/test/library-tests/frameworks/active_support/ActiveSupportDataFlow.ql
+++ b/ruby/ql/test/library-tests/frameworks/active_support/ActiveSupportDataFlow.ql
@@ -3,7 +3,7 @@
 */

 import codeql.ruby.AST
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import codeql.ruby.Frameworks
 import DefaultFlowTest
 import ValueFlow::PathGraph
--- a/ruby/ql/test/library-tests/frameworks/arel/Arel.ql
+++ b/ruby/ql/test/library-tests/frameworks/arel/Arel.ql
@@ -4,7 +4,7 @@

 import codeql.ruby.frameworks.Arel
 import codeql.ruby.AST
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import TaintFlow::PathGraph

--- a/ruby/ql/test/library-tests/frameworks/json/JsonDataFlow.ql
+++ b/ruby/ql/test/library-tests/frameworks/json/JsonDataFlow.ql
@@ -2,7 +2,7 @@
 * @kind path-problem
 */

-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import codeql.ruby.Frameworks
 import DefaultFlowTest
 import PathGraph
--- a/ruby/ql/test/library-tests/frameworks/sinatra/Flow.ql
+++ b/ruby/ql/test/library-tests/frameworks/sinatra/Flow.ql
@@ -3,7 +3,7 @@
 */

 import ruby
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 import PathGraph
 import codeql.ruby.frameworks.Sinatra
 import codeql.ruby.Concepts
--- a/ruby/ql/test/query-tests/experimental/improper-memoization/ImproperMemoization.ql
+++ b/ruby/ql/test/query-tests/experimental/improper-memoization/ImproperMemoization.ql
@@ -1,5 +1,5 @@
 import codeql.ruby.AST
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import codeql.ruby.security.ImproperMemoizationQuery

 module ImproperMemoizationTest implements TestSig {
--- a/ruby/ql/test/query-tests/security/cwe-022/PathInjection.qlref
+++ b/ruby/ql/test/query-tests/security/cwe-022/PathInjection.qlref
@@ -1,2 +1,2 @@
 query: queries/security/cwe-022/PathInjection.ql
-postprocess: TestUtilities/InlineExpectationsTestQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
--- a/ruby/ql/test/query-tests/security/cwe-116/IncompleteMultiCharacterSanitization/IncompleteMultiCharacterSanitization.ql
+++ b/ruby/ql/test/query-tests/security/cwe-116/IncompleteMultiCharacterSanitization/IncompleteMultiCharacterSanitization.ql
@@ -6,7 +6,7 @@ import codeql.ruby.AST
 import codeql.ruby.regexp.RegExpTreeView as RETV
 import codeql.ruby.DataFlow
 import codeql.ruby.security.IncompleteMultiCharacterSanitizationQuery as Query
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest

 module Test implements TestSig {
  string getARelevantTag() { result = "hasResult" }
--- a/ruby/ql/test/query-tests/security/cwe-300/InsecureDependency.ql
+++ b/ruby/ql/test/query-tests/security/cwe-300/InsecureDependency.ql
@@ -1,5 +1,5 @@
 import codeql.ruby.AST
-import TestUtilities.InlineExpectationsTest
+import utils.test.InlineExpectationsTest
 import codeql.ruby.security.InsecureDependencyQuery

 module InsecureDependencyTest implements TestSig {
--- a/ruby/ql/test/query-tests/security/cwe-829/InsecureDownload.ql
+++ b/ruby/ql/test/query-tests/security/cwe-829/InsecureDownload.ql
@@ -1,7 +1,7 @@
 import codeql.ruby.security.InsecureDownloadQuery
 import InsecureDownloadFlow::PathGraph
-import TestUtilities.InlineExpectationsTest
-import TestUtilities.InlineFlowTestUtil
+import utils.test.InlineExpectationsTest
+import utils.test.InlineFlowTestUtil

 module FlowTest implements TestSig {
  string getARelevantTag() { result = "BAD" }