diff --git a/fs/eol.ts b/fs/eol.ts index af5e81ead824..46babe406f99 100644 --- 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 index eafdb697e507..94ca4862758e 100644 --- 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 index dac0d350ddde..cc9013eed72e 100644 --- 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 index 9760b0f234ff..652ffcaaccf7 100755 --- 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";