Java: PrintAst: Improve test

Author: joefarebrother

java/ql/test/library-tests/printAst/A.java

@@ -18,6 +18,12 @@ class A {
    /** Does something */
    @Deprecated
    static int doSomething(@SuppressWarnings("all") String text) {
+       int i=0, j=1;
+
+       for(i=0, j=1; i<3; i++) {}
+
+       for(int m=0, n=1; m<3; m++) {}
+
        return 0;
    }
 

java/ql/test/library-tests/printAst/PrintAst.expected

@@ -31,26 +31,59 @@ A.java:
 #   20|               1: [StringLiteral] "all"
 #   20|           0: [TypeAccess] String
 #   20|       5: [BlockStmt] stmt
-#   21|         0: [ReturnStmt] stmt
-#   21|           0: [IntegerLiteral] 0
-#   24|     6: [FieldDeclaration] int counter, ...;
-#   24|       -1: [TypeAccess] int
-#   24|       0: [IntegerLiteral] 1
-#   26|     7: [BlockStmt] stmt
-#   27|       0: [ExprStmt] stmt
-#   27|         0: [AssignExpr] ...=...
-#   27|           0: [VarAccess] counter
-#   27|           1: [MethodAccess] doSomething(...)
-#   27|             0: [StringLiteral] "hi"
-#   36|     8: [Method] doSomethingElse
+#   21|         0: [LocalVariableDeclStmt] stmt
+#   21|           0: [TypeAccess] int
+#   21|           1: [LocalVariableDeclExpr] i
+#   21|             0: [IntegerLiteral] 0
+#   21|           2: [LocalVariableDeclExpr] j
+#   21|             0: [IntegerLiteral] 1
+#   23|         1: [ForStmt] stmt
+#-----|           0: (For Initializers) 
+#   23|             1: [AssignExpr] ...=...
+#   23|               0: [VarAccess] i
+#   23|               1: [IntegerLiteral] 0
+#   23|             2: [AssignExpr] ...=...
+#   23|               0: [VarAccess] j
+#   23|               1: [IntegerLiteral] 1
+#   23|           1: [LTExpr] ... < ...
+#   23|             0: [VarAccess] i
+#   23|             1: [IntegerLiteral] 3
+#   23|           2: [BlockStmt] stmt
+#   23|           3: [PostIncExpr] ...++
+#   23|             0: [VarAccess] i
+#   25|         2: [ForStmt] stmt
+#-----|           0: (For Initializers) 
+#   25|             0: [TypeAccess] int
+#   25|             1: [LocalVariableDeclExpr] m
+#   25|               0: [IntegerLiteral] 0
+#   25|             2: [LocalVariableDeclExpr] n
+#   25|               0: [IntegerLiteral] 1
+#   25|           1: [LTExpr] ... < ...
+#   25|             0: [VarAccess] m
+#   25|             1: [IntegerLiteral] 3
+#   25|           2: [BlockStmt] stmt
+#   25|           3: [PostIncExpr] ...++
+#   25|             0: [VarAccess] m
+#   27|         3: [ReturnStmt] stmt
+#   27|           0: [IntegerLiteral] 0
+#   30|     6: [FieldDeclaration] int counter, ...;
+#   30|       -1: [TypeAccess] int
+#   30|       0: [IntegerLiteral] 1
+#   32|     7: [BlockStmt] stmt
+#   33|       0: [ExprStmt] stmt
+#   33|         0: [AssignExpr] ...=...
+#   33|           0: [VarAccess] counter
+#   33|           1: [MethodAccess] doSomething(...)
+#   33|             0: [StringLiteral] "hi"
+#   42|     8: [Method] doSomethingElse
 #-----|       1: (Annotations)
-#   30|         1: [Annotation] Ann1
-#   31|           1: [StringLiteral] "a"
-#   32|           2: [ArrayInit] {...}
-#   33|             1: [Annotation] Ann2
-#   34|             2: [Annotation] Ann2
-#   34|               1: [IntegerLiteral] 7
-#   36|       3: [TypeAccess] String
-#   36|       5: [BlockStmt] stmt
-#   36|         0: [ReturnStmt] stmt
-#   36|           0: [StringLiteral] "c"
+#   36|         1: [Annotation] Ann1
+#   37|           1: [StringLiteral] "a"
+#   38|           2: [ArrayInit] {...}
+#   39|             1: [Annotation] Ann2
+#   40|             2: [Annotation] Ann2
+#   40|               1: [IntegerLiteral] 7
+#   42|       3: [TypeAccess] String
+#   42|       5: [BlockStmt] stmt
+#   42|         0: [ReturnStmt] stmt
+#   42|           0: [StringLiteral] "c"