Add the merged PathGraph to all copies of the InlineFlowTest library

Author: jketema

csharp/ql/test/TestUtilities/InlineFlowTest.qll

@@ -6,10 +6,10 @@
  * import csharp
  * import TestUtilities.InlineFlowTest
  * import DefaultFlowTest
- * import ValueFlow::PathGraph
+ * import PathGraph
  *
- * from ValueFlow::PathNode source, ValueFlow::PathNode sink
- * where ValueFlow::flowPath(source, sink)
+ * from PathNode source, PathNode sink
+ * where flowPath(source, sink)
  * select sink, source, sink, "$@", source, source.toString()
  *
  * ```
@@ -101,6 +101,12 @@ module FlowTest<DataFlow::ConfigSig ValueFlowConfig, DataFlow::ConfigSig TaintFl
   }
 
   import MakeTest<InlineTest>
+  import DataFlow::MergePathGraph<ValueFlow::PathNode, TaintFlow::PathNode, ValueFlow::PathGraph, TaintFlow::PathGraph>
+
+  predicate flowPath(PathNode source, PathNode sink) {
+    ValueFlow::flowPath(source.asPathNode1(), sink.asPathNode1()) or
+    TaintFlow::flowPath(source.asPathNode2(), sink.asPathNode2())
+  }
 }
 
 module DefaultFlowTest = FlowTest<DefaultFlowConfig, DefaultFlowConfig>;

go/ql/test/TestUtilities/InlineFlowTest.qll

@@ -6,6 +6,11 @@
  * import go
  * import TestUtilities.InlineFlowTest
  * import DefaultFlowTest
+ * import PathGraph
+ *
+ * from PathNode source, PathNode sink
+ * where flowPath(source, sink)
+ * select sink, source, sink, "$@", source, source.toString()
  * ```
  *
  * To declare expectations, you can use the $hasTaintFlow or $hasValueFlow comments within the test source files.
@@ -88,6 +93,12 @@ module FlowTest<DataFlow::ConfigSig ValueFlowConfig, DataFlow::ConfigSig TaintFl
   }
 
   import MakeTest<InlineTest>
+  import DataFlow::MergePathGraph<ValueFlow::PathNode, TaintFlow::PathNode, ValueFlow::PathGraph, TaintFlow::PathGraph>
+
+  predicate flowPath(PathNode source, PathNode sink) {
+    ValueFlow::flowPath(source.asPathNode1(), sink.asPathNode1()) or
+    TaintFlow::flowPath(source.asPathNode2(), sink.asPathNode2())
+  }
 }
 
 module DefaultFlowTest = FlowTest<DefaultFlowConfig, DefaultFlowConfig>;

java/ql/test/TestUtilities/InlineFlowTest.qll

@@ -6,6 +6,12 @@
  * import java
  * import TestUtilities.InlineFlowTest
  * import DefaultFlowTest
+ * import PathGraph
+ *
+ * from PathNode source, PathNode sink
+ * where flowPath(source, sink)
+ * select sink, source, sink, "$@", source, source.toString()
+
  * ```
  *
  * To declare expectations, you can use the $hasTaintFlow or $hasValueFlow comments within the test source files.
@@ -95,6 +101,12 @@ module FlowTest<DataFlow::ConfigSig ValueFlowConfig, DataFlow::ConfigSig TaintFl
   }
 
   import MakeTest<InlineTest>
+  import DataFlow::MergePathGraph<ValueFlow::PathNode, TaintFlow::PathNode, ValueFlow::PathGraph, TaintFlow::PathGraph>
+
+  predicate flowPath(PathNode source, PathNode sink) {
+    ValueFlow::flowPath(source.asPathNode1(), sink.asPathNode1()) or
+    TaintFlow::flowPath(source.asPathNode2(), sink.asPathNode2())
+  }
 }
 
 module DefaultFlowTest = FlowTest<DefaultFlowConfig, DefaultFlowConfig>;

ruby/ql/test/TestUtilities/InlineFlowTest.qll

@@ -7,8 +7,8 @@
  * import DefaultFlowTest
  * import PathGraph
  *
- * from ValueFlow::PathNode source, ValueFlow::PathNode sink
- * where ValueFlow::flowPath(source, sink)
+ * from PathNode source, PathNode sink
+ * where flowPath(source, sink)
  * select sink, source, sink, "$@", source, source.toString()
  * ```
  *