Skip to content

Commit 65b32b6

Browse files
michaelnebelmichaelnebel
committed
C#: Update test expected output.
1 parent 6b74e43 commit 65b32b6

File tree

5 files changed

+60
-27
lines changed

5 files changed

+60
-27
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@
5656
| GlobalDataFlow.cs:508:15:508:22 | access to field field |
5757
| GlobalDataFlow.cs:514:15:514:22 | access to field field |
5858
| GlobalDataFlow.cs:523:15:523:21 | access to field field |
59+
| GlobalDataFlow.cs:530:15:530:21 | access to field field |
60+
| GlobalDataFlow.cs:531:15:531:21 | access to field field |
5961
| Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x |
6062
| Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x |
6163
| Splitting.cs:11:19:11:19 | access to local variable x |

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

Lines changed: 27 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:529:71:529:71 | e [element] : String |
132+
| GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String | GlobalDataFlow.cs:537:71:537: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 |
@@ -265,18 +265,24 @@ edges
265265
| GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String | GlobalDataFlow.cs:507:25:507:26 | [post] access to local variable x1 [field field] : String |
266266
| GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String | GlobalDataFlow.cs:513:36:513:37 | [post] access to local variable y2 [field field] : String |
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 |
268+
| 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 |
269+
| 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 |
268270
| GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String |
269271
| 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 |
270272
| GlobalDataFlow.cs:508:15:508:16 | access to local variable x1 [field field] : String | GlobalDataFlow.cs:508:15:508:22 | access to field field |
271273
| GlobalDataFlow.cs:513:36:513:37 | [post] access to local variable y2 [field field] : String | GlobalDataFlow.cs:514:15:514:16 | access to local variable y2 [field field] : String |
272274
| GlobalDataFlow.cs:514:15:514:16 | access to local variable y2 [field field] : String | GlobalDataFlow.cs:514:15:514:22 | access to field field |
273275
| GlobalDataFlow.cs:522:33:522:33 | [post] access to local variable x [field field] : String | GlobalDataFlow.cs:523:15:523:15 | access to local variable x [field field] : String |
274276
| GlobalDataFlow.cs:523:15:523:15 | access to local variable x [field field] : String | GlobalDataFlow.cs:523:15:523:21 | access to field field |
275-
| GlobalDataFlow.cs:529:71:529:71 | e [element] : String | GlobalDataFlow.cs:532:27:532:27 | access to parameter e [element] : String |
276-
| GlobalDataFlow.cs:532:22:532:22 | SSA def(x) : String | GlobalDataFlow.cs:534:46:534:46 | access to local variable x : String |
277-
| GlobalDataFlow.cs:532:27:532:27 | access to parameter e [element] : String | GlobalDataFlow.cs:532:22:532:22 | SSA def(x) : String |
278-
| GlobalDataFlow.cs:534:46:534:46 | access to local variable x : String | GlobalDataFlow.cs:81:79:81:79 | x : String |
279-
| GlobalDataFlow.cs:534:46:534:46 | access to local variable x : String | GlobalDataFlow.cs:534:44:534:47 | delegate call : String |
277+
| GlobalDataFlow.cs:529:20:529:20 | [post] access to parameter x [field field] : String | GlobalDataFlow.cs:530:15:530:15 | access to parameter x [field field] : String |
278+
| 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 |
279+
| GlobalDataFlow.cs:530:15:530:15 | access to parameter x [field field] : String | GlobalDataFlow.cs:530:15:530:21 | access to field field |
280+
| 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 |
280286
| Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:8:24:8:30 | [b (line 3): false] access to parameter tainted : String |
281287
| Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:8:24:8:30 | [b (line 3): true] access to parameter tainted : String |
282288
| 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 |
@@ -543,11 +549,17 @@ nodes
543549
| GlobalDataFlow.cs:522:33:522:33 | [post] access to local variable x [field field] : String | semmle.label | [post] access to local variable x [field field] : String |
544550
| GlobalDataFlow.cs:523:15:523:15 | access to local variable x [field field] : String | semmle.label | access to local variable x [field field] : String |
545551
| GlobalDataFlow.cs:523:15:523:21 | access to field field | semmle.label | access to field field |
546-
| GlobalDataFlow.cs:529:71:529:71 | e [element] : String | semmle.label | e [element] : String |
547-
| GlobalDataFlow.cs:532:22:532:22 | SSA def(x) : String | semmle.label | SSA def(x) : String |
548-
| GlobalDataFlow.cs:532:27:532:27 | access to parameter e [element] : String | semmle.label | access to parameter e [element] : String |
549-
| GlobalDataFlow.cs:534:44:534:47 | delegate call : String | semmle.label | delegate call : String |
550-
| GlobalDataFlow.cs:534:46:534:46 | access to local variable x : String | semmle.label | access to local variable x : String |
552+
| GlobalDataFlow.cs:529:20:529:20 | [post] access to parameter x [field field] : String | semmle.label | [post] access to parameter x [field field] : String |
553+
| GlobalDataFlow.cs:529:25:529:25 | [post] access to local variable y [field field] : String | semmle.label | [post] access to local variable y [field field] : String |
554+
| GlobalDataFlow.cs:530:15:530:15 | access to parameter x [field field] : String | semmle.label | access to parameter x [field field] : String |
555+
| GlobalDataFlow.cs:530:15:530:21 | access to field field | semmle.label | access to field field |
556+
| GlobalDataFlow.cs:531:15:531:15 | access to local variable y [field field] : String | semmle.label | access to local variable y [field field] : String |
557+
| 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 |
551563
| Splitting.cs:3:28:3:34 | tainted : String | semmle.label | tainted : String |
552564
| 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 |
553565
| 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 |
@@ -585,15 +597,15 @@ subpaths
585597
| 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 |
586598
| 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 |
587599
| 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 |
588-
| GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String | GlobalDataFlow.cs:529:71:529:71 | e [element] : String | GlobalDataFlow.cs:534:44:534:47 | delegate call : String | GlobalDataFlow.cs:81:22:81:85 | call to method SelectEven<String,String> [element] : 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 |
589601
| 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 |
590602
| 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 |
591603
| 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 |
592604
| 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 |
593605
| 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 |
594606
| 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 |
595607
| 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 |
596-
| GlobalDataFlow.cs:534:46:534: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:534:44:534:47 | 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 |
597609
| 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 |
598610
| 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 |
599611
| 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 |
@@ -609,6 +621,8 @@ subpaths
609621
| GlobalDataFlow.cs:508:15:508:22 | access to field field | GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:508:15:508:22 | access to field field | access to field field |
610622
| GlobalDataFlow.cs:514:15:514:22 | access to field field | GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:514:15:514:22 | access to field field | access to field field |
611623
| 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 |
624+
| 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 |
625+
| 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 |
612626
| 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 |
613627
| 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 |
614628
| 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
@@ -164,7 +164,8 @@
164164
| GlobalDataFlow.cs:511:18:511:34 | object creation of type SimpleClass | normal | GlobalDataFlow.cs:511:18:511:34 | object creation of type SimpleClass |
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 |
167-
| GlobalDataFlow.cs:534:44:534:47 | delegate call | normal | GlobalDataFlow.cs:534:44:534:47 | delegate call |
167+
| 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 |
168169
| 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> |
169170
| 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> |
170171
| 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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363
| GlobalDataFlow.cs:508:15:508:22 | access to field field |
6464
| GlobalDataFlow.cs:514:15:514:22 | access to field field |
6565
| GlobalDataFlow.cs:523:15:523:21 | access to field field |
66+
| GlobalDataFlow.cs:530:15:530:21 | access to field field |
67+
| GlobalDataFlow.cs:531:15:531:21 | access to field field |
6668
| Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x |
6769
| Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x |
6870
| Splitting.cs:11:19:11:19 | access to local variable x |

0 commit comments

Comments
 (0)