commit 570e0c2dc4539ebcabd65e56b78a78d8bb89bd12
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Apr 26 20:05:04 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon Apr 26 20:05:04 2021 +0200
tree 48ce77cdea41b08a7f3e2b00c971cdfd4d4752c3
parent 58114c465a488231caee0fde2b64be1bd87309e3

Revert "Fix test expectations after removing plain stack trace parser"

This reverts commit 58114c465a488231caee0fde2b64be1bd87309e3.

Change-Id: I19cfc9bf342e52733d889d552fc8b00a865076c3

src/test/java/com/android/tools/r8/retrace/RetraceVerboseTests.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceVerboseTests.java b/src/test/java/com/android/tools/r8/retrace/RetraceVerboseTests.java
index 8f8e049..bcca0af 100644
--- a/src/test/java/com/android/tools/r8/retrace/RetraceVerboseTests.java
+++ b/src/test/java/com/android/tools/r8/retrace/RetraceVerboseTests.java
@@ -4,8 +4,9 @@
 
 package com.android.tools.r8.retrace;
 
+import static com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser.DEFAULT_REGULAR_EXPRESSION;
 import static junit.framework.TestCase.assertEquals;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.Assume.assumeFalse;
 
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestDiagnosticMessagesImpl;
@@ -15,6 +16,7 @@
 import com.android.tools.r8.retrace.stacktraces.FoundMethodVerboseStackTrace;
 import com.android.tools.r8.retrace.stacktraces.StackTraceForTest;
 import com.android.tools.r8.retrace.stacktraces.VerboseUnknownStackTrace;
+import com.android.tools.r8.utils.BooleanUtils;
 import java.util.Collection;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -24,12 +26,16 @@
 @RunWith(Parameterized.class)
 public class RetraceVerboseTests extends TestBase {
 
-  @Parameters(name = "{0}")
+  @Parameters(name = "{0}, use regular expression: {1}")
   public static Collection<Object[]> data() {
-    return buildParameters(getTestParameters().withNoneRuntime().build());
+    return buildParameters(getTestParameters().withNoneRuntime().build(), BooleanUtils.values());
   }
 
-  public RetraceVerboseTests(TestParameters parameters) {}
+  private final boolean useRegExpParsing;
+
+  public RetraceVerboseTests(TestParameters parameters, boolean useRegExpParsing) {
+    this.useRegExpParsing = useRegExpParsing;
+  }
 
   @Test
   public void testFoundMethod() {
@@ -48,20 +54,23 @@
 
   @Test
   public void testAmbiguousMissingLineVerbose() {
-    assumeTrue("b/169346455", false);
+    // TODO(b/169346455): Enable when separated parser.
+    assumeFalse(useRegExpParsing);
     runRetraceTest(new AmbiguousWithSignatureVerboseStackTrace());
   }
 
-  private void runRetraceTest(StackTraceForTest stackTraceForTest) {
+  private TestDiagnosticMessagesImpl runRetraceTest(StackTraceForTest stackTraceForTest) {
     TestDiagnosticMessagesImpl diagnosticsHandler = new TestDiagnosticMessagesImpl();
     RetraceCommand retraceCommand =
         RetraceCommand.builder(diagnosticsHandler)
             .setProguardMapProducer(ProguardMapProducer.fromString(stackTraceForTest.mapping()))
             .setStackTrace(stackTraceForTest.obfuscatedStackTrace())
+            .setRegularExpression(useRegExpParsing ? DEFAULT_REGULAR_EXPRESSION : null)
             .setVerbose(true)
             .setRetracedStackTraceConsumer(
                 retraced -> assertEquals(stackTraceForTest.retracedStackTrace(), retraced))
             .build();
     Retrace.run(retraceCommand);
+    return diagnosticsHandler;
   }
 }