[Compose] Clean-up compose tests after 2.2 was made stable
Bug: b/241763080
Bug: b/242673239
Change-Id: If98f2a5343eb9294236a10573149957d599e76bd
diff --git a/src/main/java/com/android/tools/r8/naming/ClassNameMapper.java b/src/main/java/com/android/tools/r8/naming/ClassNameMapper.java
index b9bc6bc..508c5db 100644
--- a/src/main/java/com/android/tools/r8/naming/ClassNameMapper.java
+++ b/src/main/java/com/android/tools/r8/naming/ClassNameMapper.java
@@ -142,14 +142,6 @@
CharSource.wrap(contents).openBufferedStream(), diagnosticsHandler);
}
- // TODO(b/241763080): Remove when 2.2 is stable.
- @Deprecated
- public static ClassNameMapper mapperFromStringWithExperimental(String contents)
- throws IOException {
- return mapperFromBufferedReader(
- CharSource.wrap(contents).openBufferedStream(), null, false, true, true);
- }
-
public static ClassNameMapper mapperFromString(
String contents,
DiagnosticsHandler diagnosticsHandler,
diff --git a/src/main/java/com/android/tools/r8/utils/positions/LineNumberOptimizer.java b/src/main/java/com/android/tools/r8/utils/positions/LineNumberOptimizer.java
index 11f01d2..1965667 100644
--- a/src/main/java/com/android/tools/r8/utils/positions/LineNumberOptimizer.java
+++ b/src/main/java/com/android/tools/r8/utils/positions/LineNumberOptimizer.java
@@ -57,7 +57,7 @@
timing.begin("Proguard map composition");
try {
mapper =
- ClassNameMapper.mapperFromStringWithExperimental(
+ ClassNameMapper.mapperFromStringWithPreamble(
MappingComposer.compose(
appView.options(), appView.appInfo().app().getProguardMap(), mapper));
} catch (IOException | MappingComposeException e) {
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeDifferentMethodTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeDifferentMethodTest.java
index a57ce5e..ea5c219 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeDifferentMethodTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeDifferentMethodTest.java
@@ -31,26 +31,26 @@
private static final String mappingFoo =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"com.foo -> a:",
" void f1(int) -> f2",
" # { id: 'com.android.tools.r8.residualsignature', signature:'(Z)I' }");
private static final String mappingBar =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"a -> b:",
" int f2(boolean) -> f3");
private static final String mappingResult =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"com.foo -> b:",
" void f1(int) -> f3",
" # {'id':'com.android.tools.r8.residualsignature','signature':'(Z)I'}");
@Test
public void testCompose() throws Exception {
- ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromStringWithExperimental(mappingFoo);
- ClassNameMapper mappingForBar = ClassNameMapper.mapperFromStringWithExperimental(mappingBar);
+ ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromStringWithPreamble(mappingFoo);
+ ClassNameMapper mappingForBar = ClassNameMapper.mapperFromStringWithPreamble(mappingBar);
String composed = MappingComposer.compose(mappingForFoo, mappingForBar);
assertEquals(mappingResult, doubleToSingleQuote(composed));
}
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeDifferentMethodWithLineNumberTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeDifferentMethodWithLineNumberTest.java
index 8647c07..a6aded1 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeDifferentMethodWithLineNumberTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeDifferentMethodWithLineNumberTest.java
@@ -31,19 +31,19 @@
private static final String mappingFoo =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"com.foo -> a:",
" 1:1:int f1(boolean) -> f2",
" 2:2:void f1(int) -> f2",
" # { id: 'com.android.tools.r8.residualsignature', signature:'(Z)V' }");
private static final String mappingBar =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"a -> b:",
" 8:8:void f2(boolean):2:2 -> f3");
private static final String mappingResult =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"com.foo -> b:",
" 1:1:int f1(boolean) -> f2",
" 8:8:void f1(int) -> f3",
@@ -51,8 +51,8 @@
@Test
public void testCompose() throws Exception {
- ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromStringWithExperimental(mappingFoo);
- ClassNameMapper mappingForBar = ClassNameMapper.mapperFromStringWithExperimental(mappingBar);
+ ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromStringWithPreamble(mappingFoo);
+ ClassNameMapper mappingForBar = ClassNameMapper.mapperFromStringWithPreamble(mappingBar);
String composed = MappingComposer.compose(mappingForFoo, mappingForBar);
assertEquals(mappingResult, doubleToSingleQuote(composed));
}
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeNoResidualSignatureExistingNamingLineNumberTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeNoResidualSignatureExistingNamingLineNumberTest.java
index f56d9af..1799999 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeNoResidualSignatureExistingNamingLineNumberTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeNoResidualSignatureExistingNamingLineNumberTest.java
@@ -31,34 +31,34 @@
private static final String mappingFoo =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"com.Class1 -> A:",
" 1:1:com.Class1 m(com.Class2[][]):42:42 -> a",
"com.Class2 -> B:");
private static final String mappingBar =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"A -> B:",
" 2:2:A a(B[][]):1:1 -> b",
"B -> C:");
private static final String mappingBaz =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"B -> C:",
" 3:3:B b(C[][]):2:2 -> c",
"C -> D:");
private static final String mappingResult =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"com.Class1 -> C:",
" 3:3:com.Class1 m(com.Class2[][]):42:42 -> c",
"com.Class2 -> D:");
@Test
public void testCompose() throws Exception {
- ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromStringWithExperimental(mappingFoo);
- ClassNameMapper mappingForBar = ClassNameMapper.mapperFromStringWithExperimental(mappingBar);
- ClassNameMapper mappingForBaz = ClassNameMapper.mapperFromStringWithExperimental(mappingBaz);
+ ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromStringWithPreamble(mappingFoo);
+ ClassNameMapper mappingForBar = ClassNameMapper.mapperFromStringWithPreamble(mappingBar);
+ ClassNameMapper mappingForBaz = ClassNameMapper.mapperFromStringWithPreamble(mappingBaz);
String composed = MappingComposer.compose(mappingForFoo, mappingForBar, mappingForBaz);
assertEquals(mappingResult, doubleToSingleQuote(composed));
}
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeNoResidualSignatureExistingNamingTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeNoResidualSignatureExistingNamingTest.java
index 17794b3..4b7e9a9 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeNoResidualSignatureExistingNamingTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeNoResidualSignatureExistingNamingTest.java
@@ -31,28 +31,28 @@
private static final String mappingFoo =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"com.Class1 -> A:",
" com.Class1 f -> a",
" com.Class1 m(com.Class2[][]) -> a",
"com.Class2 -> B:");
private static final String mappingBar =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"A -> B:",
" A a -> b",
" A a(B[][]) -> b",
"B -> C:");
private static final String mappingBaz =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"B -> C:",
" B b -> c",
" B b(C[][]) -> c",
"C -> D:");
private static final String mappingResult =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"com.Class1 -> C:",
" com.Class1 f -> c",
" com.Class1 m(com.Class2[][]) -> c",
@@ -60,9 +60,9 @@
@Test
public void testCompose() throws Exception {
- ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromStringWithExperimental(mappingFoo);
- ClassNameMapper mappingForBar = ClassNameMapper.mapperFromStringWithExperimental(mappingBar);
- ClassNameMapper mappingForBaz = ClassNameMapper.mapperFromStringWithExperimental(mappingBaz);
+ ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromStringWithPreamble(mappingFoo);
+ ClassNameMapper mappingForBar = ClassNameMapper.mapperFromStringWithPreamble(mappingBar);
+ ClassNameMapper mappingForBaz = ClassNameMapper.mapperFromStringWithPreamble(mappingBaz);
String composed = MappingComposer.compose(mappingForFoo, mappingForBar, mappingForBaz);
assertEquals(mappingResult, doubleToSingleQuote(composed));
}
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeOutlineTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeOutlineTest.java
index 587dc6a..657b551 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeOutlineTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeOutlineTest.java
@@ -31,7 +31,7 @@
private static final String mappingFoo =
StringUtils.unixLines(
- "# { id: 'com.android.tools.r8.mapping', version: 'experimental' }",
+ "# { id: 'com.android.tools.r8.mapping', version: '2.2' }",
"outline.Class -> a:",
" 1:2:int some.inlinee():75:76 -> a",
" 1:2:int outline():0 -> a",
@@ -44,11 +44,10 @@
" # { 'id':'com.android.tools.r8.outlineCallsite', 'positions': { '1': 4, '2': 5 },"
+ " 'outline':'La;a()I' }");
private static final String mappingBar =
- StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}", "a -> b:");
+ StringUtils.unixLines("# {'id':'com.android.tools.r8.mapping','version':'2.2'}", "a -> b:");
private static final String mappingBaz =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"b -> c:",
" 4:5:int a():1:2 -> m",
"x -> y:",
@@ -56,7 +55,7 @@
" 42:42:int s(int):27:27 -> o");
private static final String mappingResult =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"outline.Callsite -> y:",
" 8:8:int outlineCaller(int):23 -> o",
" 9:9:int foo.bar.baz.outlineCaller(int):98:98 -> o",
@@ -71,9 +70,9 @@
@Test
public void testCompose() throws Exception {
- ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromStringWithExperimental(mappingFoo);
- ClassNameMapper mappingForBar = ClassNameMapper.mapperFromStringWithExperimental(mappingBar);
- ClassNameMapper mappingForBaz = ClassNameMapper.mapperFromStringWithExperimental(mappingBaz);
+ ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromStringWithPreamble(mappingFoo);
+ ClassNameMapper mappingForBar = ClassNameMapper.mapperFromStringWithPreamble(mappingBar);
+ ClassNameMapper mappingForBaz = ClassNameMapper.mapperFromStringWithPreamble(mappingBaz);
String composed = MappingComposer.compose(mappingForFoo, mappingForBar, mappingForBaz);
assertEquals(mappingResult, doubleToSingleQuote(composed));
}
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeRewriteFrameTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeRewriteFrameTest.java
index 7b81cdc..93a9153 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeRewriteFrameTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeRewriteFrameTest.java
@@ -31,7 +31,7 @@
private static final String mappingFoo =
StringUtils.unixLines(
- "# { id: 'com.android.tools.r8.mapping', version: 'experimental' }",
+ "# { id: 'com.android.tools.r8.mapping', version: '2.2' }",
"my.CustomException -> a:",
"foo.Bar -> x:",
" 4:4:void other.Class.inlinee():23:23 -> a",
@@ -40,13 +40,13 @@
+ "conditions: ['throws(La;)'], actions: ['removeInnerFrames(1)'] }");
private static final String mappingBar =
StringUtils.unixLines(
- "# { id: 'com.android.tools.r8.mapping', version: 'experimental' }",
+ "# { id: 'com.android.tools.r8.mapping', version: '2.2' }",
"a -> b:",
"x -> c:",
" 8:8:void a(Other.Class):4:4 -> m");
private static final String mappingResult =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"foo.Bar -> c:",
" 8:8:void other.Class.inlinee():23:23 -> m",
" 8:8:void caller(Other.Class):7 -> m",
@@ -56,8 +56,8 @@
@Test
public void testCompose() throws Exception {
- ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromStringWithExperimental(mappingFoo);
- ClassNameMapper mappingForBar = ClassNameMapper.mapperFromStringWithExperimental(mappingBar);
+ ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromStringWithPreamble(mappingFoo);
+ ClassNameMapper mappingForBar = ClassNameMapper.mapperFromStringWithPreamble(mappingBar);
String composed = MappingComposer.compose(mappingForFoo, mappingForBar);
assertEquals(mappingResult, doubleToSingleQuote(composed));
}
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeSyntheticTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeSyntheticTest.java
index 53180d3..0954d3a 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeSyntheticTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeSyntheticTest.java
@@ -31,7 +31,7 @@
private static final String mappingFoo =
StringUtils.unixLines(
- "# { id: 'com.android.tools.r8.mapping', version: 'experimental' }",
+ "# { id: 'com.android.tools.r8.mapping', version: '2.2' }",
"com.foo -> a:",
"# { id: 'com.android.tools.r8.synthesized' }",
" int f -> a",
@@ -40,7 +40,7 @@
" # { id: 'com.android.tools.r8.synthesized' }");
private static final String mappingBar =
StringUtils.unixLines(
- "# { id: 'com.android.tools.r8.mapping', version: 'experimental' }",
+ "# { id: 'com.android.tools.r8.mapping', version: '2.2' }",
"a -> b:",
" int a -> b",
"com.bar -> c:",
@@ -49,7 +49,7 @@
" # { id: 'com.android.tools.r8.synthesized' }");
private static final String mappingResult =
StringUtils.unixLines(
- "# {'id':'com.android.tools.r8.mapping','version':'experimental'}",
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
"com.bar -> c:",
"# {'id':'com.android.tools.r8.synthesized'}",
" void bar() -> a",
@@ -57,14 +57,13 @@
"com.foo -> b:",
"# {'id':'com.android.tools.r8.synthesized'}",
" int f -> b",
- // TODO(b/242673239): When fixed, we should emit synthetized info here as well.
" void m() -> b",
" # {'id':'com.android.tools.r8.synthesized'}");
@Test
public void testCompose() throws Exception {
- ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromStringWithExperimental(mappingFoo);
- ClassNameMapper mappingForBar = ClassNameMapper.mapperFromStringWithExperimental(mappingBar);
+ ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromStringWithPreamble(mappingFoo);
+ ClassNameMapper mappingForBar = ClassNameMapper.mapperFromStringWithPreamble(mappingBar);
String composed = MappingComposer.compose(mappingForFoo, mappingForBar);
assertEquals(mappingResult, doubleToSingleQuote(composed));
}
