Add test for service loader with exception handlers
Bug: 141290856
Change-Id: I0dda0b56690668de10f306c1c3052fe1a562b420
diff --git a/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java b/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java
index 8aa2569..14af67a 100644
--- a/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java
@@ -27,6 +27,7 @@
import java.util.ServiceLoader;
import java.util.concurrent.ExecutionException;
import java.util.zip.ZipFile;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -74,6 +75,18 @@
}
}
+ public static class MainWithTryCatchRunner {
+
+ public static void main(String[] args) {
+ try {
+ ServiceLoader.load(Service.class, Service.class.getClassLoader()).iterator().next().print();
+ } catch (Throwable e) {
+ System.out.println(e);
+ throw e;
+ }
+ }
+ }
+
public static class OtherRunner {
public static void main(String[] args) {
@@ -189,6 +202,36 @@
}
@Test
+ @Ignore("b/141290856")
+ public void testRewritingsWithCatchHandlers()
+ throws IOException, CompilationFailedException, ExecutionException {
+ Path path = temp.newFile("out.zip").toPath();
+ testForR8(parameters.getBackend())
+ .addInnerClasses(ServiceLoaderRewritingTest.class)
+ .addKeepMainRule(MainWithTryCatchRunner.class)
+ .setMinApi(parameters.getRuntime())
+ .addDataEntryResources(
+ DataEntryResource.fromBytes(
+ StringUtils.lines(ServiceImpl.class.getTypeName(), ServiceImpl2.class.getTypeName())
+ .getBytes(),
+ "META-INF/services/" + Service.class.getTypeName(),
+ Origin.unknown()))
+ .compile()
+ .writeToZip(path)
+ .run(parameters.getRuntime(), MainRunner.class)
+ .assertSuccessWithOutput(EXPECTED_OUTPUT + StringUtils.lines("Hello World 2!"))
+ .inspect(
+ inspector -> {
+ // Check that we have actually rewritten the calls to ServiceLoader.load.
+ assertEquals(0, getServiceLoaderLoads(inspector, MainRunner.class));
+ });
+
+ // Check that we have removed the service configuration from META-INF/services.
+ ZipFile zip = new ZipFile(path.toFile());
+ assertNull(zip.getEntry("META-INF/services"));
+ }
+
+ @Test
public void testDoNoRewrite() throws IOException, CompilationFailedException, ExecutionException {
Path path = temp.newFile("out.zip").toPath();
CodeInspector inspector =
