Add -dontusemixedcase test showing that we can pick clashing names
Bug: 155240931
Change-Id: I438e041a9ca2479ee1e86c7fc21530d7d89de738
diff --git a/src/test/java/com/android/tools/r8/TestBuilder.java b/src/test/java/com/android/tools/r8/TestBuilder.java
index 27af1aa..e9ac10d 100644
--- a/src/test/java/com/android/tools/r8/TestBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestBuilder.java
@@ -12,6 +12,7 @@
import java.util.Collection;
import java.util.List;
import java.util.concurrent.ExecutionException;
+import java.util.function.Consumer;
public abstract class TestBuilder<RR extends TestRunResult, T extends TestBuilder<RR, T>> {
@@ -38,6 +39,14 @@
return self();
}
+ public T ifTrue(boolean value, Consumer<T> consumer) {
+ T self = self();
+ if (value) {
+ consumer.accept(self);
+ }
+ return self;
+ }
+
@Deprecated
public abstract RR run(String mainClass)
throws CompilationFailedException, ExecutionException, IOException;
diff --git a/src/test/java/com/android/tools/r8/naming/ClassObfuscationDictionaryDuplicateTest.java b/src/test/java/com/android/tools/r8/naming/ClassObfuscationDictionaryDuplicateTest.java
index 4f3a868..e0ef67d 100644
--- a/src/test/java/com/android/tools/r8/naming/ClassObfuscationDictionaryDuplicateTest.java
+++ b/src/test/java/com/android/tools/r8/naming/ClassObfuscationDictionaryDuplicateTest.java
@@ -40,7 +40,7 @@
@Parameterized.Parameters(name = "{0}")
public static TestParametersCollection data() {
- return getTestParameters().withAllRuntimes().build();
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
}
public ClassObfuscationDictionaryDuplicateTest(TestParameters parameters) {
@@ -61,8 +61,7 @@
.noTreeShaking()
.addKeepRules("-classobfuscationdictionary " + dictionary.toString())
.addKeepMainRule(C.class)
- .setMinApi(parameters.getRuntime())
- .compile()
+ .setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), C.class)
.assertSuccessWithOutput("HELLO WORLD!")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/naming/DontUseMixedCaseClassNamesExistingClassTest.java b/src/test/java/com/android/tools/r8/naming/DontUseMixedCaseClassNamesExistingClassTest.java
new file mode 100644
index 0000000..f359d32
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/naming/DontUseMixedCaseClassNamesExistingClassTest.java
@@ -0,0 +1,82 @@
+// 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.naming;
+
+import static org.junit.Assert.assertEquals;
+
+import com.android.tools.r8.CompilationFailedException;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.utils.BooleanUtils;
+import com.android.tools.r8.utils.FileUtils;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+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 DontUseMixedCaseClassNamesExistingClassTest extends TestBase {
+
+ private final TestParameters parameters;
+ private final boolean dontUseMixedCase;
+ private static final String EXPECTED = "A.foo";
+ private static final String FINAL_CLASS_NAME = "DontUseMixedCaseClassNamesExistingClassTest$main";
+
+ @Parameters(name = "{0}, dontusemixedcaseclassnames: {1}")
+ public static List<Object[]> data() {
+ return buildParameters(
+ getTestParameters().withAllRuntimesAndApiLevels().build(), BooleanUtils.values());
+ }
+
+ public DontUseMixedCaseClassNamesExistingClassTest(
+ TestParameters parameters, boolean dontUseMixedCase) {
+ this.parameters = parameters;
+ this.dontUseMixedCase = dontUseMixedCase;
+ }
+
+ @Test
+ public void testR8() throws ExecutionException, CompilationFailedException, IOException {
+ Path dictionary = temp.getRoot().toPath().resolve("dictionary.txt");
+ FileUtils.writeTextFile(dictionary, FINAL_CLASS_NAME);
+ testForR8(parameters.getBackend())
+ .addProgramClasses(A.class, Main.class)
+ .setMinApi(parameters.getApiLevel())
+ .addKeepClassRulesWithAllowObfuscation(A.class)
+ .addKeepMainRule(Main.class)
+ .addKeepRules("-classobfuscationdictionary " + dictionary.toString())
+ .ifTrue(dontUseMixedCase, b -> b.addKeepRules("-dontusemixedcaseclassnames"))
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines(EXPECTED)
+ .inspect(
+ inspector -> {
+ String finalName = Main.class.getPackage().getName() + "." + FINAL_CLASS_NAME;
+ assertEquals(finalName.toLowerCase(), Main.class.getTypeName().toLowerCase());
+ if (dontUseMixedCase) {
+ // TODO(b/155240931, b/154360339): Change to assertNotEquals.
+ assertEquals(finalName, inspector.clazz(A.class).getFinalName());
+ } else {
+ assertEquals(finalName, inspector.clazz(A.class).getFinalName());
+ }
+ });
+ }
+
+ public static class A { // Will be renamed to main if not -dontusemixedcaseclassnames
+
+ public void foo() {
+ System.out.println("A.foo");
+ }
+ }
+
+ public static class Main {
+
+ public static void main(String[] args) {
+ new A().foo();
+ }
+ }
+}