VarHandle desugar: Fix tests on Windows
Bug: b/247076137
Change-Id: I1a492de4e4da69acb81e606c340bf43aa2211152
diff --git a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringArrayOfIntTest.java b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringArrayOfIntTest.java
index f6c9334..bb98312 100644
--- a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringArrayOfIntTest.java
+++ b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringArrayOfIntTest.java
@@ -15,35 +15,37 @@
public class VarHandleDesugaringArrayOfIntTest extends VarHandleDesugaringTestBase {
private static final String TEST_GET_EXPECTED_OUTPUT =
- StringUtils.lines("1", "2", "1", "2", "1", "2", "1", "2", "1.0", "2.0", "1.0", "2.0");
+ StringUtils.lines("1", "2", "1", "2", "1", "2", "1", "2", "1.0", "2.0", "1.0", "2.0").trim();
private static final String TEST_SET_EXPECTED_OUTPUT =
StringUtils.lines(
- "1", "0", "1", "2", "3", "2", "3", "4", "5", "4", "5", "6", "7", "6", "7", "8", "48", "8",
- "48", "49", "50", "49", "50", "51", "9", "51", "9", "10", "11", "10", "11", "12", "11",
- "12", "11", "12", "11", "12", "11", "12", "11", "12", "11", "12", "11", "12", "11", "12",
- "11", "12");
+ "1", "0", "1", "2", "3", "2", "3", "4", "5", "4", "5", "6", "7", "6", "7", "8", "48",
+ "8", "48", "49", "50", "49", "50", "51", "9", "51", "9", "10", "11", "10", "11", "12",
+ "11", "12", "11", "12", "11", "12", "11", "12", "11", "12", "11", "12", "11", "12",
+ "11", "12", "11", "12")
+ .trim();
private static final String TEST_COMPAREANDSET_EXPECTED_OUTPUT =
- StringUtils.lines("1", "0", "1", "0", "1", "2", "1", "3");
+ StringUtils.lines("1", "0", "1", "0", "1", "2", "1", "3").trim();
private static final String EXPECTED_OUTPUT =
- "testGet\n"
- + TEST_GET_EXPECTED_OUTPUT
- + "testGetVolatile\n"
- + TEST_GET_EXPECTED_OUTPUT
- + "testSet\n"
- + TEST_SET_EXPECTED_OUTPUT
- + "testSetVolatile\n"
- + TEST_SET_EXPECTED_OUTPUT
- + "testSetRelease\n"
- + TEST_SET_EXPECTED_OUTPUT
- + "testCompareAndSet\n"
- + TEST_COMPAREANDSET_EXPECTED_OUTPUT
- + "testWeakCompareAndSet\n"
- + TEST_COMPAREANDSET_EXPECTED_OUTPUT
- + StringUtils.lines(
- "testArrayVarHandleForNonSingleDimension", "IllegalArgumentException");
+ StringUtils.lines(
+ "testGet",
+ TEST_GET_EXPECTED_OUTPUT,
+ "testGetVolatile",
+ TEST_GET_EXPECTED_OUTPUT,
+ "testSet",
+ TEST_SET_EXPECTED_OUTPUT,
+ "testSetVolatile",
+ TEST_SET_EXPECTED_OUTPUT,
+ "testSetRelease",
+ TEST_SET_EXPECTED_OUTPUT,
+ "testCompareAndSet",
+ TEST_COMPAREANDSET_EXPECTED_OUTPUT,
+ "testWeakCompareAndSet",
+ TEST_COMPAREANDSET_EXPECTED_OUTPUT,
+ "testArrayVarHandleForNonSingleDimension",
+ "IllegalArgumentException");
private static final String MAIN_CLASS = VarHandle.ArrayOfInt.typeName();
private static final String JAR_ENTRY = "varhandle/ArrayOfInt.class";
diff --git a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringArrayOfLongTest.java b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringArrayOfLongTest.java
index a32e832..4706835 100644
--- a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringArrayOfLongTest.java
+++ b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringArrayOfLongTest.java
@@ -15,35 +15,37 @@
public class VarHandleDesugaringArrayOfLongTest extends VarHandleDesugaringTestBase {
private static final String TEST_GET_EXPECTED_OUTPUT =
- StringUtils.lines("1", "2", "1", "2", "1", "2", "1.0", "2.0", "1.0", "2.0");
+ StringUtils.lines("1", "2", "1", "2", "1", "2", "1.0", "2.0", "1.0", "2.0").trim();
private static final String TEST_SET_EXPECTED_OUTPUT =
StringUtils.lines(
- "1", "0", "1", "2", "3", "2", "3", "4", "5", "4", "5", "6", "7", "6", "7", "8", "48", "8",
- "48", "49", "50", "49", "50", "51", "9", "51", "9", "10", "11", "10", "11", "12", "13",
- "12", "13", "14", "15", "14", "15", "16", "15", "16", "15", "16", "15", "16", "15", "16",
- "15", "16", "15", "16", "15", "16");
+ "1", "0", "1", "2", "3", "2", "3", "4", "5", "4", "5", "6", "7", "6", "7", "8", "48",
+ "8", "48", "49", "50", "49", "50", "51", "9", "51", "9", "10", "11", "10", "11", "12",
+ "13", "12", "13", "14", "15", "14", "15", "16", "15", "16", "15", "16", "15", "16",
+ "15", "16", "15", "16", "15", "16", "15", "16")
+ .trim();
private static final String TEST_COMPAREANDSET_EXPECTED_OUTPUT =
- StringUtils.lines("1", "0", "1", "0", "1", "2", "1", "3");
+ StringUtils.lines("1", "0", "1", "0", "1", "2", "1", "3").trim();
private static final String EXPECTED_OUTPUT =
- "testGet\n"
- + TEST_GET_EXPECTED_OUTPUT
- + "testGetVolatile\n"
- + TEST_GET_EXPECTED_OUTPUT
- + "testSet\n"
- + TEST_SET_EXPECTED_OUTPUT
- + "testSetVolatile\n"
- + TEST_SET_EXPECTED_OUTPUT
- + "testSetRelease\n"
- + TEST_SET_EXPECTED_OUTPUT
- + "testCompareAndSet\n"
- + TEST_COMPAREANDSET_EXPECTED_OUTPUT
- + "testWeakCompareAndSet\n"
- + TEST_COMPAREANDSET_EXPECTED_OUTPUT
- + StringUtils.lines(
- "testArrayVarHandleForNonSingleDimension", "IllegalArgumentException");
+ StringUtils.lines(
+ "testGet",
+ TEST_GET_EXPECTED_OUTPUT,
+ "testGetVolatile",
+ TEST_GET_EXPECTED_OUTPUT,
+ "testSet",
+ TEST_SET_EXPECTED_OUTPUT,
+ "testSetVolatile",
+ TEST_SET_EXPECTED_OUTPUT,
+ "testSetRelease",
+ TEST_SET_EXPECTED_OUTPUT,
+ "testCompareAndSet",
+ TEST_COMPAREANDSET_EXPECTED_OUTPUT,
+ "testWeakCompareAndSet",
+ TEST_COMPAREANDSET_EXPECTED_OUTPUT,
+ "testArrayVarHandleForNonSingleDimension",
+ "IllegalArgumentException");
private static final String MAIN_CLASS = VarHandle.ArrayOfLong.typeName();
private static final String JAR_ENTRY = "varhandle/ArrayOfLong.class";
diff --git a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringArrayOfObjectTest.java b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringArrayOfObjectTest.java
index 7b2f8ba..b06abad 100644
--- a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringArrayOfObjectTest.java
+++ b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringArrayOfObjectTest.java
@@ -16,39 +16,43 @@
private static final String TEST_GET_EXPECTED_OUTPUT =
StringUtils.lines(
- "1", "2", "1", "2", "1", "2", "1", "2", "1.0", "2.0", "1.0", "2.0", "3", "4", "3", "4",
- "3", "4", "3.0", "4.0", "3.0", "4.0");
+ "1", "2", "1", "2", "1", "2", "1", "2", "1.0", "2.0", "1.0", "2.0", "3", "4", "3",
+ "4", "3", "4", "3.0", "4.0", "3.0", "4.0")
+ .trim();
private static final String TEST_SET_EXPECTED_OUTPUT =
StringUtils.lines(
- "5", "5", "true", "true", "6", "6", "true", "true", "7", "7", "true", "true", "8", "8",
- "true", "true", "9.0", "9.0", "true", "true", "10.0", "10.0", "true", "true", "11.0",
- "11.0", "true", "true", "12.0", "12.0", "true", "true", "A", "A", "true", "true", "B",
- "B", "true", "true");
+ "5", "5", "true", "true", "6", "6", "true", "true", "7", "7", "true", "true", "8",
+ "8", "true", "true", "9.0", "9.0", "true", "true", "10.0", "10.0", "true", "true",
+ "11.0", "11.0", "true", "true", "12.0", "12.0", "true", "true", "A", "A", "true",
+ "true", "B", "B", "true", "true")
+ .trim();
private static final String TEST_COMPAREANDSET_EXPECTED_OUTPUT =
StringUtils.lines(
- "null", "A(1)", "true", "A(2)", "true", "1", "2", "3", "4", "4", "4", "4", "5", "6", "7",
- "8", "8", "8", "8", "false", "8", "false", "8", "8", "8", "8", "8", "8", "8", "8", "8",
- "8", "8", "8", "8", "8");
+ "null", "A(1)", "true", "A(2)", "true", "1", "2", "3", "4", "4", "4", "4", "5", "6",
+ "7", "8", "8", "8", "8", "false", "8", "false", "8", "8", "8", "8", "8", "8", "8",
+ "8", "8", "8", "8", "8", "8", "8")
+ .trim();
private static final String EXPECTED_OUTPUT =
- "testGet\n"
- + TEST_GET_EXPECTED_OUTPUT
- + "testGetVolatile\n"
- + TEST_GET_EXPECTED_OUTPUT
- + "testSet\n"
- + TEST_SET_EXPECTED_OUTPUT
- + "testSetVolatile\n"
- + TEST_SET_EXPECTED_OUTPUT
- + "testSetRelease\n"
- + TEST_SET_EXPECTED_OUTPUT
- + "testCompareAndSet\n"
- + TEST_COMPAREANDSET_EXPECTED_OUTPUT
- + "testWeakCompareAndSet\n"
- + TEST_COMPAREANDSET_EXPECTED_OUTPUT
- + StringUtils.lines(
- "testArrayVarHandleForNonSingleDimension", "IllegalArgumentException");
+ StringUtils.lines(
+ "testGet",
+ TEST_GET_EXPECTED_OUTPUT,
+ "testGetVolatile",
+ TEST_GET_EXPECTED_OUTPUT,
+ "testSet",
+ TEST_SET_EXPECTED_OUTPUT,
+ "testSetVolatile",
+ TEST_SET_EXPECTED_OUTPUT,
+ "testSetRelease",
+ TEST_SET_EXPECTED_OUTPUT,
+ "testCompareAndSet",
+ TEST_COMPAREANDSET_EXPECTED_OUTPUT,
+ "testWeakCompareAndSet",
+ TEST_COMPAREANDSET_EXPECTED_OUTPUT,
+ "testArrayVarHandleForNonSingleDimension",
+ "IllegalArgumentException");
private static final String MAIN_CLASS = VarHandle.ArrayOfObject.typeName();
private static final List<String> JAR_ENTRIES =
diff --git a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringInstanceIntFieldTest.java b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringInstanceIntFieldTest.java
index 0dd40b9..9de3a8c 100644
--- a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringInstanceIntFieldTest.java
+++ b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringInstanceIntFieldTest.java
@@ -15,32 +15,35 @@
public class VarHandleDesugaringInstanceIntFieldTest extends VarHandleDesugaringTestBase {
private static final String TEST_GET_EXPECTED_OUTPUT =
- StringUtils.lines("1", "1", "1", "1", "1.0", "1.0");
+ StringUtils.lines("1", "1", "1", "1", "1.0", "1.0").trim();
private static final String TEST_SET_EXPECTED_OUTPUT =
- StringUtils.lines(
- "0", "1", "2", "3", "4", "48", "49", "5", "6", "6", "6", "6", "6", "6", "6");
+ StringUtils.lines("0", "1", "2", "3", "4", "48", "49", "5", "6", "6", "6", "6", "6", "6", "6")
+ .trim();
private static final String TEST_COMPAREANDSET_EXPECTED_OUTPUT =
StringUtils.lines(
- "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "48", "49", "50", "51", "52",
- "53", "53", "53", "53", "53", "53", "53", "53", "53", "53", "53", "53", "53", "53", "53");
+ "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "48", "49", "50", "51", "52",
+ "53", "53", "53", "53", "53", "53", "53", "53", "53", "53", "53", "53", "53", "53",
+ "53")
+ .trim();
private static final String EXPECTED_OUTPUT =
- "testGet\n"
- + TEST_GET_EXPECTED_OUTPUT
- + "testGetVolatile\n"
- + TEST_GET_EXPECTED_OUTPUT
- + "testSet\n"
- + TEST_SET_EXPECTED_OUTPUT
- + "testSetVolatile\n"
- + TEST_SET_EXPECTED_OUTPUT
- + "testSetRelease\n"
- + TEST_SET_EXPECTED_OUTPUT
- + "testCompareAndSet\n"
- + TEST_COMPAREANDSET_EXPECTED_OUTPUT
- + "testWeakCompareAndSet\n"
- + TEST_COMPAREANDSET_EXPECTED_OUTPUT;
+ StringUtils.lines(
+ "testGet",
+ TEST_GET_EXPECTED_OUTPUT,
+ "testGetVolatile",
+ TEST_GET_EXPECTED_OUTPUT,
+ "testSet",
+ TEST_SET_EXPECTED_OUTPUT,
+ "testSetVolatile",
+ TEST_SET_EXPECTED_OUTPUT,
+ "testSetRelease",
+ TEST_SET_EXPECTED_OUTPUT,
+ "testCompareAndSet",
+ TEST_COMPAREANDSET_EXPECTED_OUTPUT,
+ "testWeakCompareAndSet",
+ TEST_COMPAREANDSET_EXPECTED_OUTPUT);
private static final String MAIN_CLASS = VarHandle.InstanceIntField.typeName();
private static final String JAR_ENTRY = "varhandle/InstanceIntField.class";
diff --git a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringInstanceLongFieldTest.java b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringInstanceLongFieldTest.java
index e9b1bc3..2196b35 100644
--- a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringInstanceLongFieldTest.java
+++ b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringInstanceLongFieldTest.java
@@ -15,32 +15,34 @@
public class VarHandleDesugaringInstanceLongFieldTest extends VarHandleDesugaringTestBase {
private static final String TEST_GET_EXPECTED_OUTPUT =
- StringUtils.lines("1", "1", "1", "1.0", "1.0");
+ StringUtils.lines("1", "1", "1", "1.0", "1.0").trim();
private static final String TEST_SET_EXPECTED_OUTPUT =
- StringUtils.lines(
- "0", "1", "2", "3", "4", "48", "49", "5", "6", "7", "8", "8", "8", "8", "8");
+ StringUtils.lines("0", "1", "2", "3", "4", "48", "49", "5", "6", "7", "8", "8", "8", "8", "8")
+ .trim();
private static final String TEST_COMPAREANDSET_EXPECTED_OUTPUT =
StringUtils.lines(
- "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "48", "49", "50", "51", "52",
- "53", "11", "12", "13", "14", "14", "14", "14", "14", "14", "14", "14", "14", "14");
+ "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "48", "49", "50", "51", "52",
+ "53", "11", "12", "13", "14", "14", "14", "14", "14", "14", "14", "14", "14", "14")
+ .trim();
private static final String EXPECTED_OUTPUT =
- "testGet\n"
- + TEST_GET_EXPECTED_OUTPUT
- + "testGetVolatile\n"
- + TEST_GET_EXPECTED_OUTPUT
- + "testSet\n"
- + TEST_SET_EXPECTED_OUTPUT
- + "testSetVolatile\n"
- + TEST_SET_EXPECTED_OUTPUT
- + "testSetRelease\n"
- + TEST_SET_EXPECTED_OUTPUT
- + "testCompareAndSet\n"
- + TEST_COMPAREANDSET_EXPECTED_OUTPUT
- + "testWeakCompareAndSet\n"
- + TEST_COMPAREANDSET_EXPECTED_OUTPUT;
+ StringUtils.lines(
+ "testGet",
+ TEST_GET_EXPECTED_OUTPUT,
+ "testGetVolatile",
+ TEST_GET_EXPECTED_OUTPUT,
+ "testSet",
+ TEST_SET_EXPECTED_OUTPUT,
+ "testSetVolatile",
+ TEST_SET_EXPECTED_OUTPUT,
+ "testSetRelease",
+ TEST_SET_EXPECTED_OUTPUT,
+ "testCompareAndSet",
+ TEST_COMPAREANDSET_EXPECTED_OUTPUT,
+ "testWeakCompareAndSet",
+ TEST_COMPAREANDSET_EXPECTED_OUTPUT);
private static final String MAIN_CLASS = VarHandle.InstanceLongField.typeName();
private static final String JAR_ENTRY = "varhandle/InstanceLongField.class";
diff --git a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringInstanceObjectFieldTest.java b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringInstanceObjectFieldTest.java
index 8e136f4..8c12aac 100644
--- a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringInstanceObjectFieldTest.java
+++ b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringInstanceObjectFieldTest.java
@@ -16,30 +16,33 @@
private static final String TEST_GET_SET_EXPECTED_OUTPUT =
StringUtils.lines(
- "null", "A(1)", "true", "A(2)", "true", "1", "1", "true", "true", "2", "2", "true",
- "true", "3", "3", "true", "true", "4", "4", "true", "true", "5", "5", "true", "true", "6",
- "6", "true", "true", "7", "7", "true", "true", "8", "8", "true", "true", "9.0", "9.0",
- "true", "true", "10.0", "10.0", "true", "true", "11.0", "11.0", "true", "true", "12.0",
- "12.0", "true", "true", "A", "A", "true", "true", "B", "B", "true", "true");
+ "null", "A(1)", "true", "A(2)", "true", "1", "1", "true", "true", "2", "2", "true",
+ "true", "3", "3", "true", "true", "4", "4", "true", "true", "5", "5", "true", "true",
+ "6", "6", "true", "true", "7", "7", "true", "true", "8", "8", "true", "true", "9.0",
+ "9.0", "true", "true", "10.0", "10.0", "true", "true", "11.0", "11.0", "true", "true",
+ "12.0", "12.0", "true", "true", "A", "A", "true", "true", "B", "B", "true", "true")
+ .trim();
private static final String TEST_COMPAREANDSET_EXPECTED_OUTPUT =
StringUtils.lines(
- "null", "A(1)", "true", "A(2)", "true", "1", "2", "3", "4", "4", "4", "4", "5", "6", "7",
- "8", "8", "8", "8", "false", "8", "false", "8", "8", "8", "8", "8", "8", "8", "8", "8",
- "8", "8", "8", "8", "8");
+ "null", "A(1)", "true", "A(2)", "true", "1", "2", "3", "4", "4", "4", "4", "5", "6",
+ "7", "8", "8", "8", "8", "false", "8", "false", "8", "8", "8", "8", "8", "8", "8",
+ "8", "8", "8", "8", "8", "8", "8")
+ .trim();
private static final String EXPECTED_OUTPUT =
- "testSetGet\n"
- + TEST_GET_SET_EXPECTED_OUTPUT
- + "testSetVolatileGetVolatile\n"
- + TEST_GET_SET_EXPECTED_OUTPUT
- + "testSetReleaseGet\n"
- + TEST_GET_SET_EXPECTED_OUTPUT
- + "testCompareAndSet\n"
- + TEST_COMPAREANDSET_EXPECTED_OUTPUT
- + "testWeakCompareAndSet\n"
- + TEST_COMPAREANDSET_EXPECTED_OUTPUT
- + StringUtils.lines("testReturnValueClassCastException");
+ StringUtils.lines(
+ "testSetGet",
+ TEST_GET_SET_EXPECTED_OUTPUT,
+ "testSetVolatileGetVolatile",
+ TEST_GET_SET_EXPECTED_OUTPUT,
+ "testSetReleaseGet",
+ TEST_GET_SET_EXPECTED_OUTPUT,
+ "testCompareAndSet",
+ TEST_COMPAREANDSET_EXPECTED_OUTPUT,
+ "testWeakCompareAndSet\n",
+ TEST_COMPAREANDSET_EXPECTED_OUTPUT,
+ "testReturnValueClassCastException");
private static final String MAIN_CLASS = VarHandle.InstanceObjectField.typeName();
private static final List<String> JAR_ENTRIES =
