commit a16ffc976498bd7ffffbf5e89cd58ee1db34ba26
author Morten Krogh-Jespersen <mkroghj@google.com> Thu Aug 25 10:59:37 2022 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Thu Aug 25 09:00:01 2022 +0000
tree 58b5c11701cc15a402f00d6f4d02a67d69bca6b3
parent dbdc317ff1a2ec2bce87ddd89e16304a338dda04

[Metadata] Update test expectations after keeping JvmName annotation

Change-Id: I925bd09380183ee5b3e01381240edee8155a78b0

src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDependentKeepTest.java

diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDependentKeep.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDependentKeepTest.java
similarity index 90%
rename from src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDependentKeep.java
rename to src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDependentKeepTest.java
index ee16233..a862b2c 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDependentKeep.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDependentKeepTest.java
@@ -22,7 +22,7 @@
 import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
-public class MetadataRewriteDependentKeep extends KotlinMetadataTestBase {
+public class MetadataRewriteDependentKeepTest extends KotlinMetadataTestBase {
 
   @Parameterized.Parameters(name = "{0}, {1}")
   public static Collection<Object[]> data() {
@@ -33,7 +33,7 @@
 
   private final TestParameters parameters;
 
-  public MetadataRewriteDependentKeep(
+  public MetadataRewriteDependentKeepTest(
       TestParameters parameters, KotlinTestParameters kotlinParameters) {
     super(kotlinParameters);
     this.parameters = parameters;
@@ -56,7 +56,8 @@
     // All kept classes should have their kotlin metadata.
     for (FoundClassSubject clazz : inspector.allClasses()) {
       if (clazz.getFinalName().startsWith("kotlin.io")
-          || clazz.getFinalName().equals("kotlin.Metadata")) {
+          || clazz.getFinalName().equals("kotlin.Metadata")
+          || clazz.getFinalName().equals("kotlin.jvm.JvmName")) {
         assertNotNull(clazz.getKotlinClassMetadata());
       } else {
         assertNull(clazz.getKotlinClassMetadata());

src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteKeepTest.java

diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteKeepTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteKeepTest.java
index 16fc35d..24b3e58 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteKeepTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteKeepTest.java
@@ -66,7 +66,8 @@
     // All kept classes should have their kotlin metadata.
     for (FoundClassSubject clazz : inspector.allClasses()) {
       if (clazz.getFinalName().startsWith("kotlin.io")
-          || clazz.getFinalName().equals("kotlin.Metadata")) {
+          || clazz.getFinalName().equals("kotlin.Metadata")
+          || clazz.getFinalName().equals("kotlin.jvm.JvmName")) {
         assertNotNull(clazz.getKotlinClassMetadata());
         assertNotNull(clazz.getKotlinClassMetadata().getHeader().getData2());
       } else {