From 6abf126c2a7a451cded8c6b5e6ddf1b69c84055d Mon Sep 17 00:00:00 2001 From: Casper Beyer Date: Tue, 2 Feb 2021 19:05:46 +0800 Subject: chore: remove std directory (#9361) This removes the std folder from the tree. Various parts of the tests are pretty tightly dependent on std (47 direct imports and 75 indirect imports, not counting the cli tests that use them as fixtures) so I've added std as a submodule for now. --- cli/tests/unit/blob_test.ts | 4 ++-- cli/tests/unit/console_test.ts | 2 +- cli/tests/unit/test_util.ts | 17 ++++++++++------- cli/tests/unit/tls_test.ts | 4 ++-- 4 files changed, 15 insertions(+), 12 deletions(-) (limited to 'cli/tests/unit') diff --git a/cli/tests/unit/blob_test.ts b/cli/tests/unit/blob_test.ts index 210d05b3b..a3a8e06fd 100644 --- a/cli/tests/unit/blob_test.ts +++ b/cli/tests/unit/blob_test.ts @@ -1,7 +1,7 @@ // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license. import { assert, assertEquals, unitTest } from "./test_util.ts"; -import { concat } from "../../../std/bytes/mod.ts"; -import { decode } from "../../../std/encoding/utf8.ts"; +import { concat } from "../../../test_util/std/bytes/mod.ts"; +import { decode } from "../../../test_util/std/encoding/utf8.ts"; unitTest(function blobString(): void { const b1 = new Blob(["Hello World"]); diff --git a/cli/tests/unit/console_test.ts b/cli/tests/unit/console_test.ts index 64345be84..fc23b1d70 100644 --- a/cli/tests/unit/console_test.ts +++ b/cli/tests/unit/console_test.ts @@ -15,7 +15,7 @@ import { assertThrows, unitTest, } from "./test_util.ts"; -import { stripColor } from "../../../std/fmt/colors.ts"; +import { stripColor } from "../../../test_util/std/fmt/colors.ts"; const customInspect = Deno.customInspect; const { diff --git a/cli/tests/unit/test_util.ts b/cli/tests/unit/test_util.ts index 7dae86dfb..6c3c0c6a0 100644 --- a/cli/tests/unit/test_util.ts +++ b/cli/tests/unit/test_util.ts @@ -1,9 +1,12 @@ // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license. -import { assert, assertEquals } from "../../../std/testing/asserts.ts"; -import * as colors from "../../../std/fmt/colors.ts"; +import { + assert, + assertEquals, +} from "../../../test_util/std/testing/asserts.ts"; +import * as colors from "../../../test_util/std/fmt/colors.ts"; export { colors }; -import { resolve } from "../../../std/path/mod.ts"; +import { resolve } from "../../../test_util/std/path/mod.ts"; export { assert, assertEquals, @@ -15,10 +18,10 @@ export { assertThrowsAsync, fail, unreachable, -} from "../../../std/testing/asserts.ts"; -export { deferred } from "../../../std/async/deferred.ts"; -export { readLines } from "../../../std/io/bufio.ts"; -export { parse as parseArgs } from "../../../std/flags/mod.ts"; +} from "../../../test_util/std/testing/asserts.ts"; +export { deferred } from "../../../test_util/std/async/deferred.ts"; +export { readLines } from "../../../test_util/std/io/bufio.ts"; +export { parse as parseArgs } from "../../../test_util/std/flags/mod.ts"; export interface Permissions { read: boolean; diff --git a/cli/tests/unit/tls_test.ts b/cli/tests/unit/tls_test.ts index 3a42ce4dd..ba1f067de 100644 --- a/cli/tests/unit/tls_test.ts +++ b/cli/tests/unit/tls_test.ts @@ -8,8 +8,8 @@ import { deferred, unitTest, } from "./test_util.ts"; -import { BufReader, BufWriter } from "../../../std/io/bufio.ts"; -import { TextProtoReader } from "../../../std/textproto/mod.ts"; +import { BufReader, BufWriter } from "../../../test_util/std/io/bufio.ts"; +import { TextProtoReader } from "../../../test_util/std/textproto/mod.ts"; const encoder = new TextEncoder(); const decoder = new TextDecoder(); -- cgit v1.2.3