commit 56e4cc180f5390f0f99ab4976ad6e176fab84d04
author Morten Krogh-Jespersen <mkroghj@google.com> Sat Feb 18 10:40:00 2023 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Sat Feb 18 10:40:00 2023 +0100
tree 15974aae93a8036487f3ce4e0c7a909c5e2366ab
parent a3503730e7b2be5607fc84e2b9ea0ec7ee32676d

[Metadata] Update test expectations for old and dev

Change-Id: I321ef9a6a69d7c852fe2805362a015314fc1d23a

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

diff --git a/src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java b/src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java
index a65af12..89c268e 100644
--- a/src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java
@@ -12,6 +12,7 @@
 import com.android.tools.r8.KotlinTestBase;
 import com.android.tools.r8.KotlinTestParameters;
 import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestCompileResult;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestShrinkerBuilder;
 import com.android.tools.r8.ToolHelper;
@@ -105,9 +106,7 @@
         .compile()
         .assertNoErrorMessages()
         // -keepattributes Signature is added in kotlin-reflect from version 1.4.20.
-        .applyIf(
-            kotlinParameters.is(KOTLINC_1_3_72),
-            TestBase::verifyAllInfoFromGenericSignatureTypeParameterValidation)
+        .applyIf(kotlinParameters.is(KOTLINC_1_3_72), TestCompileResult::assertNoInfoMessages)
         // TODO(b/269794485): Figure out why generic signatures fail using kotlin-dev.
         .applyIf(
             kotlinParameters.getCompiler().isNot(KOTLINC_1_3_72) && !kotlinParameters.isKotlinDev(),

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 481a1b2..9eecfaf 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
@@ -121,7 +121,7 @@
         .run(parameters.getRuntime(), MAIN_CLASS)
         // TODO(b/269792580): Figure out why this is throwing an abstract method error.
         .assertFailureWithErrorThatThrows(
-            kotlinParameters.isKotlinDev()
+            kotlinParameters.isKotlinDev() && parameters.isCfRuntime()
                 ? AbstractMethodError.class
                 : IllegalArgumentException.class);
   }
@@ -136,7 +136,7 @@
         .run(parameters.getRuntime(), MAIN_CLASS)
         // TODO(b/269792580): Figure out why this is throwing an abstract method error.
         .assertFailureWithErrorThatThrowsIf(
-            kotlinParameters.isKotlinDev(), AbstractMethodError.class)
+            kotlinParameters.isKotlinDev() && parameters.isCfRuntime(), AbstractMethodError.class)
         .assertSuccessWithOutputLinesIf(!kotlinParameters.isKotlinDev(), EXPECTED_OUTPUT);
   }
 }