commit 64f15215a96fa0254daca368a68df1279b84774b
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Feb 27 09:08:57 2023 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon Feb 27 09:08:57 2023 +0100
tree 7065b5462565535c0e3b24635a9167cb828e57e4
parent 7c5298ab692d2db3f50ad9a2503bedfac4d30ed3

Fix DataResourceTest on windows

Change-Id: I297fcd26b27a9716b293af7351d8535bc033d4c2

src/test/examples/dataresource/ResourceTest.java

diff --git a/src/test/examples/dataresource/ResourceTest.java b/src/test/examples/dataresource/ResourceTest.java
index bb63826..1b61426 100644
--- a/src/test/examples/dataresource/ResourceTest.java
+++ b/src/test/examples/dataresource/ResourceTest.java
@@ -12,12 +12,12 @@
 
 public class ResourceTest {
   public static void main(String[] args) throws IOException {
-    System.out.println("LibClass dir: " + (LibClass.getThisDir() != null));
-    System.out.println("LibClass properties: " + (LibClass.getLibClassProperties() != null));
-    System.out.println("LibClass property: " + LibClass.getLibClassProperty());
-    System.out.println("LibClass text: " + LibClass.getText());
-    System.out.println("LibClass const string: " + LibClass.getConstString());
-    System.out.println("LibClass concat string: " + LibClass.getConcatConstString());
-    System.out.println("LibClass field: " + LibClass.getConstField());
+    System.out.print("LibClass dir: " + (LibClass.getThisDir() != null) + '\n');
+    System.out.print("LibClass properties: " + (LibClass.getLibClassProperties() != null) + '\n');
+    System.out.print("LibClass property: " + LibClass.getLibClassProperty() + '\n');
+    System.out.print("LibClass text: " + LibClass.getText() + '\n');
+    System.out.print("LibClass const string: " + LibClass.getConstString() + '\n');
+    System.out.print("LibClass concat string: " + LibClass.getConcatConstString() + '\n');
+    System.out.print("LibClass field: " + LibClass.getConstField() + '\n');
   }
 }

src/test/java/com/android/tools/r8/resource/DataResourceTest.java

diff --git a/src/test/java/com/android/tools/r8/resource/DataResourceTest.java b/src/test/java/com/android/tools/r8/resource/DataResourceTest.java
index b874072..10f1937 100644
--- a/src/test/java/com/android/tools/r8/resource/DataResourceTest.java
+++ b/src/test/java/com/android/tools/r8/resource/DataResourceTest.java
@@ -28,7 +28,7 @@
   private static final Path INPUT_JAR =
       Paths.get(ToolHelper.EXAMPLES_BUILD_DIR, PACKAGE_NAME + FileUtils.JAR_EXTENSION);
   private static final String EXPECTED_OUTPUT =
-      StringUtils.lines(
+      StringUtils.unixLines(
           "LibClass dir: true",
           "LibClass properties: true",
           "LibClass property: com.test.lib.LibClass",