Add test for pg and r8 with dontobfuscate and repackage
We should follow PG behavior for -dontobfuscate and repackaging because
developers will not expect things to change name/location when using -dontobfuscate.
Bug: 182543183
Change-Id: Ia478e6c050625977df7306dee276e410b9287811
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageDontObfuscateTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageDontObfuscateTest.java
new file mode 100644
index 0000000..ed79bfc
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageDontObfuscateTest.java
@@ -0,0 +1,112 @@
+// Copyright (c) 2021, 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.repackage;
+
+import static com.android.tools.r8.shaking.ProguardConfigurationParser.FLATTEN_PACKAGE_HIERARCHY;
+import static com.android.tools.r8.shaking.ProguardConfigurationParser.REPACKAGE_CLASSES;
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresentAndNotRenamed;
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresentAndRenamed;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assume.assumeTrue;
+
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.ProguardVersion;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.utils.codeinspector.ClassSubject;
+import com.google.common.collect.ImmutableList;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * A simple test that checks that R8 behaves the same as PG for repackaging. We do require that
+ * classes that are looked up reflectively are kept in some way, however, for easier debugging with
+ * -dontobfuscate we should follow PG behavior. *
+ */
+@RunWith(Parameterized.class)
+public class RepackageDontObfuscateTest extends RepackageTestBase {
+
+ private final String[] EXPECTED = new String[] {"A::foo", "A::foo", "A::foo"};
+
+ @Parameters(name = "{1}, kind: {0}, PG-version: {2}")
+ public static List<Object[]> data() {
+ return buildParameters(
+ ImmutableList.of(FLATTEN_PACKAGE_HIERARCHY, REPACKAGE_CLASSES),
+ getTestParameters().withAllRuntimesAndApiLevels().build(),
+ ProguardVersion.values());
+ }
+
+ private final ProguardVersion proguardVersion;
+
+ public RepackageDontObfuscateTest(
+ String flattenPackageHierarchyOrRepackageClasses,
+ TestParameters parameters,
+ ProguardVersion proguardVersion) {
+ super(flattenPackageHierarchyOrRepackageClasses, parameters);
+ this.proguardVersion = proguardVersion;
+ }
+
+ @Test
+ public void testPG() throws Exception {
+ assumeTrue(parameters.isCfRuntime());
+ testForProguard(proguardVersion)
+ .addInnerClasses(getClass())
+ .addKeepMainRule(Main.class)
+ .apply(this::configureRepackaging)
+ .addInliningAnnotations()
+ .addDontWarn(RepackageDontObfuscateTest.class)
+ .noMinification()
+ .compile()
+ .inspect(
+ inspector -> {
+ ClassSubject aClass = inspector.clazz(A.class);
+ assertThat(aClass, isPresentAndNotRenamed());
+ })
+ .run(parameters.getRuntime(), Main.class, A.class.getTypeName())
+ .assertSuccessWithOutputLines(EXPECTED);
+ }
+
+ @Test
+ public void testR8() throws Exception {
+ testForR8(parameters.getBackend())
+ .addInnerClasses(getClass())
+ .setMinApi(parameters.getApiLevel())
+ .addKeepMainRule(Main.class)
+ .enableInliningAnnotations()
+ .apply(this::configureRepackaging)
+ .noMinification()
+ .compile()
+ .inspect(
+ inspector -> {
+ ClassSubject aClass = inspector.clazz(A.class);
+ // TODO(b/182543183): Should not be renamed.
+ assertThat(aClass, isPresentAndRenamed());
+ })
+ .run(parameters.getRuntime(), Main.class, A.class.getTypeName())
+ // TODO(b/182543183): Should be able to find the class.
+ .assertFailureWithErrorThatThrows(ClassNotFoundException.class);
+ }
+
+ public static class A {
+
+ @NeverInline
+ public static void foo() {
+ System.out.println("A::foo");
+ }
+ }
+
+ public static class Main {
+
+ public static void main(String[] args) throws Exception {
+ A.foo();
+ Class.forName("com.android.tools.r8.repackage.RepackageDontObfuscateTest$A")
+ .getDeclaredMethod("foo")
+ .invoke(null);
+ Class.forName(args[0]).getDeclaredMethod("foo").invoke(null);
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageTestBase.java b/src/test/java/com/android/tools/r8/repackage/RepackageTestBase.java
index 788bb0a..616295a 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageTestBase.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageTestBase.java
@@ -7,9 +7,9 @@
import static com.android.tools.r8.shaking.ProguardConfigurationParser.FLATTEN_PACKAGE_HIERARCHY;
import static com.android.tools.r8.shaking.ProguardConfigurationParser.REPACKAGE_CLASSES;
-import com.android.tools.r8.R8TestBuilder;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestShrinkerBuilder;
import com.android.tools.r8.utils.StringUtils;
import com.android.tools.r8.utils.codeinspector.ClassSubject;
import com.android.tools.r8.utils.codeinspector.CodeInspector;
@@ -130,7 +130,7 @@
};
}
- protected void configureRepackaging(R8TestBuilder<?> testBuilder) {
+ protected void configureRepackaging(TestShrinkerBuilder<?, ?, ?, ?, ?> testBuilder) {
testBuilder.addKeepRules(
"-" + flattenPackageHierarchyOrRepackageClasses + " \"" + getRepackagePackage() + "\"");
}
