Fix test expectations after removing plain stack trace parser

Change-Id: I7080aef1f0dd816f43ff7a9c2e10c37cb135d601

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 bcca0af..8f8e049 100644
--- a/src/test/java/com/android/tools/r8/retrace/RetraceVerboseTests.java
+++ b/src/test/java/com/android/tools/r8/retrace/RetraceVerboseTests.java
@@ -4,9 +4,8 @@
 
 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.assumeFalse;
+import static org.junit.Assume.assumeTrue;
 
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestDiagnosticMessagesImpl;
@@ -16,7 +15,6 @@
 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;
@@ -26,16 +24,12 @@
 @RunWith(Parameterized.class)
 public class RetraceVerboseTests extends TestBase {
 
-  @Parameters(name = "{0}, use regular expression: {1}")
+  @Parameters(name = "{0}")
   public static Collection<Object[]> data() {
-    return buildParameters(getTestParameters().withNoneRuntime().build(), BooleanUtils.values());
+    return buildParameters(getTestParameters().withNoneRuntime().build());
   }
 
-  private final boolean useRegExpParsing;
-
-  public RetraceVerboseTests(TestParameters parameters, boolean useRegExpParsing) {
-    this.useRegExpParsing = useRegExpParsing;
-  }
+  public RetraceVerboseTests(TestParameters parameters) {}
 
   @Test
   public void testFoundMethod() {
@@ -54,23 +48,20 @@
 
   @Test
   public void testAmbiguousMissingLineVerbose() {
-    // TODO(b/169346455): Enable when separated parser.
-    assumeFalse(useRegExpParsing);
+    assumeTrue("b/169346455", false);
     runRetraceTest(new AmbiguousWithSignatureVerboseStackTrace());
   }
 
-  private TestDiagnosticMessagesImpl runRetraceTest(StackTraceForTest stackTraceForTest) {
+  private void 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;
   }
 }