From 6be389ce291317346b2085231813cccd0e501daf Mon Sep 17 00:00:00 2001 From: Asher Gomez Date: Wed, 14 Feb 2024 03:22:49 +1100 Subject: chore: move `test_util/std` to `tests/util/std` (#22402) Note: tests are not the only part of the codebase that uses `std`. Other parts, like `tools/`, do too. So, it could be argued that this is a little misleading. Either way, I'm doing this as discussed with @mmastrac. --- tests/testdata/run/045_proxy_test.ts | 4 ++-- tests/testdata/run/import_meta/main.ts | 2 +- tests/testdata/run/onload/imported.ts | 2 +- tests/testdata/run/onload/main.ts | 2 +- tests/testdata/run/onload/nest_imported.ts | 2 +- tests/testdata/run/textproto.ts | 4 ++-- tests/testdata/run/tls_connecttls.js | 4 ++-- tests/testdata/run/tls_starttls.js | 6 +++--- tests/testdata/run/websocket_server_idletimeout.ts | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tests/testdata/run') diff --git a/tests/testdata/run/045_proxy_test.ts b/tests/testdata/run/045_proxy_test.ts index 1929ed6bc..fcb898c77 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 "../../../tests/util/std/http/server.ts"; +import { assertEquals } from "../../../tests/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 61880e2c1..384a9232e 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 "../../../../tests/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 d2a93c8d2..5c412bd43 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 "../../../../tests/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 990a21131..e3eae99fa 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 "../../../../tests/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 2151f4185..61af36e0a 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 "../../../../tests/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 cf9a4dce9..7297fc446 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 "../../../tests/util/std/io/buf_reader.ts"; +import { concat } from "../../../tests/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 f085d7a8f..b3cc3f339 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 "../../../tests/util/std/assert/mod.ts"; +import { BufReader, BufWriter } from "../../../tests/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 5f5428ecd..ebe0d0725 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 "../../../tests/util/std/assert/mod.ts"; +import { BufReader } from "../../../tests/util/std/io/buf_reader.ts"; +import { BufWriter } from "../../../tests/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 f116c4556..85b031b8e 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 "../../../tests/util/std/assert/mod.ts"; const errorDeferred = Promise.withResolvers(); const closeDeferred = Promise.withResolvers(); -- cgit v1.2.3