From 1c6f177d198cb4abe7a126dc543b733fa95376d1 Mon Sep 17 00:00:00 2001 From: dubiousjim Date: Fri, 20 Mar 2020 12:10:02 -0400 Subject: [PATCH] use prebuilt "not implemented" error (#4442) --- cli/js/tests/remove_test.ts | 16 ++++++++-------- cli/js/tests/symlink_test.ts | 7 ++++--- cli/js/util.ts | 2 +- cli/ops/fs.rs | 2 +- std/fs/ensure_symlink_test.ts | 8 ++++---- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/cli/js/tests/remove_test.ts b/cli/js/tests/remove_test.ts index fac5ba3038..209558de73 100644 --- a/cli/js/tests/remove_test.ts +++ b/cli/js/tests/remove_test.ts @@ -83,7 +83,7 @@ unitTest( { perms: { write: true, read: true } }, function removeSyncDanglingSymlinkSuccess(): void { const danglingSymlinkPath = Deno.makeTempDirSync() + "/dangling_symlink"; - // TODO(#3832): Remove "Not Implemented" error checking when symlink creation is implemented for Windows + // TODO(#3832): Remove "not Implemented" error checking when symlink creation is implemented for Windows let errOnWindows; try { Deno.symlinkSync("unexistent_file", danglingSymlinkPath); @@ -91,7 +91,7 @@ unitTest( errOnWindows = err; } if (Deno.build.os === "win") { - assertEquals(errOnWindows.message, "Not implemented"); + assertEquals(errOnWindows.message, "not implemented"); } else { const pathInfo = Deno.lstatSync(danglingSymlinkPath); assert(pathInfo.isSymlink()); @@ -116,7 +116,7 @@ unitTest( const filePath = tempDir + "/test.txt"; const validSymlinkPath = tempDir + "/valid_symlink"; Deno.writeFileSync(filePath, data, { mode: 0o666 }); - // TODO(#3832): Remove "Not Implemented" error checking when symlink creation is implemented for Windows + // TODO(#3832): Remove "not Implemented" error checking when symlink creation is implemented for Windows let errOnWindows; try { Deno.symlinkSync(filePath, validSymlinkPath); @@ -124,7 +124,7 @@ unitTest( errOnWindows = err; } if (Deno.build.os === "win") { - assertEquals(errOnWindows.message, "Not implemented"); + assertEquals(errOnWindows.message, "not implemented"); } else { const symlinkPathInfo = Deno.statSync(validSymlinkPath); assert(symlinkPathInfo.isFile()); @@ -319,7 +319,7 @@ unitTest( { perms: { write: true, read: true } }, async function removeDanglingSymlinkSuccess(): Promise { const danglingSymlinkPath = Deno.makeTempDirSync() + "/dangling_symlink"; - // TODO(#3832): Remove "Not Implemented" error checking when symlink creation is implemented for Windows + // TODO(#3832): Remove "not Implemented" error checking when symlink creation is implemented for Windows let errOnWindows; try { Deno.symlinkSync("unexistent_file", danglingSymlinkPath); @@ -327,7 +327,7 @@ unitTest( errOnWindows = e; } if (Deno.build.os === "win") { - assertEquals(errOnWindows.message, "Not implemented"); + assertEquals(errOnWindows.message, "not implemented"); } else { const pathInfo = Deno.lstatSync(danglingSymlinkPath); assert(pathInfo.isSymlink()); @@ -352,7 +352,7 @@ unitTest( const filePath = tempDir + "/test.txt"; const validSymlinkPath = tempDir + "/valid_symlink"; Deno.writeFileSync(filePath, data, { mode: 0o666 }); - // TODO(#3832): Remove "Not Implemented" error checking when symlink creation is implemented for Windows + // TODO(#3832): Remove "not Implemented" error checking when symlink creation is implemented for Windows let errOnWindows; try { Deno.symlinkSync(filePath, validSymlinkPath); @@ -360,7 +360,7 @@ unitTest( errOnWindows = e; } if (Deno.build.os === "win") { - assertEquals(errOnWindows.message, "Not implemented"); + assertEquals(errOnWindows.message, "not implemented"); } else { const symlinkPathInfo = Deno.statSync(validSymlinkPath); assert(symlinkPathInfo.isFile()); diff --git a/cli/js/tests/symlink_test.ts b/cli/js/tests/symlink_test.ts index 221960bb0a..25533fc64c 100644 --- a/cli/js/tests/symlink_test.ts +++ b/cli/js/tests/symlink_test.ts @@ -17,7 +17,7 @@ unitTest( } if (errOnWindows) { assertEquals(Deno.build.os, "win"); - assertEquals(errOnWindows.message, "Not implemented"); + assertEquals(errOnWindows.message, "not implemented"); } else { const newNameInfoLStat = Deno.lstatSync(newname); const newNameInfoStat = Deno.statSync(newname); @@ -54,7 +54,8 @@ unitTest( } if (err) { assertEquals(Deno.build.os, "win"); - assertEquals(err.message, "Not implemented"); + // from cli/js/util.ts:notImplemented + assertEquals(err.message, "not implemented"); } } ); @@ -74,7 +75,7 @@ unitTest( errOnWindows = e; } if (errOnWindows) { - assertEquals(errOnWindows.message, "Not implemented"); + assertEquals(errOnWindows.message, "not implemented"); } else { const newNameInfoLStat = Deno.lstatSync(newname); const newNameInfoStat = Deno.statSync(newname); diff --git a/cli/js/util.ts b/cli/js/util.ts index ec39d6f35e..692ea6d00b 100644 --- a/cli/js/util.ts +++ b/cli/js/util.ts @@ -53,7 +53,7 @@ export function createResolvable(): Resolvable { // @internal export function notImplemented(): never { - throw new Error("Not implemented"); + throw new Error("not implemented"); } // @internal diff --git a/cli/ops/fs.rs b/cli/ops/fs.rs index 31b22b3e61..416ae210af 100644 --- a/cli/ops/fs.rs +++ b/cli/ops/fs.rs @@ -730,7 +730,7 @@ fn op_symlink( // Unlike with chmod/chown, here we don't // require `oldpath` to exist on Windows let _ = oldpath; // avoid unused warning - return Err(OpError::other("Not implemented".to_string())); + return Err(OpError::not_implemented()); } }) } diff --git a/std/fs/ensure_symlink_test.ts b/std/fs/ensure_symlink_test.ts index 2357650ab2..f0dc4fbe49 100644 --- a/std/fs/ensure_symlink_test.ts +++ b/std/fs/ensure_symlink_test.ts @@ -56,7 +56,7 @@ Deno.test(async function ensureSymlinkIfItExist(): Promise { await assertThrowsAsync( (): Promise => ensureSymlink(testFile, linkFile), Error, - "Not implemented" + "not implemented" ); await Deno.remove(testDir, { recursive: true }); return; @@ -85,7 +85,7 @@ Deno.test(function ensureSymlinkSyncIfItExist(): void { assertThrows( (): void => ensureSymlinkSync(testFile, linkFile), Error, - "Not implemented" + "not implemented" ); Deno.removeSync(testDir, { recursive: true }); return; @@ -115,7 +115,7 @@ Deno.test(async function ensureSymlinkDirectoryIfItExist(): Promise { await assertThrowsAsync( (): Promise => ensureSymlink(testDir, linkDir), Error, - "Not implemented" + "not implemented" ); await Deno.remove(testDir, { recursive: true }); return; @@ -147,7 +147,7 @@ Deno.test(function ensureSymlinkSyncDirectoryIfItExist(): void { assertThrows( (): void => ensureSymlinkSync(testDir, linkDir), Error, - "Not implemented" + "not implemented" ); Deno.removeSync(testDir, { recursive: true }); return;