Fix for "ext/expected.ts" checked out with CRLF

Author: vojtechhabarta

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/util/Utils.java

@@ -1,6 +1,7 @@
 
 package cz.habarta.typescript.generator.util;
 
+import java.io.InputStream;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.*;
@@ -42,4 +43,17 @@ public static <T> List<T> listFromNullable(T item) {
         return item != null ? Arrays.asList(item) : Collections.<T>emptyList();
     }
 
+    public static String readString(InputStream stream) {
+        final Scanner s = new Scanner(stream, "UTF-8").useDelimiter("\\A");
+        return s.hasNext() ? s.next() : "";
+    }
+
+    public static String readString(InputStream stream, String lineEndings) {
+        return normalizeLineEndings(readString(stream), lineEndings);
+    }
+
+    private static String normalizeLineEndings(String text, String lineEndings) {
+        return text.replaceAll("\\r\\n|\\n|\\r", lineEndings);
+    }
+
 }

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/ext/BeanPropertyPathExtensionTest.java

@@ -1,20 +1,14 @@
 package cz.habarta.typescript.generator.ext;
 
-import java.util.Arrays;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.Files;
 import cz.habarta.typescript.generator.TypeProcessor;
 import cz.habarta.typescript.generator.DefaultTypeProcessor;
 import cz.habarta.typescript.generator.Settings;
 import cz.habarta.typescript.generator.compiler.ModelCompiler;
 import cz.habarta.typescript.generator.emitter.EmitterExtension;
 import cz.habarta.typescript.generator.emitter.TsModel;
-import cz.habarta.typescript.generator.ext.BeanPropertyPathExtension;
 import cz.habarta.typescript.generator.parser.Jackson2Parser;
 import cz.habarta.typescript.generator.parser.Model;
-import java.util.ArrayList;
-import java.util.List;
+import cz.habarta.typescript.generator.util.Utils;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -50,9 +44,7 @@ public void writeIndentedLine(String line) {
         final TsModel tsModel = new ModelCompiler(settings, typeProcessor).javaToTypeScript(model);
         new BeanPropertyPathExtension().emitElements(writer, settings, false, tsModel);
         String dataStr = data.toString();
-        final String expected = new String(
-            Files.readAllBytes(
-                Paths.get(getClass().getClassLoader().getResource("ext/expected.ts").toURI())));
-        Assert.assertEquals(expected, dataStr);
+        final String expected = Utils.readString(getClass().getResourceAsStream("/ext/expected.ts"), "\n");
+        Assert.assertEquals(expected.trim(), dataStr.trim());
     }
 }