commit e8dabfc5b0e73ebbbffe4b8415a6922d61265055
author Ian Zerny <zerny@google.com> Thu Apr 08 09:55:42 2021 +0200
committer Ian Zerny <zerny@google.com> Thu Apr 08 09:55:42 2021 +0200
tree 01bdfe075d0dd841520d5b847c22803a5b3ce914
parent f095574f4ac11fc081b9fc4e6b0996cedb2c78be

Update test after move of mapping information.

Change-Id: I0e9fb00bbe503e719b82b826ada777219acf1eb6

src/test/java/com/android/tools/r8/naming/MapReaderVersionTest.java

diff --git a/src/test/java/com/android/tools/r8/naming/MapReaderVersionTest.java b/src/test/java/com/android/tools/r8/naming/MapReaderVersionTest.java
index 36916ad..deab412 100644
--- a/src/test/java/com/android/tools/r8/naming/MapReaderVersionTest.java
+++ b/src/test/java/com/android/tools/r8/naming/MapReaderVersionTest.java
@@ -9,6 +9,8 @@
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
 import com.android.tools.r8.naming.mappinginformation.MappingInformation;
+import com.android.tools.r8.naming.mappinginformation.ScopedMappingInformation.ScopeReference;
+import com.android.tools.r8.references.Reference;
 import com.android.tools.r8.utils.StringUtils;
 import java.io.IOException;
 import org.junit.Assert;
@@ -75,11 +77,13 @@
       String finalName, String originalName, boolean isSynthesized, ClassNameMapper mapper) {
     ClassNamingForNameMapper naming = mapper.getClassNaming(finalName);
     assertEquals(originalName, naming.originalName);
-    Assert.assertEquals(isSynthesized, isCompilerSynthesized(naming));
+    Assert.assertEquals(isSynthesized, isCompilerSynthesized(mapper, finalName));
   }
 
-  private boolean isCompilerSynthesized(ClassNamingForNameMapper naming) {
-    return naming.getAdditionalMappings().stream()
+  private boolean isCompilerSynthesized(ClassNameMapper mapper, String finalName) {
+    ScopeReference reference =
+        ScopeReference.fromClassReference(Reference.classFromTypeName(finalName));
+    return mapper.getAdditionalMappingInfo(reference).stream()
         .anyMatch(MappingInformation::isCompilerSynthesizedMappingInformation);
   }
 }