C#: Cleanup C# source code file and add a test case for namespace delcarations.

michaelnebel · michaelnebel · commit 23b844434867 · 2022-01-07T16:04:43.000+01:00
diff --git a/csharp/ql/test/library-tests/csharp10/FileScopedNamespace.cs b/csharp/ql/test/library-tests/csharp10/FileScopedNamespace.cs
@@ -1,8 +1,8 @@
 namespace MyFileScopedNamespace;
+
 public class MyFileScopedNamespaceClass
 {
     private readonly object myField = new object();
     public object MyProp { get; set; }
     public void MyMethod() { }
-
 }
diff --git a/csharp/ql/test/library-tests/csharp10/fileScopedNamespace.expected b/csharp/ql/test/library-tests/csharp10/fileScopedNamespace.expected
@@ -1,4 +1,7 @@
-| FileScopedNamespace.cs:1:11:1:31 | MyFileScopedNamespace | FileScopedNamespace.cs:2:14:2:39 | MyFileScopedNamespaceClass |
-| FileScopedNamespace.cs:1:11:1:31 | MyFileScopedNamespace | FileScopedNamespace.cs:4:29:4:35 | myField |
-| FileScopedNamespace.cs:1:11:1:31 | MyFileScopedNamespace | FileScopedNamespace.cs:5:19:5:24 | MyProp |
-| FileScopedNamespace.cs:1:11:1:31 | MyFileScopedNamespace | FileScopedNamespace.cs:6:17:6:24 | MyMethod |
+fileScopedNamespace
+| FileScopedNamespace.cs:1:11:1:31 | MyFileScopedNamespace | FileScopedNamespace.cs:3:14:3:39 | MyFileScopedNamespaceClass |
+| FileScopedNamespace.cs:1:11:1:31 | MyFileScopedNamespace | FileScopedNamespace.cs:5:29:5:35 | myField |
+| FileScopedNamespace.cs:1:11:1:31 | MyFileScopedNamespace | FileScopedNamespace.cs:6:19:6:24 | MyProp |
+| FileScopedNamespace.cs:1:11:1:31 | MyFileScopedNamespace | FileScopedNamespace.cs:7:17:7:24 | MyMethod |
+namespaceDeclaration
+| FileScopedNamespace.cs:1:11:1:31 | namespace ... { ... } | FileScopedNamespace.cs:1:11:1:31 | MyFileScopedNamespace |
diff --git a/csharp/ql/test/library-tests/csharp10/fileScopedNamespace.ql b/csharp/ql/test/library-tests/csharp10/fileScopedNamespace.ql
@@ -8,3 +8,5 @@ query predicate fileScopedNamespace(Namespace n, Member m) {
     m.getLocation().toString().matches("%FileScopedNamespace.cs%")
   )
 }
+
+query predicate namespaceDeclaration(NamespaceDeclaration nd, Namespace n) { n = nd.getNamespace() }

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`namespace MyFileScopedNamespace;`
	`2`	`+`
`2`	`3`	`public class MyFileScopedNamespaceClass`
`3`	`4`	`{`
`4`	`5`	`private readonly object myField = new object();`
`5`	`6`	`public object MyProp { get; set; }`
`6`	`7`	`public void MyMethod() { }`
`7`		`-`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,3 +8,5 @@ query predicate fileScopedNamespace(Namespace n, Member m) {`
`8`	`8`	`m.getLocation().toString().matches("%FileScopedNamespace.cs%")`
`9`	`9`	`)`
`10`	`10`	`}`
	`11`	`+`
	`12`	`+query predicate namespaceDeclaration(NamespaceDeclaration nd, Namespace n) { n = nd.getNamespace() }`