C#: Add testcase, where generated flow summary is ignored.

michaelnebel · michaelnebel · commit 8e1fa35367b8 · 2022-04-05T08:55:12.000+02:00
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs
@@ -187,10 +187,21 @@ void M2()
             Sink(GeneratedFlowArgs(null, o2));
         }
 
+        void M3()
+        {
+            var o1 = new object();
+            Sink(MixedFlowArgs(o1, null));
+
+            var o2 = new object();
+            Sink(MixedFlowArgs(null, o2));
+        }
+
         object GeneratedFlow(object o) => throw null;
 
         object GeneratedFlowArgs(object o1, object o2) => throw null;
 
+        object MixedFlowArgs(object o1, object o2) => throw null;
+
         static void Sink(object o) { }
     }
 }
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.expected b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.expected
@@ -62,6 +62,8 @@ edges
 | ExternalFlow.cs:184:36:184:37 | access to local variable o1 : Object | ExternalFlow.cs:184:18:184:44 | call to method GeneratedFlowArgs |
 | ExternalFlow.cs:186:22:186:33 | object creation of type Object : Object | ExternalFlow.cs:187:42:187:43 | access to local variable o2 : Object |
 | ExternalFlow.cs:187:42:187:43 | access to local variable o2 : Object | ExternalFlow.cs:187:18:187:44 | call to method GeneratedFlowArgs |
+| ExternalFlow.cs:195:22:195:33 | object creation of type Object : Object | ExternalFlow.cs:196:38:196:39 | access to local variable o2 : Object |
+| ExternalFlow.cs:196:38:196:39 | access to local variable o2 : Object | ExternalFlow.cs:196:18:196:40 | call to method MixedFlowArgs |
 nodes
 | ExternalFlow.cs:9:27:9:38 | object creation of type Object : Object | semmle.label | object creation of type Object : Object |
 | ExternalFlow.cs:10:18:10:33 | call to method StepArgRes | semmle.label | call to method StepArgRes |
@@ -145,6 +147,9 @@ nodes
 | ExternalFlow.cs:186:22:186:33 | object creation of type Object : Object | semmle.label | object creation of type Object : Object |
 | ExternalFlow.cs:187:18:187:44 | call to method GeneratedFlowArgs | semmle.label | call to method GeneratedFlowArgs |
 | ExternalFlow.cs:187:42:187:43 | access to local variable o2 : Object | semmle.label | access to local variable o2 : Object |
+| ExternalFlow.cs:195:22:195:33 | object creation of type Object : Object | semmle.label | object creation of type Object : Object |
+| ExternalFlow.cs:196:18:196:40 | call to method MixedFlowArgs | semmle.label | call to method MixedFlowArgs |
+| ExternalFlow.cs:196:38:196:39 | access to local variable o2 : Object | semmle.label | access to local variable o2 : Object |
 subpaths
 invalidModelRow
 #select
@@ -170,3 +175,4 @@ invalidModelRow
 | ExternalFlow.cs:178:18:178:33 | call to method GeneratedFlow | ExternalFlow.cs:177:21:177:32 | object creation of type Object : Object | ExternalFlow.cs:178:18:178:33 | call to method GeneratedFlow | $@ | ExternalFlow.cs:177:21:177:32 | object creation of type Object : Object | object creation of type Object : Object |
 | ExternalFlow.cs:184:18:184:44 | call to method GeneratedFlowArgs | ExternalFlow.cs:183:22:183:33 | object creation of type Object : Object | ExternalFlow.cs:184:18:184:44 | call to method GeneratedFlowArgs | $@ | ExternalFlow.cs:183:22:183:33 | object creation of type Object : Object | object creation of type Object : Object |
 | ExternalFlow.cs:187:18:187:44 | call to method GeneratedFlowArgs | ExternalFlow.cs:186:22:186:33 | object creation of type Object : Object | ExternalFlow.cs:187:18:187:44 | call to method GeneratedFlowArgs | $@ | ExternalFlow.cs:186:22:186:33 | object creation of type Object : Object | object creation of type Object : Object |
+| ExternalFlow.cs:196:18:196:40 | call to method MixedFlowArgs | ExternalFlow.cs:195:22:195:33 | object creation of type Object : Object | ExternalFlow.cs:196:18:196:40 | call to method MixedFlowArgs | $@ | ExternalFlow.cs:195:22:195:33 | object creation of type Object : Object | object creation of type Object : Object |
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.ql b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.ql
@@ -34,6 +34,8 @@ class SummaryModelTest extends SummaryModelCsv {
         "My.Qltest;G;false;GeneratedFlow;(System.Object);;Argument[0];ReturnValue;generated:value",
         "My.Qltest;G;false;GeneratedFlowArgs;(System.Object,System.Object);;Argument[0];ReturnValue;generated:value",
         "My.Qltest;G;false;GeneratedFlowArgs;(System.Object,System.Object);;Argument[1];ReturnValue;generated:value",
+        "My.Qltest;G;false;MixedFlowArgs;(System.Object,System.Object);;Argument[0];ReturnValue;generated:value",
+        "My.Qltest;G;false;MixedFlowArgs;(System.Object,System.Object);;Argument[1];ReturnValue;value",
       ]
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -187,10 +187,21 @@ void M2()`
`187`	`187`	`Sink(GeneratedFlowArgs(null, o2));`
`188`	`188`	`}`
`189`	`189`
	`190`	`+ void M3()`
	`191`	`+ {`
	`192`	`+ var o1 = new object();`
	`193`	`+ Sink(MixedFlowArgs(o1, null));`
	`194`	`+`
	`195`	`+ var o2 = new object();`
	`196`	`+ Sink(MixedFlowArgs(null, o2));`
	`197`	`+ }`
	`198`	`+`
`190`	`199`	`object GeneratedFlow(object o) => throw null;`
`191`	`200`
`192`	`201`	`object GeneratedFlowArgs(object o1, object o2) => throw null;`
`193`	`202`
	`203`	`+ object MixedFlowArgs(object o1, object o2) => throw null;`
	`204`	`+`
`194`	`205`	`static void Sink(object o) { }`
`195`	`206`	`}`
`196`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ class SummaryModelTest extends SummaryModelCsv {`
`34`	`34`	`"My.Qltest;G;false;GeneratedFlow;(System.Object);;Argument[0];ReturnValue;generated:value",`
`35`	`35`	`"My.Qltest;G;false;GeneratedFlowArgs;(System.Object,System.Object);;Argument[0];ReturnValue;generated:value",`
`36`	`36`	`"My.Qltest;G;false;GeneratedFlowArgs;(System.Object,System.Object);;Argument[1];ReturnValue;generated:value",`
	`37`	`+ "My.Qltest;G;false;MixedFlowArgs;(System.Object,System.Object);;Argument[0];ReturnValue;generated:value",`
	`38`	`+ "My.Qltest;G;false;MixedFlowArgs;(System.Object,System.Object);;Argument[1];ReturnValue;value",`
`37`	`39`	`]`
`38`	`40`	`}`
`39`	`41`	`}`