Add static field access test

tamasvajk · igfoo · commit 246f228a3b52 · 2022-05-10T19:51:29.000+01:00
diff --git a/java/ql/test/kotlin/library-tests/exprs_typeaccess/A.kt b/java/ql/test/kotlin/library-tests/exprs_typeaccess/A.kt
@@ -17,7 +17,7 @@ class A {
     fun fn(i: Int) : Int {
         val x = this.fn(1)
         val e = Enu.A
-        return 5
+        return B.x
     }
 
     enum class Enu {
diff --git a/java/ql/test/kotlin/library-tests/exprs_typeaccess/B.java b/java/ql/test/kotlin/library-tests/exprs_typeaccess/B.java
@@ -8,7 +8,7 @@ public void fn() { }
    public int fn(int i) {
       int x = this.fn(1);
       Enu e = Enu.A;
-      return 5;
+      return B.x;
    }
 
    public static class C<T> {
@@ -20,4 +20,6 @@ public void fn() {
    public static enum Enu {
       A, B, C
    }
+
+   public static final int x = 5;
 }
diff --git a/java/ql/test/kotlin/library-tests/exprs_typeaccess/PrintAst.expected b/java/ql/test/kotlin/library-tests/exprs_typeaccess/PrintAst.expected
@@ -71,7 +71,7 @@ A.kt:
 #   19|             0: [VarAccess] Enu.A
 #   19|               -1: [TypeAccess] Enu
 #   20|         2: [ReturnStmt] return ...
-#   20|           0: [IntegerLiteral] 5
+#   20|           0: [VarAccess] x
 #   23|     11: [Class] Enu
 #    0|       1: [Method] values
 #    0|         3: [TypeAccess] Enu[]
@@ -97,13 +97,13 @@ A.kt:
 B.java:
 #    0| [CompilationUnit] B
 #    1|   1: [Class] B
-#    2|     1: [Constructor] B
+#    2|     2: [Constructor] B
 #    2|       5: [BlockStmt] { ... }
 #    3|         1: [EmptyStmt] ;
-#    6|     2: [Method] fn
+#    6|     3: [Method] fn
 #    6|       3: [TypeAccess] void
 #    6|       5: [BlockStmt] { ... }
-#    7|     3: [Method] fn
+#    7|     4: [Method] fn
 #    7|       3: [TypeAccess] C<C<Integer>>
 #    7|         0: [TypeAccess] C<Integer>
 #    7|           0: [TypeAccess] Integer
@@ -115,7 +115,7 @@ B.java:
 #    7|       5: [BlockStmt] { ... }
 #    7|         0: [ReturnStmt] return ...
 #    7|           0: [VarAccess] i
-#    8|     4: [Method] fn
+#    8|     5: [Method] fn
 #    8|       3: [TypeAccess] int
 #-----|       4: (Parameters)
 #    8|         0: [Parameter] i
@@ -133,8 +133,9 @@ B.java:
 #   10|             0: [VarAccess] Enu.A
 #   10|               -1: [TypeAccess] Enu
 #   11|         2: [ReturnStmt] return ...
-#   11|           0: [IntegerLiteral] 5
-#   14|     5: [Class,GenericType,ParameterizedType] C
+#   11|           0: [VarAccess] B.x
+#   11|             -1: [TypeAccess] B
+#   14|     6: [Class,GenericType,ParameterizedType] C
 #-----|       -2: (Generic Parameters)
 #   14|         0: [TypeVariable] T
 #   15|       2: [Method] fn
@@ -145,7 +146,7 @@ B.java:
 #   16|               -3: [TypeAccess] C<C<Integer>>
 #   16|                 0: [TypeAccess] C<Integer>
 #   16|                   0: [TypeAccess] Integer
-#   20|     6: [Class] Enu
+#   20|     7: [Class] Enu
 #   21|       3: [FieldDeclaration] Enu A;
 #   21|         -1: [TypeAccess] Enu
 #   21|         0: [ClassInstanceExpr] new Enu(...)
@@ -158,3 +159,6 @@ B.java:
 #   21|         -1: [TypeAccess] Enu
 #   21|         0: [ClassInstanceExpr] new Enu(...)
 #   21|           -3: [TypeAccess] Enu
+#   24|     8: [FieldDeclaration] int x;
+#   24|       -1: [TypeAccess] int
+#   24|       0: [IntegerLiteral] 5

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class A {`
`17`	`17`	`fun fn(i: Int) : Int {`
`18`	`18`	`val x = this.fn(1)`
`19`	`19`	`val e = Enu.A`
`20`		`- return 5`
	`20`	`+ return B.x`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`enum class Enu {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public void fn() { }`
`8`	`8`	`public int fn(int i) {`
`9`	`9`	`int x = this.fn(1);`
`10`	`10`	`Enu e = Enu.A;`
`11`		`- return 5;`
	`11`	`+ return B.x;`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public static class C<T> {`
`@@ -20,4 +20,6 @@ public void fn() {`
`20`	`20`	`public static enum Enu {`
`21`	`21`	`A, B, C`
`22`	`22`	`}`
	`23`	`+`
	`24`	`+ public static final int x = 5;`
`23`	`25`	`}`