Minor changes to -useuniqueclassmembernames tests
Change-Id: Ia975fe8c1be338a58ca5fb03a3e933b7aa5caf1b
diff --git a/src/test/java/com/android/tools/r8/naming/NamingTestBase.java b/src/test/java/com/android/tools/r8/naming/NamingTestBase.java
index 6b7005c..464f2d7 100644
--- a/src/test/java/com/android/tools/r8/naming/NamingTestBase.java
+++ b/src/test/java/com/android/tools/r8/naming/NamingTestBase.java
@@ -34,18 +34,18 @@
import java.util.function.BiConsumer;
import org.junit.Before;
-abstract class NamingTestBase {
+public abstract class NamingTestBase {
private final String appFileName;
- final List<String> keepRulesFiles;
- final BiConsumer<DexItemFactory, NamingLens> inspection;
+ protected final List<String> keepRulesFiles;
+ protected final BiConsumer<DexItemFactory, NamingLens> inspection;
private final Timing timing;
private DexApplication program;
- DexItemFactory dexItemFactory;
+ protected DexItemFactory dexItemFactory;
- NamingTestBase(
+ protected NamingTestBase(
String test,
List<String> keepRulesFiles,
BiConsumer<DexItemFactory, NamingLens> inspection,
@@ -62,7 +62,7 @@
dexItemFactory = program.dexItemFactory;
}
- NamingLens runMinifier(List<Path> configPaths) throws ExecutionException {
+ protected NamingLens runMinifier(List<Path> configPaths) throws ExecutionException {
ProguardConfiguration configuration =
ToolHelper.loadProguardConfiguration(dexItemFactory, configPaths);
InternalOptions options = new InternalOptions(configuration, new Reporter());
@@ -82,7 +82,8 @@
return new Minifier(appView.withLiveness(), rootSet, Collections.emptySet()).run(timing);
}
- static <T> Collection<Object[]> createTests(List<String> tests, Map<String, T> inspections) {
+ protected static <T> Collection<Object[]> createTests(
+ List<String> tests, Map<String, T> inspections) {
List<Object[]> testCases = new ArrayList<>();
Set<String> usedInspections = new HashSet<>();
for (String test : tests) {
diff --git a/src/test/java/com/android/tools/r8/naming/UniqueFieldMemberNamesTest.java b/src/test/java/com/android/tools/r8/naming/uniqueclassmembernames/UniqueFieldMemberNamesTest.java
similarity index 95%
rename from src/test/java/com/android/tools/r8/naming/UniqueFieldMemberNamesTest.java
rename to src/test/java/com/android/tools/r8/naming/uniqueclassmembernames/UniqueFieldMemberNamesTest.java
index bda2ba8..c455fc4 100644
--- a/src/test/java/com/android/tools/r8/naming/UniqueFieldMemberNamesTest.java
+++ b/src/test/java/com/android/tools/r8/naming/uniqueclassmembernames/UniqueFieldMemberNamesTest.java
@@ -2,7 +2,7 @@
// 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;
+package com.android.tools.r8.naming.uniqueclassmembernames;
import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
import static com.android.tools.r8.utils.codeinspector.Matchers.isRenamed;
@@ -39,7 +39,7 @@
ClassBuilder classBuilder = builder.addClass("A", "java/lang/Object");
classBuilder.addField("public", "a", "Ljava/lang/Object;", null);
classBuilder.addField("public", "f", "Ljava/lang/Object;", null);
- programClassA = tempFolder.getRoot().toPath().resolve("input.jar");
+ programClassA = tempFolder.getRoot().toPath().resolve("a.jar");
builder.writeJar(programClassA);
}
{
@@ -47,7 +47,7 @@
ClassBuilder classBuilder = builder.addClass("B", "java/lang/Object");
classBuilder.addField("public", "f", "Ljava/lang/Object;", null);
classBuilder.addField("public", "f", "Ljava/lang/String;", null);
- programClassB = tempFolder.getRoot().toPath().resolve("library.jar");
+ programClassB = tempFolder.getRoot().toPath().resolve("b.jar");
builder.writeJar(programClassB);
}
}
diff --git a/src/test/java/com/android/tools/r8/naming/UseUniqueMemberNameTest.java b/src/test/java/com/android/tools/r8/naming/uniqueclassmembernames/UseUniqueMemberNameTest.java
similarity index 96%
rename from src/test/java/com/android/tools/r8/naming/UseUniqueMemberNameTest.java
rename to src/test/java/com/android/tools/r8/naming/uniqueclassmembernames/UseUniqueMemberNameTest.java
index e032fde..8656a71 100644
--- a/src/test/java/com/android/tools/r8/naming/UseUniqueMemberNameTest.java
+++ b/src/test/java/com/android/tools/r8/naming/uniqueclassmembernames/UseUniqueMemberNameTest.java
@@ -1,7 +1,7 @@
// Copyright (c) 2017, 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;
+package com.android.tools.r8.naming.uniqueclassmembernames;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
@@ -10,6 +10,8 @@
import com.android.tools.r8.graph.DexItemFactory;
import com.android.tools.r8.graph.DexMethod;
import com.android.tools.r8.graph.DexType;
+import com.android.tools.r8.naming.NamingLens;
+import com.android.tools.r8.naming.NamingTestBase;
import com.android.tools.r8.utils.ListUtils;
import com.android.tools.r8.utils.Timing;
import java.nio.file.Paths;
