Skip to content

Commit 5440a28

Browse files
michaelnebelmichaelnebel
committed
C#: Update test expected output.
1 parent ec8453b commit 5440a28

File tree

6 files changed

+50
-14
lines changed

6 files changed

+50
-14
lines changed

‎csharp/ql/test/library-tests/dataflow/constructors/ConstructorFlow.expected‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,22 @@ edges
122122
| Constructors.cs:143:29:143:30 | access to local variable o2 : Object | Constructors.cs:143:18:143:31 | object creation of type R1 : R1 [property Obj2] : Object | provenance | |
123123
| Constructors.cs:144:14:144:15 | access to local variable r1 : R1 [property Obj1] : Object | Constructors.cs:144:14:144:20 | access to property Obj1 | provenance | |
124124
| Constructors.cs:145:14:145:15 | access to local variable r1 : R1 [property Obj2] : Object | Constructors.cs:145:14:145:20 | access to property Obj2 | provenance | |
125+
| Constructors.cs:152:40:152:40 | o : Object | Constructors.cs:157:52:157:52 | access to parameter o : Object | provenance | |
126+
| Constructors.cs:152:40:152:40 | o : Object | Constructors.cs:157:52:157:52 | access to parameter o : Object | provenance | |
127+
| Constructors.cs:157:40:157:40 | o : Object | Constructors.cs:157:52:157:52 | access to parameter o : Object | provenance | |
128+
| Constructors.cs:157:40:157:40 | o : Object | Constructors.cs:157:52:157:52 | access to parameter o : Object | provenance | |
129+
| Constructors.cs:157:46:157:48 | [post] this access : CPartial [property Obj] : Object | Constructors.cs:157:24:157:31 | this [Return] : CPartial [property Obj] : Object | provenance | |
130+
| Constructors.cs:157:46:157:48 | [post] this access : CPartial [property Obj] : Object | Constructors.cs:157:24:157:31 | this [Return] : CPartial [property Obj] : Object | provenance | |
131+
| Constructors.cs:157:52:157:52 | access to parameter o : Object | Constructors.cs:157:46:157:48 | [post] this access : CPartial [property Obj] : Object | provenance | |
132+
| Constructors.cs:157:52:157:52 | access to parameter o : Object | Constructors.cs:157:46:157:48 | [post] this access : CPartial [property Obj] : Object | provenance | |
133+
| Constructors.cs:162:13:162:13 | access to local variable o : Object | Constructors.cs:163:37:163:37 | access to local variable o : Object | provenance | |
134+
| Constructors.cs:162:17:162:34 | call to method Source<Object> : Object | Constructors.cs:162:13:162:13 | access to local variable o : Object | provenance | |
135+
| Constructors.cs:163:13:163:20 | access to local variable cPartial : CPartial [property Obj] : Object | Constructors.cs:164:14:164:21 | access to local variable cPartial : CPartial [property Obj] : Object | provenance | |
136+
| Constructors.cs:163:24:163:38 | object creation of type CPartial : CPartial [property Obj] : Object | Constructors.cs:163:13:163:20 | access to local variable cPartial : CPartial [property Obj] : Object | provenance | |
137+
| Constructors.cs:163:37:163:37 | access to local variable o : Object | Constructors.cs:152:40:152:40 | o : Object | provenance | |
138+
| Constructors.cs:163:37:163:37 | access to local variable o : Object | Constructors.cs:157:40:157:40 | o : Object | provenance | |
139+
| Constructors.cs:163:37:163:37 | access to local variable o : Object | Constructors.cs:163:24:163:38 | object creation of type CPartial : CPartial [property Obj] : Object | provenance | |
140+
| Constructors.cs:164:14:164:21 | access to local variable cPartial : CPartial [property Obj] : Object | Constructors.cs:164:14:164:25 | access to property Obj | provenance | |
125141
nodes
126142
| Constructors.cs:3:18:3:26 | [post] this access : C_no_ctor [field s1] : Object | semmle.label | [post] this access : C_no_ctor [field s1] : Object |
127143
| Constructors.cs:5:24:5:25 | [post] this access : C_no_ctor [field s1] : Object | semmle.label | [post] this access : C_no_ctor [field s1] : Object |
@@ -255,6 +271,20 @@ nodes
255271
| Constructors.cs:144:14:144:20 | access to property Obj1 | semmle.label | access to property Obj1 |
256272
| Constructors.cs:145:14:145:15 | access to local variable r1 : R1 [property Obj2] : Object | semmle.label | access to local variable r1 : R1 [property Obj2] : Object |
257273
| Constructors.cs:145:14:145:20 | access to property Obj2 | semmle.label | access to property Obj2 |
274+
| Constructors.cs:152:40:152:40 | o : Object | semmle.label | o : Object |
275+
| Constructors.cs:157:24:157:31 | this [Return] : CPartial [property Obj] : Object | semmle.label | this [Return] : CPartial [property Obj] : Object |
276+
| Constructors.cs:157:40:157:40 | o : Object | semmle.label | o : Object |
277+
| Constructors.cs:157:46:157:48 | [post] this access : CPartial [property Obj] : Object | semmle.label | [post] this access : CPartial [property Obj] : Object |
278+
| Constructors.cs:157:46:157:48 | [post] this access : CPartial [property Obj] : Object | semmle.label | [post] this access : CPartial [property Obj] : Object |
279+
| Constructors.cs:157:52:157:52 | access to parameter o : Object | semmle.label | access to parameter o : Object |
280+
| Constructors.cs:157:52:157:52 | access to parameter o : Object | semmle.label | access to parameter o : Object |
281+
| Constructors.cs:162:13:162:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
282+
| Constructors.cs:162:17:162:34 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
283+
| Constructors.cs:163:13:163:20 | access to local variable cPartial : CPartial [property Obj] : Object | semmle.label | access to local variable cPartial : CPartial [property Obj] : Object |
284+
| Constructors.cs:163:24:163:38 | object creation of type CPartial : CPartial [property Obj] : Object | semmle.label | object creation of type CPartial : CPartial [property Obj] : Object |
285+
| Constructors.cs:163:37:163:37 | access to local variable o : Object | semmle.label | access to local variable o : Object |
286+
| Constructors.cs:164:14:164:21 | access to local variable cPartial : CPartial [property Obj] : Object | semmle.label | access to local variable cPartial : CPartial [property Obj] : Object |
287+
| Constructors.cs:164:14:164:25 | access to property Obj | semmle.label | access to property Obj |
258288
subpaths
259289
| Constructors.cs:44:18:44:19 | this access : C2 [parameter o21param] : Object | Constructors.cs:46:23:46:27 | this access : C2 [parameter o21param] : Object | Constructors.cs:46:23:46:27 | [post] this access : C2 [field Obj21] : Object | Constructors.cs:44:18:44:19 | [post] this access : C2 [field Obj21] : Object |
260290
| Constructors.cs:64:37:64:37 | access to parameter o : Object | Constructors.cs:57:54:57:55 | o2 : Object | Constructors.cs:59:13:59:14 | access to parameter o1 : Object | Constructors.cs:64:27:64:34 | access to parameter o22param : Object |
@@ -273,8 +303,9 @@ subpaths
273303
| Constructors.cs:132:29:132:30 | access to local variable o2 : Object | Constructors.cs:121:38:121:40 | oc2 : Object | Constructors.cs:121:16:121:17 | this [Return] : C4 [property Obj2] : Object | Constructors.cs:132:18:132:31 | object creation of type C4 : C4 [property Obj2] : Object |
274304
| Constructors.cs:143:25:143:26 | access to local variable o1 : Object | Constructors.cs:137:29:137:32 | Obj1 : Object | Constructors.cs:137:19:137:20 | this [Return] : R1 [property Obj1] : Object | Constructors.cs:143:18:143:31 | object creation of type R1 : R1 [property Obj1] : Object |
275305
| Constructors.cs:143:29:143:30 | access to local variable o2 : Object | Constructors.cs:137:42:137:45 | Obj2 : Object | Constructors.cs:137:19:137:20 | this [Return] : R1 [property Obj2] : Object | Constructors.cs:143:18:143:31 | object creation of type R1 : R1 [property Obj2] : Object |
306+
| Constructors.cs:163:37:163:37 | access to local variable o : Object | Constructors.cs:152:40:152:40 | o : Object | Constructors.cs:157:24:157:31 | this [Return] : CPartial [property Obj] : Object | Constructors.cs:163:24:163:38 | object creation of type CPartial : CPartial [property Obj] : Object |
307+
| Constructors.cs:163:37:163:37 | access to local variable o : Object | Constructors.cs:157:40:157:40 | o : Object | Constructors.cs:157:24:157:31 | this [Return] : CPartial [property Obj] : Object | Constructors.cs:163:24:163:38 | object creation of type CPartial : CPartial [property Obj] : Object |
276308
testFailures
277-
| Constructors.cs:164:29:164:48 | // ... | Missing result: hasValueFlow=11 |
278309
#select
279310
| Constructors.cs:15:18:15:19 | access to field s1 | Constructors.cs:5:29:5:45 | call to method Source<Object> : Object | Constructors.cs:15:18:15:19 | access to field s1 | $@ | Constructors.cs:5:29:5:45 | call to method Source<Object> : Object | call to method Source<Object> : Object |
280311
| Constructors.cs:33:18:33:19 | access to field s1 | Constructors.cs:21:29:21:45 | call to method Source<Object> : Object | Constructors.cs:33:18:33:19 | access to field s1 | $@ | Constructors.cs:21:29:21:45 | call to method Source<Object> : Object | call to method Source<Object> : Object |
@@ -289,3 +320,4 @@ testFailures
289320
| Constructors.cs:134:14:134:20 | access to property Obj2 | Constructors.cs:131:18:131:34 | call to method Source<Object> : Object | Constructors.cs:134:14:134:20 | access to property Obj2 | $@ | Constructors.cs:131:18:131:34 | call to method Source<Object> : Object | call to method Source<Object> : Object |
290321
| Constructors.cs:144:14:144:20 | access to property Obj1 | Constructors.cs:141:18:141:34 | call to method Source<Object> : Object | Constructors.cs:144:14:144:20 | access to property Obj1 | $@ | Constructors.cs:141:18:141:34 | call to method Source<Object> : Object | call to method Source<Object> : Object |
291322
| Constructors.cs:145:14:145:20 | access to property Obj2 | Constructors.cs:142:18:142:35 | call to method Source<Object> : Object | Constructors.cs:145:14:145:20 | access to property Obj2 | $@ | Constructors.cs:142:18:142:35 | call to method Source<Object> : Object | call to method Source<Object> : Object |
323+
| Constructors.cs:164:14:164:25 | access to property Obj | Constructors.cs:162:17:162:34 | call to method Source<Object> : Object | Constructors.cs:164:14:164:25 | access to property Obj | $@ | Constructors.cs:162:17:162:34 | call to method Source<Object> : Object | call to method Source<Object> : Object |

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

Lines changed: 1 addition & 1 deletion
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:711:17:711:20 | Run1 | ViableCallable.cs:695:24:695:31 | Partial1 |
273+
| ViableCallable.cs:711:17:711:20 | Run1 | ViableCallable.cs:704:24:704:31 | Partial1 |
274274
| ViableCallable.cs:711:17:711:20 | Run1 | ViableCallable.cs:705:42:705:44 | get_Property |
275275
| ViableCallable.cs:711:17:711:20 | Run1 | ViableCallable.cs:705:63:705:65 | set_Property |
276276
| ViableCallable.cs:711:17:711:20 | Run1 | ViableCallable.cs:707:49:707:51 | get_Item |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
| Partial.cs:3:15:3:26 | TwoPartClass |
2-
| Partial.cs:6:20:6:31 | TwoPartClass |
32
| Partial.cs:8:18:8:42 | PartialMethodWithoutBody1 |
43
| Partial.cs:18:15:18:26 | TwoPartClass |
4+
| Partial.cs:21:20:21:31 | TwoPartClass |
55
| Partial.cs:22:18:22:39 | PartialMethodWithBody1 |
66
| Partial.cs:26:27:26:42 | PartialProperty1 |
77
| Partial.cs:28:9:28:11 | get_PartialProperty1 |

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:3:15:3:26 | <object initializer> |
12
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:8:18:8:42 | PartialMethodWithoutBody1 |
23
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:9:17:9:23 | Method2 |
34
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:22:18:22:39 | PartialMethodWithBody1 |
45
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:23:17:23:23 | Method3 |
6+
| Partial.cs:18:15:18:26 | TwoPartClass | Partial.cs:3:15:3:26 | <object initializer> |
57
| Partial.cs:18:15:18:26 | TwoPartClass | Partial.cs:8:18:8:42 | PartialMethodWithoutBody1 |
68
| Partial.cs:18:15:18:26 | TwoPartClass | Partial.cs:9:17:9:23 | Method2 |
79
| Partial.cs:18:15:18:26 | TwoPartClass | Partial.cs:22:18:22:39 | PartialMethodWithBody1 |

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
| Partial.cs:21:20:21:31 | TwoPartClass | Partial.cs:21:45:21:47 | {...} |
12
| Partial.cs:43:15:43:33 | OnePartPartialClass | Partial.cs:43:15:43:33 | {...} |
23
| Partial.cs:51:12:51:26 | NonPartialClass | Partial.cs:51:40:51:42 | {...} |
34
| PartialMultipleFiles1.cs:1:22:1:41 | PartialMultipleFiles | PartialMultipleFiles1.cs:1:22:1:41 | {...} |

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
Partial.cs:
22
# 3| [Class] TwoPartClass
3-
# 6| 4: [InstanceConstructor] TwoPartClass
4-
#-----| 2: (Parameters)
5-
# 6| 0: [Parameter] obj
6-
# 6| -1: [TypeMention] object
73
# 8| 5: [Method] PartialMethodWithoutBody1
84
# 8| -1: [TypeMention] Void
95
# 9| 6: [Method] Method2
106
# 9| -1: [TypeMention] Void
117
# 9| 4: [BlockStmt] {...}
12-
# 22| 7: [Method] PartialMethodWithBody1
8+
# 21| 7: [InstanceConstructor] TwoPartClass
9+
#-----| 2: (Parameters)
10+
# 6| 0: [Parameter] obj
11+
# 6| -1: [TypeMention] object
12+
# 21| 4: [BlockStmt] {...}
13+
# 22| 8: [Method] PartialMethodWithBody1
1314
# 7| -1: [TypeMention] Void
1415
# 22| 4: [BlockStmt] {...}
15-
# 23| 8: [Method] Method3
16+
# 23| 9: [Method] Method3
1617
# 23| -1: [TypeMention] Void
1718
# 23| 4: [BlockStmt] {...}
18-
# 24| 9: [Field] _backingField
19+
# 24| 10: [Field] _backingField
1920
# 24| -1: [TypeMention] object
20-
# 26| 10: [Property] PartialProperty1
21+
# 26| 11: [Property] PartialProperty1
2122
# 11| -1: [TypeMention] object
2223
# 26| -1: [TypeMention] object
2324
# 28| 3: [Getter] get_PartialProperty1
@@ -32,10 +33,10 @@ Partial.cs:
3233
# 29| 0: [AssignExpr] ... = ...
3334
# 29| 0: [FieldAccess] access to field _backingField
3435
# 29| 1: [ParameterAccess] access to parameter value
35-
# 31| 11: [Field] _backingArray
36+
# 31| 12: [Field] _backingArray
3637
# 31| -1: [TypeMention] Object[]
3738
# 31| 1: [TypeMention] object
38-
# 33| 12: [Indexer] Item
39+
# 33| 13: [Indexer] Item
3940
# 13| -1: [TypeMention] object
4041
# 33| -1: [TypeMention] object
4142
#-----| 1: (Parameters)
@@ -61,7 +62,7 @@ Partial.cs:
6162
# 36| -1: [FieldAccess] access to field _backingArray
6263
# 36| 0: [ParameterAccess] access to parameter index
6364
# 36| 1: [ParameterAccess] access to parameter value
64-
# 40| 13: [Event] PartialEvent1
65+
# 40| 14: [Event] PartialEvent1
6566
# 15| -1: [TypeMention] EventHandler
6667
# 40| 3: [AddEventAccessor] add_PartialEvent1
6768
#-----| 2: (Parameters)

0 commit comments

Comments
 (0)