commit e69a6efd99e1c5b5411d79486831bb14c8579a7d
author Søren Gjesse <sgjesse@google.com> Tue Nov 21 11:41:04 2023 +0100
committer Søren Gjesse <sgjesse@google.com> Tue Nov 21 13:12:11 2023 +0000
tree eb8a317f46e73c4156a88cdf4a81694a871bb989
parent c9ec33d96b64bc2820eef206914e993a6f9c60e0

Fix test failures on JDK 21 bot

Change-Id: I30b65d8a5d09349942d917479de2b299ef8290ee

src/test/java/com/android/tools/r8/annotations/RetentionPolicyTest.java

diff --git a/src/test/java/com/android/tools/r8/annotations/RetentionPolicyTest.java b/src/test/java/com/android/tools/r8/annotations/RetentionPolicyTest.java
index da0f3d1..8900bd3 100644
--- a/src/test/java/com/android/tools/r8/annotations/RetentionPolicyTest.java
+++ b/src/test/java/com/android/tools/r8/annotations/RetentionPolicyTest.java
@@ -35,8 +35,7 @@
   private static final Collection<Class<?>> CLASSES =
       ImmutableList.of(ClassRetained.class, SourceRetained.class, RuntimeRetained.class, A.class);
 
-  private static final String EXPECTED =
-      StringUtils.lines("@" + RuntimeRetained.class.getName() + "()");
+  private static final String EXPECTED = StringUtils.lines(RuntimeRetained.class.getName());
 
   @Parameters(name = "{0}, intermediate:{1}")
   public static List<Object[]> data() {
@@ -66,7 +65,7 @@
 
     public static void main(String[] args) {
       for (Annotation annotation : A.class.getAnnotations()) {
-        System.out.println(annotation);
+        System.out.println(annotation.annotationType().getName());
       }
     }
   }

src/test/java/com/android/tools/r8/examples/regress_62300145/Regress.java

diff --git a/src/test/java/com/android/tools/r8/examples/regress_62300145/Regress.java b/src/test/java/com/android/tools/r8/examples/regress_62300145/Regress.java
index 037cc1d..a3ea4b1 100644
--- a/src/test/java/com/android/tools/r8/examples/regress_62300145/Regress.java
+++ b/src/test/java/com/android/tools/r8/examples/regress_62300145/Regress.java
@@ -38,7 +38,7 @@
         System.out.print(index++ + ": ");
       }
       for (Annotation annotation : annotations[i]) {
-        System.out.println(annotation);
+        System.out.println(annotation.annotationType().getName());
       }
     }
   }

src/test/java/com/android/tools/r8/examples/regress_62300145/Regress62300145TestRunner.java

diff --git a/src/test/java/com/android/tools/r8/examples/regress_62300145/Regress62300145TestRunner.java b/src/test/java/com/android/tools/r8/examples/regress_62300145/Regress62300145TestRunner.java
index a88c723..d4b0a0e 100644
--- a/src/test/java/com/android/tools/r8/examples/regress_62300145/Regress62300145TestRunner.java
+++ b/src/test/java/com/android/tools/r8/examples/regress_62300145/Regress62300145TestRunner.java
@@ -39,8 +39,8 @@
   @Override
   public String getExpected() {
     return StringUtils.joinLines(
-        "0: @com.android.tools.r8.examples.regress_62300145.Regress$A()",
-        "1: @com.android.tools.r8.examples.regress_62300145.Regress$A()",
+        "0: com.android.tools.r8.examples.regress_62300145.Regress$A",
+        "1: com.android.tools.r8.examples.regress_62300145.Regress$A",
         "2: ");
   }