summaryrefslogtreecommitdiff
path: root/cli/js/tests
diff options
context:
space:
mode:
Diffstat (limited to 'cli/js/tests')
-rw-r--r--cli/js/tests/files_test.ts6
-rw-r--r--cli/js/tests/link_test.ts8
-rw-r--r--cli/js/tests/mkdir_test.ts2
-rw-r--r--cli/js/tests/read_dir_test.ts15
-rw-r--r--cli/js/tests/remove_test.ts40
-rw-r--r--cli/js/tests/rename_test.ts4
-rw-r--r--cli/js/tests/stat_test.ts48
-rw-r--r--cli/js/tests/symlink_test.ts8
-rw-r--r--cli/js/tests/test_util.ts2
9 files changed, 67 insertions, 66 deletions
diff --git a/cli/js/tests/files_test.ts b/cli/js/tests/files_test.ts
index f81ed3c47..1f7352afc 100644
--- a/cli/js/tests/files_test.ts
+++ b/cli/js/tests/files_test.ts
@@ -273,7 +273,7 @@ unitTest(
const filename = tempDir + "/test.txt";
const f = await Deno.create(filename);
let fileInfo = Deno.statSync(filename);
- assert(fileInfo.isFile());
+ assert(fileInfo.isFile);
assert(fileInfo.size === 0);
const enc = new TextEncoder();
const data = enc.encode("Hello");
@@ -297,7 +297,7 @@ unitTest(
let file = await Deno.open(filename, "w");
// assert file was created
let fileInfo = Deno.statSync(filename);
- assert(fileInfo.isFile());
+ assert(fileInfo.isFile);
assertEquals(fileInfo.size, 0);
// write some data
await file.write(data);
@@ -335,7 +335,7 @@ unitTest(
const seekPosition = 0;
// assert file was created
let fileInfo = Deno.statSync(filename);
- assert(fileInfo.isFile());
+ assert(fileInfo.isFile);
assertEquals(fileInfo.size, 0);
// write some data
await file.write(data);
diff --git a/cli/js/tests/link_test.ts b/cli/js/tests/link_test.ts
index e9f72ebef..c6ea4901e 100644
--- a/cli/js/tests/link_test.ts
+++ b/cli/js/tests/link_test.ts
@@ -31,8 +31,8 @@ unitTest(
// Remove oldname. File still accessible through newname.
Deno.removeSync(oldName);
const newNameStat = Deno.statSync(newName);
- assert(newNameStat.isFile());
- assert(!newNameStat.isSymlink()); // Not a symlink.
+ assert(newNameStat.isFile);
+ assert(!newNameStat.isSymlink); // Not a symlink.
assertEquals(
newData3,
new TextDecoder().decode(Deno.readFileSync(newName))
@@ -137,8 +137,8 @@ unitTest(
// Remove oldname. File still accessible through newname.
Deno.removeSync(oldName);
const newNameStat = Deno.statSync(newName);
- assert(newNameStat.isFile());
- assert(!newNameStat.isSymlink()); // Not a symlink.
+ assert(newNameStat.isFile);
+ assert(!newNameStat.isSymlink); // Not a symlink.
assertEquals(
newData3,
new TextDecoder().decode(Deno.readFileSync(newName))
diff --git a/cli/js/tests/mkdir_test.ts b/cli/js/tests/mkdir_test.ts
index 5823d6e38..20120f6b3 100644
--- a/cli/js/tests/mkdir_test.ts
+++ b/cli/js/tests/mkdir_test.ts
@@ -3,7 +3,7 @@ import { unitTest, assert, assertEquals, assertThrows } from "./test_util.ts";
function assertDirectory(path: string, mode?: number): void {
const info = Deno.lstatSync(path);
- assert(info.isDirectory());
+ assert(info.isDirectory);
if (Deno.build.os !== "win" && mode !== undefined) {
assertEquals(info.mode! & 0o777, mode & ~Deno.umask());
}
diff --git a/cli/js/tests/read_dir_test.ts b/cli/js/tests/read_dir_test.ts
index 95936c645..2c7f42103 100644
--- a/cli/js/tests/read_dir_test.ts
+++ b/cli/js/tests/read_dir_test.ts
@@ -1,14 +1,12 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
import { unitTest, assert, assertEquals } from "./test_util.ts";
-type FileInfo = Deno.FileInfo;
-
-function assertSameContent(files: FileInfo[]): void {
+function assertSameContent(files: Deno.DirEntry[]): void {
let counter = 0;
for (const file of files) {
if (file.name === "subdir") {
- assert(file.isDirectory());
+ assert(file.isDirectory);
counter++;
}
@@ -22,7 +20,7 @@ function assertSameContent(files: FileInfo[]): void {
}
unitTest({ perms: { read: true } }, function readdirSyncSuccess(): void {
- const files = Deno.readdirSync("cli/tests/");
+ const files = [...Deno.readdirSync("cli/tests/")];
assertSameContent(files);
});
@@ -68,7 +66,10 @@ unitTest({ perms: { read: true } }, function readdirSyncNotFound(): void {
unitTest({ perms: { read: true } }, async function readdirSuccess(): Promise<
void
> {
- const files = await Deno.readdir("cli/tests/");
+ const files = [];
+ for await (const dirEntry of Deno.readdir("cli/tests/")) {
+ files.push(dirEntry);
+ }
assertSameContent(files);
});
@@ -77,7 +78,7 @@ unitTest({ perms: { read: false } }, async function readdirPerm(): Promise<
> {
let caughtError = false;
try {
- await Deno.readdir("tests/");
+ await Deno.readdir("tests/")[Symbol.asyncIterator]().next();
} catch (e) {
caughtError = true;
assert(e instanceof Deno.errors.PermissionDenied);
diff --git a/cli/js/tests/remove_test.ts b/cli/js/tests/remove_test.ts
index 209558de7..b6f8aa320 100644
--- a/cli/js/tests/remove_test.ts
+++ b/cli/js/tests/remove_test.ts
@@ -10,7 +10,7 @@ unitTest(
const path = Deno.makeTempDirSync() + "/subdir";
Deno.mkdirSync(path);
const pathInfo = Deno.statSync(path);
- assert(pathInfo.isDirectory()); // check exist first
+ assert(pathInfo.isDirectory); // check exist first
Deno.removeSync(path); // remove
// We then check again after remove
let err;
@@ -33,7 +33,7 @@ unitTest(
const filename = Deno.makeTempDirSync() + "/test.txt";
Deno.writeFileSync(filename, data, { mode: 0o666 });
const fileInfo = Deno.statSync(filename);
- assert(fileInfo.isFile()); // check exist first
+ assert(fileInfo.isFile); // check exist first
Deno.removeSync(filename); // remove
// We then check again after remove
let err;
@@ -56,9 +56,9 @@ unitTest(
Deno.mkdirSync(path, { recursive: true });
Deno.mkdirSync(subPath);
const pathInfo = Deno.statSync(path);
- assert(pathInfo.isDirectory()); // check exist first
+ assert(pathInfo.isDirectory); // check exist first
const subPathInfo = Deno.statSync(subPath);
- assert(subPathInfo.isDirectory()); // check exist first
+ assert(subPathInfo.isDirectory); // check exist first
let err;
try {
// Should not be able to recursively remove
@@ -94,7 +94,7 @@ unitTest(
assertEquals(errOnWindows.message, "not implemented");
} else {
const pathInfo = Deno.lstatSync(danglingSymlinkPath);
- assert(pathInfo.isSymlink());
+ assert(pathInfo.isSymlink);
Deno.removeSync(danglingSymlinkPath);
let err;
try {
@@ -127,7 +127,7 @@ unitTest(
assertEquals(errOnWindows.message, "not implemented");
} else {
const symlinkPathInfo = Deno.statSync(validSymlinkPath);
- assert(symlinkPathInfo.isFile());
+ assert(symlinkPathInfo.isFile);
Deno.removeSync(validSymlinkPath);
let err;
try {
@@ -159,7 +159,7 @@ unitTest(
let path = Deno.makeTempDirSync() + "/dir/subdir";
Deno.mkdirSync(path, { recursive: true });
let pathInfo = Deno.statSync(path);
- assert(pathInfo.isDirectory()); // check exist first
+ assert(pathInfo.isDirectory); // check exist first
Deno.removeSync(path, { recursive: true }); // remove
// We then check again after remove
let err;
@@ -177,9 +177,9 @@ unitTest(
Deno.mkdirSync(path, { recursive: true });
Deno.mkdirSync(subPath);
pathInfo = Deno.statSync(path);
- assert(pathInfo.isDirectory()); // check exist first
+ assert(pathInfo.isDirectory); // check exist first
const subPathInfo = Deno.statSync(subPath);
- assert(subPathInfo.isDirectory()); // check exist first
+ assert(subPathInfo.isDirectory); // check exist first
Deno.removeSync(path, { recursive: true }); // remove
// We then check parent directory again after remove
try {
@@ -201,7 +201,7 @@ unitTest(
const filename = Deno.makeTempDirSync() + "/test.txt";
Deno.writeFileSync(filename, data, { mode: 0o666 });
const fileInfo = Deno.statSync(filename);
- assert(fileInfo.isFile()); // check exist first
+ assert(fileInfo.isFile); // check exist first
Deno.removeSync(filename, { recursive: true }); // remove
// We then check again after remove
let err;
@@ -247,7 +247,7 @@ unitTest(
const path = Deno.makeTempDirSync() + "/dir/subdir";
Deno.mkdirSync(path, { recursive: true });
const pathInfo = Deno.statSync(path);
- assert(pathInfo.isDirectory()); // check exist first
+ assert(pathInfo.isDirectory); // check exist first
await Deno.remove(path); // remove
// We then check again after remove
let err;
@@ -270,7 +270,7 @@ unitTest(
const filename = Deno.makeTempDirSync() + "/test.txt";
Deno.writeFileSync(filename, data, { mode: 0o666 });
const fileInfo = Deno.statSync(filename);
- assert(fileInfo.isFile()); // check exist first
+ assert(fileInfo.isFile); // check exist first
await Deno.remove(filename); // remove
// We then check again after remove
let err;
@@ -293,9 +293,9 @@ unitTest(
Deno.mkdirSync(path, { recursive: true });
Deno.mkdirSync(subPath);
const pathInfo = Deno.statSync(path);
- assert(pathInfo.isDirectory()); // check exist first
+ assert(pathInfo.isDirectory); // check exist first
const subPathInfo = Deno.statSync(subPath);
- assert(subPathInfo.isDirectory()); // check exist first
+ assert(subPathInfo.isDirectory); // check exist first
let err;
try {
// Should not be able to recursively remove
@@ -330,7 +330,7 @@ unitTest(
assertEquals(errOnWindows.message, "not implemented");
} else {
const pathInfo = Deno.lstatSync(danglingSymlinkPath);
- assert(pathInfo.isSymlink());
+ assert(pathInfo.isSymlink);
await Deno.remove(danglingSymlinkPath);
let err;
try {
@@ -363,7 +363,7 @@ unitTest(
assertEquals(errOnWindows.message, "not implemented");
} else {
const symlinkPathInfo = Deno.statSync(validSymlinkPath);
- assert(symlinkPathInfo.isFile());
+ assert(symlinkPathInfo.isFile);
await Deno.remove(validSymlinkPath);
let err;
try {
@@ -397,7 +397,7 @@ unitTest(
let path = Deno.makeTempDirSync() + "/dir/subdir";
Deno.mkdirSync(path, { recursive: true });
let pathInfo = Deno.statSync(path);
- assert(pathInfo.isDirectory()); // check exist first
+ assert(pathInfo.isDirectory); // check exist first
await Deno.remove(path, { recursive: true }); // remove
// We then check again after remove
let err;
@@ -415,9 +415,9 @@ unitTest(
Deno.mkdirSync(path, { recursive: true });
Deno.mkdirSync(subPath);
pathInfo = Deno.statSync(path);
- assert(pathInfo.isDirectory()); // check exist first
+ assert(pathInfo.isDirectory); // check exist first
const subPathInfo = Deno.statSync(subPath);
- assert(subPathInfo.isDirectory()); // check exist first
+ assert(subPathInfo.isDirectory); // check exist first
await Deno.remove(path, { recursive: true }); // remove
// We then check parent directory again after remove
try {
@@ -439,7 +439,7 @@ unitTest(
const filename = Deno.makeTempDirSync() + "/test.txt";
Deno.writeFileSync(filename, data, { mode: 0o666 });
const fileInfo = Deno.statSync(filename);
- assert(fileInfo.isFile()); // check exist first
+ assert(fileInfo.isFile); // check exist first
await Deno.remove(filename, { recursive: true }); // remove
// We then check again after remove
let err;
diff --git a/cli/js/tests/rename_test.ts b/cli/js/tests/rename_test.ts
index 45f6d709e..cbb3a55ce 100644
--- a/cli/js/tests/rename_test.ts
+++ b/cli/js/tests/rename_test.ts
@@ -16,12 +16,12 @@ function assertMissing(path: string): void {
function assertFile(path: string): void {
const info = Deno.lstatSync(path);
- assert(info.isFile());
+ assert(info.isFile);
}
function assertDirectory(path: string, mode?: number): void {
const info = Deno.lstatSync(path);
- assert(info.isDirectory());
+ assert(info.isDirectory);
if (Deno.build.os !== "win" && mode !== undefined) {
assertEquals(info.mode! & 0o777, mode & ~Deno.umask());
}
diff --git a/cli/js/tests/stat_test.ts b/cli/js/tests/stat_test.ts
index 78582900e..e4f4ae61e 100644
--- a/cli/js/tests/stat_test.ts
+++ b/cli/js/tests/stat_test.ts
@@ -5,16 +5,16 @@ import { unitTest, assert, assertEquals } from "./test_util.ts";
// to create temp files.
unitTest({ perms: { read: true } }, function statSyncSuccess(): void {
const packageInfo = Deno.statSync("README.md");
- assert(packageInfo.isFile());
- assert(!packageInfo.isSymlink());
+ assert(packageInfo.isFile);
+ assert(!packageInfo.isSymlink);
const modulesInfo = Deno.statSync("cli/tests/symlink_to_subdir");
- assert(modulesInfo.isDirectory());
- assert(!modulesInfo.isSymlink());
+ assert(modulesInfo.isDirectory);
+ assert(!modulesInfo.isSymlink);
const testsInfo = Deno.statSync("cli/tests");
- assert(testsInfo.isDirectory());
- assert(!testsInfo.isSymlink());
+ assert(testsInfo.isDirectory);
+ assert(!testsInfo.isSymlink);
});
unitTest({ perms: { read: false } }, function statSyncPerm(): void {
@@ -45,16 +45,16 @@ unitTest({ perms: { read: true } }, function statSyncNotFound(): void {
unitTest({ perms: { read: true } }, function lstatSyncSuccess(): void {
const packageInfo = Deno.lstatSync("README.md");
- assert(packageInfo.isFile());
- assert(!packageInfo.isSymlink());
+ assert(packageInfo.isFile);
+ assert(!packageInfo.isSymlink);
const modulesInfo = Deno.lstatSync("cli/tests/symlink_to_subdir");
- assert(!modulesInfo.isDirectory());
- assert(modulesInfo.isSymlink());
+ assert(!modulesInfo.isDirectory);
+ assert(modulesInfo.isSymlink);
const coreInfo = Deno.lstatSync("core");
- assert(coreInfo.isDirectory());
- assert(!coreInfo.isSymlink());
+ assert(coreInfo.isDirectory);
+ assert(!coreInfo.isSymlink);
});
unitTest({ perms: { read: false } }, function lstatSyncPerm(): void {
@@ -87,16 +87,16 @@ unitTest({ perms: { read: true } }, async function statSuccess(): Promise<
void
> {
const packageInfo = await Deno.stat("README.md");
- assert(packageInfo.isFile());
- assert(!packageInfo.isSymlink());
+ assert(packageInfo.isFile);
+ assert(!packageInfo.isSymlink);
const modulesInfo = await Deno.stat("cli/tests/symlink_to_subdir");
- assert(modulesInfo.isDirectory());
- assert(!modulesInfo.isSymlink());
+ assert(modulesInfo.isDirectory);
+ assert(!modulesInfo.isSymlink);
const testsInfo = await Deno.stat("cli/tests");
- assert(testsInfo.isDirectory());
- assert(!testsInfo.isSymlink());
+ assert(testsInfo.isDirectory);
+ assert(!testsInfo.isSymlink);
});
unitTest({ perms: { read: false } }, async function statPerm(): Promise<void> {
@@ -131,16 +131,16 @@ unitTest({ perms: { read: true } }, async function lstatSuccess(): Promise<
void
> {
const packageInfo = await Deno.lstat("README.md");
- assert(packageInfo.isFile());
- assert(!packageInfo.isSymlink());
+ assert(packageInfo.isFile);
+ assert(!packageInfo.isSymlink);
const modulesInfo = await Deno.lstat("cli/tests/symlink_to_subdir");
- assert(!modulesInfo.isDirectory());
- assert(modulesInfo.isSymlink());
+ assert(!modulesInfo.isDirectory);
+ assert(modulesInfo.isSymlink);
const coreInfo = await Deno.lstat("core");
- assert(coreInfo.isDirectory());
- assert(!coreInfo.isSymlink());
+ assert(coreInfo.isDirectory);
+ assert(!coreInfo.isSymlink);
});
unitTest({ perms: { read: false } }, async function lstatPerm(): Promise<void> {
diff --git a/cli/js/tests/symlink_test.ts b/cli/js/tests/symlink_test.ts
index 25533fc64..0dde4fbad 100644
--- a/cli/js/tests/symlink_test.ts
+++ b/cli/js/tests/symlink_test.ts
@@ -21,8 +21,8 @@ unitTest(
} else {
const newNameInfoLStat = Deno.lstatSync(newname);
const newNameInfoStat = Deno.statSync(newname);
- assert(newNameInfoLStat.isSymlink());
- assert(newNameInfoStat.isDirectory());
+ assert(newNameInfoLStat.isSymlink);
+ assert(newNameInfoStat.isDirectory);
}
}
);
@@ -79,8 +79,8 @@ unitTest(
} else {
const newNameInfoLStat = Deno.lstatSync(newname);
const newNameInfoStat = Deno.statSync(newname);
- assert(newNameInfoLStat.isSymlink());
- assert(newNameInfoStat.isDirectory());
+ assert(newNameInfoLStat.isSymlink);
+ assert(newNameInfoStat.isDirectory);
}
}
);
diff --git a/cli/js/tests/test_util.ts b/cli/js/tests/test_util.ts
index a3b4b6ce4..fc0b8a390 100644
--- a/cli/js/tests/test_util.ts
+++ b/cli/js/tests/test_util.ts
@@ -327,7 +327,7 @@ unitTest(function permissionsMatches(): void {
unitTest(
{ perms: { read: true } },
function assertAllUnitTestFilesImported(): void {
- const directoryTestFiles = Deno.readdirSync("./cli/js/tests/")
+ const directoryTestFiles = [...Deno.readdirSync("./cli/js/tests/")]
.map((k) => k.name)
.filter(
(file) =>