update paths

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);

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

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");

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,

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",

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",

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];

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]),

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");
 

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";

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", () => {

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);

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);

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);

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";

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) });

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";
 

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";
 

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) => {

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"));

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);

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);

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();

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();

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<void>();
 const closeDeferred = Promise.withResolvers<void>();

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"));

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/#"));

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",

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",

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();

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") {

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",

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"]);

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");

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 {

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;
 

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);

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;

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;
 

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));
 

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();

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,

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);

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();

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");

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",