C#: Update test case for LockOrder.

Author: calumgrant

csharp/ql/test/query-tests/Concurrency/LockOrder/LockOrder.cs

@@ -2,30 +2,29 @@
 
 class LocalTest
 {
+    // BAD: b is flagged.
     Object a, b, c;
 
     void F()
     {
-        // BAD: Flagged in G().
         lock (a) lock (b) lock(c) { }
     }
 
     void G()
     {
-        // BAD: Inconsistent with F().
         lock (a) lock (c) lock(b) { }
     }  
 
     void H()
     {
-        // GOOD: Consistent with F() and G().
         lock (a) lock(c) { }
     }
 }
 
 class GlobalTest
 {
-    Object a, b, c;
+    // BAD: b is flagged.
+    static Object a, b, c;
 
     void F()
     {
@@ -40,25 +39,24 @@ void G()
 
     void H()
     {
-        // BAD: Inconsistent with I().
         lock (c) { }
     }
 
     void I()
     {
-        // BAD: Flagged in H().
         lock (b) { }
     }
 }
 
 class LambdaTest
 {
-    Object a, b;
+    // BAD: a is flagged.
+    static Object a, b;
 
     void F()
     {
-        Action lock_a = () => { lock(a) { } };  // BAD: Inconsistent with lock_b.
-        Action lock_b = () => { lock(b) { } };  // BAD: Flagged in lock_a.
+        Action lock_a = () => { lock(a) { } };
+        Action lock_b = () => { lock(b) { } };
 
         lock(a) lock_b();
         lock(b) lock_a();

csharp/ql/test/query-tests/Concurrency/LockOrder/LockOrder.expected

@@ -1,4 +1,4 @@
-| LockOrder.cs:16:27:16:37 | lock (...) {...} | Inconsistent lock sequence. The locks b and c are locked in a different sequence $@. | LockOrder.cs:10:27:10:37 | lock (...) {...} | here |
-| LockOrder.cs:50:9:50:20 | lock (...) {...} | Inconsistent lock sequence. The locks b and c are locked in a different sequence $@. | LockOrder.cs:44:9:44:20 | lock (...) {...} | here |
-| LockOrder.cs:60:31:60:41 | lock (...) {...} | Inconsistent lock sequence. The locks a and b are locked in a different sequence $@. | LockOrder.cs:61:31:61:41 | lock (...) {...} | here |
-| LockOrderBad.cs:29:13:31:13 | lock (...) {...} | Inconsistent lock sequence. The locks lock1 and lock2 are locked in a different sequence $@. | LockOrderBad.cs:16:13:18:13 | lock (...) {...} | here |
+| LockOrder.cs:6:15:6:15 | b | Inconsistent lock sequence with $@. Lock sequences $@, $@ and $@, $@ found. | LockOrder.cs:6:18:6:18 | c | c | LockOrder.cs:10:18:10:37 | lock (...) {...} | b | LockOrder.cs:10:27:10:37 | lock (...) {...} | c | LockOrder.cs:15:18:15:37 | lock (...) {...} | c | LockOrder.cs:15:27:15:37 | lock (...) {...} | b |
+| LockOrder.cs:27:22:27:22 | b | Inconsistent lock sequence with $@. Lock sequences $@, $@ and $@, $@ found. | LockOrder.cs:27:25:27:25 | c | c | LockOrder.cs:36:8:36:20 | lock (...) {...} | b | LockOrder.cs:42:9:42:20 | lock (...) {...} | c | LockOrder.cs:37:8:37:20 | lock (...) {...} | c | LockOrder.cs:47:9:47:20 | lock (...) {...} | b |
+| LockOrder.cs:54:19:54:19 | a | Inconsistent lock sequence with $@. Lock sequences $@, $@ and $@, $@ found. | LockOrder.cs:54:22:54:22 | b | b | LockOrder.cs:61:9:61:25 | lock (...) {...} | a | LockOrder.cs:59:33:59:43 | lock (...) {...} | b | LockOrder.cs:62:9:62:25 | lock (...) {...} | b | LockOrder.cs:58:33:58:43 | lock (...) {...} | a |
+| LockOrderBad.cs:6:29:6:33 | lock1 | Inconsistent lock sequence with $@. Lock sequences $@, $@ and $@, $@ found. | LockOrderBad.cs:7:29:7:33 | lock2 | lock2 | LockOrderBad.cs:11:9:19:9 | lock (...) {...} | lock1 | LockOrderBad.cs:16:13:18:13 | lock (...) {...} | lock2 | LockOrderBad.cs:24:9:32:9 | lock (...) {...} | lock2 | LockOrderBad.cs:29:13:31:13 | lock (...) {...} | lock1 |