commit 450f49cccc1d69b7b5c28bd2da6f1c648b3910c8
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Mar 06 11:19:48 2023 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Mar 06 12:37:27 2023 +0000
tree f953b762d394325f9c1b47572df77b80fa3bc653
parent 4c0f64eaf491ef1697aeaf2bf3e8f43b83305b16

[Metadata] Fix ReflectiveConstructionWithInlineClass after dev update

Fixed: b/269792580
Change-Id: I5bb1f4f8826b44d73b29c849feb4d810a450bd7f

src/test/java/com/android/tools/r8/kotlin/reflection/ReflectiveConstructionWithInlineClassTest.java

diff --git a/src/test/java/com/android/tools/r8/kotlin/reflection/ReflectiveConstructionWithInlineClassTest.java b/src/test/java/com/android/tools/r8/kotlin/reflection/ReflectiveConstructionWithInlineClassTest.java
index 32568f9..5ef1728 100644
--- a/src/test/java/com/android/tools/r8/kotlin/reflection/ReflectiveConstructionWithInlineClassTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/reflection/ReflectiveConstructionWithInlineClassTest.java
@@ -10,6 +10,7 @@
 import com.android.tools.r8.KotlinTestParameters;
 import com.android.tools.r8.R8FullTestBuilder;
 import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestShrinkerBuilder;
 import com.android.tools.r8.ToolHelper;
 import com.android.tools.r8.kotlin.metadata.KotlinMetadataTestBase;
 import com.android.tools.r8.shaking.ProguardKeepAttributes;
@@ -96,6 +97,9 @@
         .addProgramFiles(kotlinc.getKotlinReflectJar())
         .addProgramFiles(kotlinc.getKotlinAnnotationJar())
         .addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.LATEST))
+        .applyIf(
+            parameters.isCfRuntime(),
+            TestShrinkerBuilder::addDontWarnJavaLangInvokeLambdaMetadataFactory)
         .setMinApi(parameters)
         .addKeepMainRule(MAIN_CLASS)
         .addKeepClassAndMembersRules(PKG + ".Data")
@@ -119,11 +123,7 @@
         .assertNoErrorMessages()
         .apply(KotlinMetadataTestBase::verifyExpectedWarningsFromKotlinReflectAndStdLib)
         .run(parameters.getRuntime(), MAIN_CLASS)
-        // TODO(b/269792580): Figure out why this is throwing an abstract method error.
-        .assertFailureWithErrorThatThrows(
-            kotlinParameters.isKotlinDev() && parameters.isCfRuntime()
-                ? AbstractMethodError.class
-                : IllegalArgumentException.class);
+        .assertFailureWithErrorThatThrows(IllegalArgumentException.class);
   }
 
   @Test
@@ -134,9 +134,6 @@
         .assertNoErrorMessages()
         .apply(KotlinMetadataTestBase::verifyExpectedWarningsFromKotlinReflectAndStdLib)
         .run(parameters.getRuntime(), MAIN_CLASS)
-        // TODO(b/269792580): Figure out why this is throwing an abstract method error.
-        .assertFailureWithErrorThatThrowsIf(
-            kotlinParameters.isKotlinDev() && parameters.isCfRuntime(), AbstractMethodError.class)
-        .assertSuccessWithOutputLinesIf(!kotlinParameters.isKotlinDev(), EXPECTED_OUTPUT);
+        .assertSuccessWithOutputLines(EXPECTED_OUTPUT);
   }
 }