Ensure testdata text always uses \n newlines. (#8756)

4 years ago · 91bbdc90e3
parent e9ffe09c8f
commit 91bbdc90e3
1 changed files with 1 additions and 1 deletions
--- a/java/core/src/test/java/com/google/protobuf/TestUtil.java
+++ b/java/core/src/test/java/com/google/protobuf/TestUtil.java
@ -3758,7 +3758,7 @@ public final class TestUtil {

  /** @param filePath The path relative to {@link #getTestDataDir}. */
  public static String readTextFromFile(String filePath) {
-    return readBytesFromFile(filePath).toStringUtf8();
+    return readBytesFromFile(filePath).toStringUtf8().replace(System.getProperty("line.separator"), "\n");
  }

  private static File getTestDataDir() {