Add test that highlights problem with package private overrides
Bug: 149363086
Change-Id: I6eebf8d436c20cd46081abee3ee691df6f3dad25
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/WidenAccessOutsidePackageTest.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/WidenAccessOutsidePackageTest.java
new file mode 100644
index 0000000..e66f502
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/WidenAccessOutsidePackageTest.java
@@ -0,0 +1,121 @@
+// Copyright (c) 2020, 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.resolution.packageprivate;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+import com.android.tools.r8.CompilationFailedException;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.TestRunResult;
+import com.android.tools.r8.ToolHelper.DexVm;
+import com.android.tools.r8.graph.AppView;
+import com.android.tools.r8.graph.DexEncodedMethod;
+import com.android.tools.r8.graph.DexMethod;
+import com.android.tools.r8.graph.LookupResult;
+import com.android.tools.r8.graph.ResolutionResult;
+import com.android.tools.r8.resolution.packageprivate.a.A;
+import com.android.tools.r8.resolution.packageprivate.a.A.B;
+import com.android.tools.r8.shaking.AppInfoWithLiveness;
+import com.google.common.collect.ImmutableSet;
+import java.io.IOException;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class WidenAccessOutsidePackageTest extends TestBase {
+
+ private final TestParameters parameters;
+ private static final String[] EXPECTED = new String[] {"C.foo", "B.bar", "C.foo", "C.bar"};
+ private static final String[] EXPECTED_DALVIK = new String[] {"C.foo", "C.bar", "C.foo", "C.bar"};
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ public WidenAccessOutsidePackageTest(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void testResolution() throws Exception {
+ assumeTrue(parameters.useRuntimeAsNoneRuntime());
+ AppView<AppInfoWithLiveness> appView =
+ computeAppViewWithLiveness(
+ buildClasses(A.class, B.class, C.class, Main.class).build(), Main.class);
+ AppInfoWithLiveness appInfo = appView.appInfo();
+ DexMethod method = buildNullaryVoidMethod(A.class, "bar", appInfo.dexItemFactory());
+ ResolutionResult resolutionResult = appInfo.resolveMethod(method.holder, method);
+ LookupResult lookupResult = resolutionResult.lookupVirtualDispatchTargets(appView);
+ assertTrue(lookupResult.isLookupResultSuccess());
+ Set<String> targets =
+ lookupResult.asLookupResultSuccess().getMethodTargets().stream()
+ .map(DexEncodedMethod::qualifiedName)
+ .collect(Collectors.toSet());
+ // TODO(b/149363086): Fix expectation.
+ ImmutableSet<String> expected =
+ ImmutableSet.of(
+ A.class.getTypeName() + ".bar",
+ B.class.getTypeName() + ".bar",
+ C.class.getTypeName() + ".bar");
+ assertEquals(expected, targets);
+ }
+
+ @Test
+ public void testRuntime() throws ExecutionException, CompilationFailedException, IOException {
+ TestRunResult<?> runResult =
+ testForRuntime(parameters)
+ .addProgramClasses(A.class, B.class, C.class, Main.class)
+ .run(parameters.getRuntime(), Main.class);
+ if (parameters.isDexRuntime()
+ && parameters.getRuntime().asDex().getVm().isOlderThanOrEqual(DexVm.ART_4_4_4_TARGET)) {
+ runResult.assertSuccessWithOutputLines(EXPECTED_DALVIK);
+ } else {
+ runResult.assertSuccessWithOutputLines(EXPECTED);
+ }
+ }
+
+ @Test
+ public void testR8() throws ExecutionException, CompilationFailedException, IOException {
+ // TODO(b/149363086): Fix expectation.
+ testForR8(parameters.getBackend())
+ .addProgramClasses(A.class, B.class, C.class, Main.class)
+ .setMinApi(parameters.getApiLevel())
+ .noMinification()
+ .addKeepMainRule(Main.class)
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines(EXPECTED_DALVIK);
+ }
+
+ public static class C extends B {
+ @Override
+ public void foo() {
+ System.out.println("C.foo");
+ }
+
+ public void bar() {
+ System.out.println("C.bar");
+ }
+ }
+
+ public static class Main {
+
+ public static void main(String[] args) {
+ C c = new C();
+ A.run(c);
+ c.foo();
+ c.bar();
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/a/A.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/a/A.java
new file mode 100644
index 0000000..8154e21
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/a/A.java
@@ -0,0 +1,34 @@
+// Copyright (c) 2020, 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.resolution.packageprivate.a;
+
+public class A {
+
+ protected void foo() {
+ System.out.println("A.foo");
+ }
+
+ void bar() {
+ System.out.println("A.bar");
+ }
+
+ public static class B extends A {
+
+ @Override
+ protected void foo() {
+ System.out.println("B.foo");
+ }
+
+ @Override
+ void bar() {
+ System.out.println("B.bar");
+ }
+ }
+
+ public static void run(A a) {
+ a.foo();
+ a.bar();
+ }
+}
