Delete trivial example test.
We should have sufficient coverage of empty methods without this.
Bug: b/167145686
Change-Id: Ie598ac404eef50605878cf11c0425465bf25d737
diff --git a/src/test/examples/trivial/Trivial.java b/src/test/examples/trivial/Trivial.java
deleted file mode 100644
index b6b8299..0000000
--- a/src/test/examples/trivial/Trivial.java
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2016, 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 trivial;
-
-public class Trivial {
- public static void main(String[] args) {
- }
-}
diff --git a/src/test/java/com/android/tools/r8/ExtractMarkerTest.java b/src/test/java/com/android/tools/r8/ExtractMarkerTest.java
index 1f0ef3c..c7a260a 100644
--- a/src/test/java/com/android/tools/r8/ExtractMarkerTest.java
+++ b/src/test/java/com/android/tools/r8/ExtractMarkerTest.java
@@ -13,6 +13,7 @@
import com.android.tools.r8.graph.DexString;
import com.android.tools.r8.utils.BooleanUtils;
import com.android.tools.r8.utils.ExtractMarkerUtils;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collection;
import java.util.Set;
@@ -23,8 +24,15 @@
@RunWith(Parameterized.class)
public class ExtractMarkerTest extends TestBase {
- private static final String CLASS_FILE =
- ToolHelper.EXAMPLES_BUILD_DIR + "classes/trivial/Trivial.class";
+
+ static class TestClass {
+
+ public static void main(String[] args) {
+
+ }
+ }
+
+ private static final Path CLASS_FILE = ToolHelper.getClassFileForTestClass(TestClass.class);
private final TestParameters parameters;
private boolean includeClassesChecksum;
@@ -55,7 +63,7 @@
boolean[] testExecuted = {false};
D8.run(
D8Command.builder()
- .addProgramFiles(Paths.get(CLASS_FILE))
+ .addProgramFiles(CLASS_FILE)
.setMinApiLevel(parameters.getApiLevel().getLevel())
.setIncludeClassesChecksum(includeClassesChecksum)
.setProgramConsumer(
@@ -98,7 +106,7 @@
boolean[] testExecuted = {false};
R8.run(
R8Command.builder()
- .addProgramFiles(Paths.get(CLASS_FILE))
+ .addProgramFiles(CLASS_FILE)
.addLibraryFiles(ToolHelper.getJava8RuntimeJar())
.setMode(CompilationMode.DEBUG)
.setDisableTreeShaking(true)
diff --git a/src/test/java/com/android/tools/r8/ProguardMapMarkerTest.java b/src/test/java/com/android/tools/r8/ProguardMapMarkerTest.java
index e38ecf7..74e36ab 100644
--- a/src/test/java/com/android/tools/r8/ProguardMapMarkerTest.java
+++ b/src/test/java/com/android/tools/r8/ProguardMapMarkerTest.java
@@ -14,6 +14,7 @@
import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.ExtractMarkerUtils;
import com.android.tools.r8.utils.VersionProperties;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collection;
import java.util.HashSet;
@@ -26,10 +27,16 @@
@RunWith(Parameterized.class)
public class ProguardMapMarkerTest extends TestBase {
+ static class TestClass {
+
+ public static void main(String[] args) {
+
+ }
+ }
+
private static final int EXPECTED_NUMBER_OF_KEYS_DEX = 6;
private static final int EXPECTED_NUMBER_OF_KEYS_CF = 5;
- private static final String CLASS_FILE =
- ToolHelper.EXAMPLES_BUILD_DIR + "classes/trivial/Trivial.class";
+ private static final Path CLASS_FILE = ToolHelper.getClassFileForTestClass(TestClass.class);
@Parameters(name = "{0}")
public static TestParametersCollection data() {
@@ -60,7 +67,7 @@
ProguardMapIds proguardMapIds = new ProguardMapIds();
R8.run(
R8Command.builder()
- .addProgramFiles(Paths.get(CLASS_FILE))
+ .addProgramFiles(CLASS_FILE)
.setDisableTreeShaking(true)
.setProgramConsumer(
new DexIndexedConsumer.ForwardingConsumer(null) {
@@ -107,7 +114,7 @@
ProguardMapIds buildIds = new ProguardMapIds();
R8.run(
R8Command.builder()
- .addProgramFiles(Paths.get(CLASS_FILE))
+ .addProgramFiles(CLASS_FILE)
.setDisableTreeShaking(true)
.setProgramConsumer(
new ClassFileConsumer.ForwardingConsumer(null) {
diff --git a/src/test/java/com/android/tools/r8/R8RunExamplesTest.java b/src/test/java/com/android/tools/r8/R8RunExamplesTest.java
index bbce8ea..48e4bee 100644
--- a/src/test/java/com/android/tools/r8/R8RunExamplesTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunExamplesTest.java
@@ -27,7 +27,6 @@
String[] tests = {
"arithmetic.Arithmetic",
"inlining.Inlining",
- "trivial.Trivial",
"regress.Regress",
"regress2.Regress2",
"regress_37726195.Regress",
diff --git a/src/test/java/com/android/tools/r8/debug/ExamplesDebugTest.java b/src/test/java/com/android/tools/r8/debug/ExamplesDebugTest.java
index ff2c4ba..0d645ad 100644
--- a/src/test/java/com/android/tools/r8/debug/ExamplesDebugTest.java
+++ b/src/test/java/com/android/tools/r8/debug/ExamplesDebugTest.java
@@ -60,11 +60,6 @@
}
@Test
- public void testTrivial() throws Exception {
- testDebugging("trivial", "Trivial");
- }
-
- @Test
public void testRegress() throws Exception {
testDebugging("regress", "Regress");
}
