EOL add mixed detection (denoland/std#325)

Original: denoland/std@bb92c44
ry · Apr 13, 2019 · 0c877a1 · 0c877a1
1 parent 236cedc
commit 0c877a1
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 21 deletions.
diff --git a/fs/eol.ts b/fs/eol.ts
@@ -17,7 +17,7 @@ export function detect(content: string): EOL | null {
   if (!d || d.length === 0) {
     return null;
   }
-  const crlf = d.filter(x => x === EOL.CRLF);
+  const crlf = d.filter((x: string) => x === EOL.CRLF);
   if (crlf.length > 0) {
     return EOL.CRLF;
   } else {

diff --git a/fs/eol_test.ts b/fs/eol_test.ts
@@ -9,24 +9,47 @@ const Mixedinput2 = "deno\r\nis not\nnode";
 const LFinput = "deno\nis not\nnode";
 const NoNLinput = "deno is not node";
 
-test(function detectCRLF() {
-  assertEquals(detect(CRLFinput), EOL.CRLF);
+test({
+  name: "[EOL] Detect CR LF",
+  fn() {
+    assertEquals(detect(CRLFinput), EOL.CRLF);
+  }
 });
-test(function detectLF() {
-  assertEquals(detect(LFinput), EOL.LF);
+
+test({
+  name: "[EOL] Detect LF",
+  fn() {
+    assertEquals(detect(LFinput), EOL.LF);
+  }
 });
-test(function detectNoNewLine() {
-  assertEquals(detect(NoNLinput), null);
+
+test({
+  name: "[EOL] Detect No New Line",
+  fn() {
+    assertEquals(detect(NoNLinput), null);
+  }
 });
-test(function testFormat() {
-  assertEquals(format(CRLFinput, EOL.LF), LFinput);
-  assertEquals(format(LFinput, EOL.LF), LFinput);
-  assertEquals(format(LFinput, EOL.CRLF), CRLFinput);
-  assertEquals(format(CRLFinput, EOL.CRLF), CRLFinput);
-  assertEquals(format(CRLFinput, EOL.CRLF), CRLFinput);
-  assertEquals(format(NoNLinput, EOL.CRLF), NoNLinput);
-  assertEquals(format(Mixedinput, EOL.CRLF), CRLFinput);
-  assertEquals(format(Mixedinput, EOL.LF), LFinput);
-  assertEquals(format(Mixedinput2, EOL.CRLF), CRLFinput);
-  assertEquals(format(Mixedinput2, EOL.LF), LFinput);
+
+test({
+  name: "[EOL] Detect Mixed",
+  fn() {
+    assertEquals(detect(Mixedinput), EOL.CRLF);
+    assertEquals(detect(Mixedinput2), EOL.CRLF);
+  }
+});
+
+test({
+  name: "[EOL] Format",
+  fn() {
+    assertEquals(format(CRLFinput, EOL.LF), LFinput);
+    assertEquals(format(LFinput, EOL.LF), LFinput);
+    assertEquals(format(LFinput, EOL.CRLF), CRLFinput);
+    assertEquals(format(CRLFinput, EOL.CRLF), CRLFinput);
+    assertEquals(format(CRLFinput, EOL.CRLF), CRLFinput);
+    assertEquals(format(NoNLinput, EOL.CRLF), NoNLinput);
+    assertEquals(format(Mixedinput, EOL.CRLF), CRLFinput);
+    assertEquals(format(Mixedinput, EOL.LF), LFinput);
+    assertEquals(format(Mixedinput2, EOL.CRLF), CRLFinput);
+    assertEquals(format(Mixedinput2, EOL.LF), LFinput);
+  }
 });
diff --git a/fs/test.ts b/fs/test.ts
@@ -3,8 +3,8 @@ import "./path/test.ts";
 import "./walk_test.ts";
 import "./globrex_test.ts";
 import "./glob_test.ts";
-import "./eol_test.ts";
 import "./exists_test.ts";
+import "./eol_test.ts";
 import "./empty_dir_test.ts";
 import "./ensure_dir_test.ts";
 import "./ensure_file_test.ts";

diff --git a/test.ts b/test.ts
@@ -4,10 +4,9 @@ import "./colors/test.ts";
 import "./datetime/test.ts";
 import "./examples/test.ts";
 import "./flags/test.ts";
-import "./io/test.ts";
 import "./fs/test.ts";
-import "./io/test.ts";
 import "./http/test.ts";
+import "./io/test.ts";
 import "./log/test.ts";
 import "./media_types/test.ts";
 import "./multipart/test.ts";