Prettify tests

Author: smowton

go/ql/test/library-tests/semmle/go/aliases/MethodDefs/test.ql

@@ -4,18 +4,17 @@ newtype TEntityWithDeclInfo =
   MkEntityWithDeclInfo(Entity e, int nDecls) { nDecls = count(e.getDeclaration()) and nDecls > 0 }
 
 class EntityWithDeclInfo extends TEntityWithDeclInfo {
-  string toString() {
-    exists(Entity e, int nDecls | this = MkEntityWithDeclInfo(e, nDecls) |
-      result = e.toString() + " (" + nDecls + " declaration sites)"
-    )
-  }
+  Entity e;
+  int nDecls;
+
+  EntityWithDeclInfo() { this = MkEntityWithDeclInfo(e, nDecls) }
+
+  string toString() { result = e.toString() + " (" + nDecls + " declaration sites)" }
 
   predicate hasLocationInfo(
     string filepath, int startline, int startcolumn, int endline, int endcolumn
   ) {
-    exists(Entity e | this = MkEntityWithDeclInfo(e, _) |
-      e.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-    )
+    e.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
 }
 

go/ql/test/library-tests/semmle/go/aliases/defsuses/test.ql

@@ -3,18 +3,18 @@ import go
 newtype TEntityWithDeclInfo = MkEntityWithDeclInfo(Entity e)
 
 class EntityWithDeclInfo extends TEntityWithDeclInfo {
+  Entity e;
+
+  EntityWithDeclInfo() { this = MkEntityWithDeclInfo(e) }
+
   string toString() {
-    exists(Entity e | this = MkEntityWithDeclInfo(e) |
-      result = e.toString() + " (" + count(e.getDeclaration()) + " declaration sites)"
-    )
+    result = e.toString() + " (" + count(e.getDeclaration()) + " declaration sites)"
   }
 
   predicate hasLocationInfo(
     string filepath, int startline, int startcolumn, int endline, int endcolumn
   ) {
-    exists(Entity e | this = MkEntityWithDeclInfo(e) |
-      e.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-    )
+    e.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
 }