commit 2f3e32c78307c9fea8edd56be199e7a15ceedefa
author Rico Wind <ricow@google.com> Mon May 23 14:36:12 2022 +0200
committer Rico Wind <ricow@google.com> Mon May 23 14:36:12 2022 +0200
tree c372bfd7f2d5e8ef7ab4b4bfae0eb02ef8674c33
parent c570c3e4cc6a5298a19f72a4d45c1843b7f80f47

Fix VerticalClassMergingWithNonVisibleAnnotationTest test expectation

Change-Id: I8686cb6626151fbdfc5a83f0267069d328e8af48

src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithNonVisibleAnnotationTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithNonVisibleAnnotationTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithNonVisibleAnnotationTest.java
index c3a7cfc..c431ea1 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithNonVisibleAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithNonVisibleAnnotationTest.java
@@ -62,7 +62,10 @@
               // Assert that the merged class has no annotations from Base
               assertTrue(sub.getDexProgramClass().annotations().isEmpty());
               // Assert that foo has the private annotation from the Base.foo
-              MethodSubject foo = sub.uniqueMethodWithName("foo");
+              MethodSubject foo =
+                  sub.uniqueMethodThatMatches(
+                      method ->
+                          method.getOriginalName(false).equals("foo") && !method.isSynthetic());
               assertThat(foo, isPresent());
               AnnotationSubject privateMethodAnnotation =
                   foo.annotation(