commit 0ed2f0758162edd1e364797701ebc7b02349ddaa
author Morten Krogh-Jespersen <mkroghj@google.com> Fri Oct 08 22:40:31 2021 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Fri Oct 08 22:40:31 2021 +0200
tree 3650686fc4c71d587dcdcbd05030253c1c7f9e99
parent 44688aade1d03b6498e6780d1e4c6ac66e710607

Fix retrace proguard tests on dalvik

Change-Id: Ifce1974d2805b0ff63ba3ac8eb70d6a713b43e54

src/test/java/com/android/tools/r8/naming/retraceproguard/RetraceTestBase.java

diff --git a/src/test/java/com/android/tools/r8/naming/retraceproguard/RetraceTestBase.java b/src/test/java/com/android/tools/r8/naming/retraceproguard/RetraceTestBase.java
index b172763..2200ea7 100644
--- a/src/test/java/com/android/tools/r8/naming/retraceproguard/RetraceTestBase.java
+++ b/src/test/java/com/android/tools/r8/naming/retraceproguard/RetraceTestBase.java
@@ -46,8 +46,7 @@
             .addProgramClasses(getClasses())
             .run(parameters.getRuntime(), getMainClass())
             .assertFailure()
-            .map(StackTrace::extract)
-            .filter(this::isNotDalvikNativeStartMethod);
+            .map(StackTrace::extract);
   }
 
   public void runTest(List<String> keepRules, BiConsumer<StackTrace, StackTrace> checker)

src/test/java/com/android/tools/r8/naming/retraceproguard/VerticalClassMergingRetraceTest.java

diff --git a/src/test/java/com/android/tools/r8/naming/retraceproguard/VerticalClassMergingRetraceTest.java b/src/test/java/com/android/tools/r8/naming/retraceproguard/VerticalClassMergingRetraceTest.java
index e354915..130e305 100644
--- a/src/test/java/com/android/tools/r8/naming/retraceproguard/VerticalClassMergingRetraceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retraceproguard/VerticalClassMergingRetraceTest.java
@@ -89,7 +89,8 @@
                   : retracedStackTrace.filter(this::filterSynthesizedMethodWhenLineNumberAvailable);
           assertThat(
               reprocessedStackTrace.filter(this::isNotDalvikNativeStartMethod),
-              isSameExceptForFileName(expectedStackTrace));
+              isSameExceptForFileName(
+                  expectedStackTrace.filter(this::isNotDalvikNativeStartMethod)));
           assertEquals(expectedActualStackTraceHeight(), actualStackTrace.size());
         });
   }
@@ -107,7 +108,8 @@
                   : retracedStackTrace.filter(this::filterSynthesizedMethodWhenLineNumberAvailable);
           assertThat(
               reprocessedStackTrace.filter(this::isNotDalvikNativeStartMethod),
-              isSameExceptForFileName(expectedStackTrace));
+              isSameExceptForFileName(
+                  expectedStackTrace.filter(this::isNotDalvikNativeStartMethod)));
           assertEquals(expectedActualStackTraceHeight(), actualStackTrace.size());
         });
   }
@@ -126,7 +128,8 @@
                   : retracedStackTrace.filter(this::filterSynthesizedMethod);
           assertThat(
               reprocessedStackTrace.filter(this::isNotDalvikNativeStartMethod),
-              isSameExceptForFileNameAndLineNumber(expectedStackTrace));
+              isSameExceptForFileNameAndLineNumber(
+                  expectedStackTrace.filter(this::isNotDalvikNativeStartMethod)));
           assertEquals(expectedActualStackTraceHeight(), actualStackTrace.size());
         });
   }