From f5e46c9bf2f50d66a953fa133161fc829cecff06 Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Sat, 10 Feb 2024 13:22:13 -0700 Subject: chore: move cli/tests/ -> tests/ (#22369) This looks like a massive PR, but it's only a move from cli/tests -> tests, and updates of relative paths for files. This is the first step towards aggregate all of the integration test files under tests/, which will lead to a set of integration tests that can run without the CLI binary being built. While we could leave these tests under `cli`, it would require us to keep a more complex directory structure for the various test runners. In addition, we have a lot of complexity to ignore various test files in the `cli` project itself (cargo publish exclusion rules, autotests = false, etc). And finally, the `tests/` folder will eventually house the `test_ffi`, `test_napi` and other testing code, reducing the size of the root repo directory. For easier review, the extremely large and noisy "move" is in the first commit (with no changes -- just a move), while the remainder of the changes to actual files is in the second commit. --- .../jsr/registry/@denotest/add/1.0.0/mod.ts | 3 +++ .../jsr/registry/@denotest/add/1.0.0_meta.json | 8 ++++++++ .../testdata/jsr/registry/@denotest/add/meta.json | 5 +++++ .../jsr/registry/@denotest/deps/1.0.0/mod.ts | 7 +++++++ .../jsr/registry/@denotest/deps/1.0.0_meta.json | 22 ++++++++++++++++++++++ .../testdata/jsr/registry/@denotest/deps/meta.json | 5 +++++ .../registry/@denotest/module_graph/1.4.0/mod.ts | 5 +++++ .../registry/@denotest/module_graph/1.4.0/other.ts | 2 ++ .../@denotest/module_graph/1.4.0_meta.json | 18 ++++++++++++++++++ .../jsr/registry/@denotest/module_graph/meta.json | 6 ++++++ .../@denotest/no_module_graph/0.1.0/TestClass.ts | 1 + .../@denotest/no_module_graph/0.1.0/mod.ts | 3 +++ .../@denotest/no_module_graph/0.1.0_meta.json | 5 +++++ .../@denotest/no_module_graph/0.1.1/TestClass.ts | 1 + .../@denotest/no_module_graph/0.1.1/mod.ts | 3 +++ .../@denotest/no_module_graph/0.1.1_meta.json | 5 +++++ .../@denotest/no_module_graph/0.2.0/TestClass.ts | 1 + .../@denotest/no_module_graph/0.2.0/mod.ts | 3 +++ .../@denotest/no_module_graph/0.2.0_meta.json | 5 +++++ .../registry/@denotest/no_module_graph/meta.json | 7 +++++++ .../@denotest/subset_type_graph/0.1.0/mod.ts | 17 +++++++++++++++++ .../@denotest/subset_type_graph/0.1.0_meta.json | 5 +++++ .../registry/@denotest/subset_type_graph/meta.json | 5 +++++ .../subset_type_graph_invalid/0.1.0/mod.ts | 12 ++++++++++++ .../subset_type_graph_invalid/0.1.0_meta.json | 5 +++++ .../@denotest/subset_type_graph_invalid/meta.json | 5 +++++ 26 files changed, 164 insertions(+) create mode 100644 tests/testdata/jsr/registry/@denotest/add/1.0.0/mod.ts create mode 100644 tests/testdata/jsr/registry/@denotest/add/1.0.0_meta.json create mode 100644 tests/testdata/jsr/registry/@denotest/add/meta.json create mode 100644 tests/testdata/jsr/registry/@denotest/deps/1.0.0/mod.ts create mode 100644 tests/testdata/jsr/registry/@denotest/deps/1.0.0_meta.json create mode 100644 tests/testdata/jsr/registry/@denotest/deps/meta.json create mode 100644 tests/testdata/jsr/registry/@denotest/module_graph/1.4.0/mod.ts create mode 100644 tests/testdata/jsr/registry/@denotest/module_graph/1.4.0/other.ts create mode 100644 tests/testdata/jsr/registry/@denotest/module_graph/1.4.0_meta.json create mode 100644 tests/testdata/jsr/registry/@denotest/module_graph/meta.json create mode 100644 tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0/TestClass.ts create mode 100644 tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0/mod.ts create mode 100644 tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0_meta.json create mode 100644 tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1/TestClass.ts create mode 100644 tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1/mod.ts create mode 100644 tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1_meta.json create mode 100644 tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0/TestClass.ts create mode 100644 tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0/mod.ts create mode 100644 tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0_meta.json create mode 100644 tests/testdata/jsr/registry/@denotest/no_module_graph/meta.json create mode 100644 tests/testdata/jsr/registry/@denotest/subset_type_graph/0.1.0/mod.ts create mode 100644 tests/testdata/jsr/registry/@denotest/subset_type_graph/0.1.0_meta.json create mode 100644 tests/testdata/jsr/registry/@denotest/subset_type_graph/meta.json create mode 100644 tests/testdata/jsr/registry/@denotest/subset_type_graph_invalid/0.1.0/mod.ts create mode 100644 tests/testdata/jsr/registry/@denotest/subset_type_graph_invalid/0.1.0_meta.json create mode 100644 tests/testdata/jsr/registry/@denotest/subset_type_graph_invalid/meta.json (limited to 'tests/testdata/jsr/registry') diff --git a/tests/testdata/jsr/registry/@denotest/add/1.0.0/mod.ts b/tests/testdata/jsr/registry/@denotest/add/1.0.0/mod.ts new file mode 100644 index 000000000..8d9b8a22a --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/add/1.0.0/mod.ts @@ -0,0 +1,3 @@ +export function add(a: number, b: number): number { + return a + b; +} diff --git a/tests/testdata/jsr/registry/@denotest/add/1.0.0_meta.json b/tests/testdata/jsr/registry/@denotest/add/1.0.0_meta.json new file mode 100644 index 000000000..6eebe2198 --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/add/1.0.0_meta.json @@ -0,0 +1,8 @@ +{ + "exports": { + ".": "./mod.ts" + }, + "moduleGraph1": { + "/mod.ts": {} + } +} diff --git a/tests/testdata/jsr/registry/@denotest/add/meta.json b/tests/testdata/jsr/registry/@denotest/add/meta.json new file mode 100644 index 000000000..02601e4d0 --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/add/meta.json @@ -0,0 +1,5 @@ +{ + "versions": { + "1.0.0": {} + } +} diff --git a/tests/testdata/jsr/registry/@denotest/deps/1.0.0/mod.ts b/tests/testdata/jsr/registry/@denotest/deps/1.0.0/mod.ts new file mode 100644 index 000000000..4ba0d8aaf --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/deps/1.0.0/mod.ts @@ -0,0 +1,7 @@ +import { Other } from "jsr:@denotest/module_graph@1/other"; +import version from "jsr:@denotest/no_module_graph@^0.1"; + +export default { + version, + other: new Other(), +}; diff --git a/tests/testdata/jsr/registry/@denotest/deps/1.0.0_meta.json b/tests/testdata/jsr/registry/@denotest/deps/1.0.0_meta.json new file mode 100644 index 000000000..914e4bd73 --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/deps/1.0.0_meta.json @@ -0,0 +1,22 @@ +{ + "exports": { + ".": "./mod.ts" + }, + "moduleGraph1": { + "/mod.ts": { + "dependencies": [{ + "type": "static", + "kind": "import", + "range": [[0, 0], [0, 59]], + "specifier": "jsr:@denotest/module_graph@1/other", + "specifierRange": [[0, 22], [0, 58]] + }, { + "type": "static", + "kind": "import", + "range": [[1, 0], [1, 57]], + "specifier": "jsr:@denotest/no_module_graph@^0.1", + "specifierRange": [[1, 20], [1, 56]] + }] + } + } +} diff --git a/tests/testdata/jsr/registry/@denotest/deps/meta.json b/tests/testdata/jsr/registry/@denotest/deps/meta.json new file mode 100644 index 000000000..02601e4d0 --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/deps/meta.json @@ -0,0 +1,5 @@ +{ + "versions": { + "1.0.0": {} + } +} diff --git a/tests/testdata/jsr/registry/@denotest/module_graph/1.4.0/mod.ts b/tests/testdata/jsr/registry/@denotest/module_graph/1.4.0/mod.ts new file mode 100644 index 000000000..cb3c4a5e0 --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/module_graph/1.4.0/mod.ts @@ -0,0 +1,5 @@ +import { Other } from "./other.ts"; + +export class Test { + other = new Other(); +} diff --git a/tests/testdata/jsr/registry/@denotest/module_graph/1.4.0/other.ts b/tests/testdata/jsr/registry/@denotest/module_graph/1.4.0/other.ts new file mode 100644 index 000000000..57e436cf8 --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/module_graph/1.4.0/other.ts @@ -0,0 +1,2 @@ +export class Other { +} diff --git a/tests/testdata/jsr/registry/@denotest/module_graph/1.4.0_meta.json b/tests/testdata/jsr/registry/@denotest/module_graph/1.4.0_meta.json new file mode 100644 index 000000000..ff105b58a --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/module_graph/1.4.0_meta.json @@ -0,0 +1,18 @@ +{ + "exports": { + ".": "./mod.ts", + "./other": "./other.ts" + }, + "moduleGraph1": { + "/mod.ts": { + "dependencies": [{ + "kind": "import", + "type": "static", + "range": [[0, 0], [0, 35]], + "specifier": "./other.ts", + "specifierRange": [[0, 22], [0, 34]] + }] + }, + "/other.ts": {} + } +} diff --git a/tests/testdata/jsr/registry/@denotest/module_graph/meta.json b/tests/testdata/jsr/registry/@denotest/module_graph/meta.json new file mode 100644 index 000000000..9a450c08b --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/module_graph/meta.json @@ -0,0 +1,6 @@ +{ + "versions": { + "1.0.0": {}, + "1.4.0": {} + } +} diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0/TestClass.ts b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0/TestClass.ts new file mode 100644 index 000000000..88ac04c12 --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0/TestClass.ts @@ -0,0 +1 @@ +export default class TestClass {} diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0/mod.ts b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0/mod.ts new file mode 100644 index 000000000..57600eb4b --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0/mod.ts @@ -0,0 +1,3 @@ +export default "0.1.0"; + +export { default as TestClass } from "./TestClass.ts"; diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0_meta.json b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0_meta.json new file mode 100644 index 000000000..631a18d0e --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0_meta.json @@ -0,0 +1,5 @@ +{ + "exports": { + ".": "./mod.ts" + } +} diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1/TestClass.ts b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1/TestClass.ts new file mode 100644 index 000000000..88ac04c12 --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1/TestClass.ts @@ -0,0 +1 @@ +export default class TestClass {} diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1/mod.ts b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1/mod.ts new file mode 100644 index 000000000..5e1fd9435 --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1/mod.ts @@ -0,0 +1,3 @@ +export default "0.1.1"; + +export { default as TestClass } from "./TestClass.ts"; diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1_meta.json b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1_meta.json new file mode 100644 index 000000000..631a18d0e --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1_meta.json @@ -0,0 +1,5 @@ +{ + "exports": { + ".": "./mod.ts" + } +} diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0/TestClass.ts b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0/TestClass.ts new file mode 100644 index 000000000..88ac04c12 --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0/TestClass.ts @@ -0,0 +1 @@ +export default class TestClass {} diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0/mod.ts b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0/mod.ts new file mode 100644 index 000000000..edf9622fb --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0/mod.ts @@ -0,0 +1,3 @@ +export default "0.2.0"; + +export { default as TestClass } from "./TestClass.ts"; diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0_meta.json b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0_meta.json new file mode 100644 index 000000000..631a18d0e --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0_meta.json @@ -0,0 +1,5 @@ +{ + "exports": { + ".": "./mod.ts" + } +} diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/meta.json b/tests/testdata/jsr/registry/@denotest/no_module_graph/meta.json new file mode 100644 index 000000000..0268b6c8a --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/no_module_graph/meta.json @@ -0,0 +1,7 @@ +{ + "versions": { + "0.1.0": {}, + "0.1.1": {}, + "0.2.0": {} + } +} diff --git a/tests/testdata/jsr/registry/@denotest/subset_type_graph/0.1.0/mod.ts b/tests/testdata/jsr/registry/@denotest/subset_type_graph/0.1.0/mod.ts new file mode 100644 index 000000000..e81b2309a --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/subset_type_graph/0.1.0/mod.ts @@ -0,0 +1,17 @@ +// add some statements that will be removed by the subset +// type graph so that we can test that the source map works +console.log(1); +console.log(2); +console.log(3); + +export class Foo { + method(): number { + return Math.random(); + } +} + +// this won't be type checked against because the subset +// type graph omit this code because it's not part of the +// public API. +const invalidTypeCheck: number = ""; +console.log(invalidTypeCheck); diff --git a/tests/testdata/jsr/registry/@denotest/subset_type_graph/0.1.0_meta.json b/tests/testdata/jsr/registry/@denotest/subset_type_graph/0.1.0_meta.json new file mode 100644 index 000000000..631a18d0e --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/subset_type_graph/0.1.0_meta.json @@ -0,0 +1,5 @@ +{ + "exports": { + ".": "./mod.ts" + } +} diff --git a/tests/testdata/jsr/registry/@denotest/subset_type_graph/meta.json b/tests/testdata/jsr/registry/@denotest/subset_type_graph/meta.json new file mode 100644 index 000000000..d10aa5c3a --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/subset_type_graph/meta.json @@ -0,0 +1,5 @@ +{ + "versions": { + "0.1.0": {} + } +} diff --git a/tests/testdata/jsr/registry/@denotest/subset_type_graph_invalid/0.1.0/mod.ts b/tests/testdata/jsr/registry/@denotest/subset_type_graph_invalid/0.1.0/mod.ts new file mode 100644 index 000000000..6a5036bf5 --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/subset_type_graph_invalid/0.1.0/mod.ts @@ -0,0 +1,12 @@ +export class Foo { + method() { + return Math.random(); + } +} + +// This will be analyzed because the method above is missing an +// explicit type which is required for the subset type graph to take +// effect. So the entire source file will be type checked against, +// causing a type error here. +const invalidTypeCheck: number = ""; +console.log(invalidTypeCheck); diff --git a/tests/testdata/jsr/registry/@denotest/subset_type_graph_invalid/0.1.0_meta.json b/tests/testdata/jsr/registry/@denotest/subset_type_graph_invalid/0.1.0_meta.json new file mode 100644 index 000000000..631a18d0e --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/subset_type_graph_invalid/0.1.0_meta.json @@ -0,0 +1,5 @@ +{ + "exports": { + ".": "./mod.ts" + } +} diff --git a/tests/testdata/jsr/registry/@denotest/subset_type_graph_invalid/meta.json b/tests/testdata/jsr/registry/@denotest/subset_type_graph_invalid/meta.json new file mode 100644 index 000000000..d10aa5c3a --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/subset_type_graph_invalid/meta.json @@ -0,0 +1,5 @@ +{ + "versions": { + "0.1.0": {} + } +} -- cgit v1.2.3