Update retrace tests after relaxing range assumptions
Change-Id: I8dfd3a638faf77b1ba51594a7bd786068b164e09
diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceTests.java b/src/test/java/com/android/tools/r8/retrace/RetraceTests.java
index edb6475..95c8b5b 100644
--- a/src/test/java/com/android/tools/r8/retrace/RetraceTests.java
+++ b/src/test/java/com/android/tools/r8/retrace/RetraceTests.java
@@ -7,7 +7,6 @@
import static junit.framework.TestCase.assertEquals;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeFalse;
@@ -487,19 +486,15 @@
}
@Test
- public void testInvalidMinifiedRangeStackTrace() {
+ public void testInvalidMinifiedRangeStackTrace() throws Exception {
assumeFalse(external);
- assertThrows(
- InvalidMappingFileException.class,
- () -> runRetraceTest(new InvalidMinifiedRangeStackTrace()));
+ runRetraceTest(new InvalidMinifiedRangeStackTrace());
}
@Test
- public void testInvalidOriginalRangeStackTrace() {
+ public void testInvalidOriginalRangeStackTrace() throws Exception {
assumeFalse(external);
- assertThrows(
- InvalidMappingFileException.class,
- () -> runRetraceTest(new InvalidOriginalRangeStackTrace()));
+ runRetraceTest(new InvalidOriginalRangeStackTrace());
}
private void inspectRetraceTest(
diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InvalidMinifiedRangeStackTrace.java b/src/test/java/com/android/tools/r8/retrace/stacktraces/InvalidMinifiedRangeStackTrace.java
index ad16a40..92e6567 100644
--- a/src/test/java/com/android/tools/r8/retrace/stacktraces/InvalidMinifiedRangeStackTrace.java
+++ b/src/test/java/com/android/tools/r8/retrace/stacktraces/InvalidMinifiedRangeStackTrace.java
@@ -6,7 +6,6 @@
import com.android.tools.r8.utils.StringUtils;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
public class InvalidMinifiedRangeStackTrace implements StackTraceForTest {
@@ -20,12 +19,16 @@
@Override
public List<String> retracedStackTrace() {
- return Collections.emptyList();
+ return Arrays.asList(
+ "Exception in thread \"main\" java.lang.NullPointerException",
+ "\tat com.android.tools.r8.naming.retrace.Main.main(Main.java:3)");
}
@Override
public List<String> retraceVerboseStackTrace() {
- return Collections.emptyList();
+ return Arrays.asList(
+ "Exception in thread \"main\" java.lang.NullPointerException",
+ "\tat com.android.tools.r8.naming.retrace.Main.void main(java.lang.String[])(Main.java:3)");
}
@Override
diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InvalidOriginalRangeStackTrace.java b/src/test/java/com/android/tools/r8/retrace/stacktraces/InvalidOriginalRangeStackTrace.java
index 3b8fa63..9a6bcde 100644
--- a/src/test/java/com/android/tools/r8/retrace/stacktraces/InvalidOriginalRangeStackTrace.java
+++ b/src/test/java/com/android/tools/r8/retrace/stacktraces/InvalidOriginalRangeStackTrace.java
@@ -6,7 +6,6 @@
import com.android.tools.r8.utils.StringUtils;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
public class InvalidOriginalRangeStackTrace implements StackTraceForTest {
@@ -20,12 +19,16 @@
@Override
public List<String> retracedStackTrace() {
- return Collections.emptyList();
+ return Arrays.asList(
+ "Exception in thread \"main\" java.lang.NullPointerException",
+ "\tat com.android.tools.r8.naming.retrace.Main.main(Main.java:3)");
}
@Override
public List<String> retraceVerboseStackTrace() {
- return Collections.emptyList();
+ return Arrays.asList(
+ "Exception in thread \"main\" java.lang.NullPointerException",
+ "\tat com.android.tools.r8.naming.retrace.Main.void main(java.lang.String[])(Main.java:3)");
}
@Override
