Merge pull request #14133 from hvitved/ruby/flow-test-path-graph-fixes

Ruby: Use proper `PathGraph` module in inline flow tests

Author: hvitved

ruby/ql/test/library-tests/dataflow/array-flow/array-flow.expected

@@ -5,7 +5,7 @@
 import codeql.ruby.AST
 import TestUtilities.InlineFlowTest
 import DefaultFlowTest
-import PathGraph
+import ValueFlow::PathGraph
 
 from ValueFlow::PathNode source, ValueFlow::PathNode sink
 where ValueFlow::flowPath(source, sink)

ruby/ql/test/library-tests/dataflow/array-flow/array-flow.ql

@@ -6,7 +6,7 @@ import codeql.ruby.AST
 import codeql.ruby.DataFlow
 import TestUtilities.InlineFlowTest
 import DefaultFlowTest
-import PathGraph
+import TaintFlow::PathGraph
 import codeql.ruby.dataflow.internal.DataFlowDispatch as DataFlowDispatch
 
 query predicate mayBenefitFromCallContext = DataFlowDispatch::mayBenefitFromCallContext/2;

ruby/ql/test/library-tests/dataflow/call-sensitivity/call-sensitivity.expected

@@ -6,7 +6,7 @@ import codeql.ruby.AST
 import codeql.ruby.DataFlow
 private import TestUtilities.InlineFlowTest
 import DefaultFlowTest
-import PathGraph
+import TaintFlow::PathGraph
 
 from TaintFlow::PathNode source, TaintFlow::PathNode sink
 where TaintFlow::flowPath(source, sink)

ruby/ql/test/library-tests/dataflow/call-sensitivity/call-sensitivity.ql

@@ -5,7 +5,7 @@
 import codeql.ruby.AST
 import TestUtilities.InlineFlowTest
 import ValueFlowTest<DefaultFlowConfig>
-import PathGraph
+import ValueFlow::PathGraph
 
 from ValueFlow::PathNode source, ValueFlow::PathNode sink
 where ValueFlow::flowPath(source, sink)

ruby/ql/test/library-tests/dataflow/global/Flow.expected

@@ -19,67 +19,36 @@ edges
 | local_dataflow.rb:87:10:87:10 | x | local_dataflow.rb:78:3:78:3 | z |
 | local_dataflow.rb:87:10:87:10 | x | local_dataflow.rb:87:25:87:25 | x |
 | local_dataflow.rb:93:3:93:3 | a | local_dataflow.rb:94:8:94:8 | a |
-| local_dataflow.rb:93:3:93:3 | a | local_dataflow.rb:94:8:94:8 | a |
-| local_dataflow.rb:93:7:93:15 | call to source | local_dataflow.rb:93:3:93:3 | a |
 | local_dataflow.rb:93:7:93:15 | call to source | local_dataflow.rb:93:3:93:3 | a |
 | local_dataflow.rb:93:20:93:28 | call to source | local_dataflow.rb:93:3:93:3 | a |
-| local_dataflow.rb:93:20:93:28 | call to source | local_dataflow.rb:93:3:93:3 | a |
 | local_dataflow.rb:95:3:95:3 | b | local_dataflow.rb:96:8:96:8 | b |
-| local_dataflow.rb:95:3:95:3 | b | local_dataflow.rb:96:8:96:8 | b |
-| local_dataflow.rb:95:8:95:16 | call to source | local_dataflow.rb:95:3:95:3 | b |
 | local_dataflow.rb:95:8:95:16 | call to source | local_dataflow.rb:95:3:95:3 | b |
 | local_dataflow.rb:95:21:95:29 | call to source | local_dataflow.rb:95:3:95:3 | b |
-| local_dataflow.rb:95:21:95:29 | call to source | local_dataflow.rb:95:3:95:3 | b |
-| local_dataflow.rb:98:3:98:3 | a | local_dataflow.rb:99:8:99:8 | a |
 | local_dataflow.rb:98:3:98:3 | a | local_dataflow.rb:99:8:99:8 | a |
 | local_dataflow.rb:98:7:98:15 | call to source | local_dataflow.rb:98:3:98:3 | a |
-| local_dataflow.rb:98:7:98:15 | call to source | local_dataflow.rb:98:3:98:3 | a |
 | local_dataflow.rb:98:20:98:28 | call to source | local_dataflow.rb:98:3:98:3 | a |
-| local_dataflow.rb:98:20:98:28 | call to source | local_dataflow.rb:98:3:98:3 | a |
-| local_dataflow.rb:100:3:100:3 | b | local_dataflow.rb:101:8:101:8 | b |
 | local_dataflow.rb:100:3:100:3 | b | local_dataflow.rb:101:8:101:8 | b |
 | local_dataflow.rb:100:8:100:16 | call to source | local_dataflow.rb:100:3:100:3 | b |
-| local_dataflow.rb:100:8:100:16 | call to source | local_dataflow.rb:100:3:100:3 | b |
-| local_dataflow.rb:100:22:100:30 | call to source | local_dataflow.rb:100:3:100:3 | b |
 | local_dataflow.rb:100:22:100:30 | call to source | local_dataflow.rb:100:3:100:3 | b |
 | local_dataflow.rb:103:3:103:3 | a | local_dataflow.rb:104:3:104:3 | a |
-| local_dataflow.rb:103:3:103:3 | a | local_dataflow.rb:104:3:104:3 | a |
 | local_dataflow.rb:103:7:103:15 | call to source | local_dataflow.rb:103:3:103:3 | a |
-| local_dataflow.rb:103:7:103:15 | call to source | local_dataflow.rb:103:3:103:3 | a |
-| local_dataflow.rb:104:3:104:3 | a | local_dataflow.rb:105:8:105:8 | a |
 | local_dataflow.rb:104:3:104:3 | a | local_dataflow.rb:105:8:105:8 | a |
 | local_dataflow.rb:104:9:104:17 | call to source | local_dataflow.rb:104:3:104:3 | a |
-| local_dataflow.rb:104:9:104:17 | call to source | local_dataflow.rb:104:3:104:3 | a |
-| local_dataflow.rb:106:3:106:3 | b | local_dataflow.rb:107:3:107:3 | b |
 | local_dataflow.rb:106:3:106:3 | b | local_dataflow.rb:107:3:107:3 | b |
 | local_dataflow.rb:106:7:106:15 | call to source | local_dataflow.rb:106:3:106:3 | b |
-| local_dataflow.rb:106:7:106:15 | call to source | local_dataflow.rb:106:3:106:3 | b |
-| local_dataflow.rb:107:3:107:3 | b | local_dataflow.rb:108:8:108:8 | b |
 | local_dataflow.rb:107:3:107:3 | b | local_dataflow.rb:108:8:108:8 | b |
 | local_dataflow.rb:107:9:107:17 | call to source | local_dataflow.rb:107:3:107:3 | b |
-| local_dataflow.rb:107:9:107:17 | call to source | local_dataflow.rb:107:3:107:3 | b |
-| local_dataflow.rb:112:8:112:16 | call to source | local_dataflow.rb:112:8:112:20 | call to dup |
 | local_dataflow.rb:112:8:112:16 | call to source | local_dataflow.rb:112:8:112:20 | call to dup |
 | local_dataflow.rb:113:8:113:16 | call to source | local_dataflow.rb:113:8:113:20 | call to dup |
-| local_dataflow.rb:113:8:113:16 | call to source | local_dataflow.rb:113:8:113:20 | call to dup |
 | local_dataflow.rb:113:8:113:20 | call to dup | local_dataflow.rb:113:8:113:24 | call to dup |
-| local_dataflow.rb:113:8:113:20 | call to dup | local_dataflow.rb:113:8:113:24 | call to dup |
-| local_dataflow.rb:117:8:117:16 | call to source | local_dataflow.rb:117:8:117:23 | call to tap |
 | local_dataflow.rb:117:8:117:16 | call to source | local_dataflow.rb:117:8:117:23 | call to tap |
 | local_dataflow.rb:118:3:118:11 | call to source | local_dataflow.rb:118:20:118:20 | x |
-| local_dataflow.rb:118:3:118:11 | call to source | local_dataflow.rb:118:20:118:20 | x |
-| local_dataflow.rb:118:20:118:20 | x | local_dataflow.rb:118:28:118:28 | x |
 | local_dataflow.rb:118:20:118:20 | x | local_dataflow.rb:118:28:118:28 | x |
 | local_dataflow.rb:119:8:119:16 | call to source | local_dataflow.rb:119:8:119:23 | call to tap |
-| local_dataflow.rb:119:8:119:16 | call to source | local_dataflow.rb:119:8:119:23 | call to tap |
-| local_dataflow.rb:119:8:119:23 | call to tap | local_dataflow.rb:119:8:119:30 | call to tap |
 | local_dataflow.rb:119:8:119:23 | call to tap | local_dataflow.rb:119:8:119:30 | call to tap |
 | local_dataflow.rb:123:8:123:16 | call to source | local_dataflow.rb:123:8:123:20 | call to dup |
-| local_dataflow.rb:123:8:123:16 | call to source | local_dataflow.rb:123:8:123:20 | call to dup |
-| local_dataflow.rb:123:8:123:20 | call to dup | local_dataflow.rb:123:8:123:45 | call to tap |
 | local_dataflow.rb:123:8:123:20 | call to dup | local_dataflow.rb:123:8:123:45 | call to tap |
 | local_dataflow.rb:123:8:123:45 | call to tap | local_dataflow.rb:123:8:123:49 | call to dup |
-| local_dataflow.rb:123:8:123:45 | call to tap | local_dataflow.rb:123:8:123:49 | call to dup |
 nodes
 | local_dataflow.rb:78:3:78:3 | z | semmle.label | z |
 | local_dataflow.rb:78:12:78:20 | call to source | semmle.label | call to source |
@@ -101,90 +70,47 @@ nodes
 | local_dataflow.rb:87:25:87:25 | x | semmle.label | x |
 | local_dataflow.rb:89:8:89:8 | z | semmle.label | z |
 | local_dataflow.rb:93:3:93:3 | a | semmle.label | a |
-| local_dataflow.rb:93:3:93:3 | a | semmle.label | a |
-| local_dataflow.rb:93:7:93:15 | call to source | semmle.label | call to source |
 | local_dataflow.rb:93:7:93:15 | call to source | semmle.label | call to source |
 | local_dataflow.rb:93:20:93:28 | call to source | semmle.label | call to source |
-| local_dataflow.rb:93:20:93:28 | call to source | semmle.label | call to source |
-| local_dataflow.rb:94:8:94:8 | a | semmle.label | a |
 | local_dataflow.rb:94:8:94:8 | a | semmle.label | a |
 | local_dataflow.rb:95:3:95:3 | b | semmle.label | b |
-| local_dataflow.rb:95:3:95:3 | b | semmle.label | b |
-| local_dataflow.rb:95:8:95:16 | call to source | semmle.label | call to source |
 | local_dataflow.rb:95:8:95:16 | call to source | semmle.label | call to source |
 | local_dataflow.rb:95:21:95:29 | call to source | semmle.label | call to source |
-| local_dataflow.rb:95:21:95:29 | call to source | semmle.label | call to source |
-| local_dataflow.rb:96:8:96:8 | b | semmle.label | b |
 | local_dataflow.rb:96:8:96:8 | b | semmle.label | b |
 | local_dataflow.rb:98:3:98:3 | a | semmle.label | a |
-| local_dataflow.rb:98:3:98:3 | a | semmle.label | a |
 | local_dataflow.rb:98:7:98:15 | call to source | semmle.label | call to source |
-| local_dataflow.rb:98:7:98:15 | call to source | semmle.label | call to source |
-| local_dataflow.rb:98:20:98:28 | call to source | semmle.label | call to source |
 | local_dataflow.rb:98:20:98:28 | call to source | semmle.label | call to source |
 | local_dataflow.rb:99:8:99:8 | a | semmle.label | a |
-| local_dataflow.rb:99:8:99:8 | a | semmle.label | a |
-| local_dataflow.rb:100:3:100:3 | b | semmle.label | b |
 | local_dataflow.rb:100:3:100:3 | b | semmle.label | b |
 | local_dataflow.rb:100:8:100:16 | call to source | semmle.label | call to source |
-| local_dataflow.rb:100:8:100:16 | call to source | semmle.label | call to source |
 | local_dataflow.rb:100:22:100:30 | call to source | semmle.label | call to source |
-| local_dataflow.rb:100:22:100:30 | call to source | semmle.label | call to source |
-| local_dataflow.rb:101:8:101:8 | b | semmle.label | b |
 | local_dataflow.rb:101:8:101:8 | b | semmle.label | b |
 | local_dataflow.rb:103:3:103:3 | a | semmle.label | a |
-| local_dataflow.rb:103:3:103:3 | a | semmle.label | a |
-| local_dataflow.rb:103:7:103:15 | call to source | semmle.label | call to source |
 | local_dataflow.rb:103:7:103:15 | call to source | semmle.label | call to source |
 | local_dataflow.rb:104:3:104:3 | a | semmle.label | a |
-| local_dataflow.rb:104:3:104:3 | a | semmle.label | a |
 | local_dataflow.rb:104:9:104:17 | call to source | semmle.label | call to source |
-| local_dataflow.rb:104:9:104:17 | call to source | semmle.label | call to source |
-| local_dataflow.rb:105:8:105:8 | a | semmle.label | a |
 | local_dataflow.rb:105:8:105:8 | a | semmle.label | a |
 | local_dataflow.rb:106:3:106:3 | b | semmle.label | b |
-| local_dataflow.rb:106:3:106:3 | b | semmle.label | b |
-| local_dataflow.rb:106:7:106:15 | call to source | semmle.label | call to source |
 | local_dataflow.rb:106:7:106:15 | call to source | semmle.label | call to source |
 | local_dataflow.rb:107:3:107:3 | b | semmle.label | b |
-| local_dataflow.rb:107:3:107:3 | b | semmle.label | b |
-| local_dataflow.rb:107:9:107:17 | call to source | semmle.label | call to source |
 | local_dataflow.rb:107:9:107:17 | call to source | semmle.label | call to source |
 | local_dataflow.rb:108:8:108:8 | b | semmle.label | b |
-| local_dataflow.rb:108:8:108:8 | b | semmle.label | b |
-| local_dataflow.rb:112:8:112:16 | call to source | semmle.label | call to source |
 | local_dataflow.rb:112:8:112:16 | call to source | semmle.label | call to source |
 | local_dataflow.rb:112:8:112:20 | call to dup | semmle.label | call to dup |
-| local_dataflow.rb:112:8:112:20 | call to dup | semmle.label | call to dup |
 | local_dataflow.rb:113:8:113:16 | call to source | semmle.label | call to source |
-| local_dataflow.rb:113:8:113:16 | call to source | semmle.label | call to source |
-| local_dataflow.rb:113:8:113:20 | call to dup | semmle.label | call to dup |
 | local_dataflow.rb:113:8:113:20 | call to dup | semmle.label | call to dup |
 | local_dataflow.rb:113:8:113:24 | call to dup | semmle.label | call to dup |
-| local_dataflow.rb:113:8:113:24 | call to dup | semmle.label | call to dup |
-| local_dataflow.rb:117:8:117:16 | call to source | semmle.label | call to source |
 | local_dataflow.rb:117:8:117:16 | call to source | semmle.label | call to source |
 | local_dataflow.rb:117:8:117:23 | call to tap | semmle.label | call to tap |
-| local_dataflow.rb:117:8:117:23 | call to tap | semmle.label | call to tap |
-| local_dataflow.rb:118:3:118:11 | call to source | semmle.label | call to source |
 | local_dataflow.rb:118:3:118:11 | call to source | semmle.label | call to source |
 | local_dataflow.rb:118:20:118:20 | x | semmle.label | x |
-| local_dataflow.rb:118:20:118:20 | x | semmle.label | x |
-| local_dataflow.rb:118:28:118:28 | x | semmle.label | x |
 | local_dataflow.rb:118:28:118:28 | x | semmle.label | x |
 | local_dataflow.rb:119:8:119:16 | call to source | semmle.label | call to source |
-| local_dataflow.rb:119:8:119:16 | call to source | semmle.label | call to source |
 | local_dataflow.rb:119:8:119:23 | call to tap | semmle.label | call to tap |
-| local_dataflow.rb:119:8:119:23 | call to tap | semmle.label | call to tap |
-| local_dataflow.rb:119:8:119:30 | call to tap | semmle.label | call to tap |
 | local_dataflow.rb:119:8:119:30 | call to tap | semmle.label | call to tap |
 | local_dataflow.rb:123:8:123:16 | call to source | semmle.label | call to source |
-| local_dataflow.rb:123:8:123:16 | call to source | semmle.label | call to source |
-| local_dataflow.rb:123:8:123:20 | call to dup | semmle.label | call to dup |
 | local_dataflow.rb:123:8:123:20 | call to dup | semmle.label | call to dup |
 | local_dataflow.rb:123:8:123:45 | call to tap | semmle.label | call to tap |
-| local_dataflow.rb:123:8:123:45 | call to tap | semmle.label | call to tap |
-| local_dataflow.rb:123:8:123:49 | call to dup | semmle.label | call to dup |
 | local_dataflow.rb:123:8:123:49 | call to dup | semmle.label | call to dup |
 subpaths
 #select

ruby/ql/test/library-tests/dataflow/global/Flow.ql

@@ -5,7 +5,7 @@
 import codeql.ruby.AST
 import TestUtilities.InlineFlowTest
 import DefaultFlowTest
-import PathGraph
+import TaintFlow::PathGraph
 
 from TaintFlow::PathNode source, TaintFlow::PathNode sink
 where TaintFlow::flowPath(source, sink)

ruby/ql/test/library-tests/dataflow/hash-flow/hash-flow.ql

@@ -5,7 +5,7 @@
 import codeql.ruby.AST
 import TestUtilities.InlineFlowTest
 import ValueFlowTest<DefaultFlowConfig>
-import PathGraph
+import ValueFlow::PathGraph
 
 from ValueFlow::PathNode source, ValueFlow::PathNode sink
 where ValueFlow::flowPath(source, sink)