64 files changed, 75 insertions, 17 deletions
diff --git a/cli/js/tests/README.md b/cli/js/tests/README.md
new file mode 100644
index 000000000..5809224f7
--- /dev/null
+++ b/cli/js/tests/README.md
@@ -0,0 +1,47 @@
+# Deno runtime tests
+
+Files in this directory are unit tests for Deno runtime.
+
+They are run under compiled Deno binary as opposed to files in `cli/js/` which
+are bundled and snapshotted using `deno_typescript` crate.
+
+Testing Deno runtime code requires checking API under different runtime
+permissions (ie. running with different `--allow-*` flags). To accomplish this
+all tests exercised are created using `unitTest()` function.
+
+```
+import { unitTest } from "./test_util.ts";
+
+unitTest(function simpleTestFn(): void {
+  // test code here
+});
+
+unitTest({
+    skip: Deno.build.os === "win",
+    perms: { read: true, write: true },
+  },
+  function complexTestFn(): void {
+    // test code here
+  }
+);
+```
+
+`unitTest` is is a wrapper function that enhances `Deno.test()` API in several
+ways:
+
+- ability to conditionally skip tests using `UnitTestOptions.skip`
+- ability to register required set of permissions for given test case using
+  `UnitTestOptions.perms`
+- sanitization of resources - ensuring that tests close all opened resources
+  preventing interference between tests
+- sanitization of async ops - ensuring that tests don't leak async ops by
+  ensuring that all started async ops are done before test finishes
+
+`unit_test_runner.ts` is main script used to run unit tests.
+
+Runner discoveres required permissions combinations by loading
+`cli/js/tests/unit_tests.ts` and going through all registered instances of
+`unitTest`. For each discovered permission combination a new Deno process is
+created with respective `--allow-*` flags which loads
+`cli/js/tests/unit_tests.ts` and executes all `unitTest` that match runtime
+permissions.
diff --git a/cli/js/blob_test.ts b/cli/js/tests/blob_test.ts
index 54071a11e..54071a11e 100644
--- a/cli/js/blob_test.ts
+++ b/cli/js/tests/blob_test.ts
diff --git a/cli/js/body_test.ts b/cli/js/tests/body_test.ts
index 23f6d89e4..23f6d89e4 100644
--- a/cli/js/body_test.ts
+++ b/cli/js/tests/body_test.ts
diff --git a/cli/js/buffer_test.ts b/cli/js/tests/buffer_test.ts
index 163ed0a30..163ed0a30 100644
--- a/cli/js/buffer_test.ts
+++ b/cli/js/tests/buffer_test.ts
diff --git a/cli/js/build_test.ts b/cli/js/tests/build_test.ts
index 50c7b519c..50c7b519c 100644
--- a/cli/js/build_test.ts
+++ b/cli/js/tests/build_test.ts
diff --git a/cli/js/chmod_test.ts b/cli/js/tests/chmod_test.ts
index 8731fad22..8731fad22 100644
--- a/cli/js/chmod_test.ts
+++ b/cli/js/tests/chmod_test.ts
diff --git a/cli/js/chown_test.ts b/cli/js/tests/chown_test.ts
index 50dcd6dc1..50dcd6dc1 100644
--- a/cli/js/chown_test.ts
+++ b/cli/js/tests/chown_test.ts
diff --git a/cli/js/compiler_api_test.ts b/cli/js/tests/compiler_api_test.ts
index 3b0449f9a..3b0449f9a 100644
--- a/cli/js/compiler_api_test.ts
+++ b/cli/js/tests/compiler_api_test.ts
diff --git a/cli/js/console_test.ts b/cli/js/tests/console_test.ts
index 34a61c25f..34a61c25f 100644
--- a/cli/js/console_test.ts
+++ b/cli/js/tests/console_test.ts
diff --git a/cli/js/copy_file_test.ts b/cli/js/tests/copy_file_test.ts
index 986bab53b..986bab53b 100644
--- a/cli/js/copy_file_test.ts
+++ b/cli/js/tests/copy_file_test.ts
diff --git a/cli/js/custom_event_test.ts b/cli/js/tests/custom_event_test.ts
index 7a5cc44ca..7a5cc44ca 100644
--- a/cli/js/custom_event_test.ts
+++ b/cli/js/tests/custom_event_test.ts
diff --git a/cli/js/dir_test.ts b/cli/js/tests/dir_test.ts
index 75184587b..75184587b 100644
--- a/cli/js/dir_test.ts
+++ b/cli/js/tests/dir_test.ts
diff --git a/cli/js/dispatch_json_test.ts b/cli/js/tests/dispatch_json_test.ts
index a2306dda8..a2306dda8 100644
--- a/cli/js/dispatch_json_test.ts
+++ b/cli/js/tests/dispatch_json_test.ts
diff --git a/cli/js/dispatch_minimal_test.ts b/cli/js/tests/dispatch_minimal_test.ts
index 724a41698..724a41698 100644
--- a/cli/js/dispatch_minimal_test.ts
+++ b/cli/js/tests/dispatch_minimal_test.ts
diff --git a/cli/js/mixins/dom_iterable_test.ts b/cli/js/tests/dom_iterable_test.ts
index a1b8b5699..e16378945 100644
--- a/cli/js/mixins/dom_iterable_test.ts
+++ b/cli/js/tests/dom_iterable_test.ts
@@ -1,5 +1,5 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-import { unitTest, assert, assertEquals } from "../test_util.ts";
+import { unitTest, assert, assertEquals } from "./test_util.ts";
 
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 function setup() {
diff --git a/cli/js/error_stack_test.ts b/cli/js/tests/error_stack_test.ts
index 7acbd3a3d..7acbd3a3d 100644
--- a/cli/js/error_stack_test.ts
+++ b/cli/js/tests/error_stack_test.ts
diff --git a/cli/js/event_target_test.ts b/cli/js/tests/event_target_test.ts
index 09d47f704..09d47f704 100644
--- a/cli/js/event_target_test.ts
+++ b/cli/js/tests/event_target_test.ts
diff --git a/cli/js/event_test.ts b/cli/js/tests/event_test.ts
index 05a9ed577..05a9ed577 100644
--- a/cli/js/event_test.ts
+++ b/cli/js/tests/event_test.ts
diff --git a/cli/js/fetch_test.ts b/cli/js/tests/fetch_test.ts
index 5ebef92d9..5ebef92d9 100644
--- a/cli/js/fetch_test.ts
+++ b/cli/js/tests/fetch_test.ts
diff --git a/cli/js/file_test.ts b/cli/js/tests/file_test.ts
index 1a7a5f88b..1a7a5f88b 100644
--- a/cli/js/file_test.ts
+++ b/cli/js/tests/file_test.ts
diff --git a/cli/js/files_test.ts b/cli/js/tests/files_test.ts
index 49fecabe0..49fecabe0 100644
--- a/cli/js/files_test.ts
+++ b/cli/js/tests/files_test.ts
diff --git a/cli/js/form_data_test.ts b/cli/js/tests/form_data_test.ts
index 9b218547c..9b218547c 100644
--- a/cli/js/form_data_test.ts
+++ b/cli/js/tests/form_data_test.ts
diff --git a/cli/js/format_error_test.ts b/cli/js/tests/format_error_test.ts
index 9831ef160..9831ef160 100644
--- a/cli/js/format_error_test.ts
+++ b/cli/js/tests/format_error_test.ts
diff --git a/cli/js/fs_events_test.ts b/cli/js/tests/fs_events_test.ts
index b1697971a..b1697971a 100644
--- a/cli/js/fs_events_test.ts
+++ b/cli/js/tests/fs_events_test.ts
diff --git a/cli/js/get_random_values_test.ts b/cli/js/tests/get_random_values_test.ts
index 76fa732ea..76fa732ea 100644
--- a/cli/js/get_random_values_test.ts
+++ b/cli/js/tests/get_random_values_test.ts
diff --git a/cli/js/globals_test.ts b/cli/js/tests/globals_test.ts
index aa8b4f46e..aa8b4f46e 100644
--- a/cli/js/globals_test.ts
+++ b/cli/js/tests/globals_test.ts
diff --git a/cli/js/headers_test.ts b/cli/js/tests/headers_test.ts
index fcb5385a5..fcb5385a5 100644
--- a/cli/js/headers_test.ts
+++ b/cli/js/tests/headers_test.ts
diff --git a/cli/js/internals_test.ts b/cli/js/tests/internals_test.ts
index fb712707c..fb712707c 100644
--- a/cli/js/internals_test.ts
+++ b/cli/js/tests/internals_test.ts
diff --git a/cli/js/link_test.ts b/cli/js/tests/link_test.ts
index e9f72ebef..e9f72ebef 100644
--- a/cli/js/link_test.ts
+++ b/cli/js/tests/link_test.ts
diff --git a/cli/js/location_test.ts b/cli/js/tests/location_test.ts
index 78ecb55b3..78ecb55b3 100644
--- a/cli/js/location_test.ts
+++ b/cli/js/tests/location_test.ts
diff --git a/cli/js/make_temp_test.ts b/cli/js/tests/make_temp_test.ts
index 9804a7043..9804a7043 100644
--- a/cli/js/make_temp_test.ts
+++ b/cli/js/tests/make_temp_test.ts
diff --git a/cli/js/metrics_test.ts b/cli/js/tests/metrics_test.ts
index 9b7d83887..9b7d83887 100644
--- a/cli/js/metrics_test.ts
+++ b/cli/js/tests/metrics_test.ts
diff --git a/cli/js/mkdir_test.ts b/cli/js/tests/mkdir_test.ts
index 2921177eb..2921177eb 100644
--- a/cli/js/mkdir_test.ts
+++ b/cli/js/tests/mkdir_test.ts
diff --git a/cli/js/net_test.ts b/cli/js/tests/net_test.ts
index 46543acdf..46543acdf 100644
--- a/cli/js/net_test.ts
+++ b/cli/js/tests/net_test.ts
diff --git a/cli/js/os_test.ts b/cli/js/tests/os_test.ts
index 0c851be51..0c851be51 100644
--- a/cli/js/os_test.ts
+++ b/cli/js/tests/os_test.ts
diff --git a/cli/js/performance_test.ts b/cli/js/tests/performance_test.ts
index 89b7cad8b..89b7cad8b 100644
--- a/cli/js/performance_test.ts
+++ b/cli/js/tests/performance_test.ts
diff --git a/cli/js/permissions_test.ts b/cli/js/tests/permissions_test.ts
index 7528768a1..7528768a1 100644
--- a/cli/js/permissions_test.ts
+++ b/cli/js/tests/permissions_test.ts
diff --git a/cli/js/process_test.ts b/cli/js/tests/process_test.ts
index 2411b5134..2411b5134 100644
--- a/cli/js/process_test.ts
+++ b/cli/js/tests/process_test.ts
diff --git a/cli/js/read_dir_test.ts b/cli/js/tests/read_dir_test.ts
index 95936c645..95936c645 100644
--- a/cli/js/read_dir_test.ts
+++ b/cli/js/tests/read_dir_test.ts
diff --git a/cli/js/read_file_test.ts b/cli/js/tests/read_file_test.ts
index 1b709b1f4..1b709b1f4 100644
--- a/cli/js/read_file_test.ts
+++ b/cli/js/tests/read_file_test.ts
diff --git a/cli/js/read_link_test.ts b/cli/js/tests/read_link_test.ts
index 409f37110..409f37110 100644
--- a/cli/js/read_link_test.ts
+++ b/cli/js/tests/read_link_test.ts
diff --git a/cli/js/realpath_test.ts b/cli/js/tests/realpath_test.ts
index cda7ddaf1..cda7ddaf1 100644
--- a/cli/js/realpath_test.ts
+++ b/cli/js/tests/realpath_test.ts
diff --git a/cli/js/remove_test.ts b/cli/js/tests/remove_test.ts
index fac5ba303..fac5ba303 100644
--- a/cli/js/remove_test.ts
+++ b/cli/js/tests/remove_test.ts
diff --git a/cli/js/rename_test.ts b/cli/js/tests/rename_test.ts
index 288f24bd7..288f24bd7 100644
--- a/cli/js/rename_test.ts
+++ b/cli/js/tests/rename_test.ts
diff --git a/cli/js/request_test.ts b/cli/js/tests/request_test.ts
index 15e19e285..15e19e285 100644
--- a/cli/js/request_test.ts
+++ b/cli/js/tests/request_test.ts
diff --git a/cli/js/resources_test.ts b/cli/js/tests/resources_test.ts
index 84b713a6d..84b713a6d 100644
--- a/cli/js/resources_test.ts
+++ b/cli/js/tests/resources_test.ts
diff --git a/cli/js/signal_test.ts b/cli/js/tests/signal_test.ts
index e1d00c669..e1d00c669 100644
--- a/cli/js/signal_test.ts
+++ b/cli/js/tests/signal_test.ts
diff --git a/cli/js/stat_test.ts b/cli/js/tests/stat_test.ts
index 0a33901b7..0a33901b7 100644
--- a/cli/js/stat_test.ts
+++ b/cli/js/tests/stat_test.ts
diff --git a/cli/js/symbols_test.ts b/cli/js/tests/symbols_test.ts
index ad05e9a70..ad05e9a70 100644
--- a/cli/js/symbols_test.ts
+++ b/cli/js/tests/symbols_test.ts
diff --git a/cli/js/symlink_test.ts b/cli/js/tests/symlink_test.ts
index 221960bb0..221960bb0 100644
--- a/cli/js/symlink_test.ts
+++ b/cli/js/tests/symlink_test.ts
diff --git a/cli/js/test_util.ts b/cli/js/tests/test_util.ts
index fa17a2f87..c8f28437d 100644
--- a/cli/js/test_util.ts
+++ b/cli/js/tests/test_util.ts
@@ -7,8 +7,8 @@
 // tests by the special string. permW1N0 means allow-write but not allow-net.
 // See tools/unit_tests.py for more details.
 
-import { readLines } from "../../std/io/bufio.ts";
-import { assert, assertEquals } from "../../std/testing/asserts.ts";
+import { readLines } from "../../../std/io/bufio.ts";
+import { assert, assertEquals } from "../../../std/testing/asserts.ts";
 export {
   assert,
   assertThrows,
@@ -19,7 +19,7 @@ export {
   assertStrContains,
   unreachable,
   fail
-} from "../../std/testing/asserts.ts";
+} from "../../../std/testing/asserts.ts";
 
 interface TestPermissions {
   read?: boolean;
@@ -380,21 +380,27 @@ unitTest(
 
 /*
  * Ensure all unit test files (e.g. xxx_test.ts) are present as imports in
- * cli/js/unit_tests.ts as it is easy to miss this out
+ * cli/js/tests/unit_tests.ts as it is easy to miss this out
  */
 unitTest(
   { perms: { read: true } },
   async function assertAllUnitTestFilesImported(): Promise<void> {
-    const directoryTestFiles = Deno.readdirSync("./cli/js")
+    const directoryTestFiles = Deno.readdirSync("./cli/js/tests/")
       .map(k => k.name)
-      .filter(file => file!.endsWith("_test.ts"));
+      .filter(
+        file =>
+          file!.endsWith(".ts") &&
+          !file!.endsWith("unit_tests.ts") &&
+          !file!.endsWith("test_util.ts") &&
+          !file!.endsWith("unit_test_runner.ts")
+      );
     const unitTestsFile: Uint8Array = Deno.readFileSync(
-      "./cli/js/unit_tests.ts"
+      "./cli/js/tests/unit_tests.ts"
     );
     const importLines = new TextDecoder("utf-8")
       .decode(unitTestsFile)
       .split("\n")
-      .filter(line => line.startsWith("import") && line.includes("_test.ts"));
+      .filter(line => line.startsWith("import"));
     const importedTestFiles = importLines.map(
       relativeFilePath => relativeFilePath.match(/\/([^\/]+)";/)![1]
     );
@@ -402,7 +408,7 @@ unitTest(
     directoryTestFiles.forEach(dirFile => {
       if (!importedTestFiles.includes(dirFile!)) {
         throw new Error(
-          "cil/js/unit_tests.ts is missing import of test file: cli/js/" +
+          "cil/js/tests/unit_tests.ts is missing import of test file: cli/js/" +
             dirFile
         );
       }
diff --git a/cli/js/testing_test.ts b/cli/js/tests/testing_test.ts
index b47eb03e2..b47eb03e2 100644
--- a/cli/js/testing_test.ts
+++ b/cli/js/tests/testing_test.ts
diff --git a/cli/js/text_encoding_test.ts b/cli/js/tests/text_encoding_test.ts
index e85655feb..e85655feb 100644
--- a/cli/js/text_encoding_test.ts
+++ b/cli/js/tests/text_encoding_test.ts
diff --git a/cli/js/timers_test.ts b/cli/js/tests/timers_test.ts
index 429e42692..429e42692 100644
--- a/cli/js/timers_test.ts
+++ b/cli/js/tests/timers_test.ts
diff --git a/cli/js/tls_test.ts b/cli/js/tests/tls_test.ts
index 99900ab57..b405a94dd 100644
--- a/cli/js/tls_test.ts
+++ b/cli/js/tests/tls_test.ts
@@ -5,8 +5,8 @@ import {
   createResolvable,
   unitTest
 } from "./test_util.ts";
-import { BufWriter, BufReader } from "../../std/io/bufio.ts";
-import { TextProtoReader } from "../../std/textproto/mod.ts";
+import { BufWriter, BufReader } from "../../../std/io/bufio.ts";
+import { TextProtoReader } from "../../../std/textproto/mod.ts";
 
 const encoder = new TextEncoder();
 const decoder = new TextDecoder();
diff --git a/cli/js/truncate_test.ts b/cli/js/tests/truncate_test.ts
index 3fd85c990..3fd85c990 100644
--- a/cli/js/truncate_test.ts
+++ b/cli/js/tests/truncate_test.ts
diff --git a/cli/js/tty_test.ts b/cli/js/tests/tty_test.ts
index 116b0dfe9..116b0dfe9 100644
--- a/cli/js/tty_test.ts
+++ b/cli/js/tests/tty_test.ts
diff --git a/cli/js/unit_test_runner.ts b/cli/js/tests/unit_test_runner.ts
index f32de96f8..a5b7c3a48 100755
--- a/cli/js/unit_test_runner.ts
+++ b/cli/js/tests/unit_test_runner.ts
@@ -54,7 +54,12 @@ async function main(): Promise<void> {
     console.log(`Running tests for: ${permsFmt}`);
     const cliPerms = permsToCliFlags(perms);
     // run subsequent tests using same deno executable
-    const args = [Deno.execPath(), "run", ...cliPerms, "cli/js/unit_tests.ts"];
+    const args = [
+      Deno.execPath(),
+      "run",
+      ...cliPerms,
+      "cli/js/tests/unit_tests.ts"
+    ];
 
     const p = Deno.run({
       args,
@@ -69,7 +74,7 @@ async function main(): Promise<void> {
     let result = 0;
 
     if (!actual && !expected) {
-      console.error("Bad cli/js/unit_test.ts output");
+      console.error("Bad cli/js/tests/unit_test.ts output");
       result = 1;
     } else if (expected !== actual) {
       result = 1;
diff --git a/cli/js/unit_tests.ts b/cli/js/tests/unit_tests.ts
index 2b02f8dcf..cc51e6ade 100644
--- a/cli/js/unit_tests.ts
+++ b/cli/js/tests/unit_tests.ts
@@ -1,7 +1,7 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 
 // This test is executed as part of tools/test.py
-// But it can also be run manually: ./target/debug/deno cli/js/unit_tests.ts
+// But it can also be run manually: ./target/debug/deno cli/js/tests/unit_tests.ts
 
 import "./blob_test.ts";
 import "./body_test.ts";
@@ -33,7 +33,7 @@ import "./link_test.ts";
 import "./location_test.ts";
 import "./make_temp_test.ts";
 import "./metrics_test.ts";
-import "./mixins/dom_iterable_test.ts";
+import "./dom_iterable_test.ts";
 import "./mkdir_test.ts";
 import "./net_test.ts";
 import "./os_test.ts";
@@ -52,8 +52,8 @@ import "./stat_test.ts";
 import "./symbols_test.ts";
 import "./symlink_test.ts";
 import "./text_encoding_test.ts";
-import "./timers_test.ts";
 import "./testing_test.ts";
+import "./timers_test.ts";
 import "./tls_test.ts";
 import "./truncate_test.ts";
 import "./tty_test.ts";
diff --git a/cli/js/url_search_params_test.ts b/cli/js/tests/url_search_params_test.ts
index b256395a0..b256395a0 100644
--- a/cli/js/url_search_params_test.ts
+++ b/cli/js/tests/url_search_params_test.ts
diff --git a/cli/js/url_test.ts b/cli/js/tests/url_test.ts
index 46468c8ae..46468c8ae 100644
--- a/cli/js/url_test.ts
+++ b/cli/js/tests/url_test.ts
diff --git a/cli/js/utime_test.ts b/cli/js/tests/utime_test.ts
index 8cd34d39a..8cd34d39a 100644
--- a/cli/js/utime_test.ts
+++ b/cli/js/tests/utime_test.ts
diff --git a/cli/js/version_test.ts b/cli/js/tests/version_test.ts
index 0417b27de..0417b27de 100644
--- a/cli/js/version_test.ts
+++ b/cli/js/tests/version_test.ts
diff --git a/cli/js/write_file_test.ts b/cli/js/tests/write_file_test.ts
index c06c5b330..c06c5b330 100644
--- a/cli/js/write_file_test.ts
+++ b/cli/js/tests/write_file_test.ts