commit 9206ab0b5a0570f527422273ea04829e9c78f166
author Ian Zerny <zerny@google.com> Wed Apr 21 11:47:12 2021 +0200
committer Ian Zerny <zerny@google.com> Wed Apr 21 12:37:12 2021 +0000
tree 873804dfe5cfdeddd96420967513b801684fff6b
parent bc60198ec92f126ee0f6541aef30c9c2d86b7b33

Fix test to allow experimental mapping content.

Change-Id: I34536d9ebf98380501c0c8fb9c7be22d4cc086fa

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 d8d47a2..5a4db90 100644
--- a/src/test/java/com/android/tools/r8/naming/MapReaderVersionTest.java
+++ b/src/test/java/com/android/tools/r8/naming/MapReaderVersionTest.java
@@ -5,12 +5,14 @@
 
 import static junit.framework.TestCase.assertEquals;
 
+import com.android.tools.r8.DiagnosticsHandler;
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestDiagnosticMessagesImpl;
 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.utils.StringUtils;
+import com.google.common.io.CharSource;
 import java.io.IOException;
 import org.junit.Assert;
 import org.junit.Test;
@@ -30,23 +32,33 @@
     parameters.assertNoneRuntime();
   }
 
+  private static ClassNameMapper read(DiagnosticsHandler diagnosticsHandler, String... lines)
+      throws IOException {
+    return ClassNameMapper.mapperFromBufferedReader(
+        CharSource.wrap(StringUtils.joinLines(lines)).openBufferedStream(),
+        diagnosticsHandler,
+        false,
+        true);
+  }
+
+  private static ClassNameMapper read(String... lines) throws IOException {
+    return read(null, lines);
+  }
+
   @Test
   public void testNoVersion() throws IOException {
     ClassNameMapper mapper =
-        ClassNameMapper.mapperFromString(
-            StringUtils.joinLines(
-                "pkg.Foo -> a.a:", "# { id: \"com.android.tools.r8.synthesized\" }"));
+        read("pkg.Foo -> a.a:", "# { id: \"com.android.tools.r8.synthesized\" }");
     assertMapping("a.a", "pkg.Foo", false, mapper);
   }
 
   @Test
   public void testExperimentalVersion() throws IOException {
     ClassNameMapper mapper =
-        ClassNameMapper.mapperFromString(
-            StringUtils.joinLines(
-                "# { id: 'com.android.tools.r8.mapping', version: 'experimental' }",
-                "pkg.Foo -> a.a:",
-                "# { id: 'com.android.tools.r8.synthesized' }"));
+        read(
+            "# { id: 'com.android.tools.r8.mapping', version: 'experimental' }",
+            "pkg.Foo -> a.a:",
+            "# { id: 'com.android.tools.r8.synthesized' }");
     assertMapping("a.a", "pkg.Foo", true, mapper);
   }
 
@@ -54,21 +66,20 @@
   public void testConcatMapFiles() throws IOException {
     TestDiagnosticMessagesImpl diagnostics = new TestDiagnosticMessagesImpl();
     ClassNameMapper mapper =
-        ClassNameMapper.mapperFromString(
-            StringUtils.joinLines(
-                // Default map-version is none.
-                "pkg.Foo -> a.a:",
-                "# { id: 'com.android.tools.r8.synthesized' }",
-                // Section with map-version experimental.
-                "# { id: 'com.android.tools.r8.mapping', version: 'experimental' }",
-                "pkg.Bar -> a.b:",
-                "# { id: 'com.android.tools.r8.synthesized' }",
-                // Section reverting map-version back to none (to support tooling that
-                // concatenates).
-                "# { id: 'com.android.tools.r8.mapping', version: 'none' }",
-                "pkg.Baz -> a.c:",
-                "# { id: 'com.android.tools.r8.synthesized' }"),
-            diagnostics);
+        read(
+            diagnostics,
+            // Default map-version is none.
+            "pkg.Foo -> a.a:",
+            "# { id: 'com.android.tools.r8.synthesized' }",
+            // Section with map-version experimental.
+            "# { id: 'com.android.tools.r8.mapping', version: 'experimental' }",
+            "pkg.Bar -> a.b:",
+            "# { id: 'com.android.tools.r8.synthesized' }",
+            // Section reverting map-version back to none (to support tooling that
+            // concatenates).
+            "# { id: 'com.android.tools.r8.mapping', version: 'none' }",
+            "pkg.Baz -> a.c:",
+            "# { id: 'com.android.tools.r8.synthesized' }");
     diagnostics.assertNoMessages();
     assertMapping("a.a", "pkg.Foo", false, mapper);
     assertMapping("a.b", "pkg.Bar", true, mapper);