Reproduce b/130135768: keeppackagenames with asterisks
Bug: 130135768
Change-Id: I5ab1cdb5148a570a63bdd488358759bb33da700a
diff --git a/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java b/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
index 7d2d474..8079072 100644
--- a/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
@@ -64,6 +64,10 @@
return addKeepRules("-keep class ** { *; }");
}
+ public T addKeepAndMinifyAllClassesRule() {
+ return addKeepRules("-keep,allowobfuscation class ** { *; }");
+ }
+
public T addKeepAllInterfacesRule() {
return addKeepRules("-keep interface ** { *; }");
}
diff --git a/src/test/java/com/android/tools/r8/naming/KeepPackageNamesTest.java b/src/test/java/com/android/tools/r8/naming/KeepPackageNamesTest.java
new file mode 100644
index 0000000..6167a56
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/naming/KeepPackageNamesTest.java
@@ -0,0 +1,106 @@
+// Copyright (c) 2019, 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;
+
+import static com.android.tools.r8.utils.DescriptorUtils.getPackageNameFromDescriptor;
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static com.android.tools.r8.utils.codeinspector.Matchers.isRenamed;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assume.assumeTrue;
+
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.errors.Unreachable;
+import com.android.tools.r8.naming.keeppackagenames.Top;
+import com.android.tools.r8.naming.keeppackagenames.sub.SubClass;
+import com.android.tools.r8.utils.codeinspector.ClassSubject;
+import com.android.tools.r8.utils.codeinspector.CodeInspector;
+import com.google.common.collect.ImmutableList;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class KeepPackageNamesTest extends TestBase {
+ private static final String PACKAGE_NAME = Top.class.getPackage().getName();
+ private static final List<Class<?>> CLASSES = ImmutableList.of(Top.class, SubClass.class);
+
+ enum TestConfig {
+ SINGLE_ASTERISK,
+ DOUBLE_ASTERISKS;
+
+ public String getKeepRule() {
+ switch (this) {
+ case SINGLE_ASTERISK:
+ return "-keeppackagenames com.android.tools.r8.naming.keeppackage*";
+ case DOUBLE_ASTERISKS:
+ return "-keeppackagenames com.android.tools.r8.naming.keeppackage**";
+ }
+ throw new Unreachable();
+ }
+
+ public void inspect(CodeInspector inspector) {
+ ClassSubject top = inspector.clazz(Top.class);
+ assertThat(top, isPresent());
+ assertThat(top, isRenamed());
+ assertEquals(
+ getPackageNameFromDescriptor(top.getOriginalDescriptor()),
+ getPackageNameFromDescriptor(top.getFinalDescriptor()));
+
+ ClassSubject sub = inspector.clazz(SubClass.class);
+ assertThat(sub, isPresent());
+ assertThat(sub, isRenamed());
+ switch (this) {
+ case SINGLE_ASTERISK:
+ assertNotEquals(
+ getPackageNameFromDescriptor(sub.getOriginalDescriptor()),
+ getPackageNameFromDescriptor(sub.getFinalDescriptor()));
+ assertThat(
+ getPackageNameFromDescriptor(sub.getFinalDescriptor()),
+ containsString(PACKAGE_NAME));
+ break;
+ case DOUBLE_ASTERISKS:
+ assertEquals(
+ getPackageNameFromDescriptor(sub.getOriginalDescriptor()),
+ getPackageNameFromDescriptor(sub.getFinalDescriptor()));
+ break;
+ }
+ }
+ }
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Object[] parameters() {
+ return TestConfig.values();
+ }
+
+ private final TestConfig config;
+
+ public KeepPackageNamesTest(TestConfig config) {
+ this.config = config;
+ }
+
+ @Test
+ public void testProguard() throws Exception {
+ testForProguard()
+ .addProgramClasses(CLASSES)
+ .addKeepAndMinifyAllClassesRule()
+ .addKeepRules(config.getKeepRule())
+ .compile()
+ .inspect(config::inspect);
+ }
+
+ @Test
+ public void testR8() throws Exception {
+ assumeTrue("b/130135768", config == TestConfig.DOUBLE_ASTERISKS);
+ testForR8(Backend.DEX)
+ .addProgramClasses(CLASSES)
+ .addKeepAndMinifyAllClassesRule()
+ .addKeepRules(config.getKeepRule())
+ .compile()
+ .inspect(config::inspect);
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/naming/keeppackagenames/Top.java b/src/test/java/com/android/tools/r8/naming/keeppackagenames/Top.java
new file mode 100644
index 0000000..032dc14
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/naming/keeppackagenames/Top.java
@@ -0,0 +1,7 @@
+// Copyright (c) 2019, 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.keeppackagenames;
+
+public class Top {
+}
diff --git a/src/test/java/com/android/tools/r8/naming/keeppackagenames/sub/SubClass.java b/src/test/java/com/android/tools/r8/naming/keeppackagenames/sub/SubClass.java
new file mode 100644
index 0000000..9910e8b
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/naming/keeppackagenames/sub/SubClass.java
@@ -0,0 +1,7 @@
+// Copyright (c) 2019, 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.keeppackagenames.sub;
+
+public class SubClass {
+}
