C#: Convert a data flow test to use inline test expectations

Author: hvitved

csharp/ql/test/TestUtilities/InlineFlowTest.qll

@@ -26,7 +26,11 @@ private module FlowTestImpl implements InputSig<CsharpDataFlow> {
   }
 
   string getArgString(DataFlow::Node src, DataFlow::Node sink) {
-    (if exists(getSourceArgString(src)) then result = getSourceArgString(src) else result = "") and
+    (
+      result = getSourceArgString(src)
+      or
+      not exists(getSourceArgString(src)) and result = "line:" + src.getLocation().getStartLine()
+    ) and
     exists(sink)
   }
 }

csharp/ql/test/library-tests/dataflow/types/Types.cs

@@ -13,7 +13,7 @@ class C : B<int> { }
 
     class D : B<string>
     {
-        public override void M() => Sink(this);
+        public override void M() => Sink(this); // $ hasValueFlow=line:32 $ hasValueFlow=line:33 $ hasValueFlow=line:40
     }
 
     static void M1()
@@ -41,32 +41,32 @@ static void M1()
         M9(new D()); // no flow
 
         object o = null; // flow
-        Sink(o);
+        Sink(o); // $ hasValueFlow=line:43
     }
 
     static void M2(A a)
     {
         if (a is C c)
-            Sink(c);
+            Sink(c); // $ hasValueFlow=line:23
     }
 
     static void M3(A a)
     {
         switch (a)
         {
             case D d:
-                Sink(d);
+                Sink(d); // $ hasValueFlow=line:35
                 break;
         }
     }
 
-    static void M4(A a) => Sink((C)a);
+    static void M4(A a) => Sink((C)a); // $ hasValueFlow=line:25
 
-    static void M5<T>(T x) => Sink(x);
+    static void M5<T>(T x) => Sink(x); // $ hasValueFlow=line:26 $ hasValueFlow=line:37
 
-    static void M6<T>(T x) where T : A => Sink(x);
+    static void M6<T>(T x) where T : A => Sink(x); // $ hasValueFlow=line:27 $ hasValueFlow=line:38
 
-    static void M7<T>(T x) where T : class => Sink(x);
+    static void M7<T>(T x) where T : class => Sink(x); // $ hasValueFlow=line:28 $ hasValueFlow=line:39
 
     static void M8<T>(T x)
     {
@@ -77,7 +77,7 @@ static void M8<T>(T x)
     static void M9(A a)
     {
         if (a is B<int> b)
-            Sink(b);
+            Sink(b); // $ hasValueFlow=line:30
     }
 
     static void Sink<T>(T x) { }
@@ -112,15 +112,15 @@ void M3()
 
             public override void M()
             {
-                Sink(this.Field);
+                Sink(this.Field); // $ hasValueFlow=line:110
             }
 
             void M10()
             {
                 var a = new A();
                 var e2 = new E2();
-                Sink(Through(a)); // flow
-                Sink(Through(e2)); // flow
+                Sink(Through(a)); // $ hasValueFlow=line:120
+                Sink(Through(e2)); // $ hasValueFlow=line:121
                 Sink((E2)Through(a)); // no flow
                 Sink((A)Through(e2)); // no flow
             }
@@ -150,6 +150,6 @@ class FieldB : FieldA { }
 
     class FieldC : FieldA
     {
-        public override void M() => Sink(this.Field);
+        public override void M() => Sink(this.Field); // $ hasValueFlow=line:144
     }
 }

csharp/ql/test/library-tests/dataflow/types/Types.expected

@@ -1,3 +1,4 @@
+testFailures
 edges
 | Types.cs:7:21:7:25 | this : D | Types.cs:7:32:7:35 | this access : D |
 | Types.cs:7:32:7:35 | this access : D | Types.cs:16:30:16:30 | this : D |

csharp/ql/test/library-tests/dataflow/types/Types.ql

@@ -3,7 +3,8 @@
  */
 
 import csharp
-import Types::PathGraph
+import TestUtilities.InlineFlowTest
+import PathGraph
 
 module TypesConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node src) {
@@ -17,10 +18,12 @@ module TypesConfig implements DataFlow::ConfigSig {
       mc.getAnArgument() = sink.asExpr()
     )
   }
+
+  int fieldFlowBranchLimit() { result = 1000 }
 }
 
-module Types = DataFlow::Global<TypesConfig>;
+import ValueFlowTest<TypesConfig>
 
-from Types::PathNode source, Types::PathNode sink
-where Types::flowPath(source, sink)
+from PathNode source, PathNode sink
+where flowPath(source, sink)
 select source, source, sink, "$@", sink, sink.toString()