Add test for repackaging to keep original package structure
Bug: b/241220445
Change-Id: I8eca42d8767b43f37a239242e1d9b1b0b2513ed4
diff --git a/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java b/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
index 9072aa3..e1de2d3 100644
--- a/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
@@ -105,6 +105,10 @@
return addKeepRules(Arrays.asList(rules));
}
+ public T addDontObfuscate() {
+ return addKeepRules("-dontobfuscate");
+ }
+
public T addDontObfuscate(Class<?> clazz) {
return addKeepRules(
"-keep,allowaccessmodification,allowannotationremoval,allowoptimization,allowshrinking"
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageClassWithKeepPackageNameOnTargetTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageClassWithKeepPackageNameOnTargetTest.java
new file mode 100644
index 0000000..ce8088f
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageClassWithKeepPackageNameOnTargetTest.java
@@ -0,0 +1,77 @@
+// 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.repackage;
+
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotEquals;
+
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.utils.DescriptorUtils;
+import com.android.tools.r8.utils.codeinspector.ClassSubject;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class RepackageClassWithKeepPackageNameOnTargetTest extends RepackageTestBase {
+
+ private static final String DESTINATION_PACKAGE = "other.package";
+
+ public RepackageClassWithKeepPackageNameOnTargetTest(
+ String flattenPackageHierarchyOrRepackageClasses, TestParameters parameters) {
+ super(flattenPackageHierarchyOrRepackageClasses, parameters);
+ }
+
+ @Override
+ protected String getRepackagePackage() {
+ return DESTINATION_PACKAGE;
+ }
+
+ @Test
+ public void testR8() throws Exception {
+ // TODO(b/241220445): Should be able to relocate when having -dontobfuscate in some way to
+ // support mainline.
+ testForR8(parameters.getBackend())
+ .addInnerClasses(getClass())
+ .setMinApi(parameters.getApiLevel())
+ .addKeepMainRule(Main.class)
+ .enableInliningAnnotations()
+ .apply(this::configureRepackaging)
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines("Foo::foo()")
+ .inspect(
+ inspector -> {
+ ClassSubject clazz = inspector.clazz(Foo.class);
+ assertThat(clazz, isPresent());
+ assertThat(clazz.getFinalName(), startsWith(DESTINATION_PACKAGE));
+ String relocatedPackageSuffix =
+ DescriptorUtils.getPackageBinaryNameFromJavaType(
+ clazz.getFinalName().substring(DESTINATION_PACKAGE.length() + 1));
+ String originalPackage =
+ DescriptorUtils.getPackageBinaryNameFromJavaType(clazz.getOriginalName());
+ // TODO(b/241220445): Have a configuration where the suffix is identicial to the
+ // original.
+ assertNotEquals(relocatedPackageSuffix, originalPackage);
+ });
+ }
+
+ public static class Main {
+
+ public static void main(String[] args) {
+ Foo.foo();
+ }
+ }
+
+ public static class Foo {
+
+ @NeverInline
+ public static void foo() {
+ System.out.println("Foo::foo()");
+ }
+ }
+}
