commit efc9ed8cdd4d5cfb80b468e5be999f6853064c96
author Morten Krogh-Jespersen <mkroghj@google.com> Fri Oct 09 20:16:33 2020 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Fri Oct 09 18:17:36 2020 +0000
tree 66672669175a4354e17b1fd0988577ca61de86bb
parent f7a2816c582ed19f2a75022f57f07bac57b4e738

Adjust MemberFieldOverlapStackTrace to retrace obfuscated field

Change-Id: I8c6b08e385687a96ebf088791d7d726b764ddfbf

src/test/java/com/android/tools/r8/retrace/stacktraces/MemberFieldOverlapStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/MemberFieldOverlapStackTrace.java b/src/test/java/com/android/tools/r8/retrace/stacktraces/MemberFieldOverlapStackTrace.java
index 9071654..3ca3297 100644
--- a/src/test/java/com/android/tools/r8/retrace/stacktraces/MemberFieldOverlapStackTrace.java
+++ b/src/test/java/com/android/tools/r8/retrace/stacktraces/MemberFieldOverlapStackTrace.java
@@ -4,15 +4,18 @@
 
 package com.android.tools.r8.retrace.stacktraces;
 
+import static junit.framework.TestCase.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import com.android.tools.r8.references.Reference;
 import com.android.tools.r8.retrace.RetraceApi;
 import com.android.tools.r8.retrace.RetraceFieldResult;
+import com.android.tools.r8.retrace.RetraceFieldResult.Element;
 import com.android.tools.r8.utils.StringUtils;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 public class MemberFieldOverlapStackTrace implements StackTraceForTest {
 
@@ -41,8 +44,11 @@
 
   public void inspectField(RetraceApi retracer) {
     RetraceFieldResult result =
-        retracer.retrace(Reference.classFromTypeName("a.A")).lookupField("field");
-    assertTrue(result.stream().findAny().isPresent());
+        retracer.retrace(Reference.classFromTypeName("a.A")).lookupField("a");
     assertFalse(result.isAmbiguous());
+    assertEquals(1, result.stream().count());
+    Optional<Element> field = result.stream().findFirst();
+    assertTrue(field.isPresent());
+    assertEquals("field", field.get().getField().getFieldName());
   }
 }