[Compose] Add test for missing empty mapped ranges
Bug: b/267289876
Change-Id: Id835b8227237766a4c0616b5e25d79825b54245d
diff --git a/src/main/java/com/android/tools/r8/naming/ProguardMapReader.java b/src/main/java/com/android/tools/r8/naming/ProguardMapReader.java
index eba6b53..c1dfb81 100644
--- a/src/main/java/com/android/tools/r8/naming/ProguardMapReader.java
+++ b/src/main/java/com/android/tools/r8/naming/ProguardMapReader.java
@@ -825,6 +825,7 @@
}
ParseException(String msg, boolean eol) {
+ super(msg);
lineNo = ProguardMapReader.this.lineNo;
lineOffset = ProguardMapReader.this.lineOffset;
this.eol = eol;
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeNoMinifiedPositionForMethodTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeNoMinifiedPositionForMethodTest.java
index 91d5479..c7367ee 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeNoMinifiedPositionForMethodTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeNoMinifiedPositionForMethodTest.java
@@ -4,14 +4,15 @@
package com.android.tools.r8.mappingcompose;
-import static com.android.tools.r8.mappingcompose.ComposeTestHelpers.doubleToSingleQuote;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertThrows;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.naming.ClassNameMapper;
-import com.android.tools.r8.naming.MappingComposer;
+import com.android.tools.r8.naming.ProguardMapReader.ParseException;
import com.android.tools.r8.utils.StringUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,23 +38,14 @@
StringUtils.unixLines(
"# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"com.foo -> a:",
- " void m1() -> x");
- private static final String mappingBar =
- StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
- "a -> b:",
- " 1:2:void x():5:5 -> z");
- private static final String mappingResult =
- StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
- "com.foo -> b:",
- " 1:2:void m1():0:0 -> z");
+ " void m1():13:13 -> x",
+ " 1:1:void bar():42:42 -> y",
+ " void bar():58 -> y");
@Test
public void testCompose() throws Exception {
- ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromString(mappingFoo);
- ClassNameMapper mappingForBar = ClassNameMapper.mapperFromString(mappingBar);
- String composed = MappingComposer.compose(mappingForFoo, mappingForBar);
- assertEquals(mappingResult, doubleToSingleQuote(composed));
+ ParseException parseException =
+ assertThrows(ParseException.class, () -> ClassNameMapper.mapperFromString(mappingFoo));
+ assertThat(parseException.getMessage(), containsString("No mapping for original range 13:13."));
}
}
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeNoPositionForMethodTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeNoPositionForMethodTest.java
new file mode 100644
index 0000000..ac8f21c
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeNoPositionForMethodTest.java
@@ -0,0 +1,59 @@
+// Copyright (c) 2023, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.mappingcompose;
+
+import static com.android.tools.r8.mappingcompose.ComposeTestHelpers.doubleToSingleQuote;
+import static org.junit.Assert.assertEquals;
+
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.naming.ClassNameMapper;
+import com.android.tools.r8.naming.MappingComposer;
+import com.android.tools.r8.utils.StringUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/***
+ * This is a regression test for b/267289876.
+ */
+@RunWith(Parameterized.class)
+public class ComposeNoPositionForMethodTest extends TestBase {
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withNoneRuntime().build();
+ }
+
+ public ComposeNoPositionForMethodTest(TestParameters parameters) {
+ parameters.assertNoneRuntime();
+ }
+
+ private static final String mappingFoo =
+ StringUtils.unixLines(
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
+ "com.foo -> a:",
+ " void m1() -> x");
+ private static final String mappingBar =
+ StringUtils.unixLines(
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
+ "a -> b:",
+ " 1:2:void x():5:5 -> z");
+ private static final String mappingResult =
+ StringUtils.unixLines(
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
+ "com.foo -> b:",
+ " 1:2:void m1():0:0 -> z");
+
+ @Test
+ public void testCompose() throws Exception {
+ ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromString(mappingFoo);
+ ClassNameMapper mappingForBar = ClassNameMapper.mapperFromString(mappingBar);
+ String composed = MappingComposer.compose(mappingForFoo, mappingForBar);
+ assertEquals(mappingResult, doubleToSingleQuote(composed));
+ }
+}
