Fix VarHandle test on Windows
Bug: b/247076137
Change-Id: I4652a99558c6a6ac3739d07945c52074aa7bbf16
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 3ee2797..ac43573 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
@@ -138,19 +138,14 @@
@Override
protected String getExpectedOutputForReferenceImplementation() {
- String expectedOutputWithoutNewLine =
- EXPECTED_OUTPUT.substring(0, EXPECTED_OUTPUT.length() - 1);
return StringUtils.lines(
- expectedOutputWithoutNewLine, "Reference implementation", "Reference implementation");
+ EXPECTED_OUTPUT.trim(), "Reference implementation", "Reference implementation");
}
@Override
protected String getExpectedOutputForArtImplementation() {
assert parameters.isDexRuntime();
- String expectedOutputWithoutNewLine =
- EXPECTED_OUTPUT.substring(0, EXPECTED_OUTPUT.length() - 1);
- return StringUtils.lines(
- expectedOutputWithoutNewLine, "Art implementation", "Art implementation");
+ return StringUtils.lines(EXPECTED_OUTPUT.trim(), "Art implementation", "Art implementation");
}
@Override
