Merge pull request #709 from hvitved/csharp/autoformat/tests

C#: Autoformat QL tests

Author: calumgrant

csharp/ql/test/library-tests/arguments/argumentType.ql

@@ -1,5 +1,5 @@
 import csharp
 
 from Expr e, int m
-where expr_argument(e,m)
+where expr_argument(e, m)
 select e, m

csharp/ql/test/library-tests/asp/basic/AspDirective.ql

@@ -3,4 +3,3 @@ import semmle.code.asp.AspNet
 from AspDirective directive, string name, AspAttribute attrib
 where directive.getAttributeByName(name) = attrib
 select directive, name, attrib
-

csharp/ql/test/library-tests/asp/basic/AspOpenTag.ql

@@ -3,4 +3,3 @@ import semmle.code.asp.AspNet
 from AspOpenTag tag, string name, AspAttribute attrib
 where tag.getAttributeByName(name) = attrib
 select tag, name, attrib
-

csharp/ql/test/library-tests/asp/basic/comments.ql

@@ -1,8 +1,5 @@
 import semmle.code.asp.AspNet
 
 from AspComment comment, string kind
-where
-  if comment instanceof AspServerComment
-  then kind = "server"
-  else kind = "client"
+where if comment instanceof AspServerComment then kind = "server" else kind = "client"
 select comment, comment.getBody(), kind

csharp/ql/test/library-tests/asp/parseError/AspDirective.ql

@@ -3,4 +3,3 @@ import semmle.code.asp.AspNet
 from AspDirective directive, string name, AspAttribute attrib
 where directive.getAttributeByName(name) = attrib
 select directive, name, attrib
-

csharp/ql/test/library-tests/asp/parseError/AspOpenTag.ql

@@ -3,4 +3,3 @@ import semmle.code.asp.AspNet
 from AspOpenTag tag, string name, AspAttribute attrib
 where tag.getAttributeByName(name) = attrib
 select tag, name, attrib
-

csharp/ql/test/library-tests/asp/parseError/comments.ql

@@ -1,8 +1,5 @@
 import semmle.code.asp.AspNet
 
 from AspComment comment, string kind
-where
-  if comment instanceof AspServerComment
-  then kind = "server"
-  else kind = "client"
+where if comment instanceof AspServerComment then kind = "server" else kind = "client"
 select comment, comment.getBody(), kind

csharp/ql/test/library-tests/assemblies/CompareVersions.ql

@@ -1,7 +1,6 @@
 import csharp
 
-Version getAVersion()
-{
+Version getAVersion() {
   result = "1.2" or
   result = "1.2.0" or
   result = "1.2.0.0" or
@@ -15,6 +14,7 @@ Version getAVersion()
 }
 
 from Version v1, Version v2
-where v1 = getAVersion()
-  and v2 = getAVersion()
+where
+  v1 = getAVersion() and
+  v2 = getAVersion()
 select v1, v2, v1.compareTo(v2)

csharp/ql/test/library-tests/assemblies/ValidVersions.ql

@@ -1,12 +1,14 @@
 import csharp
 
 from Version version
-where version = "1.2.3.4"
-   or version = "2.3.24"
-   or version = "1.2"
-   or version = "xxx"
-   or version = "1.x"
-   or version = "1"
-   or version = ""
-   or version = "1234.56"
-select version, version.getMajor(), version.getMajorRevision(), version.getMinor(), version.getMinorRevision()
+where
+  version = "1.2.3.4" or
+  version = "2.3.24" or
+  version = "1.2" or
+  version = "xxx" or
+  version = "1.x" or
+  version = "1" or
+  version = "" or
+  version = "1234.56"
+select version, version.getMajor(), version.getMajorRevision(), version.getMinor(),
+  version.getMinorRevision()

csharp/ql/test/library-tests/assemblies/assemblies.ql

@@ -1,41 +1,18 @@
 import csharp
 
-class TypeRef extends @typeref
-{
-  string toString() {
-    hasName(result)
-  }
+class TypeRef extends @typeref {
+  string toString() { hasName(result) }
 
-  predicate hasName(string name) {
-    typerefs(this, name)
-  }
+  predicate hasName(string name) { typerefs(this, name) }
 
-  Type getType() {
-    typeref_type(this, result)
-  }
+  Type getType() { typeref_type(this, result) }
 }
 
-class MissingType extends TypeRef
-{
-  MissingType() {
-    not exists(getType())
-  }
-}
+class MissingType extends TypeRef { MissingType() { not exists(getType()) } }
 
 from
-  Class class1,
-  MissingType class2,
-  MissingType class3,
-  MissingType class4,
-  MissingType class5,
-  MissingType del2,
-  Field a,
-  Method b,
-  Method c,
-  Method d,
-  Method e,
-  Method f,
-  Method g
+  Class class1, MissingType class2, MissingType class3, MissingType class4, MissingType class5,
+  MissingType del2, Field a, Method b, Method c, Method d, Method e, Method f, Method g
 where
   class1.hasQualifiedName("Assembly1.Class1") and
   class2.hasName("Class2") and
@@ -50,10 +27,10 @@ where
   e.hasName("e") and
   f.hasName("f") and
   g.hasName("g") and
-  a.getDeclaringType()=class1 and
-  a.getDeclaringType()=class1 and
-  b.getDeclaringType()=class1 and
-  c.getDeclaringType()=class1 and
+  a.getDeclaringType() = class1 and
+  a.getDeclaringType() = class1 and
+  b.getDeclaringType() = class1 and
+  c.getDeclaringType() = class1 and
   not exists(c.getParameter(0).getType()) and
   not exists(a.getType()) and
   not exists(b.getReturnType()) and