Skip to content

Commit 485b0be

Browse files
Marcono1234Marcono1234
committed
Java: Fix expected test output
1 parent 2889f94 commit 485b0be

File tree

10 files changed

+25
-25
lines changed

10 files changed

+25
-25
lines changed

‎java/ql/test/library-tests/JDK/PrintAst.expected

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,29 +69,29 @@ jdk/SystemGetPropertyCall.java:
6969
# 6| 4: [Method] a
7070
# 6| 3: [TypeAccess] void
7171
# 6| 5: [BlockStmt] { ... }
72-
# 7| 0: [ExprStmt] ...;
72+
# 7| 0: [ExprStmt] <Expr>;
7373
# 7| 0: [MethodAccess] getProperty(...)
7474
# 7| -1: [TypeAccess] System
7575
# 7| 0: [StringLiteral] "user.dir"
7676
# 10| 5: [Method] b
7777
# 10| 3: [TypeAccess] void
7878
# 10| 5: [BlockStmt] { ... }
79-
# 11| 0: [ExprStmt] ...;
79+
# 11| 0: [ExprStmt] <Expr>;
8080
# 11| 0: [MethodAccess] getProperty(...)
8181
# 11| -1: [TypeAccess] System
8282
# 11| 0: [StringLiteral] "user.dir"
8383
# 11| 1: [StringLiteral] "HOME"
8484
# 14| 6: [Method] c
8585
# 14| 3: [TypeAccess] void
8686
# 14| 5: [BlockStmt] { ... }
87-
# 15| 0: [ExprStmt] ...;
87+
# 15| 0: [ExprStmt] <Expr>;
8888
# 15| 0: [MethodAccess] getProperty(...)
8989
# 15| -1: [TypeAccess] System
9090
# 15| 0: [VarAccess] USER_DIR_PROPERTY
9191
# 18| 7: [Method] d
9292
# 18| 3: [TypeAccess] void
9393
# 18| 5: [BlockStmt] { ... }
94-
# 19| 0: [ExprStmt] ...;
94+
# 19| 0: [ExprStmt] <Expr>;
9595
# 19| 0: [MethodAccess] getProperty(...)
9696
# 19| -1: [TypeAccess] System
9797
# 19| 0: [StringLiteral] "random.property"

‎java/ql/test/library-tests/collections/PrintAst.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ collections/Test.java:
1212
# 6| 0: [TypeAccess] String
1313
# 6| 1: [TypeAccess] Integer
1414
# 8| 4: [BlockStmt] { ... }
15-
# 9| 0: [ExprStmt] ...;
15+
# 9| 0: [ExprStmt] <Expr>;
1616
# 9| 0: [MethodAccess] put(...)
1717
# 9| -1: [VarAccess] m
1818
# 9| 0: [StringLiteral] "key"

‎java/ql/test/library-tests/constants/PrintAst.expected

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ constants/Initializers.java:
8080
# 8| -1: [TypeAccess] int
8181
# 10| 6: [Constructor] Initializers
8282
# 10| 5: [BlockStmt] { ... }
83-
# 12| 2: [ExprStmt] ...;
83+
# 12| 2: [ExprStmt] <Expr>;
8484
# 12| 0: [AssignExpr] ...=...
8585
# 12| 0: [VarAccess] IFIELD2
8686
# 12| 1: [IntegerLiteral] 22
@@ -94,7 +94,7 @@ constants/Initializers.java:
9494
# 17| 1: [LocalVariableDeclStmt] var ...;
9595
# 17| 0: [TypeAccess] int
9696
# 17| 1: [LocalVariableDeclExpr] y
97-
# 18| 2: [ExprStmt] ...;
97+
# 18| 2: [ExprStmt] <Expr>;
9898
# 18| 0: [AssignExpr] ...=...
9999
# 18| 0: [VarAccess] y
100100
# 18| 1: [IntegerLiteral] 400
@@ -112,20 +112,20 @@ constants/Initializers.java:
112112
# 26| -1: [TypeAccess] int
113113
# 26| 0: [IntegerLiteral] 4
114114
# 28| 13: [BlockStmt] { ... }
115-
# 30| 0: [ExprStmt] ...;
115+
# 30| 0: [ExprStmt] <Expr>;
116116
# 30| 0: [AssignExpr] ...=...
117117
# 30| 0: [VarAccess] fsf
118118
# 30| 1: [IntegerLiteral] 42
119-
# 31| 1: [ExprStmt] ...;
119+
# 31| 1: [ExprStmt] <Expr>;
120120
# 31| 0: [AssignExpr] ...=...
121121
# 31| 0: [VarAccess] sf
122122
# 31| 1: [IntegerLiteral] 42
123123
# 34| 14: [BlockStmt] { ... }
124-
# 36| 0: [ExprStmt] ...;
124+
# 36| 0: [ExprStmt] <Expr>;
125125
# 36| 0: [AssignExpr] ...=...
126126
# 36| 0: [VarAccess] ff
127127
# 36| 1: [IntegerLiteral] 42
128-
# 37| 1: [ExprStmt] ...;
128+
# 37| 1: [ExprStmt] <Expr>;
129129
# 37| 0: [AssignExpr] ...=...
130130
# 37| 0: [VarAccess] f
131131
# 37| 1: [IntegerLiteral] 42

‎java/ql/test/library-tests/constructors/PrintAst.expected

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ constructors/A.java:
1717
# 10| 0: [ArrayTypeAccess] ...[]
1818
# 10| 0: [TypeAccess] String
1919
# 10| 5: [BlockStmt] { ... }
20-
# 11| 0: [ExprStmt] ...;
20+
# 11| 0: [ExprStmt] <Expr>;
2121
# 11| 0: [ClassInstanceExpr] new A(...)
2222
# 11| -3: [TypeAccess] A
2323
# 14| 6: [FieldDeclaration] String STATIC, ...;
@@ -27,13 +27,13 @@ constructors/A.java:
2727
# 15| -1: [TypeAccess] String
2828
# 15| 0: [StringLiteral] "instance string"
2929
# 17| 8: [BlockStmt] { ... }
30-
# 18| 0: [ExprStmt] ...;
30+
# 18| 0: [ExprStmt] <Expr>;
3131
# 18| 0: [MethodAccess] println(...)
3232
# 18| -1: [VarAccess] System.out
3333
# 18| -1: [TypeAccess] System
3434
# 18| 0: [StringLiteral] "<obinit>"
3535
# 21| 9: [BlockStmt] { ... }
36-
# 22| 0: [ExprStmt] ...;
36+
# 22| 0: [ExprStmt] <Expr>;
3737
# 22| 0: [MethodAccess] println(...)
3838
# 22| -1: [VarAccess] System.out
3939
# 22| -1: [TypeAccess] System

‎java/ql/test/library-tests/generics/PrintAst.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ generics/A.java:
4343
# 20| 0: [WildcardTypeAccess] ? ...
4444
# 20| 1: [TypeAccess] Double
4545
# 21| 7: [BlockStmt] { ... }
46-
# 21| 0: [ExprStmt] ...;
46+
# 21| 0: [ExprStmt] <Expr>;
4747
# 21| 0: [MethodAccess] asList(...)
4848
# 21| -1: [TypeAccess] Arrays

‎java/ql/test/library-tests/java7/MultiCatch/PrintAst.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ MultiCatch.java:
2727
# 15| 1: [TypeAccess] SQLException
2828
# 15| 1: [LocalVariableDeclExpr] e
2929
# 16| 1: [BlockStmt] { ... }
30-
# 17| 0: [ExprStmt] ...;
30+
# 17| 0: [ExprStmt] <Expr>;
3131
# 17| 0: [MethodAccess] printStackTrace(...)
3232
# 17| -1: [VarAccess] e
3333
# 18| 1: [ThrowStmt] throw ...

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ A.java:
9797
# 45| 0: [TryStmt] try ...
9898
# 45| -1: [BlockStmt] { ... }
9999
# 46| 0: [EnhancedForStmt] for (... : ...)
100-
#-----| 0: (Single var ...;)
100+
#-----| 0: (Single Local Variable Declaration)
101101
# 46| 0: [TypeAccess] Object
102102
# 46| 1: [LocalVariableDeclExpr] thing
103103
# 46| 1: [VarAccess] things
@@ -110,7 +110,7 @@ A.java:
110110
# 48| 0: [ReturnStmt] return ...
111111
# 50| 1: [IfStmt] if (...)
112112
# 50| 0: [InstanceOfExpr] ...instanceof...
113-
#-----| 0: (Single var ...;)
113+
#-----| 0: (Single Local Variable Declaration)
114114
# 50| 0: [TypeAccess] String
115115
# 50| 1: [LocalVariableDeclExpr] s
116116
# 50| 0: [VarAccess] thing
@@ -120,7 +120,7 @@ A.java:
120120
# 51| -3: [TypeAccess] RuntimeException
121121
# 51| 0: [VarAccess] s
122122
# 55| 0: [CatchClause] catch (...)
123-
#-----| 0: (Single var ...;)
123+
#-----| 0: (Single Local Variable Declaration)
124124
# 55| 0: [TypeAccess] RuntimeException
125125
# 55| 1: [LocalVariableDeclExpr] rte
126126
# 55| 1: [BlockStmt] { ... }

‎java/ql/test/library-tests/reflection/PrintAst.expected

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ reflection/ReflectiveAccess.java:
3838
# 18| 0: [MethodAccess] forName(...)
3939
# 18| -1: [TypeAccess] Class<>
4040
# 18| 0: [StringLiteral] "reflection.ReflectiveAccess$TestClass"
41-
# 20| 1: [ExprStmt] ...;
41+
# 20| 1: [ExprStmt] <Expr>;
4242
# 20| 0: [MethodAccess] newInstance(...)
4343
# 20| -1: [VarAccess] testClass
44-
# 22| 2: [ExprStmt] ...;
44+
# 22| 2: [ExprStmt] <Expr>;
4545
# 22| 0: [MethodAccess] getAnnotation(...)
4646
# 22| 0: [TypeLiteral] TestClass.class
4747
# 22| 0: [TypeAccess] TestClass

‎java/ql/test/library-tests/typeaccesses/PrintAst.expected

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ typeaccesses/TA.java:
6565
# 11| 7: [Method] method5
6666
# 11| 3: [TypeAccess] void
6767
# 11| 5: [BlockStmt] { ... }
68-
# 11| 0: [ExprStmt] ...;
68+
# 11| 0: [ExprStmt] <Expr>;
6969
# 11| 0: [MethodAccess] toString(...)
7070
# 11| -1: [CastExpr] (...)...
7171
# 11| 0: [TypeAccess] ArrayList<TA>
@@ -74,14 +74,14 @@ typeaccesses/TA.java:
7474
# 12| 8: [Method] method6
7575
# 12| 3: [TypeAccess] void
7676
# 12| 5: [BlockStmt] { ... }
77-
# 12| 0: [ExprStmt] ...;
77+
# 12| 0: [ExprStmt] <Expr>;
7878
# 12| 0: [ClassInstanceExpr] new ArrayList<TA>(...)
7979
# 12| -3: [TypeAccess] ArrayList<TA>
8080
# 12| 0: [TypeAccess] TA
8181
# 13| 9: [Method] method7
8282
# 13| 3: [TypeAccess] void
8383
# 13| 5: [BlockStmt] { ... }
84-
# 13| 0: [ExprStmt] ...;
84+
# 13| 0: [ExprStmt] <Expr>;
8585
# 13| 0: [MethodAccess] method3(...)
8686
# 13| -1: [TypeAccess] TA
8787
# 14| 10: [Class] Inner

‎java/ql/test/library-tests/varargs/PrintAst.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ varargs/Test.java:
4848
# 10| 0: [TypeAccess] String
4949
# 10| 5: [BlockStmt] { ... }
5050
# 11| 9: [BlockStmt] { ... }
51-
# 12| 0: [ExprStmt] ...;
51+
# 12| 0: [ExprStmt] <Expr>;
5252
# 12| 0: [MethodAccess] asList(...)
5353
# 12| -1: [TypeAccess] Arrays
5454
# 12| 0: [IntegerLiteral] 1

0 commit comments

Comments
 (0)