C#: Update stats and test output.

calumgrant · calumgrant · commit fa89d2b845a5 · 2019-06-04T18:10:49.000+01:00
diff --git a/csharp/ql/src/semmlecode.csharp.dbscheme.stats b/csharp/ql/src/semmlecode.csharp.dbscheme.stats
@@ -360,10 +360,14 @@
 <v>1854</v>
 </e>
 <e>
-<k>@using_stmt</k>
+<k>@using_block_stmt</k>
 <v>5815</v>
 </e>
 <e>
+<k>@using_decl_stmt</k>
+<v>1000</v>
+</e>
+<e>
 <k>@var_decl_stmt</k>
 <v>243866</v>
 </e>
@@ -688,6 +692,10 @@
 <v>116</v>
 </e>
 <e>
+<k>@assign_coalesce_expr</k>
+<v>116</v>
+</e>
+<e>
 <k>@object_init_expr</k>
 <v>5320</v>
 </e>
diff --git a/csharp/ql/test/library-tests/csharp8/UsingDeclarations.expected b/csharp/ql/test/library-tests/csharp8/UsingDeclarations.expected
@@ -1,11 +1,9 @@
 localVars
-| NullCoalescingAssignment.cs:7:16:7:16 | o |
 | UsingDeclarations.cs:8:26:8:30 | file1 |
 | UsingDeclarations.cs:8:72:8:76 | file2 |
 | UsingDeclarations.cs:10:26:10:30 | file3 |
 | UsingDeclarations.cs:10:72:10:76 | file4 |
 localVariableDeclarations
-| NullCoalescingAssignment.cs:7:9:7:24 | ... ...; | 0 | NullCoalescingAssignment.cs:7:16:7:23 | Object o = ... |
 usingStmts1
 | UsingDeclarations.cs:8:9:8:116 | using ... ...; |
 | UsingDeclarations.cs:10:9:12:9 | using (...) {...} |
diff --git a/csharp/ql/test/library-tests/csharp8/UsingDeclarations.ql b/csharp/ql/test/library-tests/csharp8/UsingDeclarations.ql
@@ -1,10 +1,13 @@
 import csharp
 
-query predicate localVars(LocalVariable decl) { any() }
+query predicate localVars(LocalVariable decl) {
+  decl.getEnclosingCallable().hasName("TestUsingDeclarations")
+}
 
 query predicate localVariableDeclarations(
   LocalVariableDeclStmt stmt, int i, LocalVariableDeclExpr decl
 ) {
+  decl.getEnclosingCallable().hasName("TestUsingDeclarations") and
   decl = stmt.getVariableDeclExpr(i)
 }
 
