[Compose] Change linemapping of tests to always be unix
Change-Id: I9ea9cc8bcbd3edc4f2aa5f7a8b2d9e1146b3281a
diff --git a/src/main/java/com/android/tools/r8/utils/StringUtils.java b/src/main/java/com/android/tools/r8/utils/StringUtils.java
index 7275934..f1e4e18 100644
--- a/src/main/java/com/android/tools/r8/utils/StringUtils.java
+++ b/src/main/java/com/android/tools/r8/utils/StringUtils.java
@@ -155,9 +155,13 @@
}
public static String lines(List<String> lines) {
+ return lines(lines, LINE_SEPARATOR);
+ }
+
+ private static String lines(List<String> lines, String lineSeperator) {
StringBuilder builder = new StringBuilder();
for (String line : lines) {
- builder.append(line).append(LINE_SEPARATOR);
+ builder.append(line).append(lineSeperator);
}
return builder.toString();
}
@@ -166,6 +170,10 @@
return lines(Arrays.asList(lines));
}
+ public static String unixLines(String... lines) {
+ return lines(Arrays.asList(lines), "\n");
+ }
+
public static String withNativeLineSeparator(String s) {
s = s.replace("\r\n", "\n");
if (LINE_SEPARATOR.equals("\r\n")) {
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeChangeLineNumberTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeChangeLineNumberTest.java
index bffa4b3..b1ff980 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeChangeLineNumberTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeChangeLineNumberTest.java
@@ -29,11 +29,11 @@
}
private static final String mappingFoo =
- StringUtils.lines("com.foo -> a:", " 1:1:void m():42:42 -> m");
+ StringUtils.unixLines("com.foo -> a:", " 1:1:void m():42:42 -> m");
private static final String mappingBar =
- StringUtils.lines("a -> b:", " 2:2:void m():1:1 -> m");
+ StringUtils.unixLines("a -> b:", " 2:2:void m():1:1 -> m");
private static final String mappingResult =
- StringUtils.lines("com.foo -> b:", " 2:2:void m():42:42 -> m");
+ StringUtils.unixLines("com.foo -> b:", " 2:2:void m():42:42 -> m");
@Test
public void testCompose() throws Exception {
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeChangeMethodAndLineNumberTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeChangeMethodAndLineNumberTest.java
index 3e4270c..c0fe2b7 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeChangeMethodAndLineNumberTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeChangeMethodAndLineNumberTest.java
@@ -29,11 +29,11 @@
}
private static final String mappingFoo =
- StringUtils.lines("com.foo -> a:", " 1:1:void m1():42:42 -> m2");
+ StringUtils.unixLines("com.foo -> a:", " 1:1:void m1():42:42 -> m2");
private static final String mappingBar =
- StringUtils.lines("a -> b:", " 2:2:void m2():1:1 -> m3");
+ StringUtils.unixLines("a -> b:", " 2:2:void m2():1:1 -> m3");
private static final String mappingResult =
- StringUtils.lines("com.foo -> b:", " 2:2:void m1():42:42 -> m3");
+ StringUtils.unixLines("com.foo -> b:", " 2:2:void m1():42:42 -> m3");
@Test
public void testCompose() throws Exception {
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeChangeMethodTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeChangeMethodTest.java
index 03b2baa..83026e6 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeChangeMethodTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeChangeMethodTest.java
@@ -29,10 +29,10 @@
}
private static final String mappingFoo =
- StringUtils.lines("com.foo -> a:", " void f1() -> f2");
- private static final String mappingBar = StringUtils.lines("a -> b:", " void f2() -> f3");
+ StringUtils.unixLines("com.foo -> a:", " void f1() -> f2");
+ private static final String mappingBar = StringUtils.unixLines("a -> b:", " void f2() -> f3");
private static final String mappingResult =
- StringUtils.lines("com.foo -> b:", " void f1() -> f3");
+ StringUtils.unixLines("com.foo -> b:", " void f1() -> f3");
@Test
public void testCompose() throws Exception {
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 b0ceccc..a145c17 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeDifferentMethodTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeDifferentMethodTest.java
@@ -32,11 +32,11 @@
// right hand side mapping we have no other choice than to map the naming through. This would not
// be ok if we had overloads but any shrinker should put in line numbering for those.
private static final String mappingFoo =
- StringUtils.lines("com.foo -> a:", " void f1(int) -> f2");
+ StringUtils.unixLines("com.foo -> a:", " void f1(int) -> f2");
private static final String mappingBar =
- StringUtils.lines("a -> b:", " int f2(boolean) -> f3");
+ StringUtils.unixLines("a -> b:", " int f2(boolean) -> f3");
private static final String mappingResult =
- StringUtils.lines("com.foo -> b:", " void f1(int) -> f3");
+ StringUtils.unixLines("com.foo -> b:", " void f1(int) -> f3");
@Test
public void testCompose() throws Exception {
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 a58342f..a9b4d44 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeDifferentMethodWithLineNumberTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeDifferentMethodWithLineNumberTest.java
@@ -29,12 +29,12 @@
}
private static final String mappingFoo =
- StringUtils.lines(
+ StringUtils.unixLines(
"com.foo -> a:", " 1:1:int f1(boolean) -> f2", " 2:2:void f1(int) -> f2");
private static final String mappingBar =
- StringUtils.lines("a -> b:", " 8:8:void f2(boolean):2:2 -> f3");
+ StringUtils.unixLines("a -> b:", " 8:8:void f2(boolean):2:2 -> f3");
private static final String mappingResult =
- StringUtils.lines(
+ StringUtils.unixLines(
"com.foo -> b:", " 1:1:int f1(boolean) -> f2", " 8:8:void f1(int) -> f3");
@Test
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeDistinctClassesTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeDistinctClassesTest.java
index 706f7ef..e226de7 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeDistinctClassesTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeDistinctClassesTest.java
@@ -28,8 +28,8 @@
return getTestParameters().withNoneRuntime().build();
}
- private static final String mappingFoo = StringUtils.lines("com.foo -> a:");
- private static final String mappingBar = StringUtils.lines("com.bar -> b:");
+ private static final String mappingFoo = StringUtils.unixLines("com.foo -> a:");
+ private static final String mappingBar = StringUtils.unixLines("com.bar -> b:");
@Test
public void testCompose() throws Exception {
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeDuplicateClassMappingTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeDuplicateClassMappingTest.java
index 154d09d..cd2c32d 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeDuplicateClassMappingTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeDuplicateClassMappingTest.java
@@ -30,8 +30,8 @@
return getTestParameters().withNoneRuntime().build();
}
- private static final String mappingFoo = StringUtils.lines("com.foo -> b:");
- private static final String mappingBar = StringUtils.lines("a -> b:");
+ private static final String mappingFoo = StringUtils.unixLines("com.foo -> b:");
+ private static final String mappingBar = StringUtils.unixLines("a -> b:");
@Test
public void testCompose() throws Exception {
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeFieldNameTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeFieldNameTest.java
index e568a56..0834ed7 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeFieldNameTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeFieldNameTest.java
@@ -28,10 +28,11 @@
return getTestParameters().withNoneRuntime().build();
}
- private static final String mappingFoo = StringUtils.lines("com.foo -> a:", " int f1 -> f2");
- private static final String mappingBar = StringUtils.lines("a -> b:", " int f2 -> f3");
+ private static final String mappingFoo =
+ StringUtils.unixLines("com.foo -> a:", " int f1 -> f2");
+ private static final String mappingBar = StringUtils.unixLines("a -> b:", " int f2 -> f3");
private static final String mappingResult =
- StringUtils.lines("com.foo -> b:", " int f1 -> f3");
+ StringUtils.unixLines("com.foo -> b:", " int f1 -> f3");
@Test
public void testCompose() throws Exception {
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeFieldWithAmbiguousTypeTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeFieldWithAmbiguousTypeTest.java
index b6883aa..d4fedec 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeFieldWithAmbiguousTypeTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeFieldWithAmbiguousTypeTest.java
@@ -30,8 +30,9 @@
return getTestParameters().withNoneRuntime().build();
}
- private static final String mappingFoo = StringUtils.lines("com.foo -> a:", " int f1 -> f2");
- private static final String mappingBar = StringUtils.lines("a -> b:", " bool f2 -> f3");
+ private static final String mappingFoo =
+ StringUtils.unixLines("com.foo -> a:", " int f1 -> f2");
+ private static final String mappingBar = StringUtils.unixLines("a -> b:", " bool f2 -> f3");
@Test
public void testCompose() throws Exception {
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeInlineFollowedByLineNumberChangeTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeInlineFollowedByLineNumberChangeTest.java
index 8c6116e..79bae0b 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeInlineFollowedByLineNumberChangeTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeInlineFollowedByLineNumberChangeTest.java
@@ -29,15 +29,15 @@
}
private static final String mappingFoo =
- StringUtils.lines(
+ StringUtils.unixLines(
"com.foo -> a:",
" 1:1:void inlinee2():42:42 -> x",
" 1:1:void foo.bar.baz.inlinee1():41 -> x",
" 1:1:void caller():40 -> x");
private static final String mappingBar =
- StringUtils.lines("a -> b:", " 2:2:void x():1:1 -> y");
+ StringUtils.unixLines("a -> b:", " 2:2:void x():1:1 -> y");
private static final String mappingResult =
- StringUtils.lines(
+ StringUtils.unixLines(
"com.foo -> b:",
" 2:2:void inlinee2():42:42 -> y",
" 2:2:void foo.bar.baz.inlinee1():41 -> y",
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeSplitRangeStartTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeSplitRangeStartTest.java
index 84bceed..82cb66d 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeSplitRangeStartTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeSplitRangeStartTest.java
@@ -29,17 +29,17 @@
}
private static final String mappingFoo =
- StringUtils.lines(
+ StringUtils.unixLines(
"com.foo -> a:", " 1:5:void m():41:45 -> x", " 6:10:void m():56:60 -> x");
private static final String mappingBar =
- StringUtils.lines(
+ StringUtils.unixLines(
"a -> b:",
" 11:12:void x():1:2 -> y",
" 13:17:void x():3:7 -> y",
" 18:24:void x():8:8 -> y",
" 25:26:void x():9:10 -> y");
private static final String mappingResult =
- StringUtils.lines(
+ StringUtils.unixLines(
"com.foo -> b:",
" 11:12:void m():41:42 -> y",
" 13:15:void m():43:45 -> y",
