Add test for not renaming a lambda according to mapping file
Bug: 218793832
Change-Id: Iaba9157f521df4225014942b724ed62b2d92444b
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingLambdaRepackageTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingLambdaRepackageTest.java
new file mode 100644
index 0000000..b60e1ad
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingLambdaRepackageTest.java
@@ -0,0 +1,89 @@
+// Copyright (c) 2022, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.naming.applymapping;
+
+import static org.junit.Assert.assertNotEquals;
+
+import com.android.tools.r8.NeverClassInline;
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.R8TestRunResult;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class ApplyMappingLambdaRepackageTest extends TestBase {
+
+ @Parameter() public TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ @Test
+ public void testR8() throws Exception {
+ R8TestRunResult firstRunResult =
+ testForR8(parameters.getBackend())
+ .addProgramClassesAndInnerClasses(Main.class, PackagePrivate.class, Foo.class)
+ .setMinApi(parameters.getApiLevel())
+ .addKeepMainRule(Main.class)
+ .addKeepRules("-repackageclasses foo")
+ .enableInliningAnnotations()
+ .enableNeverClassInliningAnnotations()
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines("Hello World");
+ R8TestRunResult secondRunResult =
+ testForR8(parameters.getBackend())
+ .addProgramClassesAndInnerClasses(Main.class, PackagePrivate.class, Foo.class)
+ .setMinApi(parameters.getApiLevel())
+ .addKeepMainRule(Main.class)
+ .enableInliningAnnotations()
+ .enableNeverClassInliningAnnotations()
+ .addApplyMapping(firstRunResult.proguardMap())
+ .compile()
+ .run(parameters.getRuntime(), Main.class);
+ // TODO(b/218793832): Should be the same map.
+ assertNotEquals(firstRunResult.proguardMap(), secondRunResult.proguardMap());
+ secondRunResult
+ .assertSuccessWithOutputLinesIf(parameters.isCfRuntime(), "Hello World")
+ // TODO(b/218793832): Should not fail with an error.
+ .assertFailureWithErrorThatThrowsIf(parameters.isDexRuntime(), IllegalAccessError.class);
+ }
+
+ @NeverClassInline
+ public static class PackagePrivate {
+
+ @NeverInline
+ void print() {
+ System.out.println("Hello World");
+ }
+ }
+
+ interface Foo {
+
+ @NeverInline
+ void doSomething(PackagePrivate o);
+
+ @NeverInline
+ static Foo getInstance() {
+ return x -> {
+ x.print();
+ };
+ }
+ }
+
+ public static class Main {
+
+ public static void main(String[] args) {
+ Foo.getInstance().doSomething(new PackagePrivate());
+ }
+ }
+}
