Skip to content

Commit 131a6ac

Browse files
michaelnebelmichaelnebel
committed
C#: Update expected test output.
1 parent e06afb6 commit 131a6ac

File tree

5 files changed

+44
-27
lines changed

5 files changed

+44
-27
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
| GlobalDataFlow.cs:546:15:546:21 | access to field field |
6363
| GlobalDataFlow.cs:547:15:547:21 | access to field field |
6464
| GlobalDataFlow.cs:553:15:553:22 | access to field field |
65+
| GlobalDataFlow.cs:561:15:561:21 | access to field field |
6566
| Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x |
6667
| Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x |
6768
| Splitting.cs:11:19:11:19 | access to local variable x |

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

Lines changed: 20 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:559:71:559:71 | e [element] : String |
132+
| GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String | GlobalDataFlow.cs:567:71:567: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 |
@@ -271,6 +271,7 @@ edges
271271
| 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 |
272272
| 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 |
273273
| GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String | GlobalDataFlow.cs:552:20:552:21 | [post] access to parameter sc [field field] : String |
274+
| GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String | GlobalDataFlow.cs:560:24:560:24 | [post] access to local variable x [field field] : String |
274275
| GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String |
275276
| 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 |
276277
| GlobalDataFlow.cs:508:15:508:16 | access to local variable x1 [field field] : String | GlobalDataFlow.cs:508:15:508:22 | access to field field |
@@ -290,11 +291,13 @@ edges
290291
| GlobalDataFlow.cs:547:15:547:15 | access to local variable z [field field] : String | GlobalDataFlow.cs:547:15:547:21 | access to field field |
291292
| GlobalDataFlow.cs:552:20:552:21 | [post] access to parameter sc [field field] : String | GlobalDataFlow.cs:553:15:553:16 | access to parameter sc [field field] : String |
292293
| GlobalDataFlow.cs:553:15:553:16 | access to parameter sc [field field] : String | GlobalDataFlow.cs:553:15:553:22 | access to field field |
293-
| GlobalDataFlow.cs:559:71:559:71 | e [element] : String | GlobalDataFlow.cs:562:27:562:27 | access to parameter e [element] : String |
294-
| GlobalDataFlow.cs:562:22:562:22 | SSA def(x) : String | GlobalDataFlow.cs:564:46:564:46 | access to local variable x : String |
295-
| GlobalDataFlow.cs:562:27:562:27 | access to parameter e [element] : String | GlobalDataFlow.cs:562:22:562:22 | SSA def(x) : String |
296-
| GlobalDataFlow.cs:564:46:564:46 | access to local variable x : String | GlobalDataFlow.cs:81:79:81:79 | x : String |
297-
| GlobalDataFlow.cs:564:46:564:46 | access to local variable x : String | GlobalDataFlow.cs:564:44:564:47 | delegate call : String |
294+
| GlobalDataFlow.cs:560:24:560:24 | [post] access to local variable x [field field] : String | GlobalDataFlow.cs:561:15:561:15 | access to local variable x [field field] : String |
295+
| GlobalDataFlow.cs:561:15:561:15 | access to local variable x [field field] : String | GlobalDataFlow.cs:561:15:561:21 | access to field field |
296+
| GlobalDataFlow.cs:567:71:567:71 | e [element] : String | GlobalDataFlow.cs:570:27:570:27 | access to parameter e [element] : String |
297+
| GlobalDataFlow.cs:570:22:570:22 | SSA def(x) : String | GlobalDataFlow.cs:572:46:572:46 | access to local variable x : String |
298+
| GlobalDataFlow.cs:570:27:570:27 | access to parameter e [element] : String | GlobalDataFlow.cs:570:22:570:22 | SSA def(x) : String |
299+
| GlobalDataFlow.cs:572:46:572:46 | access to local variable x : String | GlobalDataFlow.cs:81:79:81:79 | x : String |
300+
| GlobalDataFlow.cs:572:46:572:46 | access to local variable x : String | GlobalDataFlow.cs:572:44:572:47 | delegate call : String |
298301
| Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:8:24:8:30 | [b (line 3): false] access to parameter tainted : String |
299302
| Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:8:24:8:30 | [b (line 3): true] access to parameter tainted : String |
300303
| 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 |
@@ -579,11 +582,14 @@ nodes
579582
| GlobalDataFlow.cs:552:20:552:21 | [post] access to parameter sc [field field] : String | semmle.label | [post] access to parameter sc [field field] : String |
580583
| GlobalDataFlow.cs:553:15:553:16 | access to parameter sc [field field] : String | semmle.label | access to parameter sc [field field] : String |
581584
| GlobalDataFlow.cs:553:15:553:22 | access to field field | semmle.label | access to field field |
582-
| GlobalDataFlow.cs:559:71:559:71 | e [element] : String | semmle.label | e [element] : String |
583-
| GlobalDataFlow.cs:562:22:562:22 | SSA def(x) : String | semmle.label | SSA def(x) : String |
584-
| GlobalDataFlow.cs:562:27:562:27 | access to parameter e [element] : String | semmle.label | access to parameter e [element] : String |
585-
| GlobalDataFlow.cs:564:44:564:47 | delegate call : String | semmle.label | delegate call : String |
586-
| GlobalDataFlow.cs:564:46:564:46 | access to local variable x : String | semmle.label | access to local variable x : String |
585+
| GlobalDataFlow.cs:560:24:560:24 | [post] access to local variable x [field field] : String | semmle.label | [post] access to local variable x [field field] : String |
586+
| GlobalDataFlow.cs:561:15:561:15 | access to local variable x [field field] : String | semmle.label | access to local variable x [field field] : String |
587+
| GlobalDataFlow.cs:561:15:561:21 | access to field field | semmle.label | access to field field |
588+
| GlobalDataFlow.cs:567:71:567:71 | e [element] : String | semmle.label | e [element] : String |
589+
| GlobalDataFlow.cs:570:22:570:22 | SSA def(x) : String | semmle.label | SSA def(x) : String |
590+
| GlobalDataFlow.cs:570:27:570:27 | access to parameter e [element] : String | semmle.label | access to parameter e [element] : String |
591+
| GlobalDataFlow.cs:572:44:572:47 | delegate call : String | semmle.label | delegate call : String |
592+
| GlobalDataFlow.cs:572:46:572:46 | access to local variable x : String | semmle.label | access to local variable x : String |
587593
| Splitting.cs:3:28:3:34 | tainted : String | semmle.label | tainted : String |
588594
| 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 |
589595
| 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 |
@@ -621,15 +627,15 @@ subpaths
621627
| 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 |
622628
| 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 |
623629
| 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 |
624-
| GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String | GlobalDataFlow.cs:559:71:559:71 | e [element] : String | GlobalDataFlow.cs:564:44:564:47 | delegate call : String | GlobalDataFlow.cs:81:22:81:85 | call to method SelectEven<String,String> [element] : String |
630+
| GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String | GlobalDataFlow.cs:567:71:567:71 | e [element] : String | GlobalDataFlow.cs:572:44:572:47 | delegate call : String | GlobalDataFlow.cs:81:22:81:85 | call to method SelectEven<String,String> [element] : String |
625631
| 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 |
626632
| 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 |
627633
| 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 |
628634
| 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 |
629635
| 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 |
630636
| 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 |
631637
| 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 |
632-
| GlobalDataFlow.cs:564:46:564: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:564:44:564:47 | delegate call : String |
638+
| GlobalDataFlow.cs:572:46:572: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:572:44:572:47 | delegate call : String |
633639
| 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 |
634640
| 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 |
635641
| 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 |
@@ -651,6 +657,7 @@ subpaths
651657
| 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 |
652658
| 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 |
653659
| GlobalDataFlow.cs:553:15:553:22 | access to field field | GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:553:15:553:22 | access to field field | access to field field |
660+
| GlobalDataFlow.cs:561:15:561:21 | access to field field | GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:561:15:561:21 | access to field field | access to field field |
654661
| 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 |
655662
| 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 |
656663
| 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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@
168168
| GlobalDataFlow.cs:536:17:536:33 | object creation of type SimpleClass | normal | GlobalDataFlow.cs:536:17:536:33 | object creation of type SimpleClass |
169169
| GlobalDataFlow.cs:537:17:537:33 | object creation of type SimpleClass | normal | GlobalDataFlow.cs:537:17:537:33 | object creation of type SimpleClass |
170170
| 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:564:44:564:47 | delegate call | normal | GlobalDataFlow.cs:564:44:564:47 | delegate call |
171+
| GlobalDataFlow.cs:559:17:559:33 | object creation of type SimpleClass | normal | GlobalDataFlow.cs:559:17:559:33 | object creation of type SimpleClass |
172+
| GlobalDataFlow.cs:572:44:572:47 | delegate call | normal | GlobalDataFlow.cs:572:44:572:47 | delegate call |
172173
| 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> |
173174
| 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> |
174175
| 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
| GlobalDataFlow.cs:546:15:546:21 | access to field field |
7070
| GlobalDataFlow.cs:547:15:547:21 | access to field field |
7171
| GlobalDataFlow.cs:553:15:553:22 | access to field field |
72+
| GlobalDataFlow.cs:561:15:561:21 | access to field field |
7273
| Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x |
7374
| Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x |
7475
| Splitting.cs:11:19:11:19 | access to local variable x |

0 commit comments

Comments
 (0)