Skip to content

Commit fc03c36

Browse files
michaelnebelmichaelnebel
committed
C#: Update expected test output.
1 parent 0453ae8 commit fc03c36

File tree

8 files changed

+166
-71
lines changed

8 files changed

+166
-71
lines changed

‎csharp/ql/test/library-tests/dataflow/fields/FieldFlow.expected

Lines changed: 42 additions & 33 deletions
Large diffs are not rendered by default.

‎csharp/ql/test/library-tests/dataflow/indexers/IndexerFlow.expected

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,70 @@
11
models
22
edges
3+
| Indexers.cs:6:9:6:11 | this : Partial1 [field _backingArray, element] : Object | Indexers.cs:6:22:6:34 | this access : Partial1 [field _backingArray, element] : Object | provenance | |
4+
| Indexers.cs:6:9:6:11 | this : Partial1 [field _backingArray, element] : Object | Indexers.cs:6:22:6:34 | this access : Partial1 [field _backingArray, element] : Object | provenance | |
5+
| Indexers.cs:6:22:6:34 | access to field _backingArray : Object[] [element] : Object | Indexers.cs:6:22:6:41 | access to array element : Object | provenance | |
6+
| Indexers.cs:6:22:6:34 | access to field _backingArray : Object[] [element] : Object | Indexers.cs:6:22:6:41 | access to array element : Object | provenance | |
7+
| Indexers.cs:6:22:6:34 | this access : Partial1 [field _backingArray, element] : Object | Indexers.cs:6:22:6:34 | access to field _backingArray : Object[] [element] : Object | provenance | |
8+
| Indexers.cs:6:22:6:34 | this access : Partial1 [field _backingArray, element] : Object | Indexers.cs:6:22:6:34 | access to field _backingArray : Object[] [element] : Object | provenance | |
9+
| Indexers.cs:7:9:7:11 | value : Object | Indexers.cs:7:38:7:42 | access to parameter value : Object | provenance | |
10+
| Indexers.cs:7:9:7:11 | value : Object | Indexers.cs:7:38:7:42 | access to parameter value : Object | provenance | |
11+
| Indexers.cs:7:15:7:27 | [post] access to field _backingArray : Object[] [element] : Object | Indexers.cs:7:15:7:27 | [post] this access : Partial1 [field _backingArray, element] : Object | provenance | |
12+
| Indexers.cs:7:15:7:27 | [post] access to field _backingArray : Object[] [element] : Object | Indexers.cs:7:15:7:27 | [post] this access : Partial1 [field _backingArray, element] : Object | provenance | |
13+
| Indexers.cs:7:15:7:27 | [post] this access : Partial1 [field _backingArray, element] : Object | Indexers.cs:7:9:7:11 | this [Return] : Partial1 [field _backingArray, element] : Object | provenance | |
14+
| Indexers.cs:7:15:7:27 | [post] this access : Partial1 [field _backingArray, element] : Object | Indexers.cs:7:9:7:11 | this [Return] : Partial1 [field _backingArray, element] : Object | provenance | |
15+
| Indexers.cs:7:38:7:42 | access to parameter value : Object | Indexers.cs:7:15:7:27 | [post] access to field _backingArray : Object[] [element] : Object | provenance | |
16+
| Indexers.cs:7:38:7:42 | access to parameter value : Object | Indexers.cs:7:15:7:27 | [post] access to field _backingArray : Object[] [element] : Object | provenance | |
17+
| Indexers.cs:34:13:34:13 | access to local variable o : Object | Indexers.cs:37:17:37:17 | access to local variable o : Object | provenance | |
18+
| Indexers.cs:34:13:34:13 | access to local variable o : Object | Indexers.cs:37:17:37:17 | access to local variable o : Object | provenance | |
19+
| Indexers.cs:34:17:34:33 | call to method Source<Object> : Object | Indexers.cs:34:13:34:13 | access to local variable o : Object | provenance | |
20+
| Indexers.cs:34:17:34:33 | call to method Source<Object> : Object | Indexers.cs:34:13:34:13 | access to local variable o : Object | provenance | |
21+
| Indexers.cs:37:9:37:10 | [post] access to local variable p1 : Partial1 [field _backingArray, element] : Object | Indexers.cs:38:14:38:15 | access to local variable p1 : Partial1 [field _backingArray, element] : Object | provenance | |
22+
| Indexers.cs:37:9:37:10 | [post] access to local variable p1 : Partial1 [field _backingArray, element] : Object | Indexers.cs:38:14:38:15 | access to local variable p1 : Partial1 [field _backingArray, element] : Object | provenance | |
23+
| Indexers.cs:37:17:37:17 | access to local variable o : Object | Indexers.cs:7:9:7:11 | value : Object | provenance | |
24+
| Indexers.cs:37:17:37:17 | access to local variable o : Object | Indexers.cs:7:9:7:11 | value : Object | provenance | |
25+
| Indexers.cs:37:17:37:17 | access to local variable o : Object | Indexers.cs:37:9:37:10 | [post] access to local variable p1 : Partial1 [field _backingArray, element] : Object | provenance | |
26+
| Indexers.cs:37:17:37:17 | access to local variable o : Object | Indexers.cs:37:9:37:10 | [post] access to local variable p1 : Partial1 [field _backingArray, element] : Object | provenance | |
27+
| Indexers.cs:38:14:38:15 | access to local variable p1 : Partial1 [field _backingArray, element] : Object | Indexers.cs:6:9:6:11 | this : Partial1 [field _backingArray, element] : Object | provenance | |
28+
| Indexers.cs:38:14:38:15 | access to local variable p1 : Partial1 [field _backingArray, element] : Object | Indexers.cs:6:9:6:11 | this : Partial1 [field _backingArray, element] : Object | provenance | |
29+
| Indexers.cs:38:14:38:15 | access to local variable p1 : Partial1 [field _backingArray, element] : Object | Indexers.cs:38:14:38:18 | access to indexer | provenance | |
30+
| Indexers.cs:38:14:38:15 | access to local variable p1 : Partial1 [field _backingArray, element] : Object | Indexers.cs:38:14:38:18 | access to indexer | provenance | |
331
nodes
32+
| Indexers.cs:6:9:6:11 | this : Partial1 [field _backingArray, element] : Object | semmle.label | this : Partial1 [field _backingArray, element] : Object |
33+
| Indexers.cs:6:9:6:11 | this : Partial1 [field _backingArray, element] : Object | semmle.label | this : Partial1 [field _backingArray, element] : Object |
34+
| Indexers.cs:6:22:6:34 | access to field _backingArray : Object[] [element] : Object | semmle.label | access to field _backingArray : Object[] [element] : Object |
35+
| Indexers.cs:6:22:6:34 | access to field _backingArray : Object[] [element] : Object | semmle.label | access to field _backingArray : Object[] [element] : Object |
36+
| Indexers.cs:6:22:6:34 | this access : Partial1 [field _backingArray, element] : Object | semmle.label | this access : Partial1 [field _backingArray, element] : Object |
37+
| Indexers.cs:6:22:6:34 | this access : Partial1 [field _backingArray, element] : Object | semmle.label | this access : Partial1 [field _backingArray, element] : Object |
38+
| Indexers.cs:6:22:6:41 | access to array element : Object | semmle.label | access to array element : Object |
39+
| Indexers.cs:6:22:6:41 | access to array element : Object | semmle.label | access to array element : Object |
40+
| Indexers.cs:7:9:7:11 | this [Return] : Partial1 [field _backingArray, element] : Object | semmle.label | this [Return] : Partial1 [field _backingArray, element] : Object |
41+
| Indexers.cs:7:9:7:11 | this [Return] : Partial1 [field _backingArray, element] : Object | semmle.label | this [Return] : Partial1 [field _backingArray, element] : Object |
42+
| Indexers.cs:7:9:7:11 | value : Object | semmle.label | value : Object |
43+
| Indexers.cs:7:9:7:11 | value : Object | semmle.label | value : Object |
44+
| Indexers.cs:7:15:7:27 | [post] access to field _backingArray : Object[] [element] : Object | semmle.label | [post] access to field _backingArray : Object[] [element] : Object |
45+
| Indexers.cs:7:15:7:27 | [post] access to field _backingArray : Object[] [element] : Object | semmle.label | [post] access to field _backingArray : Object[] [element] : Object |
46+
| Indexers.cs:7:15:7:27 | [post] this access : Partial1 [field _backingArray, element] : Object | semmle.label | [post] this access : Partial1 [field _backingArray, element] : Object |
47+
| Indexers.cs:7:15:7:27 | [post] this access : Partial1 [field _backingArray, element] : Object | semmle.label | [post] this access : Partial1 [field _backingArray, element] : Object |
48+
| Indexers.cs:7:38:7:42 | access to parameter value : Object | semmle.label | access to parameter value : Object |
49+
| Indexers.cs:7:38:7:42 | access to parameter value : Object | semmle.label | access to parameter value : Object |
50+
| Indexers.cs:34:13:34:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
51+
| Indexers.cs:34:13:34:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
52+
| Indexers.cs:34:17:34:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
53+
| Indexers.cs:34:17:34:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
54+
| Indexers.cs:37:9:37:10 | [post] access to local variable p1 : Partial1 [field _backingArray, element] : Object | semmle.label | [post] access to local variable p1 : Partial1 [field _backingArray, element] : Object |
55+
| Indexers.cs:37:9:37:10 | [post] access to local variable p1 : Partial1 [field _backingArray, element] : Object | semmle.label | [post] access to local variable p1 : Partial1 [field _backingArray, element] : Object |
56+
| Indexers.cs:37:17:37:17 | access to local variable o : Object | semmle.label | access to local variable o : Object |
57+
| Indexers.cs:37:17:37:17 | access to local variable o : Object | semmle.label | access to local variable o : Object |
58+
| Indexers.cs:38:14:38:15 | access to local variable p1 : Partial1 [field _backingArray, element] : Object | semmle.label | access to local variable p1 : Partial1 [field _backingArray, element] : Object |
59+
| Indexers.cs:38:14:38:15 | access to local variable p1 : Partial1 [field _backingArray, element] : Object | semmle.label | access to local variable p1 : Partial1 [field _backingArray, element] : Object |
60+
| Indexers.cs:38:14:38:18 | access to indexer | semmle.label | access to indexer |
61+
| Indexers.cs:38:14:38:18 | access to indexer | semmle.label | access to indexer |
462
subpaths
63+
| Indexers.cs:37:17:37:17 | access to local variable o : Object | Indexers.cs:7:9:7:11 | value : Object | Indexers.cs:7:9:7:11 | this [Return] : Partial1 [field _backingArray, element] : Object | Indexers.cs:37:9:37:10 | [post] access to local variable p1 : Partial1 [field _backingArray, element] : Object |
64+
| Indexers.cs:37:17:37:17 | access to local variable o : Object | Indexers.cs:7:9:7:11 | value : Object | Indexers.cs:7:9:7:11 | this [Return] : Partial1 [field _backingArray, element] : Object | Indexers.cs:37:9:37:10 | [post] access to local variable p1 : Partial1 [field _backingArray, element] : Object |
65+
| Indexers.cs:38:14:38:15 | access to local variable p1 : Partial1 [field _backingArray, element] : Object | Indexers.cs:6:9:6:11 | this : Partial1 [field _backingArray, element] : Object | Indexers.cs:6:22:6:41 | access to array element : Object | Indexers.cs:38:14:38:18 | access to indexer |
66+
| Indexers.cs:38:14:38:15 | access to local variable p1 : Partial1 [field _backingArray, element] : Object | Indexers.cs:6:9:6:11 | this : Partial1 [field _backingArray, element] : Object | Indexers.cs:6:22:6:41 | access to array element : Object | Indexers.cs:38:14:38:18 | access to indexer |
567
testFailures
6-
| Indexers.cs:38:22:38:40 | // ... | Missing result: hasValueFlow=1 |
768
#select
69+
| Indexers.cs:38:14:38:18 | access to indexer | Indexers.cs:34:17:34:33 | call to method Source<Object> : Object | Indexers.cs:38:14:38:18 | access to indexer | $@ | Indexers.cs:34:17:34:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
70+
| Indexers.cs:38:14:38:18 | access to indexer | Indexers.cs:34:17:34:33 | call to method Source<Object> : Object | Indexers.cs:38:14:38:18 | access to indexer | $@ | Indexers.cs:34:17:34:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |

‎csharp/ql/test/library-tests/dispatch/CallGraph.expected

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@
270270
| ViableCallable.cs:679:17:679:20 | Run3 | ViableCallable.cs:637:21:637:21 | M |
271271
| ViableCallable.cs:679:17:679:20 | Run3 | ViableCallable.cs:646:21:646:21 | M |
272272
| ViableCallable.cs:679:17:679:20 | Run3 | ViableCallable.cs:648:21:648:21 | M |
273-
| ViableCallable.cs:707:17:707:20 | Run1 | ViableCallable.cs:695:42:695:44 | get_Property |
274-
| ViableCallable.cs:707:17:707:20 | Run1 | ViableCallable.cs:695:47:695:49 | set_Property |
275-
| ViableCallable.cs:707:17:707:20 | Run1 | ViableCallable.cs:697:49:697:51 | get_Item |
276-
| ViableCallable.cs:707:17:707:20 | Run1 | ViableCallable.cs:697:54:697:56 | set_Item |
273+
| ViableCallable.cs:707:17:707:20 | Run1 | ViableCallable.cs:702:42:702:44 | get_Property |
274+
| ViableCallable.cs:707:17:707:20 | Run1 | ViableCallable.cs:702:63:702:65 | set_Property |
275+
| ViableCallable.cs:707:17:707:20 | Run1 | ViableCallable.cs:704:49:704:51 | get_Item |
276+
| ViableCallable.cs:707:17:707:20 | Run1 | ViableCallable.cs:704:70:704:72 | set_Item |

‎csharp/ql/test/library-tests/partial/Partial1.expected

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
| Partial.cs:1:15:1:26 | TwoPartClass |
22
| Partial.cs:4:18:4:42 | PartialMethodWithoutBody1 |
3-
| Partial.cs:7:27:7:42 | PartialProperty1 |
4-
| Partial.cs:7:46:7:48 | get_PartialProperty1 |
5-
| Partial.cs:7:51:7:53 | set_PartialProperty1 |
6-
| Partial.cs:9:27:9:30 | Item |
7-
| Partial.cs:9:45:9:47 | get_Item |
8-
| Partial.cs:9:50:9:52 | set_Item |
93
| Partial.cs:12:15:12:26 | TwoPartClass |
104
| Partial.cs:14:18:14:39 | PartialMethodWithBody1 |
5+
| Partial.cs:18:27:18:42 | PartialProperty1 |
6+
| Partial.cs:20:9:20:11 | get_PartialProperty1 |
7+
| Partial.cs:21:9:21:11 | set_PartialProperty1 |
8+
| Partial.cs:25:27:25:30 | Item |
9+
| Partial.cs:27:9:27:11 | get_Item |
10+
| Partial.cs:28:9:28:11 | set_Item |
1111
| Partial.cs:32:15:32:33 | OnePartPartialClass |
1212
| Partial.cs:34:18:34:42 | PartialMethodWithoutBody2 |

‎csharp/ql/test/library-tests/partial/PartialAccessors.expected

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
| Partial.cs:7:46:7:48 | get_PartialProperty1 | true |
2-
| Partial.cs:7:51:7:53 | set_PartialProperty1 | true |
3-
| Partial.cs:9:45:9:47 | get_Item | true |
4-
| Partial.cs:9:50:9:52 | set_Item | true |
1+
| Partial.cs:20:9:20:11 | get_PartialProperty1 | true |
2+
| Partial.cs:21:9:21:11 | set_PartialProperty1 | true |
3+
| Partial.cs:27:9:27:11 | get_Item | true |
4+
| Partial.cs:28:9:28:11 | set_Item | true |
55
| Partial.cs:41:30:41:32 | get_Property | false |
66
| Partial.cs:41:35:41:37 | set_Property | false |
77
| Partial.cs:44:9:44:11 | get_Item | false |

‎csharp/ql/test/library-tests/partial/PartialIndexers.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| Partial.cs:9:27:9:30 | Item | true |
1+
| Partial.cs:25:27:25:30 | Item | true |
22
| Partial.cs:42:19:42:22 | Item | false |

‎csharp/ql/test/library-tests/partial/PartialProperties.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| Partial.cs:7:27:7:42 | PartialProperty1 | true |
1+
| Partial.cs:18:27:18:42 | PartialProperty1 | true |
22
| Partial.cs:41:19:41:26 | Property | false |

‎csharp/ql/test/library-tests/partial/PrintAst.expected

Lines changed: 44 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,58 @@ Partial.cs:
55
# 5| 6: [Method] Method2
66
# 5| -1: [TypeMention] Void
77
# 5| 4: [BlockStmt] {...}
8-
# 7| 7: [Property] PartialProperty1
8+
# 14| 7: [Method] PartialMethodWithBody1
9+
# 3| -1: [TypeMention] Void
10+
# 14| 4: [BlockStmt] {...}
11+
# 15| 8: [Method] Method3
12+
# 15| -1: [TypeMention] Void
13+
# 15| 4: [BlockStmt] {...}
14+
# 16| 9: [Field] _backingField
15+
# 16| -1: [TypeMention] object
16+
# 18| 10: [Property] PartialProperty1
917
# 7| -1: [TypeMention] object
10-
# 7| 3: [Getter] get_PartialProperty1
11-
# 7| 4: [Setter] set_PartialProperty1
18+
# 18| -1: [TypeMention] object
19+
# 20| 3: [Getter] get_PartialProperty1
20+
# 20| 4: [BlockStmt] {...}
21+
# 20| 0: [ReturnStmt] return ...;
22+
# 20| 0: [FieldAccess] access to field _backingField
23+
# 21| 4: [Setter] set_PartialProperty1
1224
#-----| 2: (Parameters)
13-
# 7| 0: [Parameter] value
14-
# 9| 8: [Indexer] Item
25+
# 21| 0: [Parameter] value
26+
# 21| 4: [BlockStmt] {...}
27+
# 21| 0: [ExprStmt] ...;
28+
# 21| 0: [AssignExpr] ... = ...
29+
# 21| 0: [FieldAccess] access to field _backingField
30+
# 21| 1: [ParameterAccess] access to parameter value
31+
# 23| 11: [Field] _backingArray
32+
# 23| -1: [TypeMention] Object[]
33+
# 23| 1: [TypeMention] object
34+
# 25| 12: [Indexer] Item
1535
# 9| -1: [TypeMention] object
36+
# 25| -1: [TypeMention] object
1637
#-----| 1: (Parameters)
1738
# 9| 0: [Parameter] index
1839
# 9| -1: [TypeMention] int
19-
# 9| 3: [Getter] get_Item
40+
# 25| -1: [TypeMention] int
41+
# 27| 3: [Getter] get_Item
2042
#-----| 2: (Parameters)
21-
# 9| 0: [Parameter] index
22-
# 9| 4: [Setter] set_Item
43+
# 25| 0: [Parameter] index
44+
# 27| 4: [BlockStmt] {...}
45+
# 27| 0: [ReturnStmt] return ...;
46+
# 27| 0: [ArrayAccess] access to array element
47+
# 27| -1: [FieldAccess] access to field _backingArray
48+
# 27| 0: [ParameterAccess] access to parameter index
49+
# 28| 4: [Setter] set_Item
2350
#-----| 2: (Parameters)
24-
# 9| 0: [Parameter] index
25-
# 9| 1: [Parameter] value
26-
# 14| 9: [Method] PartialMethodWithBody1
27-
# 3| -1: [TypeMention] Void
28-
# 14| 4: [BlockStmt] {...}
29-
# 15| 10: [Method] Method3
30-
# 15| -1: [TypeMention] Void
31-
# 15| 4: [BlockStmt] {...}
32-
# 16| 11: [Field] _backingField
33-
# 16| -1: [TypeMention] object
34-
# 23| 12: [Field] _backingArray
35-
# 23| -1: [TypeMention] Object[]
36-
# 23| 1: [TypeMention] object
51+
# 25| 0: [Parameter] index
52+
# 28| 1: [Parameter] value
53+
# 28| 4: [BlockStmt] {...}
54+
# 28| 0: [ExprStmt] ...;
55+
# 28| 0: [AssignExpr] ... = ...
56+
# 28| 0: [ArrayAccess] access to array element
57+
# 28| -1: [FieldAccess] access to field _backingArray
58+
# 28| 0: [ParameterAccess] access to parameter index
59+
# 28| 1: [ParameterAccess] access to parameter value
3760
# 32| [Class] OnePartPartialClass
3861
# 34| 5: [Method] PartialMethodWithoutBody2
3962
# 34| -1: [TypeMention] Void

0 commit comments

Comments
 (0)