Skip to content

Commit 940e925

Browse files
michaelnebelmichaelnebel
committed
C#: Update expected test output.
1 parent b24fd13 commit 940e925

File tree

5 files changed

+78
-27
lines changed

5 files changed

+78
-27
lines changed

‎csharp/ql/test/library-tests/dataflow/global/DataFlow.expected

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
| GlobalDataFlow.cs:523:15:523:21 | access to field field |
5959
| GlobalDataFlow.cs:530:15:530:21 | access to field field |
6060
| GlobalDataFlow.cs:531:15:531:21 | access to field field |
61+
| GlobalDataFlow.cs:545:15:545:21 | access to field field |
62+
| GlobalDataFlow.cs:546:15:546:21 | access to field field |
63+
| GlobalDataFlow.cs:547:15:547:21 | access to field field |
6164
| Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x |
6265
| Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x |
6366
| Splitting.cs:11:19:11:19 | access to local variable x |

‎csharp/ql/test/library-tests/dataflow/global/DataFlowPath.expected

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ edges
129129
| GlobalDataFlow.cs:81:22:81:93 | call to method First<String> : String | GlobalDataFlow.cs:82:15:82:20 | access to local variable sink13 |
130130
| GlobalDataFlow.cs:81:22:81:93 | call to method First<String> : String | GlobalDataFlow.cs:83:59:83:64 | access to local variable sink13 : String |
131131
| GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String | GlobalDataFlow.cs:81:22:81:85 | call to method SelectEven<String,String> [element] : String |
132-
| GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String | GlobalDataFlow.cs:537:71:537:71 | e [element] : String |
132+
| GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String | GlobalDataFlow.cs:553:71:553:71 | e [element] : String |
133133
| GlobalDataFlow.cs:81:57:81:65 | { ..., ... } [element] : String | GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String |
134134
| GlobalDataFlow.cs:81:59:81:63 | access to local variable sink3 : String | GlobalDataFlow.cs:81:57:81:65 | { ..., ... } [element] : String |
135135
| GlobalDataFlow.cs:81:79:81:79 | x : String | GlobalDataFlow.cs:81:84:81:84 | access to parameter x : String |
@@ -267,6 +267,9 @@ edges
267267
| GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String | GlobalDataFlow.cs:522:33:522:33 | [post] access to local variable x [field field] : String |
268268
| GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String | GlobalDataFlow.cs:529:20:529:20 | [post] access to parameter x [field field] : String |
269269
| GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String | GlobalDataFlow.cs:529:25:529:25 | [post] access to local variable y [field field] : String |
270+
| GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String | GlobalDataFlow.cs:541:20:541:20 | [post] access to local variable x [field field] : String |
271+
| GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String | GlobalDataFlow.cs:542:20:542:20 | [post] access to local variable y [field field] : String |
272+
| GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String | GlobalDataFlow.cs:543:18:543:18 | [post] access to local variable z [field field] : String |
270273
| GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String |
271274
| GlobalDataFlow.cs:507:25:507:26 | [post] access to local variable x1 [field field] : String | GlobalDataFlow.cs:508:15:508:16 | access to local variable x1 [field field] : String |
272275
| GlobalDataFlow.cs:508:15:508:16 | access to local variable x1 [field field] : String | GlobalDataFlow.cs:508:15:508:22 | access to field field |
@@ -278,11 +281,17 @@ edges
278281
| GlobalDataFlow.cs:529:25:529:25 | [post] access to local variable y [field field] : String | GlobalDataFlow.cs:531:15:531:15 | access to local variable y [field field] : String |
279282
| GlobalDataFlow.cs:530:15:530:15 | access to parameter x [field field] : String | GlobalDataFlow.cs:530:15:530:21 | access to field field |
280283
| GlobalDataFlow.cs:531:15:531:15 | access to local variable y [field field] : String | GlobalDataFlow.cs:531:15:531:21 | access to field field |
281-
| GlobalDataFlow.cs:537:71:537:71 | e [element] : String | GlobalDataFlow.cs:540:27:540:27 | access to parameter e [element] : String |
282-
| GlobalDataFlow.cs:540:22:540:22 | SSA def(x) : String | GlobalDataFlow.cs:542:46:542:46 | access to local variable x : String |
283-
| GlobalDataFlow.cs:540:27:540:27 | access to parameter e [element] : String | GlobalDataFlow.cs:540:22:540:22 | SSA def(x) : String |
284-
| GlobalDataFlow.cs:542:46:542:46 | access to local variable x : String | GlobalDataFlow.cs:81:79:81:79 | x : String |
285-
| GlobalDataFlow.cs:542:46:542:46 | access to local variable x : String | GlobalDataFlow.cs:542:44:542:47 | delegate call : String |
284+
| GlobalDataFlow.cs:541:20:541:20 | [post] access to local variable x [field field] : String | GlobalDataFlow.cs:545:15:545:15 | access to local variable x [field field] : String |
285+
| GlobalDataFlow.cs:542:20:542:20 | [post] access to local variable y [field field] : String | GlobalDataFlow.cs:546:15:546:15 | access to local variable y [field field] : String |
286+
| GlobalDataFlow.cs:543:18:543:18 | [post] access to local variable z [field field] : String | GlobalDataFlow.cs:547:15:547:15 | access to local variable z [field field] : String |
287+
| GlobalDataFlow.cs:545:15:545:15 | access to local variable x [field field] : String | GlobalDataFlow.cs:545:15:545:21 | access to field field |
288+
| GlobalDataFlow.cs:546:15:546:15 | access to local variable y [field field] : String | GlobalDataFlow.cs:546:15:546:21 | access to field field |
289+
| GlobalDataFlow.cs:547:15:547:15 | access to local variable z [field field] : String | GlobalDataFlow.cs:547:15:547:21 | access to field field |
290+
| GlobalDataFlow.cs:553:71:553:71 | e [element] : String | GlobalDataFlow.cs:556:27:556:27 | access to parameter e [element] : String |
291+
| GlobalDataFlow.cs:556:22:556:22 | SSA def(x) : String | GlobalDataFlow.cs:558:46:558:46 | access to local variable x : String |
292+
| GlobalDataFlow.cs:556:27:556:27 | access to parameter e [element] : String | GlobalDataFlow.cs:556:22:556:22 | SSA def(x) : String |
293+
| GlobalDataFlow.cs:558:46:558:46 | access to local variable x : String | GlobalDataFlow.cs:81:79:81:79 | x : String |
294+
| GlobalDataFlow.cs:558:46:558:46 | access to local variable x : String | GlobalDataFlow.cs:558:44:558:47 | delegate call : String |
286295
| Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:8:24:8:30 | [b (line 3): false] access to parameter tainted : String |
287296
| Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:8:24:8:30 | [b (line 3): true] access to parameter tainted : String |
288297
| Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> : String | Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x |
@@ -555,11 +564,20 @@ nodes
555564
| GlobalDataFlow.cs:530:15:530:21 | access to field field | semmle.label | access to field field |
556565
| GlobalDataFlow.cs:531:15:531:15 | access to local variable y [field field] : String | semmle.label | access to local variable y [field field] : String |
557566
| GlobalDataFlow.cs:531:15:531:21 | access to field field | semmle.label | access to field field |
558-
| GlobalDataFlow.cs:537:71:537:71 | e [element] : String | semmle.label | e [element] : String |
559-
| GlobalDataFlow.cs:540:22:540:22 | SSA def(x) : String | semmle.label | SSA def(x) : String |
560-
| GlobalDataFlow.cs:540:27:540:27 | access to parameter e [element] : String | semmle.label | access to parameter e [element] : String |
561-
| GlobalDataFlow.cs:542:44:542:47 | delegate call : String | semmle.label | delegate call : String |
562-
| GlobalDataFlow.cs:542:46:542:46 | access to local variable x : String | semmle.label | access to local variable x : String |
567+
| GlobalDataFlow.cs:541:20:541:20 | [post] access to local variable x [field field] : String | semmle.label | [post] access to local variable x [field field] : String |
568+
| GlobalDataFlow.cs:542:20:542:20 | [post] access to local variable y [field field] : String | semmle.label | [post] access to local variable y [field field] : String |
569+
| GlobalDataFlow.cs:543:18:543:18 | [post] access to local variable z [field field] : String | semmle.label | [post] access to local variable z [field field] : String |
570+
| GlobalDataFlow.cs:545:15:545:15 | access to local variable x [field field] : String | semmle.label | access to local variable x [field field] : String |
571+
| GlobalDataFlow.cs:545:15:545:21 | access to field field | semmle.label | access to field field |
572+
| GlobalDataFlow.cs:546:15:546:15 | access to local variable y [field field] : String | semmle.label | access to local variable y [field field] : String |
573+
| GlobalDataFlow.cs:546:15:546:21 | access to field field | semmle.label | access to field field |
574+
| GlobalDataFlow.cs:547:15:547:15 | access to local variable z [field field] : String | semmle.label | access to local variable z [field field] : String |
575+
| GlobalDataFlow.cs:547:15:547:21 | access to field field | semmle.label | access to field field |
576+
| GlobalDataFlow.cs:553:71:553:71 | e [element] : String | semmle.label | e [element] : String |
577+
| GlobalDataFlow.cs:556:22:556:22 | SSA def(x) : String | semmle.label | SSA def(x) : String |
578+
| GlobalDataFlow.cs:556:27:556:27 | access to parameter e [element] : String | semmle.label | access to parameter e [element] : String |
579+
| GlobalDataFlow.cs:558:44:558:47 | delegate call : String | semmle.label | delegate call : String |
580+
| GlobalDataFlow.cs:558:46:558:46 | access to local variable x : String | semmle.label | access to local variable x : String |
563581
| Splitting.cs:3:28:3:34 | tainted : String | semmle.label | tainted : String |
564582
| Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> : String | semmle.label | [b (line 3): false] call to method Return<String> : String |
565583
| Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> : String | semmle.label | [b (line 3): true] call to method Return<String> : String |
@@ -597,15 +615,15 @@ subpaths
597615
| GlobalDataFlow.cs:73:94:73:98 | access to local variable sink0 : String | GlobalDataFlow.cs:298:26:298:26 | x : String | GlobalDataFlow.cs:301:16:301:41 | ... ? ... : ... : String | GlobalDataFlow.cs:73:29:73:101 | call to method Invoke : String |
598616
| GlobalDataFlow.cs:76:19:76:23 | access to local variable sink1 : String | GlobalDataFlow.cs:304:32:304:32 | x : String | GlobalDataFlow.cs:306:9:306:13 | SSA def(y) : String | GlobalDataFlow.cs:76:30:76:34 | SSA def(sink2) : String |
599617
| GlobalDataFlow.cs:79:19:79:23 | access to local variable sink2 : String | GlobalDataFlow.cs:310:32:310:32 | x : String | GlobalDataFlow.cs:312:9:312:13 | SSA def(y) : String | GlobalDataFlow.cs:79:30:79:34 | SSA def(sink3) : String |
600-
| GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String | GlobalDataFlow.cs:537:71:537:71 | e [element] : String | GlobalDataFlow.cs:542:44:542:47 | delegate call : String | GlobalDataFlow.cs:81:22:81:85 | call to method SelectEven<String,String> [element] : String |
618+
| GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String | GlobalDataFlow.cs:553:71:553:71 | e [element] : String | GlobalDataFlow.cs:558:44:558:47 | delegate call : String | GlobalDataFlow.cs:81:22:81:85 | call to method SelectEven<String,String> [element] : String |
601619
| GlobalDataFlow.cs:138:63:138:63 | access to parameter x : String | GlobalDataFlow.cs:387:46:387:46 | x : String | GlobalDataFlow.cs:389:16:389:19 | delegate call : String | GlobalDataFlow.cs:138:45:138:64 | call to method ApplyFunc<String,String> : String |
602620
| GlobalDataFlow.cs:139:29:139:33 | access to local variable sink3 : String | GlobalDataFlow.cs:138:40:138:40 | x : String | GlobalDataFlow.cs:138:45:138:64 | call to method ApplyFunc<String,String> : String | GlobalDataFlow.cs:139:21:139:34 | delegate call : String |
603621
| GlobalDataFlow.cs:147:39:147:43 | access to local variable sink4 : String | GlobalDataFlow.cs:387:46:387:46 | x : String | GlobalDataFlow.cs:389:16:389:19 | delegate call : String | GlobalDataFlow.cs:147:21:147:44 | call to method ApplyFunc<String,String> : String |
604622
| GlobalDataFlow.cs:300:37:300:37 | access to parameter x : String | GlobalDataFlow.cs:387:46:387:46 | x : String | GlobalDataFlow.cs:389:16:389:19 | delegate call : String | GlobalDataFlow.cs:300:17:300:38 | call to method ApplyFunc<T,T> : String |
605623
| GlobalDataFlow.cs:389:18:389:18 | access to parameter x : String | GlobalDataFlow.cs:298:26:298:26 | x : String | GlobalDataFlow.cs:301:16:301:41 | ... ? ... : ... : String | GlobalDataFlow.cs:389:16:389:19 | delegate call : String |
606624
| GlobalDataFlow.cs:389:18:389:18 | access to parameter x : String | GlobalDataFlow.cs:298:26:298:26 | x : String | GlobalDataFlow.cs:301:16:301:41 | ... ? ... : ... : String | GlobalDataFlow.cs:389:16:389:19 | delegate call : String |
607625
| GlobalDataFlow.cs:389:18:389:18 | access to parameter x : String | GlobalDataFlow.cs:300:27:300:28 | x0 : String | GlobalDataFlow.cs:300:33:300:34 | access to parameter x0 : String | GlobalDataFlow.cs:389:16:389:19 | delegate call : String |
608-
| GlobalDataFlow.cs:542:46:542:46 | access to local variable x : String | GlobalDataFlow.cs:81:79:81:79 | x : String | GlobalDataFlow.cs:81:84:81:84 | access to parameter x : String | GlobalDataFlow.cs:542:44:542:47 | delegate call : String |
626+
| GlobalDataFlow.cs:558:46:558:46 | access to local variable x : String | GlobalDataFlow.cs:81:79:81:79 | x : String | GlobalDataFlow.cs:81:84:81:84 | access to parameter x : String | GlobalDataFlow.cs:558:44:558:47 | delegate call : String |
609627
| Splitting.cs:8:24:8:30 | [b (line 3): false] access to parameter tainted : String | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> : String |
610628
| Splitting.cs:8:24:8:30 | [b (line 3): true] access to parameter tainted : String | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> : String |
611629
| Splitting.cs:20:29:20:29 | access to parameter s : String | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | Splitting.cs:20:22:20:30 | call to method Return<String> : String |
@@ -623,6 +641,9 @@ subpaths
623641
| GlobalDataFlow.cs:523:15:523:21 | access to field field | GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:523:15:523:21 | access to field field | access to field field |
624642
| GlobalDataFlow.cs:530:15:530:21 | access to field field | GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:530:15:530:21 | access to field field | access to field field |
625643
| GlobalDataFlow.cs:531:15:531:21 | access to field field | GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:531:15:531:21 | access to field field | access to field field |
644+
| GlobalDataFlow.cs:545:15:545:21 | access to field field | GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:545:15:545:21 | access to field field | access to field field |
645+
| GlobalDataFlow.cs:546:15:546:21 | access to field field | GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:546:15:546:21 | access to field field | access to field field |
646+
| GlobalDataFlow.cs:547:15:547:21 | access to field field | GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:547:15:547:21 | access to field field | access to field field |
626647
| Splitting.cs:41:19:41:19 | access to local variable s | Splitting.cs:39:21:39:34 | [b (line 37): true] "taint source" : String | Splitting.cs:41:19:41:19 | access to local variable s | access to local variable s |
627648
| Splitting.cs:50:19:50:19 | access to local variable s | Splitting.cs:48:36:48:49 | "taint source" : String | Splitting.cs:50:19:50:19 | access to local variable s | access to local variable s |
628649
| Splitting.cs:52:19:52:19 | access to local variable s | Splitting.cs:48:36:48:49 | "taint source" : String | Splitting.cs:52:19:52:19 | access to local variable s | access to local variable s |

‎csharp/ql/test/library-tests/dataflow/global/GetAnOutNode.expected

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,10 @@
165165
| GlobalDataFlow.cs:512:18:512:34 | object creation of type SimpleClass | normal | GlobalDataFlow.cs:512:18:512:34 | object creation of type SimpleClass |
166166
| GlobalDataFlow.cs:521:17:521:36 | object creation of type SubSimpleClass | normal | GlobalDataFlow.cs:521:17:521:36 | object creation of type SubSimpleClass |
167167
| GlobalDataFlow.cs:528:17:528:33 | object creation of type SimpleClass | normal | GlobalDataFlow.cs:528:17:528:33 | object creation of type SimpleClass |
168-
| GlobalDataFlow.cs:542:44:542:47 | delegate call | normal | GlobalDataFlow.cs:542:44:542:47 | delegate call |
168+
| GlobalDataFlow.cs:536:17:536:33 | object creation of type SimpleClass | normal | GlobalDataFlow.cs:536:17:536:33 | object creation of type SimpleClass |
169+
| GlobalDataFlow.cs:537:17:537:33 | object creation of type SimpleClass | normal | GlobalDataFlow.cs:537:17:537:33 | object creation of type SimpleClass |
170+
| GlobalDataFlow.cs:538:17:538:33 | object creation of type SimpleClass | normal | GlobalDataFlow.cs:538:17:538:33 | object creation of type SimpleClass |
171+
| GlobalDataFlow.cs:558:44:558:47 | delegate call | normal | GlobalDataFlow.cs:558:44:558:47 | delegate call |
169172
| Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> | normal | Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> |
170173
| Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> | normal | Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> |
171174
| Splitting.cs:20:22:20:30 | call to method Return<String> | normal | Splitting.cs:20:22:20:30 | call to method Return<String> |

‎csharp/ql/test/library-tests/dataflow/global/TaintTracking.expected

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@
6565
| GlobalDataFlow.cs:523:15:523:21 | access to field field |
6666
| GlobalDataFlow.cs:530:15:530:21 | access to field field |
6767
| GlobalDataFlow.cs:531:15:531:21 | access to field field |
68+
| GlobalDataFlow.cs:545:15:545:21 | access to field field |
69+
| GlobalDataFlow.cs:546:15:546:21 | access to field field |
70+
| GlobalDataFlow.cs:547:15:547:21 | access to field field |
6871
| Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x |
6972
| Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x |
7073
| Splitting.cs:11:19:11:19 | access to local variable x |

0 commit comments

Comments
 (0)