Skip to content

Commit 359dea2

Browse files
calumgrantcalumgrant
committed
C#: Fixed test output.
1 parent bcd8dca commit 359dea2

File tree

6 files changed

+6
-32
lines changed

6 files changed

+6
-32
lines changed

‎csharp/ql/test/library-tests/controlflow/guards/AbstractValue.expected‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -269,31 +269,24 @@ abstractValue
269269
| non-null | Guards.cs:70:31:70:31 | access to parameter s |
270270
| non-null | Guards.cs:71:13:71:13 | access to parameter s |
271271
| non-null | Guards.cs:72:13:72:19 | access to type Console |
272-
| non-null | Guards.cs:78:15:78:21 | access to property Length |
273272
| non-null | Guards.cs:78:26:78:26 | (...) ... |
274273
| non-null | Guards.cs:79:13:79:19 | access to type Console |
275274
| non-null | Guards.cs:79:31:79:31 | access to parameter s |
276-
| non-null | Guards.cs:80:15:80:21 | access to property Length |
277275
| non-null | Guards.cs:80:25:80:25 | (...) ... |
278276
| non-null | Guards.cs:81:13:81:19 | access to type Console |
279277
| non-null | Guards.cs:81:31:81:31 | access to parameter s |
280-
| non-null | Guards.cs:82:15:82:21 | access to property Length |
281278
| non-null | Guards.cs:82:26:82:26 | (...) ... |
282279
| non-null | Guards.cs:83:13:83:19 | access to type Console |
283280
| non-null | Guards.cs:83:31:83:31 | access to parameter s |
284-
| non-null | Guards.cs:84:15:84:21 | access to property Length |
285281
| non-null | Guards.cs:84:25:84:26 | (...) ... |
286282
| non-null | Guards.cs:85:13:85:19 | access to type Console |
287283
| non-null | Guards.cs:85:31:85:31 | access to parameter s |
288-
| non-null | Guards.cs:86:15:86:21 | access to property Length |
289284
| non-null | Guards.cs:86:26:86:27 | (...) ... |
290285
| non-null | Guards.cs:87:13:87:19 | access to type Console |
291286
| non-null | Guards.cs:87:31:87:31 | access to parameter s |
292-
| non-null | Guards.cs:88:15:88:21 | access to property Length |
293287
| non-null | Guards.cs:89:13:89:19 | access to type Console |
294288
| non-null | Guards.cs:89:31:89:31 | access to parameter s |
295289
| non-null | Guards.cs:91:13:91:19 | access to type Console |
296-
| non-null | Guards.cs:92:15:92:21 | access to property Length |
297290
| non-null | Guards.cs:92:25:92:25 | (...) ... |
298291
| non-null | Guards.cs:92:30:92:30 | (...) ... |
299292
| non-null | Guards.cs:93:13:93:19 | access to type Console |
@@ -334,7 +327,6 @@ abstractValue
334327
| non-null | Guards.cs:119:27:119:27 | access to parameter g |
335328
| non-null | Guards.cs:119:27:119:36 | access to property Property |
336329
| non-null | Guards.cs:125:18:125:19 | access to parameter s1 |
337-
| non-null | Guards.cs:125:21:125:31 | call to method Equals |
338330
| non-null | Guards.cs:125:29:125:30 | access to parameter s1 |
339331
| non-null | Guards.cs:132:16:132:16 | access to parameter s |
340332
| non-null | Guards.cs:138:20:138:20 | access to parameter s |
@@ -360,12 +352,9 @@ abstractValue
360352
| non-null | Guards.cs:205:13:205:13 | access to parameter o |
361353
| non-null | Guards.cs:206:33:206:36 | access to parameter args |
362354
| non-null | Guards.cs:208:17:208:17 | access to parameter o |
363-
| non-null | Guards.cs:268:16:268:25 | call to method GetType |
364355
| non-null | Guards.cs:268:30:268:41 | call to method GetType |
365356
| non-null | Guards.cs:269:13:269:14 | access to parameter o1 |
366-
| non-null | Guards.cs:270:16:270:25 | call to method GetType |
367357
| non-null | Guards.cs:270:30:270:31 | access to parameter o2 |
368-
| non-null | Guards.cs:270:33:270:42 | call to method GetType |
369358
| non-null | Guards.cs:279:17:279:17 | access to parameter o |
370359
| non-null | Guards.cs:281:17:281:17 | access to local variable a |
371360
| non-null | Guards.cs:283:17:283:17 | access to parameter o |

‎csharp/ql/test/library-tests/controlflow/guards/GuardedControlFlowNode.expected‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,7 @@
174174
| Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:13:268:14 | access to parameter o1 | Guards.cs:268:13:268:14 | access to parameter o1 | non-null |
175175
| Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:13:268:41 | call to operator == | Guards.cs:268:13:268:14 | access to parameter o1 | true |
176176
| Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:16:268:25 | call to method GetType | Guards.cs:268:13:268:14 | access to parameter o1 | non-null |
177-
| Guards.cs:271:13:271:14 | access to parameter o1 | Guards.cs:270:13:270:14 | access to parameter o1 | Guards.cs:270:13:270:14 | access to parameter o1 | non-null |
178177
| Guards.cs:271:13:271:14 | access to parameter o1 | Guards.cs:270:13:270:42 | call to operator == | Guards.cs:270:13:270:14 | access to parameter o1 | true |
179-
| Guards.cs:271:13:271:14 | access to parameter o1 | Guards.cs:270:16:270:25 | call to method GetType | Guards.cs:270:13:270:14 | access to parameter o1 | non-null |
180178
| Guards.cs:279:17:279:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | match access to type Action<Object> |
181179
| Guards.cs:279:17:279:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-null |
182180
| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | match "" |

‎csharp/ql/test/library-tests/controlflow/guards/GuardedExpr.expected‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,7 @@
174174
| Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:13:268:14 | access to parameter o1 | Guards.cs:268:13:268:14 | access to parameter o1 | non-null |
175175
| Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:13:268:41 | call to operator == | Guards.cs:268:13:268:14 | access to parameter o1 | true |
176176
| Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:16:268:25 | call to method GetType | Guards.cs:268:13:268:14 | access to parameter o1 | non-null |
177-
| Guards.cs:271:13:271:14 | access to parameter o1 | Guards.cs:270:13:270:14 | access to parameter o1 | Guards.cs:270:13:270:14 | access to parameter o1 | non-null |
178177
| Guards.cs:271:13:271:14 | access to parameter o1 | Guards.cs:270:13:270:42 | call to operator == | Guards.cs:270:13:270:14 | access to parameter o1 | true |
179-
| Guards.cs:271:13:271:14 | access to parameter o1 | Guards.cs:270:16:270:25 | call to method GetType | Guards.cs:270:13:270:14 | access to parameter o1 | non-null |
180178
| Guards.cs:279:17:279:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | match access to type Action<Object> |
181179
| Guards.cs:279:17:279:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-null |
182180
| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | match "" |

‎csharp/ql/test/library-tests/controlflow/guards/Implications.expected‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -281,34 +281,27 @@
281281
| Guards.cs:72:31:72:31 | access to parameter s | non-null | Guards.cs:71:17:71:20 | null | non-null |
282282
| Guards.cs:72:31:72:31 | access to parameter s | null | Guards.cs:71:17:71:20 | null | null |
283283
| Guards.cs:78:13:78:26 | ... == ... | true | Guards.cs:78:15:78:21 | access to property Length | non-null |
284-
| Guards.cs:78:13:78:26 | ... == ... | true | Guards.cs:78:26:78:26 | (...) ... | non-null |
285284
| Guards.cs:78:15:78:21 | access to property Length | non-null | Guards.cs:78:13:78:13 | access to parameter s | non-null |
286285
| Guards.cs:78:15:78:21 | access to property Length | null | Guards.cs:78:13:78:13 | access to parameter s | null |
287286
| Guards.cs:80:13:80:25 | ... > ... | true | Guards.cs:80:15:80:21 | access to property Length | non-null |
288-
| Guards.cs:80:13:80:25 | ... > ... | true | Guards.cs:80:25:80:25 | (...) ... | non-null |
289287
| Guards.cs:80:15:80:21 | access to property Length | non-null | Guards.cs:80:13:80:13 | access to parameter s | non-null |
290288
| Guards.cs:80:15:80:21 | access to property Length | null | Guards.cs:80:13:80:13 | access to parameter s | null |
291289
| Guards.cs:82:13:82:26 | ... >= ... | true | Guards.cs:82:15:82:21 | access to property Length | non-null |
292-
| Guards.cs:82:13:82:26 | ... >= ... | true | Guards.cs:82:26:82:26 | (...) ... | non-null |
293290
| Guards.cs:82:15:82:21 | access to property Length | non-null | Guards.cs:82:13:82:13 | access to parameter s | non-null |
294291
| Guards.cs:82:15:82:21 | access to property Length | null | Guards.cs:82:13:82:13 | access to parameter s | null |
295292
| Guards.cs:84:13:84:26 | ... < ... | true | Guards.cs:84:15:84:21 | access to property Length | non-null |
296-
| Guards.cs:84:13:84:26 | ... < ... | true | Guards.cs:84:25:84:26 | (...) ... | non-null |
297293
| Guards.cs:84:15:84:21 | access to property Length | non-null | Guards.cs:84:13:84:13 | access to parameter s | non-null |
298294
| Guards.cs:84:15:84:21 | access to property Length | null | Guards.cs:84:13:84:13 | access to parameter s | null |
299295
| Guards.cs:86:13:86:27 | ... <= ... | true | Guards.cs:86:15:86:21 | access to property Length | non-null |
300-
| Guards.cs:86:13:86:27 | ... <= ... | true | Guards.cs:86:26:86:27 | (...) ... | non-null |
301296
| Guards.cs:86:15:86:21 | access to property Length | non-null | Guards.cs:86:13:86:13 | access to parameter s | non-null |
302297
| Guards.cs:86:15:86:21 | access to property Length | null | Guards.cs:86:13:86:13 | access to parameter s | null |
303298
| Guards.cs:88:13:88:29 | ... != ... | false | Guards.cs:88:15:88:21 | access to property Length | null |
304-
| Guards.cs:88:13:88:29 | ... != ... | false | Guards.cs:88:26:88:29 | null | non-null |
305299
| Guards.cs:88:13:88:29 | ... != ... | true | Guards.cs:88:15:88:21 | access to property Length | non-null |
306300
| Guards.cs:88:15:88:21 | access to property Length | non-null | Guards.cs:88:13:88:13 | access to parameter s | non-null |
307301
| Guards.cs:88:15:88:21 | access to property Length | null | Guards.cs:88:13:88:13 | access to parameter s | null |
308302
| Guards.cs:92:13:92:25 | ... - ... | non-null | Guards.cs:92:15:92:21 | access to property Length | non-null |
309303
| Guards.cs:92:13:92:25 | ... - ... | non-null | Guards.cs:92:25:92:25 | (...) ... | non-null |
310304
| Guards.cs:92:13:92:25 | ... - ... | null | Guards.cs:92:15:92:21 | access to property Length | null |
311-
| Guards.cs:92:13:92:25 | ... - ... | null | Guards.cs:92:25:92:25 | (...) ... | null |
312305
| Guards.cs:92:13:92:30 | ... != ... | false | Guards.cs:92:13:92:25 | ... - ... | non-null |
313306
| Guards.cs:92:15:92:21 | access to property Length | non-null | Guards.cs:92:13:92:13 | access to parameter s | non-null |
314307
| Guards.cs:92:15:92:21 | access to property Length | null | Guards.cs:92:13:92:13 | access to parameter s | null |
@@ -396,10 +389,7 @@
396389
| Guards.cs:258:17:258:17 | access to local variable e | match access to constant B | Guards.cs:258:17:258:17 | access to local variable e | 1 |
397390
| Guards.cs:258:17:258:17 | access to local variable e | non-match access to constant B | Guards.cs:256:13:256:13 | access to parameter b | false |
398391
| Guards.cs:268:13:268:41 | call to operator == | true | Guards.cs:268:16:268:25 | call to method GetType | non-null |
399-
| Guards.cs:268:13:268:41 | call to operator == | true | Guards.cs:268:30:268:41 | call to method GetType | non-null |
400392
| Guards.cs:268:16:268:25 | call to method GetType | non-null | Guards.cs:268:13:268:14 | access to parameter o1 | non-null |
401-
| Guards.cs:270:13:270:42 | call to operator == | true | Guards.cs:270:16:270:25 | call to method GetType | non-null |
402-
| Guards.cs:270:13:270:42 | call to operator == | true | Guards.cs:270:33:270:42 | call to method GetType | non-null |
403393
| Guards.cs:270:16:270:25 | call to method GetType | non-null | Guards.cs:270:13:270:14 | access to parameter o1 | non-null |
404394
| Guards.cs:270:33:270:42 | call to method GetType | non-null | Guards.cs:270:30:270:31 | access to parameter o2 | non-null |
405395
| Guards.cs:276:16:276:16 | access to parameter o | match "" | Guards.cs:276:16:276:16 | access to parameter o | non-null |

‎csharp/ql/test/library-tests/controlflow/guards/NullGuardedExpr.expected‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
| Guards.cs:205:13:205:13 | access to parameter o |
4343
| Guards.cs:208:17:208:17 | access to parameter o |
4444
| Guards.cs:269:13:269:14 | access to parameter o1 |
45-
| Guards.cs:271:13:271:14 | access to parameter o1 |
4645
| Guards.cs:279:17:279:17 | access to parameter o |
4746
| Guards.cs:283:17:283:17 | access to parameter o |
4847
| Guards.cs:287:17:287:17 | access to parameter o |

‎csharp/ql/test/library-tests/csharp8/NullableRefTypes.expected‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -363,18 +363,18 @@ expressionTypes
363363
| NullableRefTypes.cs:211:13:211:13 | access to local variable t | Type? |
364364
| NullableRefTypes.cs:211:13:211:28 | Type t = ... | Type? |
365365
| NullableRefTypes.cs:211:17:211:17 | access to parameter o | object? |
366-
| NullableRefTypes.cs:211:19:211:28 | call to method GetType | Type! |
366+
| NullableRefTypes.cs:211:19:211:28 | call to method GetType | Type? |
367367
| NullableRefTypes.cs:212:16:212:16 | access to local variable t | Type? |
368368
| NullableRefTypes.cs:212:16:212:27 | call to method ToString | string! |
369369
| NullableRefTypes.cs:217:17:217:17 | access to local variable a | string! |
370370
| NullableRefTypes.cs:217:17:217:36 | String a = ... | string! |
371371
| NullableRefTypes.cs:217:21:217:29 | call to method GetSelf | TestNullableFlowStates? |
372372
| NullableRefTypes.cs:217:21:217:29 | this access | TestNullableFlowStates |
373-
| NullableRefTypes.cs:217:31:217:36 | access to field Field | string! |
373+
| NullableRefTypes.cs:217:31:217:36 | access to field Field | string? |
374374
| NullableRefTypes.cs:218:17:218:17 | access to local variable b | string! |
375375
| NullableRefTypes.cs:218:17:218:28 | String b = ... | string! |
376376
| NullableRefTypes.cs:218:21:218:24 | access to parameter list | List<string!>? |
377-
| NullableRefTypes.cs:218:26:218:28 | access to indexer | string |
377+
| NullableRefTypes.cs:218:26:218:28 | access to indexer | string? |
378378
| NullableRefTypes.cs:218:27:218:27 | 0 | int! |
379379
| NullableRefTypes.cs:219:16:219:16 | access to local variable c | string! |
380380
| NullableRefTypes.cs:219:16:219:26 | String c = ... | string! |
@@ -466,13 +466,13 @@ exprFlowState
466466
| NullableRefTypes.cs:206:9:206:16 | call to method Check | Not null |
467467
| NullableRefTypes.cs:206:15:206:15 | access to local variable y | Not null |
468468
| NullableRefTypes.cs:211:17:211:17 | access to parameter o | Maybe null |
469-
| NullableRefTypes.cs:211:19:211:28 | call to method GetType | Not null |
469+
| NullableRefTypes.cs:211:19:211:28 | call to method GetType | Maybe null |
470470
| NullableRefTypes.cs:212:16:212:16 | access to local variable t | Maybe null |
471471
| NullableRefTypes.cs:212:16:212:27 | call to method ToString | Not null |
472472
| NullableRefTypes.cs:217:21:217:29 | call to method GetSelf | Maybe null |
473-
| NullableRefTypes.cs:217:31:217:36 | access to field Field | Not null |
473+
| NullableRefTypes.cs:217:31:217:36 | access to field Field | Maybe null |
474474
| NullableRefTypes.cs:218:21:218:24 | access to parameter list | Maybe null |
475-
| NullableRefTypes.cs:218:26:218:28 | access to indexer | Not null |
475+
| NullableRefTypes.cs:218:26:218:28 | access to indexer | Maybe null |
476476
| NullableRefTypes.cs:218:27:218:27 | 0 | Not null |
477477
| NullableRefTypes.cs:219:20:219:23 | access to parameter list | Maybe null |
478478
| NullableRefTypes.cs:219:20:219:26 | access to indexer | Not null |

0 commit comments

Comments
 (0)