commit f4581b3e824fef5f4096b0aba761003602e4c435
author Christoffer Adamsen <christofferqa@google.com> Mon Sep 09 09:25:15 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Tue Sep 10 06:30:08 2024 +0000
tree 49df5bd234df0bd8675f1c968080f516a3ec5764
parent a6a3a16ea8658b930dd354cbc0b9ab594f44f4ff

Update Kotlin test expectations

Change-Id: Id25e2c641f37bd3750a25c3889f61871c7730d77

src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingSingletonTest.java

diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingSingletonTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingSingletonTest.java
index d88c75d..6847df2 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingSingletonTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingSingletonTest.java
@@ -5,7 +5,6 @@
 package com.android.tools.r8.kotlin.lambda;
 
 import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLINC_1_9_21;
-import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLINC_2_0_20;
 import static junit.framework.TestCase.assertEquals;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assume.assumeFalse;
@@ -71,14 +70,11 @@
         KotlinLambdasInInput.create(getProgramFiles(), getTestName());
     assertEquals(
         kotlinParameters.getLambdaGeneration().isInvokeDynamic()
-                && kotlinParameters.getCompilerVersion().isLessThanOrEqualTo(KOTLINC_2_0_20)
             ? 8
             : 2,
         lambdasInInput.getNumberOfJStyleLambdas());
     assertEquals(
-        kotlinParameters.getLambdaGeneration().isInvokeDynamic()
-            ? (kotlinParameters.getCompilerVersion().isLessThanOrEqualTo(KOTLINC_2_0_20) ? 0 : 6)
-            : 7,
+        kotlinParameters.getLambdaGeneration().isInvokeDynamic() ? 0 : 7,
         lambdasInInput.getNumberOfKStyleLambdas());
 
     testForR8(parameters.getBackend())

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

diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/KotlinMetadataTestBase.java b/src/test/java/com/android/tools/r8/kotlin/metadata/KotlinMetadataTestBase.java
index 280d1e5..c7a31d0 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/KotlinMetadataTestBase.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/KotlinMetadataTestBase.java
@@ -178,9 +178,7 @@
   }
 
   protected String unresolvedReferenceMessage(KotlinTestParameters param, String ref) {
-    if (param.isKotlinDev()) {
-      return "unresolved reference 'class " + ref + "'";
-    } else if (param.getCompilerVersion().isGreaterThanOrEqualTo(KOTLINC_2_0_20)) {
+    if (param.getCompilerVersion().isGreaterThanOrEqualTo(KOTLINC_2_0_20)) {
       return "unresolved reference '" + ref + "'";
     } else {
       return "unresolved reference: " + ref;