diff --git a/tests/integration/compile_tests.rs b/tests/integration/compile_tests.rs index cf3bf023dbade4..f06e5a5a489208 100644 --- a/tests/integration/compile_tests.rs +++ b/tests/integration/compile_tests.rs @@ -24,7 +24,7 @@ fn compile_basic() { "compile", "--output", &exe.to_string_lossy(), - "../../../cli/tests/testdata/welcome.ts", + "../../../tests/testdata/welcome.ts", ]) .run(); output.assert_exit_code(0); diff --git a/tests/node_compat/common.ts b/tests/node_compat/common.ts index b3663ec3c4f8a5..8ed0927b62d216 100644 --- a/tests/node_compat/common.ts +++ b/tests/node_compat/common.ts @@ -1,7 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { partition } from "../../../test_util/std/collections/partition.ts"; -import { join } from "../../../test_util/std/path/mod.ts"; -import * as JSONC from "../../../test_util/std/jsonc/mod.ts"; +import { partition } from "../../test_util/std/collections/partition.ts"; +import { join } from "../../test_util/std/path/mod.ts"; +import * as JSONC from "../../test_util/std/jsonc/mod.ts"; /** * The test suite matches the folders inside the `test` folder inside the * node repo diff --git a/tests/node_compat/runner.ts b/tests/node_compat/runner.ts index 11ccefa82d70fa..1f6e756932226d 100644 --- a/tests/node_compat/runner.ts +++ b/tests/node_compat/runner.ts @@ -1,7 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import "./polyfill_globals.js"; import { createRequire } from "node:module"; -import { toFileUrl } from "../../../test_util/std/path/mod.ts"; +import { toFileUrl } from "../../test_util/std/path/mod.ts"; const file = Deno.args[0]; if (!file) { throw new Error("No file provided"); diff --git a/tests/node_compat/test.ts b/tests/node_compat/test.ts index a57fd11a5211dd..af4ce3604b4da7 100644 --- a/tests/node_compat/test.ts +++ b/tests/node_compat/test.ts @@ -13,10 +13,10 @@ * all share the same working directory. */ -import { magenta } from "../../../test_util/std/fmt/colors.ts"; -import { pooledMap } from "../../../test_util/std/async/pool.ts"; -import { dirname, fromFileUrl, join } from "../../../test_util/std/path/mod.ts"; -import { fail } from "../../../test_util/std/assert/mod.ts"; +import { magenta } from "../../test_util/std/fmt/colors.ts"; +import { pooledMap } from "../../test_util/std/async/pool.ts"; +import { dirname, fromFileUrl, join } from "../../test_util/std/path/mod.ts"; +import { fail } from "../../test_util/std/assert/mod.ts"; import { config, getPathsFromTestSuites, diff --git a/tests/testdata/bench/allow_all.ts b/tests/testdata/bench/allow_all.ts index beb4a450e5ed6f..43e005b58dac1e 100644 --- a/tests/testdata/bench/allow_all.ts +++ b/tests/testdata/bench/allow_all.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../../test_util/std/assert/mod.ts"; const permissions: Deno.PermissionName[] = [ "read", diff --git a/tests/testdata/bench/allow_none.ts b/tests/testdata/bench/allow_none.ts index e723ed8684aed5..62eb9c4c60e0b2 100644 --- a/tests/testdata/bench/allow_none.ts +++ b/tests/testdata/bench/allow_none.ts @@ -1,4 +1,4 @@ -import { unreachable } from "../../../../test_util/std/assert/mod.ts"; +import { unreachable } from "../../../test_util/std/assert/mod.ts"; const permissions: Deno.PermissionName[] = [ "read", diff --git a/tests/testdata/cat.ts b/tests/testdata/cat.ts index c2a500b3e27564..f0205451e61c55 100644 --- a/tests/testdata/cat.ts +++ b/tests/testdata/cat.ts @@ -1,4 +1,4 @@ -import { copy } from "../../../test_util/std/streams/copy.ts"; +import { copy } from "../../test_util/std/streams/copy.ts"; async function main() { for (let i = 1; i < Deno.args.length; i++) { const filename = Deno.args[i]; diff --git a/tests/testdata/cert/listen_tls_alpn_fail.ts b/tests/testdata/cert/listen_tls_alpn_fail.ts index e321c9bd354c05..f52316cbce3da5 100644 --- a/tests/testdata/cert/listen_tls_alpn_fail.ts +++ b/tests/testdata/cert/listen_tls_alpn_fail.ts @@ -1,4 +1,4 @@ -import { assertRejects } from "../../../../test_util/std/assert/mod.ts"; +import { assertRejects } from "../../../test_util/std/assert/mod.ts"; const listener = Deno.listenTls({ port: Number(Deno.args[0]), diff --git a/tests/testdata/compile/dynamic_imports/main_unanalyzable.ts b/tests/testdata/compile/dynamic_imports/main_unanalyzable.ts index ee8ff2c4b1f192..7880fa4a6b61c9 100644 --- a/tests/testdata/compile/dynamic_imports/main_unanalyzable.ts +++ b/tests/testdata/compile/dynamic_imports/main_unanalyzable.ts @@ -1,4 +1,4 @@ -import { join } from "../../../../../test_util/std/path/mod.ts"; +import { join } from "../../../../test_util/std/path/mod.ts"; console.log("Starting the main module"); diff --git a/tests/testdata/compile/standalone_follow_redirects_2.js b/tests/testdata/compile/standalone_follow_redirects_2.js index 00ebc0f5c9bae8..765dda153cb296 100644 --- a/tests/testdata/compile/standalone_follow_redirects_2.js +++ b/tests/testdata/compile/standalone_follow_redirects_2.js @@ -2,4 +2,4 @@ import { assertNotEquals as _a, assertStrictEquals as _b, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; diff --git a/tests/testdata/coverage/no_snaps_included/no_snaps_included_test.ts b/tests/testdata/coverage/no_snaps_included/no_snaps_included_test.ts index e1f99ed9bb83b9..6fb44fcc684a66 100644 --- a/tests/testdata/coverage/no_snaps_included/no_snaps_included_test.ts +++ b/tests/testdata/coverage/no_snaps_included/no_snaps_included_test.ts @@ -1,4 +1,4 @@ -import { assertSnapshot } from "../../../../../test_util/std/testing/snapshot.ts"; +import { assertSnapshot } from "../../../../test_util/std/testing/snapshot.ts"; import { truth } from "./no_snaps_included.ts"; Deno.test("the truth", () => { diff --git a/tests/testdata/coverage/no_tests_included/foo.test.js b/tests/testdata/coverage/no_tests_included/foo.test.js index f555c2d0a6b128..46dd037befc36f 100644 --- a/tests/testdata/coverage/no_tests_included/foo.test.js +++ b/tests/testdata/coverage/no_tests_included/foo.test.js @@ -1,5 +1,5 @@ import { addNumbers } from "./foo.ts"; -import { assertEquals } from "../../../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../../../test_util/std/assert/mod.ts"; Deno.test("addNumbers works", () => { assertEquals(addNumbers(1, 2), 3); diff --git a/tests/testdata/coverage/no_tests_included/foo.test.mts b/tests/testdata/coverage/no_tests_included/foo.test.mts index f555c2d0a6b128..46dd037befc36f 100644 --- a/tests/testdata/coverage/no_tests_included/foo.test.mts +++ b/tests/testdata/coverage/no_tests_included/foo.test.mts @@ -1,5 +1,5 @@ import { addNumbers } from "./foo.ts"; -import { assertEquals } from "../../../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../../../test_util/std/assert/mod.ts"; Deno.test("addNumbers works", () => { assertEquals(addNumbers(1, 2), 3); diff --git a/tests/testdata/coverage/no_tests_included/foo.test.ts b/tests/testdata/coverage/no_tests_included/foo.test.ts index f555c2d0a6b128..46dd037befc36f 100644 --- a/tests/testdata/coverage/no_tests_included/foo.test.ts +++ b/tests/testdata/coverage/no_tests_included/foo.test.ts @@ -1,5 +1,5 @@ import { addNumbers } from "./foo.ts"; -import { assertEquals } from "../../../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../../../test_util/std/assert/mod.ts"; Deno.test("addNumbers works", () => { assertEquals(addNumbers(1, 2), 3); diff --git a/tests/testdata/coverage/no_transpiled_lines/index.ts b/tests/testdata/coverage/no_transpiled_lines/index.ts index 7e4f22163570de..8b87e768050fdf 100644 --- a/tests/testdata/coverage/no_transpiled_lines/index.ts +++ b/tests/testdata/coverage/no_transpiled_lines/index.ts @@ -1,3 +1,3 @@ -export { assertStrictEquals } from "../../../../../test_util/std/assert/mod.ts"; +export { assertStrictEquals } from "../../../../test_util/std/assert/mod.ts"; export * from "./interface.ts"; diff --git a/tests/testdata/echo_server.ts b/tests/testdata/echo_server.ts index 658b07374e49fd..e7622c7aaec5cc 100644 --- a/tests/testdata/echo_server.ts +++ b/tests/testdata/echo_server.ts @@ -1,4 +1,4 @@ -import { copy } from "../../../test_util/std/streams/copy.ts"; +import { copy } from "../../test_util/std/streams/copy.ts"; const addr = Deno.args[0] || "0.0.0.0:4544"; const [hostname, port] = addr.split(":"); const listener = Deno.listen({ hostname, port: Number(port) }); diff --git a/tests/testdata/run/045_proxy_test.ts b/tests/testdata/run/045_proxy_test.ts index 60bde5066d0733..1929ed6bce4507 100644 --- a/tests/testdata/run/045_proxy_test.ts +++ b/tests/testdata/run/045_proxy_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { Server } from "../../../../test_util/std/http/server.ts"; -import { assertEquals } from "../../../../test_util/std/assert/mod.ts"; +import { Server } from "../../../test_util/std/http/server.ts"; +import { assertEquals } from "../../../test_util/std/assert/mod.ts"; const addr = Deno.args[1] || "localhost:4555"; diff --git a/tests/testdata/run/import_meta/main.ts b/tests/testdata/run/import_meta/main.ts index fb859e250ea6fe..61880e2c1a2f88 100644 --- a/tests/testdata/run/import_meta/main.ts +++ b/tests/testdata/run/import_meta/main.ts @@ -1,4 +1,4 @@ -import { assertThrows } from "../../../../../test_util/std/assert/mod.ts"; +import { assertThrows } from "../../../../test_util/std/assert/mod.ts"; import "http://localhost:4545/run/import_meta/other.ts"; import "./other.ts"; diff --git a/tests/testdata/run/onload/imported.ts b/tests/testdata/run/onload/imported.ts index 971ddaea351676..d2a93c8d2b8952 100644 --- a/tests/testdata/run/onload/imported.ts +++ b/tests/testdata/run/onload/imported.ts @@ -1,5 +1,5 @@ // deno-lint-ignore-file no-window-prefix -import { assert } from "../../../../../test_util/std/assert/mod.ts"; +import { assert } from "../../../../test_util/std/assert/mod.ts"; import "./nest_imported.ts"; const handler = (e: Event) => { diff --git a/tests/testdata/run/onload/main.ts b/tests/testdata/run/onload/main.ts index 191c4d872879fd..990a21131d2afa 100644 --- a/tests/testdata/run/onload/main.ts +++ b/tests/testdata/run/onload/main.ts @@ -1,5 +1,5 @@ // deno-lint-ignore-file no-window-prefix no-prototype-builtins -import { assert } from "../../../../../test_util/std/assert/mod.ts"; +import { assert } from "../../../../test_util/std/assert/mod.ts"; import "./imported.ts"; assert(window.hasOwnProperty("onload")); diff --git a/tests/testdata/run/onload/nest_imported.ts b/tests/testdata/run/onload/nest_imported.ts index e8969985491273..2151f41856b1c2 100644 --- a/tests/testdata/run/onload/nest_imported.ts +++ b/tests/testdata/run/onload/nest_imported.ts @@ -1,5 +1,5 @@ // deno-lint-ignore-file no-window-prefix -import { assert } from "../../../../../test_util/std/assert/mod.ts"; +import { assert } from "../../../../test_util/std/assert/mod.ts"; const handler = (e: Event) => { assert(e.type === "beforeunload" ? e.cancelable : !e.cancelable); diff --git a/tests/testdata/run/textproto.ts b/tests/testdata/run/textproto.ts index 44dd6fbc113a88..cf9a4dce971af9 100644 --- a/tests/testdata/run/textproto.ts +++ b/tests/testdata/run/textproto.ts @@ -17,8 +17,8 @@ import type { BufReader, ReadLineResult, -} from "../../../../test_util/std/io/buf_reader.ts"; -import { concat } from "../../../../test_util/std/bytes/concat.ts"; +} from "../../../test_util/std/io/buf_reader.ts"; +import { concat } from "../../../test_util/std/bytes/concat.ts"; // Constants created for DRY const CHAR_SPACE: number = " ".charCodeAt(0); diff --git a/tests/testdata/run/tls_connecttls.js b/tests/testdata/run/tls_connecttls.js index 8c6c285f3e7ca9..f085d7a8fd04b5 100644 --- a/tests/testdata/run/tls_connecttls.js +++ b/tests/testdata/run/tls_connecttls.js @@ -1,5 +1,5 @@ -import { assert, assertEquals } from "../../../../test_util/std/assert/mod.ts"; -import { BufReader, BufWriter } from "../../../../test_util/std/io/mod.ts"; +import { assert, assertEquals } from "../../../test_util/std/assert/mod.ts"; +import { BufReader, BufWriter } from "../../../test_util/std/io/mod.ts"; import { TextProtoReader } from "./textproto.ts"; const encoder = new TextEncoder(); diff --git a/tests/testdata/run/tls_starttls.js b/tests/testdata/run/tls_starttls.js index 3e406ff5f51691..5f5428ecd7e859 100644 --- a/tests/testdata/run/tls_starttls.js +++ b/tests/testdata/run/tls_starttls.js @@ -1,6 +1,6 @@ -import { assert, assertEquals } from "../../../../test_util/std/assert/mod.ts"; -import { BufReader } from "../../../../test_util/std/io/buf_reader.ts"; -import { BufWriter } from "../../../../test_util/std/io/buf_writer.ts"; +import { assert, assertEquals } from "../../../test_util/std/assert/mod.ts"; +import { BufReader } from "../../../test_util/std/io/buf_reader.ts"; +import { BufWriter } from "../../../test_util/std/io/buf_writer.ts"; import { TextProtoReader } from "./textproto.ts"; const encoder = new TextEncoder(); diff --git a/tests/testdata/run/websocket_server_idletimeout.ts b/tests/testdata/run/websocket_server_idletimeout.ts index fa267c41bad998..f116c4556aec7e 100644 --- a/tests/testdata/run/websocket_server_idletimeout.ts +++ b/tests/testdata/run/websocket_server_idletimeout.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../../test_util/std/assert/mod.ts"; const errorDeferred = Promise.withResolvers(); const closeDeferred = Promise.withResolvers(); diff --git a/tests/testdata/run/websocket_test.ts b/tests/testdata/run/websocket_test.ts index b6c5744afd3f99..ab1ee81d55ee8a 100644 --- a/tests/testdata/run/websocket_test.ts +++ b/tests/testdata/run/websocket_test.ts @@ -4,7 +4,7 @@ import { assertEquals, assertThrows, fail, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; Deno.test("invalid scheme", () => { assertThrows(() => new WebSocket("foo://localhost:4242")); diff --git a/tests/testdata/run/websocketstream_test.ts b/tests/testdata/run/websocketstream_test.ts index b9157c25e7922f..b727cda3a6c7f1 100644 --- a/tests/testdata/run/websocketstream_test.ts +++ b/tests/testdata/run/websocketstream_test.ts @@ -7,7 +7,7 @@ import { assertRejects, assertThrows, unreachable, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; Deno.test("fragment", () => { assertThrows(() => new WebSocketStream("ws://localhost:4242/#")); diff --git a/tests/testdata/test/allow_all.ts b/tests/testdata/test/allow_all.ts index 50cd407e41a28b..e533bc017d8fbd 100644 --- a/tests/testdata/test/allow_all.ts +++ b/tests/testdata/test/allow_all.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../../test_util/std/assert/mod.ts"; const permissions: Deno.PermissionName[] = [ "read", diff --git a/tests/testdata/test/allow_none.ts b/tests/testdata/test/allow_none.ts index eb760242a4ea71..04c40a09391103 100644 --- a/tests/testdata/test/allow_none.ts +++ b/tests/testdata/test/allow_none.ts @@ -1,4 +1,4 @@ -import { unreachable } from "../../../../test_util/std/assert/mod.ts"; +import { unreachable } from "../../../test_util/std/assert/mod.ts"; const permissions: Deno.PermissionName[] = [ "read", diff --git a/tests/testdata/test/ops_sanitizer_missing_details.ts b/tests/testdata/test/ops_sanitizer_missing_details.ts index e3b07d77a218cf..a40240bfc87da6 100644 --- a/tests/testdata/test/ops_sanitizer_missing_details.ts +++ b/tests/testdata/test/ops_sanitizer_missing_details.ts @@ -1,6 +1,6 @@ // https://github.com/denoland/deno/issues/13729 // https://github.com/denoland/deno/issues/13938 -import { writeAll } from "../../../../test_util/std/streams/write_all.ts"; +import { writeAll } from "../../../test_util/std/streams/write_all.ts"; Deno.test("test 1", { permissions: { write: true, read: true } }, async () => { const tmpFile = await Deno.makeTempFile(); diff --git a/tests/testdata/workers/deno_worker.ts b/tests/testdata/workers/deno_worker.ts index eccdab5b0b7de7..cbebde94ac293f 100644 --- a/tests/testdata/workers/deno_worker.ts +++ b/tests/testdata/workers/deno_worker.ts @@ -1,4 +1,4 @@ -import { assert } from "../../../../test_util/std/assert/mod.ts"; +import { assert } from "../../../test_util/std/assert/mod.ts"; onmessage = function (e) { if (typeof self.Deno === "undefined") { diff --git a/tests/testdata/workers/test.ts b/tests/testdata/workers/test.ts index 2fecc63e041907..df38bf2ff4a45f 100644 --- a/tests/testdata/workers/test.ts +++ b/tests/testdata/workers/test.ts @@ -7,7 +7,7 @@ import { assertEquals, assertMatch, assertThrows, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; Deno.test({ name: "worker terminate", diff --git a/tests/unit/blob_test.ts b/tests/unit/blob_test.ts index dbdd4e297a3ec1..fba9525cadba12 100644 --- a/tests/unit/blob_test.ts +++ b/tests/unit/blob_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { assert, assertEquals, assertStringIncludes } from "./test_util.ts"; -import { concat } from "../../../test_util/std/bytes/concat.ts"; +import { concat } from "../../test_util/std/bytes/concat.ts"; Deno.test(function blobString() { const b1 = new Blob(["Hello World"]); diff --git a/tests/unit/broadcast_channel_test.ts b/tests/unit/broadcast_channel_test.ts index f412db682fe107..c2ec3a76a83f8d 100644 --- a/tests/unit/broadcast_channel_test.ts +++ b/tests/unit/broadcast_channel_test.ts @@ -1,5 +1,5 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { assertEquals } from "../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../test_util/std/assert/mod.ts"; Deno.test("BroadcastChannel worker", async () => { const intercom = new BroadcastChannel("intercom"); diff --git a/tests/unit/console_test.ts b/tests/unit/console_test.ts index 219b6ab07721c1..9b7a95c52ab866 100644 --- a/tests/unit/console_test.ts +++ b/tests/unit/console_test.ts @@ -14,7 +14,7 @@ import { assertStringIncludes, assertThrows, } from "./test_util.ts"; -import { stripColor } from "../../../test_util/std/fmt/colors.ts"; +import { stripColor } from "../../test_util/std/fmt/colors.ts"; const customInspect = Symbol.for("Deno.customInspect"); const { diff --git a/tests/unit/fetch_test.ts b/tests/unit/fetch_test.ts index 62f31896d1da51..4b6278bb0be41d 100644 --- a/tests/unit/fetch_test.ts +++ b/tests/unit/fetch_test.ts @@ -8,7 +8,7 @@ import { fail, unimplemented, } from "./test_util.ts"; -import { Buffer } from "../../../test_util/std/io/buffer.ts"; +import { Buffer } from "../../test_util/std/io/buffer.ts"; const listenPort = 4506; diff --git a/tests/unit/files_test.ts b/tests/unit/files_test.ts index aed09e81460f0f..6d38e8f92a55f9 100644 --- a/tests/unit/files_test.ts +++ b/tests/unit/files_test.ts @@ -8,7 +8,7 @@ import { assertRejects, assertThrows, } from "./test_util.ts"; -import { copy } from "../../../test_util/std/streams/copy.ts"; +import { copy } from "../../test_util/std/streams/copy.ts"; Deno.test(function filesStdioFileDescriptors() { assertEquals(Deno.stdin.rid, 0); diff --git a/tests/unit/http_test.ts b/tests/unit/http_test.ts index a7f34f0acb9320..4124d6f3e9c6f3 100644 --- a/tests/unit/http_test.ts +++ b/tests/unit/http_test.ts @@ -1,5 +1,5 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { Buffer, BufReader, BufWriter } from "../../../test_util/std/io/mod.ts"; +import { Buffer, BufReader, BufWriter } from "../../test_util/std/io/mod.ts"; import { TextProtoReader } from "../testdata/run/textproto.ts"; import { assert, @@ -10,7 +10,7 @@ import { delay, fail, } from "./test_util.ts"; -import { join } from "../../../test_util/std/path/mod.ts"; +import { join } from "../../test_util/std/path/mod.ts"; const listenPort = 4507; const listenPort2 = 4508; diff --git a/tests/unit/io_test.ts b/tests/unit/io_test.ts index 236bb27fe4adf5..9e197e65dc1fec 100644 --- a/tests/unit/io_test.ts +++ b/tests/unit/io_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { assertEquals } from "./test_util.ts"; -import { Buffer } from "../../../test_util/std/io/buffer.ts"; +import { Buffer } from "../../test_util/std/io/buffer.ts"; const DEFAULT_BUF_SIZE = 32 * 1024; diff --git a/tests/unit/kv_test.ts b/tests/unit/kv_test.ts index c98611e2da1e43..51fa27ed5e0b00 100644 --- a/tests/unit/kv_test.ts +++ b/tests/unit/kv_test.ts @@ -7,7 +7,7 @@ import { assertRejects, assertThrows, } from "./test_util.ts"; -import { assertType, IsExact } from "../../../test_util/std/testing/types.ts"; +import { assertType, IsExact } from "../../test_util/std/testing/types.ts"; const sleep = (time: number) => new Promise((r) => setTimeout(r, time)); diff --git a/tests/unit/message_channel_test.ts b/tests/unit/message_channel_test.ts index 59cf38430e82fd..3c935c12f3e97a 100644 --- a/tests/unit/message_channel_test.ts +++ b/tests/unit/message_channel_test.ts @@ -1,7 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. // NOTE: these are just sometests to test the TypeScript types. Real coverage is // provided by WPT. -import { assert, assertEquals } from "../../../test_util/std/assert/mod.ts"; +import { assert, assertEquals } from "../../test_util/std/assert/mod.ts"; Deno.test("messagechannel", async () => { const mc = new MessageChannel(); diff --git a/tests/unit/serve_test.ts b/tests/unit/serve_test.ts index 09bd8601529499..0fa07760095a42 100644 --- a/tests/unit/serve_test.ts +++ b/tests/unit/serve_test.ts @@ -3,8 +3,8 @@ import { assertMatch, assertRejects, -} from "../../../test_util/std/assert/mod.ts"; -import { Buffer, BufReader, BufWriter } from "../../../test_util/std/io/mod.ts"; +} from "../../test_util/std/assert/mod.ts"; +import { Buffer, BufReader, BufWriter } from "../../test_util/std/io/mod.ts"; import { TextProtoReader } from "../testdata/run/textproto.ts"; import { assert, diff --git a/tests/unit/test_util.ts b/tests/unit/test_util.ts index 14d212b82be357..aee28412e11fb6 100644 --- a/tests/unit/test_util.ts +++ b/tests/unit/test_util.ts @@ -1,8 +1,8 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import * as colors from "../../../test_util/std/fmt/colors.ts"; +import * as colors from "../../test_util/std/fmt/colors.ts"; export { colors }; -import { join, resolve } from "../../../test_util/std/path/mod.ts"; +import { join, resolve } from "../../test_util/std/path/mod.ts"; export { assert, assertEquals, @@ -19,10 +19,10 @@ export { fail, unimplemented, unreachable, -} from "../../../test_util/std/assert/mod.ts"; -export { delay } from "../../../test_util/std/async/delay.ts"; -export { readLines } from "../../../test_util/std/io/read_lines.ts"; -export { parse as parseArgs } from "../../../test_util/std/flags/mod.ts"; +} from "../../test_util/std/assert/mod.ts"; +export { delay } from "../../test_util/std/async/delay.ts"; +export { readLines } from "../../test_util/std/io/read_lines.ts"; +export { parse as parseArgs } from "../../test_util/std/flags/mod.ts"; export function pathToAbsoluteFileUrl(path: string): URL { path = resolve(path); diff --git a/tests/unit/tls_test.ts b/tests/unit/tls_test.ts index 2e797b16090a23..77103a150cea96 100644 --- a/tests/unit/tls_test.ts +++ b/tests/unit/tls_test.ts @@ -7,9 +7,9 @@ import { assertStrictEquals, assertThrows, } from "./test_util.ts"; -import { BufReader, BufWriter } from "../../../test_util/std/io/mod.ts"; -import { readAll } from "../../../test_util/std/streams/read_all.ts"; -import { writeAll } from "../../../test_util/std/streams/write_all.ts"; +import { BufReader, BufWriter } from "../../test_util/std/io/mod.ts"; +import { readAll } from "../../test_util/std/streams/read_all.ts"; +import { writeAll } from "../../test_util/std/streams/write_all.ts"; import { TextProtoReader } from "../testdata/run/textproto.ts"; const encoder = new TextEncoder(); diff --git a/tests/unit/urlpattern_test.ts b/tests/unit/urlpattern_test.ts index 60800a3613a1d2..bd4e5fa498d79f 100644 --- a/tests/unit/urlpattern_test.ts +++ b/tests/unit/urlpattern_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { assert, assertEquals } from "./test_util.ts"; -import { assertType, IsExact } from "../../../test_util/std/testing/types.ts"; +import { assertType, IsExact } from "../../test_util/std/testing/types.ts"; Deno.test(function urlPatternFromString() { const pattern = new URLPattern("https://deno.land/foo/:bar"); diff --git a/tests/unit_node/_fs/_fs_access_test.ts b/tests/unit_node/_fs/_fs_access_test.ts index 6239f17cb8b0f5..66176a8d46a1f3 100644 --- a/tests/unit_node/_fs/_fs_access_test.ts +++ b/tests/unit_node/_fs/_fs_access_test.ts @@ -3,7 +3,7 @@ import * as fs from "node:fs"; import { assertRejects, assertThrows, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; Deno.test( "[node/fs.access] Uses the owner permission when the user is the owner", diff --git a/tests/unit_node/_fs/_fs_appendFile_test.ts b/tests/unit_node/_fs/_fs_appendFile_test.ts index a7dec7e7c839a4..2203ebc4195979 100644 --- a/tests/unit_node/_fs/_fs_appendFile_test.ts +++ b/tests/unit_node/_fs/_fs_appendFile_test.ts @@ -3,9 +3,9 @@ import { assertEquals, assertThrows, fail, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { appendFile, appendFileSync } from "node:fs"; -import { fromFileUrl } from "../../../../test_util/std/path/mod.ts"; +import { fromFileUrl } from "../../../test_util/std/path/mod.ts"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; const decoder = new TextDecoder("utf-8"); diff --git a/tests/unit_node/_fs/_fs_chmod_test.ts b/tests/unit_node/_fs/_fs_chmod_test.ts index 69a1cc0178bfac..2eaaa91bbc60b1 100644 --- a/tests/unit_node/_fs/_fs_chmod_test.ts +++ b/tests/unit_node/_fs/_fs_chmod_test.ts @@ -4,7 +4,7 @@ import { assertRejects, assertThrows, fail, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { chmod, chmodSync } from "node:fs"; diff --git a/tests/unit_node/_fs/_fs_chown_test.ts b/tests/unit_node/_fs/_fs_chown_test.ts index 06c19713cee111..bb82003048e2c9 100644 --- a/tests/unit_node/_fs/_fs_chown_test.ts +++ b/tests/unit_node/_fs/_fs_chown_test.ts @@ -1,5 +1,5 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { assertEquals, fail } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals, fail } from "../../../test_util/std/assert/mod.ts"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { chown, chownSync } from "node:fs"; diff --git a/tests/unit_node/_fs/_fs_close_test.ts b/tests/unit_node/_fs/_fs_close_test.ts index fb9ce05c306e8d..9581d4a388bd55 100644 --- a/tests/unit_node/_fs/_fs_close_test.ts +++ b/tests/unit_node/_fs/_fs_close_test.ts @@ -3,7 +3,7 @@ import { assert, assertThrows, fail, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { close, closeSync } from "node:fs"; diff --git a/tests/unit_node/_fs/_fs_copy_test.ts b/tests/unit_node/_fs/_fs_copy_test.ts index 67179f45b6cca4..90a70bc207e571 100644 --- a/tests/unit_node/_fs/_fs_copy_test.ts +++ b/tests/unit_node/_fs/_fs_copy_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import * as path from "../../../../test_util/std/path/mod.ts"; -import { assert } from "../../../../test_util/std/assert/mod.ts"; +import * as path from "../../../test_util/std/path/mod.ts"; +import { assert } from "../../../test_util/std/assert/mod.ts"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { copyFile, copyFileSync, existsSync } from "node:fs"; diff --git a/tests/unit_node/_fs/_fs_dir_test.ts b/tests/unit_node/_fs/_fs_dir_test.ts index cd8c8b510b6fd5..4262fedb65f8e5 100644 --- a/tests/unit_node/_fs/_fs_dir_test.ts +++ b/tests/unit_node/_fs/_fs_dir_test.ts @@ -3,7 +3,7 @@ import { assert, assertEquals, fail, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { Dir as DirOrig, type Dirent } from "node:fs"; diff --git a/tests/unit_node/_fs/_fs_dirent_test.ts b/tests/unit_node/_fs/_fs_dirent_test.ts index 1ba6e91f116ff3..f5df0222ba9ea0 100644 --- a/tests/unit_node/_fs/_fs_dirent_test.ts +++ b/tests/unit_node/_fs/_fs_dirent_test.ts @@ -3,7 +3,7 @@ import { assert, assertEquals, assertThrows, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { Dirent as Dirent_ } from "node:fs"; // deno-lint-ignore no-explicit-any diff --git a/tests/unit_node/_fs/_fs_exists_test.ts b/tests/unit_node/_fs/_fs_exists_test.ts index b505c5142528f9..fa9bab5f4d79c3 100644 --- a/tests/unit_node/_fs/_fs_exists_test.ts +++ b/tests/unit_node/_fs/_fs_exists_test.ts @@ -3,7 +3,7 @@ import { assert, assertEquals, assertStringIncludes, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { exists, existsSync } from "node:fs"; import { promisify } from "node:util"; diff --git a/tests/unit_node/_fs/_fs_fdatasync_test.ts b/tests/unit_node/_fs/_fs_fdatasync_test.ts index 5a57ba553783e8..429636b445961b 100644 --- a/tests/unit_node/_fs/_fs_fdatasync_test.ts +++ b/tests/unit_node/_fs/_fs_fdatasync_test.ts @@ -1,5 +1,5 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { assertEquals, fail } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals, fail } from "../../../test_util/std/assert/mod.ts"; import { fdatasync, fdatasyncSync } from "node:fs"; Deno.test({ diff --git a/tests/unit_node/_fs/_fs_fstat_test.ts b/tests/unit_node/_fs/_fs_fstat_test.ts index 220b9589a71638..89ff5cad6f37b7 100644 --- a/tests/unit_node/_fs/_fs_fstat_test.ts +++ b/tests/unit_node/_fs/_fs_fstat_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { fstat, fstatSync } from "node:fs"; -import { fail } from "../../../../test_util/std/assert/mod.ts"; +import { fail } from "../../../test_util/std/assert/mod.ts"; import { assertStats, assertStatsBigInt } from "./_fs_stat_test.ts"; import type { BigIntStats, Stats } from "node:fs"; diff --git a/tests/unit_node/_fs/_fs_fsync_test.ts b/tests/unit_node/_fs/_fs_fsync_test.ts index 90bbed9dae76c3..56628c53253629 100644 --- a/tests/unit_node/_fs/_fs_fsync_test.ts +++ b/tests/unit_node/_fs/_fs_fsync_test.ts @@ -1,5 +1,5 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { assertEquals, fail } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals, fail } from "../../../test_util/std/assert/mod.ts"; import { fsync, fsyncSync } from "node:fs"; Deno.test({ diff --git a/tests/unit_node/_fs/_fs_ftruncate_test.ts b/tests/unit_node/_fs/_fs_ftruncate_test.ts index ef59f05777d6a0..6724d33018f017 100644 --- a/tests/unit_node/_fs/_fs_ftruncate_test.ts +++ b/tests/unit_node/_fs/_fs_ftruncate_test.ts @@ -3,7 +3,7 @@ import { assertEquals, assertThrows, fail, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { ftruncate, ftruncateSync } from "node:fs"; Deno.test({ diff --git a/tests/unit_node/_fs/_fs_futimes_test.ts b/tests/unit_node/_fs/_fs_futimes_test.ts index 2bfe0175a5980e..664346e4b5d03d 100644 --- a/tests/unit_node/_fs/_fs_futimes_test.ts +++ b/tests/unit_node/_fs/_fs_futimes_test.ts @@ -3,7 +3,7 @@ import { assertEquals, assertThrows, fail, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { futimes, futimesSync } from "node:fs"; const randomDate = new Date(Date.now() + 1000); diff --git a/tests/unit_node/_fs/_fs_handle_test.ts b/tests/unit_node/_fs/_fs_handle_test.ts index 3e5bb70d5268b4..9c3b708789117a 100644 --- a/tests/unit_node/_fs/_fs_handle_test.ts +++ b/tests/unit_node/_fs/_fs_handle_test.ts @@ -1,8 +1,8 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import * as path from "../../../../test_util/std/path/mod.ts"; +import * as path from "../../../test_util/std/path/mod.ts"; import { Buffer } from "node:buffer"; import * as fs from "node:fs/promises"; -import { assert, assertEquals } from "../../../../test_util/std/assert/mod.ts"; +import { assert, assertEquals } from "../../../test_util/std/assert/mod.ts"; const moduleDir = path.dirname(path.fromFileUrl(import.meta.url)); const testData = path.resolve(moduleDir, "testdata", "hello.txt"); diff --git a/tests/unit_node/_fs/_fs_link_test.ts b/tests/unit_node/_fs/_fs_link_test.ts index 8407a3fd7d8987..1d8df3da63ad99 100644 --- a/tests/unit_node/_fs/_fs_link_test.ts +++ b/tests/unit_node/_fs/_fs_link_test.ts @@ -1,10 +1,10 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import * as path from "../../../../test_util/std/path/mod.ts"; +import * as path from "../../../test_util/std/path/mod.ts"; import { assert, assertEquals, fail, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { link, linkSync } from "node:fs"; diff --git a/tests/unit_node/_fs/_fs_lstat_test.ts b/tests/unit_node/_fs/_fs_lstat_test.ts index d8cda8de45fcf8..d79eeba0f6ea7d 100644 --- a/tests/unit_node/_fs/_fs_lstat_test.ts +++ b/tests/unit_node/_fs/_fs_lstat_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { lstat, lstatSync } from "node:fs"; -import { fail } from "../../../../test_util/std/assert/mod.ts"; +import { fail } from "../../../test_util/std/assert/mod.ts"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { assertStats, assertStatsBigInt } from "./_fs_stat_test.ts"; import type { BigIntStats, Stats } from "node:fs"; diff --git a/tests/unit_node/_fs/_fs_mkdir_test.ts b/tests/unit_node/_fs/_fs_mkdir_test.ts index 51f7e5d1c71ab1..13fa929555c2e9 100644 --- a/tests/unit_node/_fs/_fs_mkdir_test.ts +++ b/tests/unit_node/_fs/_fs_mkdir_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import * as path from "../../../../test_util/std/path/mod.ts"; -import { assert } from "../../../../test_util/std/assert/mod.ts"; +import * as path from "../../../test_util/std/path/mod.ts"; +import { assert } from "../../../test_util/std/assert/mod.ts"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { existsSync, mkdir, mkdirSync } from "node:fs"; diff --git a/tests/unit_node/_fs/_fs_mkdtemp_test.ts b/tests/unit_node/_fs/_fs_mkdtemp_test.ts index fb7340b570d4ef..7de54d9c1153ce 100644 --- a/tests/unit_node/_fs/_fs_mkdtemp_test.ts +++ b/tests/unit_node/_fs/_fs_mkdtemp_test.ts @@ -3,7 +3,7 @@ import { assert, assertRejects, assertThrows, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { EncodingOption, existsSync, mkdtemp, mkdtempSync } from "node:fs"; import { env } from "node:process"; import { promisify } from "node:util"; diff --git a/tests/unit_node/_fs/_fs_open_test.ts b/tests/unit_node/_fs/_fs_open_test.ts index fa79aa68f85970..94ef8b5c1b7f85 100644 --- a/tests/unit_node/_fs/_fs_open_test.ts +++ b/tests/unit_node/_fs/_fs_open_test.ts @@ -13,7 +13,7 @@ import { assertEquals, assertThrows, fail, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { open, openSync } from "node:fs"; import { join, parse } from "node:path"; diff --git a/tests/unit_node/_fs/_fs_opendir_test.ts b/tests/unit_node/_fs/_fs_opendir_test.ts index 24ebc67b344303..10f0d78f5ca131 100644 --- a/tests/unit_node/_fs/_fs_opendir_test.ts +++ b/tests/unit_node/_fs/_fs_opendir_test.ts @@ -6,7 +6,7 @@ import { assertFalse, assertInstanceOf, assertThrows, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { opendir, opendirSync } from "node:fs"; import { Buffer } from "node:buffer"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; diff --git a/tests/unit_node/_fs/_fs_readFile_test.ts b/tests/unit_node/_fs/_fs_readFile_test.ts index 05cb909747f9ec..f488ffbe0625ab 100644 --- a/tests/unit_node/_fs/_fs_readFile_test.ts +++ b/tests/unit_node/_fs/_fs_readFile_test.ts @@ -1,8 +1,8 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { promises, readFile, readFileSync } from "node:fs"; -import * as path from "../../../../test_util/std/path/mod.ts"; -import { assert, assertEquals } from "../../../../test_util/std/assert/mod.ts"; +import * as path from "../../../test_util/std/path/mod.ts"; +import { assert, assertEquals } from "../../../test_util/std/assert/mod.ts"; const moduleDir = path.dirname(path.fromFileUrl(import.meta.url)); const testData = path.resolve(moduleDir, "testdata", "hello.txt"); diff --git a/tests/unit_node/_fs/_fs_read_test.ts b/tests/unit_node/_fs/_fs_read_test.ts index fbd23958dac2c4..9d089da2748690 100644 --- a/tests/unit_node/_fs/_fs_read_test.ts +++ b/tests/unit_node/_fs/_fs_read_test.ts @@ -4,11 +4,11 @@ import { assertFalse, assertMatch, assertStrictEquals, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { read, readSync } from "node:fs"; import { open, openSync } from "node:fs"; import { Buffer } from "node:buffer"; -import * as path from "../../../../test_util/std/path/mod.ts"; +import * as path from "../../../test_util/std/path/mod.ts"; import { closeSync } from "node:fs"; async function readTest( diff --git a/tests/unit_node/_fs/_fs_readdir_test.ts b/tests/unit_node/_fs/_fs_readdir_test.ts index 4d1d371b93be2b..9775003c3a60cc 100644 --- a/tests/unit_node/_fs/_fs_readdir_test.ts +++ b/tests/unit_node/_fs/_fs_readdir_test.ts @@ -3,10 +3,10 @@ import { assertEquals, assertNotEquals, fail, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { readdir, readdirSync } from "node:fs"; -import { join } from "../../../../test_util/std/path/mod.ts"; +import { join } from "../../../test_util/std/path/mod.ts"; Deno.test({ name: "ASYNC: reading empty directory", diff --git a/tests/unit_node/_fs/_fs_readlink_test.ts b/tests/unit_node/_fs/_fs_readlink_test.ts index 0d7c843d4c5a26..a43c80db51f498 100644 --- a/tests/unit_node/_fs/_fs_readlink_test.ts +++ b/tests/unit_node/_fs/_fs_readlink_test.ts @@ -1,8 +1,8 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { readlink, readlinkSync } from "node:fs"; -import { assert, assertEquals } from "../../../../test_util/std/assert/mod.ts"; -import * as path from "../../../../test_util/std/path/mod.ts"; +import { assert, assertEquals } from "../../../test_util/std/assert/mod.ts"; +import * as path from "../../../test_util/std/path/mod.ts"; const testDir = Deno.makeTempDirSync(); const oldname = path.join(testDir, "oldname"); diff --git a/tests/unit_node/_fs/_fs_realpath_test.ts b/tests/unit_node/_fs/_fs_realpath_test.ts index e8723746722c96..88a719825e69e7 100644 --- a/tests/unit_node/_fs/_fs_realpath_test.ts +++ b/tests/unit_node/_fs/_fs_realpath_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import * as path from "../../../../test_util/std/path/mod.ts"; -import { assertEquals } from "../../../../test_util/std/assert/mod.ts"; +import * as path from "../../../test_util/std/path/mod.ts"; +import { assertEquals } from "../../../test_util/std/assert/mod.ts"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { realpath, realpathSync } from "node:fs"; diff --git a/tests/unit_node/_fs/_fs_rename_test.ts b/tests/unit_node/_fs/_fs_rename_test.ts index 699e02fce65a3a..7ccf78ec47da47 100644 --- a/tests/unit_node/_fs/_fs_rename_test.ts +++ b/tests/unit_node/_fs/_fs_rename_test.ts @@ -1,9 +1,9 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { assertEquals, fail } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals, fail } from "../../../test_util/std/assert/mod.ts"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { rename, renameSync } from "node:fs"; import { existsSync } from "node:fs"; -import { join, parse } from "../../../../test_util/std/path/mod.ts"; +import { join, parse } from "../../../test_util/std/path/mod.ts"; Deno.test({ name: "ASYNC: renaming a file", diff --git a/tests/unit_node/_fs/_fs_rm_test.ts b/tests/unit_node/_fs/_fs_rm_test.ts index 881ee1c4f51cac..e13dcdbe3187e1 100644 --- a/tests/unit_node/_fs/_fs_rm_test.ts +++ b/tests/unit_node/_fs/_fs_rm_test.ts @@ -4,10 +4,10 @@ import { assertRejects, assertThrows, fail, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { rm, rmSync } from "node:fs"; import { existsSync } from "node:fs"; -import { join } from "../../../../test_util/std/path/mod.ts"; +import { join } from "../../../test_util/std/path/mod.ts"; Deno.test({ name: "ASYNC: removing empty folder", diff --git a/tests/unit_node/_fs/_fs_rmdir_test.ts b/tests/unit_node/_fs/_fs_rmdir_test.ts index 1fe9e499cd427c..2fc2b19765a0d3 100644 --- a/tests/unit_node/_fs/_fs_rmdir_test.ts +++ b/tests/unit_node/_fs/_fs_rmdir_test.ts @@ -1,8 +1,8 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { assertEquals, fail } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals, fail } from "../../../test_util/std/assert/mod.ts"; import { rmdir, rmdirSync } from "node:fs"; import { existsSync } from "node:fs"; -import { join } from "../../../../test_util/std/path/mod.ts"; +import { join } from "../../../test_util/std/path/mod.ts"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; Deno.test({ diff --git a/tests/unit_node/_fs/_fs_stat_test.ts b/tests/unit_node/_fs/_fs_stat_test.ts index 72bae01b5fa829..0b18692ba8a98a 100644 --- a/tests/unit_node/_fs/_fs_stat_test.ts +++ b/tests/unit_node/_fs/_fs_stat_test.ts @@ -1,7 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { BigIntStats, stat, Stats, statSync } from "node:fs"; -import { assertEquals, fail } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals, fail } from "../../../test_util/std/assert/mod.ts"; export function assertStats(actual: Stats, expected: Deno.FileInfo) { assertEquals(actual.dev, expected.dev); diff --git a/tests/unit_node/_fs/_fs_symlink_test.ts b/tests/unit_node/_fs/_fs_symlink_test.ts index cda42e92af6b98..645eeecff415f8 100644 --- a/tests/unit_node/_fs/_fs_symlink_test.ts +++ b/tests/unit_node/_fs/_fs_symlink_test.ts @@ -3,7 +3,7 @@ import { assert, assertThrows, fail, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { symlink, symlinkSync } from "node:fs"; Deno.test({ diff --git a/tests/unit_node/_fs/_fs_truncate_test.ts b/tests/unit_node/_fs/_fs_truncate_test.ts index ff087095be0204..8d9c1e817e3f7c 100644 --- a/tests/unit_node/_fs/_fs_truncate_test.ts +++ b/tests/unit_node/_fs/_fs_truncate_test.ts @@ -3,7 +3,7 @@ import { assertEquals, assertThrows, fail, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { truncate, truncateSync } from "node:fs"; Deno.test({ diff --git a/tests/unit_node/_fs/_fs_unlink_test.ts b/tests/unit_node/_fs/_fs_unlink_test.ts index 8baba49a4f1a90..829d2558c19849 100644 --- a/tests/unit_node/_fs/_fs_unlink_test.ts +++ b/tests/unit_node/_fs/_fs_unlink_test.ts @@ -1,5 +1,5 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { assertEquals, fail } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals, fail } from "../../../test_util/std/assert/mod.ts"; import { existsSync } from "node:fs"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { unlink, unlinkSync } from "node:fs"; diff --git a/tests/unit_node/_fs/_fs_utimes_test.ts b/tests/unit_node/_fs/_fs_utimes_test.ts index 8a16c057f39e47..4d8242dfabceba 100644 --- a/tests/unit_node/_fs/_fs_utimes_test.ts +++ b/tests/unit_node/_fs/_fs_utimes_test.ts @@ -3,7 +3,7 @@ import { assertEquals, assertThrows, fail, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { utimes, utimesSync } from "node:fs"; const randomDate = new Date(Date.now() + 1000); diff --git a/tests/unit_node/_fs/_fs_watch_test.ts b/tests/unit_node/_fs/_fs_watch_test.ts index 1b1fc79d12a1c0..d8e49672385cc8 100644 --- a/tests/unit_node/_fs/_fs_watch_test.ts +++ b/tests/unit_node/_fs/_fs_watch_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { watch } from "node:fs"; -import { assertEquals } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../../test_util/std/assert/mod.ts"; function wait(time: number) { return new Promise((resolve) => { diff --git a/tests/unit_node/_fs/_fs_writeFile_test.ts b/tests/unit_node/_fs/_fs_writeFile_test.ts index 0bff905946bf5e..b9e319b81fd40d 100644 --- a/tests/unit_node/_fs/_fs_writeFile_test.ts +++ b/tests/unit_node/_fs/_fs_writeFile_test.ts @@ -5,9 +5,9 @@ import { assertNotEquals, assertRejects, assertThrows, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { writeFile, writeFileSync } from "node:fs"; -import * as path from "../../../../test_util/std/path/mod.ts"; +import * as path from "../../../test_util/std/path/mod.ts"; type TextEncodings = | "ascii" diff --git a/tests/unit_node/_fs/_fs_write_test.ts b/tests/unit_node/_fs/_fs_write_test.ts index ef538e9e462ce7..4c3815846951a9 100644 --- a/tests/unit_node/_fs/_fs_write_test.ts +++ b/tests/unit_node/_fs/_fs_write_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { write, writeSync } from "node:fs"; -import { assertEquals } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../../test_util/std/assert/mod.ts"; import { Buffer } from "node:buffer"; const decoder = new TextDecoder("utf-8"); diff --git a/tests/unit_node/_test_utils.ts b/tests/unit_node/_test_utils.ts index 510355647215a0..c680b52d9100ef 100644 --- a/tests/unit_node/_test_utils.ts +++ b/tests/unit_node/_test_utils.ts @@ -3,7 +3,7 @@ import { assert, assertStringIncludes, -} from "../../../test_util/std/assert/mod.ts"; +} from "../../test_util/std/assert/mod.ts"; /** Asserts that an error thrown in a callback will not be wrongly caught. */ export async function assertCallbackErrorUncaught( diff --git a/tests/unit_node/assertion_error_test.ts b/tests/unit_node/assertion_error_test.ts index a4f57c47948525..11458d4194a8a7 100644 --- a/tests/unit_node/assertion_error_test.ts +++ b/tests/unit_node/assertion_error_test.ts @@ -1,9 +1,9 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { stripColor } from "../../../test_util/std/fmt/colors.ts"; +import { stripColor } from "../../test_util/std/fmt/colors.ts"; import { assert, assertStrictEquals, -} from "../../../test_util/std/assert/mod.ts"; +} from "../../test_util/std/assert/mod.ts"; import { AssertionError } from "node:assert"; Deno.test({ diff --git a/tests/unit_node/async_hooks_test.ts b/tests/unit_node/async_hooks_test.ts index 0c64eafe628c98..ce073a8e41a860 100644 --- a/tests/unit_node/async_hooks_test.ts +++ b/tests/unit_node/async_hooks_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { AsyncLocalStorage, AsyncResource } from "node:async_hooks"; -import { assert, assertEquals } from "../../../test_util/std/assert/mod.ts"; +import { assert, assertEquals } from "../../test_util/std/assert/mod.ts"; Deno.test(async function foo() { const asyncLocalStorage = new AsyncLocalStorage(); diff --git a/tests/unit_node/buffer_test.ts b/tests/unit_node/buffer_test.ts index 0fd82c82ad1376..5ff20742e96c68 100644 --- a/tests/unit_node/buffer_test.ts +++ b/tests/unit_node/buffer_test.ts @@ -3,7 +3,7 @@ import { Buffer } from "node:buffer"; import { assertEquals, assertThrows, -} from "../../../test_util/std/assert/mod.ts"; +} from "../../test_util/std/assert/mod.ts"; Deno.test({ name: "[node/buffer] alloc fails if size is not a number", diff --git a/tests/unit_node/child_process_test.ts b/tests/unit_node/child_process_test.ts index 066e45f72248d2..ae9c64cfcb8757 100644 --- a/tests/unit_node/child_process_test.ts +++ b/tests/unit_node/child_process_test.ts @@ -9,8 +9,8 @@ import { assertNotStrictEquals, assertStrictEquals, assertStringIncludes, -} from "../../../test_util/std/assert/mod.ts"; -import * as path from "../../../test_util/std/path/mod.ts"; +} from "../../test_util/std/assert/mod.ts"; +import * as path from "../../test_util/std/path/mod.ts"; const { spawn, spawnSync, execFile, execFileSync, ChildProcess } = CP; diff --git a/tests/unit_node/console_test.ts b/tests/unit_node/console_test.ts index 00765f213a1105..c435db1a096ca5 100644 --- a/tests/unit_node/console_test.ts +++ b/tests/unit_node/console_test.ts @@ -1,8 +1,8 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import vm from "node:vm"; -import { stripColor } from "../../../test_util/std/fmt/colors.ts"; -import { assertStringIncludes } from "../../../test_util/std/assert/mod.ts"; +import { stripColor } from "../../test_util/std/fmt/colors.ts"; +import { assertStringIncludes } from "../../test_util/std/assert/mod.ts"; Deno.test(function inspectCrossRealmObjects() { assertStringIncludes( diff --git a/tests/unit_node/crypto/crypto_cipher_gcm_test.ts b/tests/unit_node/crypto/crypto_cipher_gcm_test.ts index 6c500f9f27d833..1edc08388b02fd 100644 --- a/tests/unit_node/crypto/crypto_cipher_gcm_test.ts +++ b/tests/unit_node/crypto/crypto_cipher_gcm_test.ts @@ -4,7 +4,7 @@ import crypto from "node:crypto"; import { Buffer } from "node:buffer"; import testVectors128 from "./gcmEncryptExtIV128.json" assert { type: "json" }; import testVectors256 from "./gcmEncryptExtIV256.json" assert { type: "json" }; -import { assertEquals } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../../test_util/std/assert/mod.ts"; const aesGcm = (bits: string, key: Uint8Array) => { const ALGO = bits == "128" ? `aes-128-gcm` : `aes-256-gcm`; diff --git a/tests/unit_node/crypto/crypto_cipher_test.ts b/tests/unit_node/crypto/crypto_cipher_test.ts index 7ea361bf6b31df..49f2253984cba0 100644 --- a/tests/unit_node/crypto/crypto_cipher_test.ts +++ b/tests/unit_node/crypto/crypto_cipher_test.ts @@ -6,7 +6,7 @@ import { buffer, text } from "node:stream/consumers"; import { assertEquals, assertThrows, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; const rsaPrivateKey = Deno.readTextFileSync( new URL("../testdata/rsa_private.pem", import.meta.url), diff --git a/tests/unit_node/crypto/crypto_hash_test.ts b/tests/unit_node/crypto/crypto_hash_test.ts index e1bb4de8a61407..3c21f1bf27b532 100644 --- a/tests/unit_node/crypto/crypto_hash_test.ts +++ b/tests/unit_node/crypto/crypto_hash_test.ts @@ -8,7 +8,7 @@ import { } from "node:crypto"; import { Buffer } from "node:buffer"; import { Readable } from "node:stream"; -import { assert, assertEquals } from "../../../../test_util/std/assert/mod.ts"; +import { assert, assertEquals } from "../../../test_util/std/assert/mod.ts"; // https://github.com/denoland/deno/issues/18140 Deno.test({ diff --git a/tests/unit_node/crypto/crypto_key_test.ts b/tests/unit_node/crypto/crypto_key_test.ts index 3ad195df1a80b0..47518ebfaec169 100644 --- a/tests/unit_node/crypto/crypto_key_test.ts +++ b/tests/unit_node/crypto/crypto_key_test.ts @@ -14,7 +14,7 @@ import { Buffer } from "node:buffer"; import { assertEquals, assertThrows, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { createHmac } from "node:crypto"; const RUN_SLOW_TESTS = Deno.env.get("SLOW_TESTS") === "1"; diff --git a/tests/unit_node/crypto/crypto_sign_test.ts b/tests/unit_node/crypto/crypto_sign_test.ts index 000f2311a30225..dc4586472e9586 100644 --- a/tests/unit_node/crypto/crypto_sign_test.ts +++ b/tests/unit_node/crypto/crypto_sign_test.ts @@ -3,7 +3,7 @@ import { assert, assertEquals, -} from "../../../../test_util/std/testing/asserts.ts"; +} from "../../../test_util/std/testing/asserts.ts"; import { createSign, createVerify, sign, verify } from "node:crypto"; import { Buffer } from "node:buffer"; diff --git a/tests/unit_node/dgram_test.ts b/tests/unit_node/dgram_test.ts index d532241f51193a..dc938ad8d9b86f 100644 --- a/tests/unit_node/dgram_test.ts +++ b/tests/unit_node/dgram_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { assertEquals } from "../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../test_util/std/assert/mod.ts"; import { execCode } from "../unit/test_util.ts"; import { createSocket } from "node:dgram"; diff --git a/tests/unit_node/fs_test.ts b/tests/unit_node/fs_test.ts index 6766c59280bce0..9b203c69e81c51 100644 --- a/tests/unit_node/fs_test.ts +++ b/tests/unit_node/fs_test.ts @@ -4,7 +4,7 @@ import { assert, assertEquals, assertThrows, -} from "../../../test_util/std/assert/mod.ts"; +} from "../../test_util/std/assert/mod.ts"; import { join } from "node:path"; import { tmpdir } from "node:os"; import { diff --git a/tests/unit_node/http2_test.ts b/tests/unit_node/http2_test.ts index 4972a31d9c2481..dbafa591bc1e85 100644 --- a/tests/unit_node/http2_test.ts +++ b/tests/unit_node/http2_test.ts @@ -2,7 +2,7 @@ import * as http2 from "node:http2"; import * as net from "node:net"; -import { assertEquals } from "../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../test_util/std/assert/mod.ts"; for (const url of ["http://127.0.0.1:4246", "https://127.0.0.1:4247"]) { Deno.test(`[node/http2 client] ${url}`, { diff --git a/tests/unit_node/http_test.ts b/tests/unit_node/http_test.ts index 7b2012471a71cc..076e9cd31467b7 100644 --- a/tests/unit_node/http_test.ts +++ b/tests/unit_node/http_test.ts @@ -7,12 +7,12 @@ import { assert, assertEquals, fail, -} from "../../../test_util/std/assert/mod.ts"; -import { assertSpyCalls, spy } from "../../../test_util/std/testing/mock.ts"; +} from "../../test_util/std/assert/mod.ts"; +import { assertSpyCalls, spy } from "../../test_util/std/testing/mock.ts"; import { gzip } from "node:zlib"; import { Buffer } from "node:buffer"; -import { serve } from "../../../test_util/std/http/server.ts"; +import { serve } from "../../test_util/std/http/server.ts"; import { execCode } from "../unit/test_util.ts"; Deno.test("[node/http listen]", async () => { diff --git a/tests/unit_node/internal/_randomBytes_test.ts b/tests/unit_node/internal/_randomBytes_test.ts index 8b8b0a99a28891..dc7567541c8b8b 100644 --- a/tests/unit_node/internal/_randomBytes_test.ts +++ b/tests/unit_node/internal/_randomBytes_test.ts @@ -4,7 +4,7 @@ import { assertEquals, assertRejects, assertThrows, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; import { assertCallbackErrorUncaught } from "../_test_utils.ts"; import { pseudoRandomBytes, randomBytes } from "node:crypto"; diff --git a/tests/unit_node/internal/_randomFill_test.ts b/tests/unit_node/internal/_randomFill_test.ts index c15b5a8a1818d5..034267744e7fac 100644 --- a/tests/unit_node/internal/_randomFill_test.ts +++ b/tests/unit_node/internal/_randomFill_test.ts @@ -5,7 +5,7 @@ import { assertEquals, assertNotEquals, assertThrows, -} from "../../../../test_util/std/assert/mod.ts"; +} from "../../../test_util/std/assert/mod.ts"; const validateNonZero = (buf: Buffer) => { if (!buf.some((ch) => ch > 0)) throw new Error("Error"); diff --git a/tests/unit_node/internal/_randomInt_test.ts b/tests/unit_node/internal/_randomInt_test.ts index caa7277d162f97..bc59d33145a4b2 100644 --- a/tests/unit_node/internal/_randomInt_test.ts +++ b/tests/unit_node/internal/_randomInt_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { randomInt } from "node:crypto"; -import { assert, assertThrows } from "../../../../test_util/std/assert/mod.ts"; +import { assert, assertThrows } from "../../../test_util/std/assert/mod.ts"; const between = (x: number, min: number, max: number) => x >= min && x < max; diff --git a/tests/unit_node/internal/pbkdf2_test.ts b/tests/unit_node/internal/pbkdf2_test.ts index 5e68ac01cfb390..2a6302decb296b 100644 --- a/tests/unit_node/internal/pbkdf2_test.ts +++ b/tests/unit_node/internal/pbkdf2_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { pbkdf2, pbkdf2Sync } from "node:crypto"; -import { assert, assertEquals } from "../../../../test_util/std/assert/mod.ts"; +import { assert, assertEquals } from "../../../test_util/std/assert/mod.ts"; type Algorithms = | "md5" diff --git a/tests/unit_node/internal/scrypt_test.ts b/tests/unit_node/internal/scrypt_test.ts index 68eb51dc2bc2fb..23b3b8d2fd80c9 100644 --- a/tests/unit_node/internal/scrypt_test.ts +++ b/tests/unit_node/internal/scrypt_test.ts @@ -1,7 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { scrypt, scryptSync } from "node:crypto"; import { Buffer } from "node:buffer"; -import { assertEquals } from "../../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../../test_util/std/assert/mod.ts"; Deno.test("scrypt works correctly", async () => { const { promise, resolve } = Promise.withResolvers(); diff --git a/tests/unit_node/module_test.ts b/tests/unit_node/module_test.ts index 05edc5c41c4d06..8e3c9eb2681e06 100644 --- a/tests/unit_node/module_test.ts +++ b/tests/unit_node/module_test.ts @@ -1,7 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { createRequire, Module } from "node:module"; -import { assert, assertEquals } from "../../../test_util/std/assert/mod.ts"; +import { assert, assertEquals } from "../../test_util/std/assert/mod.ts"; import process from "node:process"; import * as path from "node:path"; diff --git a/tests/unit_node/net_test.ts b/tests/unit_node/net_test.ts index cd4854ab1cd01a..2e7579d05d8522 100644 --- a/tests/unit_node/net_test.ts +++ b/tests/unit_node/net_test.ts @@ -1,8 +1,8 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import * as net from "node:net"; -import { assert, assertEquals } from "../../../test_util/std/assert/mod.ts"; -import * as path from "../../../test_util/std/path/mod.ts"; +import { assert, assertEquals } from "../../test_util/std/assert/mod.ts"; +import * as path from "../../test_util/std/path/mod.ts"; import * as http from "node:http"; Deno.test("[node/net] close event emits after error event", async () => { diff --git a/tests/unit_node/os_test.ts b/tests/unit_node/os_test.ts index f4da8d030f6cde..ae7db7c49ec945 100644 --- a/tests/unit_node/os_test.ts +++ b/tests/unit_node/os_test.ts @@ -7,7 +7,7 @@ import { assertEquals, assertNotEquals, assertThrows, -} from "../../../test_util/std/assert/mod.ts"; +} from "../../test_util/std/assert/mod.ts"; Deno.test({ name: "build architecture is a string", diff --git a/tests/unit_node/path_test.ts b/tests/unit_node/path_test.ts index 0c50f0da15c618..46acaebef3383c 100644 --- a/tests/unit_node/path_test.ts +++ b/tests/unit_node/path_test.ts @@ -4,7 +4,7 @@ import path from "node:path"; import posix from "node:path/posix"; import win32 from "node:path/win32"; -import { assertStrictEquals } from "../../../test_util/std/assert/mod.ts"; +import { assertStrictEquals } from "../../test_util/std/assert/mod.ts"; Deno.test("[node/path] posix and win32 objects", () => { assertStrictEquals(path.posix, posix); diff --git a/tests/unit_node/perf_hooks_test.ts b/tests/unit_node/perf_hooks_test.ts index 6e25444e481ded..5439ce6ae29206 100644 --- a/tests/unit_node/perf_hooks_test.ts +++ b/tests/unit_node/perf_hooks_test.ts @@ -4,7 +4,7 @@ import { performance } from "node:perf_hooks"; import { assertEquals, assertThrows, -} from "../../../test_util/std/assert/mod.ts"; +} from "../../test_util/std/assert/mod.ts"; Deno.test({ name: "[perf_hooks] performance", diff --git a/tests/unit_node/process_test.ts b/tests/unit_node/process_test.ts index 21f873260e14b8..d789ffce64435f 100644 --- a/tests/unit_node/process_test.ts +++ b/tests/unit_node/process_test.ts @@ -11,10 +11,10 @@ import { assertObjectMatch, assertStrictEquals, assertThrows, -} from "../../../test_util/std/assert/mod.ts"; -import { stripColor } from "../../../test_util/std/fmt/colors.ts"; -import * as path from "../../../test_util/std/path/mod.ts"; -import { delay } from "../../../test_util/std/async/delay.ts"; +} from "../../test_util/std/assert/mod.ts"; +import { stripColor } from "../../test_util/std/fmt/colors.ts"; +import * as path from "../../test_util/std/path/mod.ts"; +import { delay } from "../../test_util/std/async/delay.ts"; const testDir = new URL(".", import.meta.url); diff --git a/tests/unit_node/querystring_test.ts b/tests/unit_node/querystring_test.ts index ce2747db2bf9e2..d52642fa95e309 100644 --- a/tests/unit_node/querystring_test.ts +++ b/tests/unit_node/querystring_test.ts @@ -1,5 +1,5 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { assertEquals } from "../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../test_util/std/assert/mod.ts"; import { parse, stringify } from "node:querystring"; Deno.test({ diff --git a/tests/unit_node/readline_test.ts b/tests/unit_node/readline_test.ts index 9bdd96cc82bcbe..44713625ac2803 100644 --- a/tests/unit_node/readline_test.ts +++ b/tests/unit_node/readline_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { createInterface, Interface } from "node:readline"; -import { assertInstanceOf } from "../../../test_util/std/assert/mod.ts"; +import { assertInstanceOf } from "../../test_util/std/assert/mod.ts"; import { Readable, Writable } from "node:stream"; Deno.test("[node/readline] createInstance", () => { diff --git a/tests/unit_node/repl_test.ts b/tests/unit_node/repl_test.ts index cebc7c23c27d71..ff3e18e1a569d6 100644 --- a/tests/unit_node/repl_test.ts +++ b/tests/unit_node/repl_test.ts @@ -2,7 +2,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import repl from "node:repl"; -import { assert } from "../../../test_util/std/assert/mod.ts"; +import { assert } from "../../test_util/std/assert/mod.ts"; Deno.test({ name: "repl module exports", diff --git a/tests/unit_node/stream_test.ts b/tests/unit_node/stream_test.ts index b50d45c1dbba01..50fc4798827600 100644 --- a/tests/unit_node/stream_test.ts +++ b/tests/unit_node/stream_test.ts @@ -1,7 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { assert } from "../../../test_util/std/assert/mod.ts"; -import { fromFileUrl, relative } from "../../../test_util/std/path/mod.ts"; +import { assert } from "../../test_util/std/assert/mod.ts"; +import { fromFileUrl, relative } from "../../test_util/std/path/mod.ts"; import { pipeline } from "node:stream/promises"; import { createReadStream, createWriteStream } from "node:fs"; diff --git a/tests/unit_node/string_decoder_test.ts b/tests/unit_node/string_decoder_test.ts index 406fe57a6abbdd..f43ab220af1ee5 100644 --- a/tests/unit_node/string_decoder_test.ts +++ b/tests/unit_node/string_decoder_test.ts @@ -1,5 +1,5 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { assertEquals } from "../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../test_util/std/assert/mod.ts"; import { Buffer } from "node:buffer"; import { StringDecoder } from "node:string_decoder"; diff --git a/tests/unit_node/timers_test.ts b/tests/unit_node/timers_test.ts index 40b70372ab9312..e253b7fe5e97c9 100644 --- a/tests/unit_node/timers_test.ts +++ b/tests/unit_node/timers_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { assert, fail } from "../../../test_util/std/assert/mod.ts"; +import { assert, fail } from "../../test_util/std/assert/mod.ts"; import * as timers from "node:timers"; import * as timersPromises from "node:timers/promises"; diff --git a/tests/unit_node/tls_test.ts b/tests/unit_node/tls_test.ts index 3e6a892bd47b15..feb05de3d1fbee 100644 --- a/tests/unit_node/tls_test.ts +++ b/tests/unit_node/tls_test.ts @@ -3,10 +3,10 @@ import { assertEquals, assertInstanceOf, -} from "../../../test_util/std/assert/mod.ts"; -import { delay } from "../../../test_util/std/async/delay.ts"; -import { fromFileUrl, join } from "../../../test_util/std/path/mod.ts"; -import { serveTls } from "../../../test_util/std/http/server.ts"; +} from "../../test_util/std/assert/mod.ts"; +import { delay } from "../../test_util/std/async/delay.ts"; +import { fromFileUrl, join } from "../../test_util/std/path/mod.ts"; +import { serveTls } from "../../test_util/std/http/server.ts"; import * as tls from "node:tls"; import * as net from "node:net"; import * as stream from "node:stream"; diff --git a/tests/unit_node/tty_test.ts b/tests/unit_node/tty_test.ts index f72eb088b87f56..65a3acdc103dcc 100644 --- a/tests/unit_node/tty_test.ts +++ b/tests/unit_node/tty_test.ts @@ -1,7 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. // deno-lint-ignore-file no-explicit-any -import { assert } from "../../../test_util/std/assert/mod.ts"; +import { assert } from "../../test_util/std/assert/mod.ts"; import { isatty } from "node:tty"; import process from "node:process"; diff --git a/tests/unit_node/util_test.ts b/tests/unit_node/util_test.ts index a88128ee93edfb..b6eca63f065804 100644 --- a/tests/unit_node/util_test.ts +++ b/tests/unit_node/util_test.ts @@ -5,8 +5,8 @@ import { assertEquals, assertStrictEquals, assertThrows, -} from "../../../test_util/std/assert/mod.ts"; -import { stripColor } from "../../../test_util/std/fmt/colors.ts"; +} from "../../test_util/std/assert/mod.ts"; +import { stripColor } from "../../test_util/std/fmt/colors.ts"; import * as util from "node:util"; import { Buffer } from "node:buffer"; diff --git a/tests/unit_node/v8_test.ts b/tests/unit_node/v8_test.ts index f54ec72f6d4f3e..ab0191254d6fd2 100644 --- a/tests/unit_node/v8_test.ts +++ b/tests/unit_node/v8_test.ts @@ -4,7 +4,7 @@ import { getHeapStatistics, setFlagsFromString, } from "node:v8"; -import { assertEquals } from "../../../test_util/std/assert/mod.ts"; +import { assertEquals } from "../../test_util/std/assert/mod.ts"; // https://github.com/nodejs/node/blob/a2bbe5ff216bc28f8dac1c36a8750025a93c3827/test/parallel/test-v8-version-tag.js#L6 Deno.test({ diff --git a/tests/unit_node/vm_test.ts b/tests/unit_node/vm_test.ts index 83d169deb1edd3..0ce9404042f951 100644 --- a/tests/unit_node/vm_test.ts +++ b/tests/unit_node/vm_test.ts @@ -3,7 +3,7 @@ import { isContext, runInNewContext } from "node:vm"; import { assertEquals, assertThrows, -} from "../../../test_util/std/assert/mod.ts"; +} from "../../test_util/std/assert/mod.ts"; Deno.test({ name: "vm runInNewContext", diff --git a/tests/unit_node/worker_threads_test.ts b/tests/unit_node/worker_threads_test.ts index b11361ad34037a..a2e293af765dcb 100644 --- a/tests/unit_node/worker_threads_test.ts +++ b/tests/unit_node/worker_threads_test.ts @@ -4,8 +4,8 @@ import { assert, assertEquals, assertObjectMatch, -} from "../../../test_util/std/assert/mod.ts"; -import { fromFileUrl, relative } from "../../../test_util/std/path/mod.ts"; +} from "../../test_util/std/assert/mod.ts"; +import { fromFileUrl, relative } from "../../test_util/std/path/mod.ts"; import * as workerThreads from "node:worker_threads"; import { EventEmitter, once } from "node:events"; diff --git a/tests/unit_node/zlib_test.ts b/tests/unit_node/zlib_test.ts index fa94493c134364..53a588f83a2be2 100644 --- a/tests/unit_node/zlib_test.ts +++ b/tests/unit_node/zlib_test.ts @@ -1,7 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -import { assert, assertEquals } from "../../../test_util/std/assert/mod.ts"; -import { fromFileUrl, relative } from "../../../test_util/std/path/mod.ts"; +import { assert, assertEquals } from "../../test_util/std/assert/mod.ts"; +import { fromFileUrl, relative } from "../../test_util/std/path/mod.ts"; import { brotliCompress, brotliCompressSync,