commit ee81ed181532064ce3a05bacf6cb2c0f13ff284a
author Morten Krogh-Jespersen <mkroghj@google.com> Fri Jun 05 00:40:26 2020 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Jun 08 06:36:09 2020 +0000
tree 7d9e6a6d0f7056476270a7c8f9374aebee1a7520
parent 8f6c03384ef834acec9a9497024748b9815bb61f

Configure kotlin local delegated property reflect test

Bug: 157988734
Change-Id: I68a192d147f375bb2103841647f3c435c41372dc

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

diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDelegatedPropertyTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDelegatedPropertyTest.java
index 50007fb..7c8329f 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDelegatedPropertyTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDelegatedPropertyTest.java
@@ -5,14 +5,11 @@
 package com.android.tools.r8.kotlin.metadata;
 
 import static com.android.tools.r8.KotlinCompilerTool.KOTLINC;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
 
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.ToolHelper;
 import com.android.tools.r8.ToolHelper.KotlinTargetVersion;
-import com.android.tools.r8.ToolHelper.ProcessResult;
+import com.android.tools.r8.shaking.ProguardKeepAttributes;
 import com.android.tools.r8.utils.DescriptorUtils;
 import com.android.tools.r8.utils.StringUtils;
 import java.nio.file.Path;
@@ -151,24 +148,25 @@
         testForR8(parameters.getBackend())
             .addClasspathFiles(ToolHelper.getKotlinStdlibJar())
             .addProgramFiles(libJars.get(targetVersion))
+            .addKeepAttributes(ProguardKeepAttributes.RUNTIME_VISIBLE_ANNOTATIONS)
             .addKeepRules("-keep class " + PKG_LIB + ".Delegates { *; }")
             .addKeepRules("-keep class " + PKG_LIB + ".Resource { *; }")
             .addKeepRules("-keep class " + PKG_LIB + ".CustomDelegate { *; }")
             .compile()
             .writeToZip();
-    ProcessResult result =
+    Path output =
         kotlinc(parameters.getRuntime().asCf(), KOTLINC, targetVersion)
             .addClasspathFiles(libJar)
             .addSourceFiles(
                 getKotlinFileInTest(
                     DescriptorUtils.getBinaryNameFromJavaType(PKG_APP), "main_reflect"))
             .setOutputPath(temp.newFolder().toPath())
-            .compileRaw();
-    assertEquals(1, result.exitCode);
-    assertThat(
-        result.stderr,
-        containsString(
-            "unsupported [reference to the synthetic extension property for a Java get/set"
-                + " method]"));
+            .compile();
+    testForJvm()
+        .addRunClasspathFiles(
+            ToolHelper.getKotlinStdlibJar(), ToolHelper.getKotlinReflectJar(), libJar)
+        .addClasspath(output)
+        .run(parameters.getRuntime(), PKG_APP + ".Main_reflectKt")
+        .assertSuccessWithOutput(EXPECTED_REFLECT);
   }
 }