Accept test changes (implicit annotations, restoration of annotation type accesses)

Author: smowton

java/ql/integration-tests/all-platforms/kotlin/annotation-id-consistency/PrintAst.expected

@@ -21,24 +21,57 @@ User.java:
 test.kt:
 #    0| [CompilationUnit] test
 #    3|   1: [Interface] Ann1
+#-----|     -3: (Annotations)
+#    0|       1: [Annotation] Retention
+#    0|         1: [VarAccess] RetentionPolicy.RUNTIME
+#    0|           -1: [TypeAccess] RetentionPolicy
 #    3|     1: [Method] x
+#    3|       3: [TypeAccess] int
 #    3|     2: [Method] y
+#    3|       3: [TypeAccess] Ann2
 #    5|   2: [Interface] Ann2
+#-----|     -3: (Annotations)
+#    0|       1: [Annotation] Retention
+#    0|         1: [VarAccess] RetentionPolicy.RUNTIME
+#    0|           -1: [TypeAccess] RetentionPolicy
 #    5|     1: [Method] z
+#    5|       3: [TypeAccess] String
 #    5|     2: [Method] w
+#    5|       3: [TypeAccess] Class<?>
+#    5|         0: [WildcardTypeAccess] ? ...
 #    5|     3: [Method] v
+#    5|       3: [TypeAccess] int[]
 #    5|     4: [Method] u
+#    5|       3: [TypeAccess] Ann3[]
+#    5|         0: [TypeAccess] Ann3
 #    5|     5: [Method] t
+#    5|       3: [TypeAccess] Class<?>[]
+#    5|         0: [TypeAccess] Class<?>
+#    5|           0: [WildcardTypeAccess] ? ...
 #    7|   3: [Interface] Ann3
+#-----|     -3: (Annotations)
+#    0|       1: [Annotation] Retention
+#    0|         1: [VarAccess] RetentionPolicy.RUNTIME
+#    0|           -1: [TypeAccess] RetentionPolicy
 #    7|     1: [Method] a
+#    7|       3: [TypeAccess] int
 #    9|   4: [GenericType,Interface,ParameterizedType] GenericAnnotation
+#-----|     -3: (Annotations)
+#    0|       1: [Annotation] Retention
+#    0|         1: [VarAccess] RetentionPolicy.RUNTIME
+#    0|           -1: [TypeAccess] RetentionPolicy
 #-----|     -2: (Generic Parameters)
 #    9|       0: [TypeVariable] T
 #    9|     1: [Method] x
+#    9|       3: [TypeAccess] Class<T>
+#    9|         0: [TypeAccess] T
 #    9|     2: [Method] y
+#    9|       3: [TypeAccess] Class<T>[]
+#    9|         0: [TypeAccess] Class<T>
+#    9|           0: [TypeAccess] T
 #   11|   6: [Class] Annotated
 #-----|     -3: (Annotations)
-#   11|       2: [Annotation] Ann1
+#   11|       1: [Annotation] Ann1
 #    0|         1: [IntegerLiteral] 1
 #    0|         1: [Annotation] Ann2
 #    0|           1: [StringLiteral] "Hello"
@@ -58,7 +91,7 @@ test.kt:
 #    0|               0: [TypeAccess] String
 #    0|             1: [TypeLiteral] int.class
 #    0|               0: [TypeAccess] int
-#   12|       3: [Annotation] GenericAnnotation<>
+#   12|       2: [Annotation] GenericAnnotation<>
 #   13|     1: [Constructor] Annotated
 #   11|       5: [BlockStmt] { ... }
 #   11|         0: [SuperConstructorInvocationStmt] super(...)

java/ql/test/kotlin/library-tests/annotation_classes/PrintAst.expected

@@ -141,6 +141,7 @@ def.kt:
 #-----|       1: (Annotations)
 #   21|         1: [Annotation] JvmName
 #    0|           1: [StringLiteral] "a"
+#   21|       3: [TypeAccess] int
 #   23|   3: [Interface] Annot1k
 #-----|     -3: (Annotations)
 #    0|       1: [Annotation] Retention
@@ -149,11 +150,19 @@ def.kt:
 #   23|       2: [Annotation] Annot0k
 #    0|         1: [IntegerLiteral] 0
 #   25|     1: [Method] a
+#   25|       3: [TypeAccess] int
 #   26|     2: [Method] b
+#   26|       3: [TypeAccess] String
 #   27|     3: [Method] c
+#   27|       3: [TypeAccess] Class<?>
+#   27|         0: [WildcardTypeAccess] ? ...
 #   28|     4: [Method] d
+#   28|       3: [TypeAccess] Y
 #   29|     5: [Method] e
+#   29|       3: [TypeAccess] Y[]
+#   29|         0: [TypeAccess] Y
 #   30|     6: [Method] f
+#   30|       3: [TypeAccess] Annot0k
 #   33|   4: [Class] X
 #   33|     1: [Constructor] X
 #   33|       5: [BlockStmt] { ... }

java/ql/test/kotlin/library-tests/collection-literals/PrintAst.expected

@@ -6,4 +6,7 @@ test.kt:
 #    0|         1: [VarAccess] RetentionPolicy.RUNTIME
 #    0|           -1: [TypeAccess] RetentionPolicy
 #    1|     1: [Method] arr1
+#    1|       3: [TypeAccess] String[]
+#    1|         0: [TypeAccess] String
 #    1|     2: [Method] arr2
+#    1|       3: [TypeAccess] int[]