C#: Update the test expected output.

Author: michaelnebel

csharp/ql/test/library-tests/spans/slice.expected

@@ -1,34 +1,24 @@
-methodCalls
 | Slice.cs:8:20:8:26 | call to method Substring | Substring(int, int) | 0 | 1 |
-| Slice.cs:8:20:8:26 | call to method Substring | Substring(int, int) | 1 | access to parameter a - 1 |
+| Slice.cs:8:20:8:26 | call to method Substring | Substring(int, int) | 1 | access to parameter a |
 | Slice.cs:9:20:9:25 | call to method Substring | Substring(int, int) | 0 | 0 |
 | Slice.cs:9:20:9:25 | call to method Substring | Substring(int, int) | 1 | 2 |
 | Slice.cs:10:20:10:25 | call to method Substring | Substring(int, int) | 0 | 3 |
-| Slice.cs:10:20:10:25 | call to method Substring | Substring(int, int) | 1 | access to property Length - 3 |
+| Slice.cs:10:20:10:25 | call to method Substring | Substring(int, int) | 1 | ^0 |
 | Slice.cs:11:20:11:26 | call to method Substring | Substring(int, int) | 0 | 0 |
-| Slice.cs:11:20:11:26 | call to method Substring | Substring(int, int) | 1 | access to property Length - 4 |
+| Slice.cs:11:20:11:26 | call to method Substring | Substring(int, int) | 1 | ^4 |
 | Slice.cs:12:20:12:27 | call to method Substring | Substring(int, int) | 0 | access to parameter a |
-| Slice.cs:12:20:12:27 | call to method Substring | Substring(int, int) | 1 | access to property Length - access to parameter b - access to parameter a |
+| Slice.cs:12:20:12:27 | call to method Substring | Substring(int, int) | 1 | ^access to parameter b |
 | Slice.cs:13:20:13:24 | call to method Substring | Substring(int, int) | 0 | 0 |
-| Slice.cs:13:20:13:24 | call to method Substring | Substring(int, int) | 1 | access to property Length |
+| Slice.cs:13:20:13:24 | call to method Substring | Substring(int, int) | 1 | ^0 |
 | Slice.cs:16:22:16:29 | call to method Slice | Slice(int, int) | 0 | 5 |
-| Slice.cs:16:22:16:29 | call to method Slice | Slice(int, int) | 1 | access to parameter a - 5 |
+| Slice.cs:16:22:16:29 | call to method Slice | Slice(int, int) | 1 | access to parameter a |
 | Slice.cs:17:22:17:28 | call to method Slice | Slice(int, int) | 0 | 0 |
 | Slice.cs:17:22:17:28 | call to method Slice | Slice(int, int) | 1 | 6 |
 | Slice.cs:18:22:18:28 | call to method Slice | Slice(int, int) | 0 | 7 |
-| Slice.cs:18:22:18:28 | call to method Slice | Slice(int, int) | 1 | access to property Length - 7 |
+| Slice.cs:18:22:18:28 | call to method Slice | Slice(int, int) | 1 | ^0 |
 | Slice.cs:19:22:19:29 | call to method Slice | Slice(int, int) | 0 | 0 |
-| Slice.cs:19:22:19:29 | call to method Slice | Slice(int, int) | 1 | access to property Length - 8 |
+| Slice.cs:19:22:19:29 | call to method Slice | Slice(int, int) | 1 | ^8 |
 | Slice.cs:20:22:20:30 | call to method Slice | Slice(int, int) | 0 | access to parameter a |
-| Slice.cs:20:22:20:30 | call to method Slice | Slice(int, int) | 1 | access to property Length - access to parameter b - access to parameter a |
+| Slice.cs:20:22:20:30 | call to method Slice | Slice(int, int) | 1 | ^access to parameter b |
 | Slice.cs:21:22:21:27 | call to method Slice | Slice(int, int) | 0 | 0 |
-| Slice.cs:21:22:21:27 | call to method Slice | Slice(int, int) | 1 | access to property Length |
-propertyCalls
-| Slice.cs:10:20:10:25 | access to property Length | Slice.cs:10:20:10:20 | access to local variable s |
-| Slice.cs:11:20:11:26 | access to property Length | Slice.cs:11:20:11:20 | access to local variable s |
-| Slice.cs:12:20:12:27 | access to property Length | Slice.cs:12:20:12:20 | access to local variable s |
-| Slice.cs:13:20:13:24 | access to property Length | Slice.cs:13:20:13:20 | access to local variable s |
-| Slice.cs:18:22:18:28 | access to property Length | Slice.cs:18:22:18:23 | access to local variable sp |
-| Slice.cs:19:22:19:29 | access to property Length | Slice.cs:19:22:19:23 | access to local variable sp |
-| Slice.cs:20:22:20:30 | access to property Length | Slice.cs:20:22:20:23 | access to local variable sp |
-| Slice.cs:21:22:21:27 | access to property Length | Slice.cs:21:22:21:23 | access to local variable sp |
+| Slice.cs:21:22:21:27 | call to method Slice | Slice(int, int) | 1 | ^0 |

csharp/ql/test/library-tests/spans/slice.ql

@@ -1,18 +1,13 @@
 import csharp
 
 private string printExpr(Expr e) {
-  e =
-    any(SubExpr sub |
-      result = printExpr(sub.getLeftOperand()) + " - " + printExpr(sub.getRightOperand())
-    )
+  e = any(IndexExpr index | result = "^" + index.getExpr().toString())
   or
-  not e instanceof SubExpr and
+  not e instanceof IndexExpr and
   result = e.toString()
 }
 
 query predicate methodCalls(MethodCall mc, string m, int i, string arg) {
   m = mc.getTarget().toStringWithTypes() and
   arg = printExpr(mc.getArgument(i))
 }
-
-query predicate propertyCalls(PropertyCall p, Expr qualifier) { qualifier = p.getQualifier() }