Skip to content

Commit

Permalink
C#: Update expected test output.
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelnebel committed Jan 22, 2025
1 parent 5eaa59b commit ec17a0e
Show file tree
Hide file tree
Showing 8 changed files with 166 additions and 71 deletions.
75 changes: 42 additions & 33 deletions csharp/ql/test/library-tests/dataflow/fields/FieldFlow.expected

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,7 +1,70 @@
models
edges
| 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 | |
| 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 | |
| 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 | |
| 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 | |
| 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 | |
| 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 | |
| Indexers.cs:7:9:7:11 | value : Object | Indexers.cs:7:38:7:42 | access to parameter value : Object | provenance | |
| Indexers.cs:7:9:7:11 | value : Object | Indexers.cs:7:38:7:42 | access to parameter value : Object | provenance | |
| 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 | |
| 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 | |
| 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 | |
| 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 | |
| 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 | |
| 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 | |
| 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 | |
| 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 | |
| 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 | |
| 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 | |
| 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 | |
| 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 | |
| Indexers.cs:37:17:37:17 | access to local variable o : Object | Indexers.cs:7:9:7:11 | value : Object | provenance | |
| Indexers.cs:37:17:37:17 | access to local variable o : Object | Indexers.cs:7:9:7:11 | value : Object | provenance | |
| 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 | |
| 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 | |
| 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 | |
| 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 | |
| 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 | |
| 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 | |
nodes
| Indexers.cs:6:9:6:11 | this : Partial1 [field _backingArray, element] : Object | semmle.label | this : Partial1 [field _backingArray, element] : Object |
| Indexers.cs:6:9:6:11 | this : Partial1 [field _backingArray, element] : Object | semmle.label | this : Partial1 [field _backingArray, element] : Object |
| Indexers.cs:6:22:6:34 | access to field _backingArray : Object[] [element] : Object | semmle.label | access to field _backingArray : Object[] [element] : Object |
| Indexers.cs:6:22:6:34 | access to field _backingArray : Object[] [element] : Object | semmle.label | access to field _backingArray : Object[] [element] : Object |
| Indexers.cs:6:22:6:34 | this access : Partial1 [field _backingArray, element] : Object | semmle.label | this access : Partial1 [field _backingArray, element] : Object |
| Indexers.cs:6:22:6:34 | this access : Partial1 [field _backingArray, element] : Object | semmle.label | this access : Partial1 [field _backingArray, element] : Object |
| Indexers.cs:6:22:6:41 | access to array element : Object | semmle.label | access to array element : Object |
| Indexers.cs:6:22:6:41 | access to array element : Object | semmle.label | access to array element : Object |
| Indexers.cs:7:9:7:11 | this [Return] : Partial1 [field _backingArray, element] : Object | semmle.label | this [Return] : Partial1 [field _backingArray, element] : Object |
| Indexers.cs:7:9:7:11 | this [Return] : Partial1 [field _backingArray, element] : Object | semmle.label | this [Return] : Partial1 [field _backingArray, element] : Object |
| Indexers.cs:7:9:7:11 | value : Object | semmle.label | value : Object |
| Indexers.cs:7:9:7:11 | value : Object | semmle.label | value : Object |
| Indexers.cs:7:15:7:27 | [post] access to field _backingArray : Object[] [element] : Object | semmle.label | [post] access to field _backingArray : Object[] [element] : Object |
| Indexers.cs:7:15:7:27 | [post] access to field _backingArray : Object[] [element] : Object | semmle.label | [post] access to field _backingArray : Object[] [element] : Object |
| Indexers.cs:7:15:7:27 | [post] this access : Partial1 [field _backingArray, element] : Object | semmle.label | [post] this access : Partial1 [field _backingArray, element] : Object |
| Indexers.cs:7:15:7:27 | [post] this access : Partial1 [field _backingArray, element] : Object | semmle.label | [post] this access : Partial1 [field _backingArray, element] : Object |
| Indexers.cs:7:38:7:42 | access to parameter value : Object | semmle.label | access to parameter value : Object |
| Indexers.cs:7:38:7:42 | access to parameter value : Object | semmle.label | access to parameter value : Object |
| Indexers.cs:34:13:34:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
| Indexers.cs:34:13:34:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
| Indexers.cs:34:17:34:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
| Indexers.cs:34:17:34:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
| 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 |
| 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 |
| Indexers.cs:37:17:37:17 | access to local variable o : Object | semmle.label | access to local variable o : Object |
| Indexers.cs:37:17:37:17 | access to local variable o : Object | semmle.label | access to local variable o : Object |
| 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 |
| 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 |
| Indexers.cs:38:14:38:18 | access to indexer | semmle.label | access to indexer |
| Indexers.cs:38:14:38:18 | access to indexer | semmle.label | access to indexer |
subpaths
| 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 |
| 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 |
| 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 |
| 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 |
testFailures
| Indexers.cs:38:22:38:40 | // ... | Missing result: hasValueFlow=1 |
#select
| 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 |
| 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 |
8 changes: 4 additions & 4 deletions csharp/ql/test/library-tests/dispatch/CallGraph.expected
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@
| ViableCallable.cs:609:17:609:23 | Run1`1 | ViableCallable.cs:601:21:601:21 | M |
| ViableCallable.cs:615:17:615:23 | Run2`1 | ViableCallable.cs:601:21:601:21 | M |
| ViableCallable.cs:615:17:615:23 | Run2`1 | ViableCallable.cs:606:21:606:21 | M |
| ViableCallable.cs:638:17:638:20 | Run1 | ViableCallable.cs:626:42:626:44 | get_Property |
| ViableCallable.cs:638:17:638:20 | Run1 | ViableCallable.cs:626:47:626:49 | set_Property |
| ViableCallable.cs:638:17:638:20 | Run1 | ViableCallable.cs:628:49:628:51 | get_Item |
| ViableCallable.cs:638:17:638:20 | Run1 | ViableCallable.cs:628:54:628:56 | set_Item |
| ViableCallable.cs:638:17:638:20 | Run1 | ViableCallable.cs:633:42:633:44 | get_Property |
| ViableCallable.cs:638:17:638:20 | Run1 | ViableCallable.cs:633:63:633:65 | set_Property |
| ViableCallable.cs:638:17:638:20 | Run1 | ViableCallable.cs:635:49:635:51 | get_Item |
| ViableCallable.cs:638:17:638:20 | Run1 | ViableCallable.cs:635:70:635:72 | set_Item |
12 changes: 6 additions & 6 deletions csharp/ql/test/library-tests/partial/Partial1.expected
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
| Partial.cs:1:15:1:26 | TwoPartClass |
| Partial.cs:4:18:4:42 | PartialMethodWithoutBody1 |
| Partial.cs:7:27:7:42 | PartialProperty1 |
| Partial.cs:7:46:7:48 | get_PartialProperty1 |
| Partial.cs:7:51:7:53 | set_PartialProperty1 |
| Partial.cs:9:27:9:30 | Item |
| Partial.cs:9:45:9:47 | get_Item |
| Partial.cs:9:50:9:52 | set_Item |
| Partial.cs:12:15:12:26 | TwoPartClass |
| Partial.cs:14:18:14:39 | PartialMethodWithBody1 |
| Partial.cs:18:27:18:42 | PartialProperty1 |
| Partial.cs:20:9:20:11 | get_PartialProperty1 |
| Partial.cs:21:9:21:11 | set_PartialProperty1 |
| Partial.cs:25:27:25:30 | Item |
| Partial.cs:27:9:27:11 | get_Item |
| Partial.cs:28:9:28:11 | set_Item |
| Partial.cs:32:15:32:33 | OnePartPartialClass |
| Partial.cs:34:18:34:42 | PartialMethodWithoutBody2 |
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
| Partial.cs:7:46:7:48 | get_PartialProperty1 | true |
| Partial.cs:7:51:7:53 | set_PartialProperty1 | true |
| Partial.cs:9:45:9:47 | get_Item | true |
| Partial.cs:9:50:9:52 | set_Item | true |
| Partial.cs:20:9:20:11 | get_PartialProperty1 | true |
| Partial.cs:21:9:21:11 | set_PartialProperty1 | true |
| Partial.cs:27:9:27:11 | get_Item | true |
| Partial.cs:28:9:28:11 | set_Item | true |
| Partial.cs:41:30:41:32 | get_Property | false |
| Partial.cs:41:35:41:37 | set_Property | false |
| Partial.cs:44:9:44:11 | get_Item | false |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
| Partial.cs:9:27:9:30 | Item | true |
| Partial.cs:25:27:25:30 | Item | true |
| Partial.cs:42:19:42:22 | Item | false |
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
| Partial.cs:7:27:7:42 | PartialProperty1 | true |
| Partial.cs:18:27:18:42 | PartialProperty1 | true |
| Partial.cs:41:19:41:26 | Property | false |
65 changes: 44 additions & 21 deletions csharp/ql/test/library-tests/partial/PrintAst.expected
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,58 @@ Partial.cs:
# 5| 6: [Method] Method2
# 5| -1: [TypeMention] Void
# 5| 4: [BlockStmt] {...}
# 7| 7: [Property] PartialProperty1
# 14| 7: [Method] PartialMethodWithBody1
# 3| -1: [TypeMention] Void
# 14| 4: [BlockStmt] {...}
# 15| 8: [Method] Method3
# 15| -1: [TypeMention] Void
# 15| 4: [BlockStmt] {...}
# 16| 9: [Field] _backingField
# 16| -1: [TypeMention] object
# 18| 10: [Property] PartialProperty1
# 7| -1: [TypeMention] object
# 7| 3: [Getter] get_PartialProperty1
# 7| 4: [Setter] set_PartialProperty1
# 18| -1: [TypeMention] object
# 20| 3: [Getter] get_PartialProperty1
# 20| 4: [BlockStmt] {...}
# 20| 0: [ReturnStmt] return ...;
# 20| 0: [FieldAccess] access to field _backingField
# 21| 4: [Setter] set_PartialProperty1
#-----| 2: (Parameters)
# 7| 0: [Parameter] value
# 9| 8: [Indexer] Item
# 21| 0: [Parameter] value
# 21| 4: [BlockStmt] {...}
# 21| 0: [ExprStmt] ...;
# 21| 0: [AssignExpr] ... = ...
# 21| 0: [FieldAccess] access to field _backingField
# 21| 1: [ParameterAccess] access to parameter value
# 23| 11: [Field] _backingArray
# 23| -1: [TypeMention] Object[]
# 23| 1: [TypeMention] object
# 25| 12: [Indexer] Item
# 9| -1: [TypeMention] object
# 25| -1: [TypeMention] object
#-----| 1: (Parameters)
# 9| 0: [Parameter] index
# 9| -1: [TypeMention] int
# 9| 3: [Getter] get_Item
# 25| -1: [TypeMention] int
# 27| 3: [Getter] get_Item
#-----| 2: (Parameters)
# 9| 0: [Parameter] index
# 9| 4: [Setter] set_Item
# 25| 0: [Parameter] index
# 27| 4: [BlockStmt] {...}
# 27| 0: [ReturnStmt] return ...;
# 27| 0: [ArrayAccess] access to array element
# 27| -1: [FieldAccess] access to field _backingArray
# 27| 0: [ParameterAccess] access to parameter index
# 28| 4: [Setter] set_Item
#-----| 2: (Parameters)
# 9| 0: [Parameter] index
# 9| 1: [Parameter] value
# 14| 9: [Method] PartialMethodWithBody1
# 3| -1: [TypeMention] Void
# 14| 4: [BlockStmt] {...}
# 15| 10: [Method] Method3
# 15| -1: [TypeMention] Void
# 15| 4: [BlockStmt] {...}
# 16| 11: [Field] _backingField
# 16| -1: [TypeMention] object
# 23| 12: [Field] _backingArray
# 23| -1: [TypeMention] Object[]
# 23| 1: [TypeMention] object
# 25| 0: [Parameter] index
# 28| 1: [Parameter] value
# 28| 4: [BlockStmt] {...}
# 28| 0: [ExprStmt] ...;
# 28| 0: [AssignExpr] ... = ...
# 28| 0: [ArrayAccess] access to array element
# 28| -1: [FieldAccess] access to field _backingArray
# 28| 0: [ParameterAccess] access to parameter index
# 28| 1: [ParameterAccess] access to parameter value
# 32| [Class] OnePartPartialClass
# 34| 5: [Method] PartialMethodWithoutBody2
# 34| -1: [TypeMention] Void
Expand Down

0 comments on commit ec17a0e

Please sign in to comment.