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. --- cli/tests/testdata/lsp/registries/a_latest_.json | 4 -- cli/tests/testdata/lsp/registries/a_v1.0.0_.json | 4 -- cli/tests/testdata/lsp/registries/a_v1.0.0_b.json | 3 -- cli/tests/testdata/lsp/registries/a_v1.0.1_.json | 4 -- cli/tests/testdata/lsp/registries/a_v2.0.0_.json | 4 -- cli/tests/testdata/lsp/registries/a_versions_.json | 5 -- .../testdata/lsp/registries/a_versions_v1..json | 4 -- cli/tests/testdata/lsp/registries/b_latest_.json | 4 -- cli/tests/testdata/lsp/registries/b_v0.0.1_.json | 4 -- cli/tests/testdata/lsp/registries/b_v0.0.2_.json | 4 -- cli/tests/testdata/lsp/registries/b_v0.0.3_.json | 4 -- cli/tests/testdata/lsp/registries/b_versions_.json | 5 -- cli/tests/testdata/lsp/registries/cde_tags.json | 4 -- cli/tests/testdata/lsp/registries/cdef_tags.json | 4 -- cli/tests/testdata/lsp/registries/complex.json | 5 -- cli/tests/testdata/lsp/registries/complex_efg.json | 6 --- .../testdata/lsp/registries/complex_efg_0.2.0.json | 6 --- cli/tests/testdata/lsp/registries/def_tags.json | 3 -- .../deno-import-intellisense-complex.json | 22 -------- .../deno-import-intellisense-key-first.json | 18 ------- .../lsp/registries/deno-import-intellisense.json | 62 ---------------------- cli/tests/testdata/lsp/registries/doc_a.json | 4 -- .../lsp/registries/doc_a_latest_mod.ts.json | 4 -- cli/tests/testdata/lsp/registries/key_first.json | 5 -- cli/tests/testdata/lsp/registries/modules_.json | 8 --- cli/tests/testdata/lsp/registries/modules_a.json | 10 ---- 26 files changed, 210 deletions(-) delete mode 100644 cli/tests/testdata/lsp/registries/a_latest_.json delete mode 100644 cli/tests/testdata/lsp/registries/a_v1.0.0_.json delete mode 100644 cli/tests/testdata/lsp/registries/a_v1.0.0_b.json delete mode 100644 cli/tests/testdata/lsp/registries/a_v1.0.1_.json delete mode 100644 cli/tests/testdata/lsp/registries/a_v2.0.0_.json delete mode 100644 cli/tests/testdata/lsp/registries/a_versions_.json delete mode 100644 cli/tests/testdata/lsp/registries/a_versions_v1..json delete mode 100644 cli/tests/testdata/lsp/registries/b_latest_.json delete mode 100644 cli/tests/testdata/lsp/registries/b_v0.0.1_.json delete mode 100644 cli/tests/testdata/lsp/registries/b_v0.0.2_.json delete mode 100644 cli/tests/testdata/lsp/registries/b_v0.0.3_.json delete mode 100644 cli/tests/testdata/lsp/registries/b_versions_.json delete mode 100644 cli/tests/testdata/lsp/registries/cde_tags.json delete mode 100644 cli/tests/testdata/lsp/registries/cdef_tags.json delete mode 100644 cli/tests/testdata/lsp/registries/complex.json delete mode 100644 cli/tests/testdata/lsp/registries/complex_efg.json delete mode 100644 cli/tests/testdata/lsp/registries/complex_efg_0.2.0.json delete mode 100644 cli/tests/testdata/lsp/registries/def_tags.json delete mode 100644 cli/tests/testdata/lsp/registries/deno-import-intellisense-complex.json delete mode 100644 cli/tests/testdata/lsp/registries/deno-import-intellisense-key-first.json delete mode 100644 cli/tests/testdata/lsp/registries/deno-import-intellisense.json delete mode 100644 cli/tests/testdata/lsp/registries/doc_a.json delete mode 100644 cli/tests/testdata/lsp/registries/doc_a_latest_mod.ts.json delete mode 100644 cli/tests/testdata/lsp/registries/key_first.json delete mode 100644 cli/tests/testdata/lsp/registries/modules_.json delete mode 100644 cli/tests/testdata/lsp/registries/modules_a.json (limited to 'cli/tests/testdata/lsp/registries') diff --git a/cli/tests/testdata/lsp/registries/a_latest_.json b/cli/tests/testdata/lsp/registries/a_latest_.json deleted file mode 100644 index f9f9d111e..000000000 --- a/cli/tests/testdata/lsp/registries/a_latest_.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "b/c.ts", - "d/e.js" -] diff --git a/cli/tests/testdata/lsp/registries/a_v1.0.0_.json b/cli/tests/testdata/lsp/registries/a_v1.0.0_.json deleted file mode 100644 index f9f9d111e..000000000 --- a/cli/tests/testdata/lsp/registries/a_v1.0.0_.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "b/c.ts", - "d/e.js" -] diff --git a/cli/tests/testdata/lsp/registries/a_v1.0.0_b.json b/cli/tests/testdata/lsp/registries/a_v1.0.0_b.json deleted file mode 100644 index 20ec4ad90..000000000 --- a/cli/tests/testdata/lsp/registries/a_v1.0.0_b.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - "b/c.ts" -] diff --git a/cli/tests/testdata/lsp/registries/a_v1.0.1_.json b/cli/tests/testdata/lsp/registries/a_v1.0.1_.json deleted file mode 100644 index f9f9d111e..000000000 --- a/cli/tests/testdata/lsp/registries/a_v1.0.1_.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "b/c.ts", - "d/e.js" -] diff --git a/cli/tests/testdata/lsp/registries/a_v2.0.0_.json b/cli/tests/testdata/lsp/registries/a_v2.0.0_.json deleted file mode 100644 index f9f9d111e..000000000 --- a/cli/tests/testdata/lsp/registries/a_v2.0.0_.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "b/c.ts", - "d/e.js" -] diff --git a/cli/tests/testdata/lsp/registries/a_versions_.json b/cli/tests/testdata/lsp/registries/a_versions_.json deleted file mode 100644 index 930e38323..000000000 --- a/cli/tests/testdata/lsp/registries/a_versions_.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - "v1.0.0", - "v1.0.1", - "v2.0.0" -] diff --git a/cli/tests/testdata/lsp/registries/a_versions_v1..json b/cli/tests/testdata/lsp/registries/a_versions_v1..json deleted file mode 100644 index 1d8a865c1..000000000 --- a/cli/tests/testdata/lsp/registries/a_versions_v1..json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "v1.0.0", - "v1.0.1" -] diff --git a/cli/tests/testdata/lsp/registries/b_latest_.json b/cli/tests/testdata/lsp/registries/b_latest_.json deleted file mode 100644 index f9f9d111e..000000000 --- a/cli/tests/testdata/lsp/registries/b_latest_.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "b/c.ts", - "d/e.js" -] diff --git a/cli/tests/testdata/lsp/registries/b_v0.0.1_.json b/cli/tests/testdata/lsp/registries/b_v0.0.1_.json deleted file mode 100644 index f9f9d111e..000000000 --- a/cli/tests/testdata/lsp/registries/b_v0.0.1_.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "b/c.ts", - "d/e.js" -] diff --git a/cli/tests/testdata/lsp/registries/b_v0.0.2_.json b/cli/tests/testdata/lsp/registries/b_v0.0.2_.json deleted file mode 100644 index f9f9d111e..000000000 --- a/cli/tests/testdata/lsp/registries/b_v0.0.2_.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "b/c.ts", - "d/e.js" -] diff --git a/cli/tests/testdata/lsp/registries/b_v0.0.3_.json b/cli/tests/testdata/lsp/registries/b_v0.0.3_.json deleted file mode 100644 index f9f9d111e..000000000 --- a/cli/tests/testdata/lsp/registries/b_v0.0.3_.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "b/c.ts", - "d/e.js" -] diff --git a/cli/tests/testdata/lsp/registries/b_versions_.json b/cli/tests/testdata/lsp/registries/b_versions_.json deleted file mode 100644 index 9532fbb85..000000000 --- a/cli/tests/testdata/lsp/registries/b_versions_.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - "v0.0.1", - "v0.0.2", - "v0.0.3" -] diff --git a/cli/tests/testdata/lsp/registries/cde_tags.json b/cli/tests/testdata/lsp/registries/cde_tags.json deleted file mode 100644 index 24aeba56a..000000000 --- a/cli/tests/testdata/lsp/registries/cde_tags.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "1.0.0", - "1.0.1" -] diff --git a/cli/tests/testdata/lsp/registries/cdef_tags.json b/cli/tests/testdata/lsp/registries/cdef_tags.json deleted file mode 100644 index a69cb1c55..000000000 --- a/cli/tests/testdata/lsp/registries/cdef_tags.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "2.0.0", - "2.0.1" -] diff --git a/cli/tests/testdata/lsp/registries/complex.json b/cli/tests/testdata/lsp/registries/complex.json deleted file mode 100644 index b6e28649a..000000000 --- a/cli/tests/testdata/lsp/registries/complex.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - "efg", - "efgh", - "fg" -] diff --git a/cli/tests/testdata/lsp/registries/complex_efg.json b/cli/tests/testdata/lsp/registries/complex_efg.json deleted file mode 100644 index cd170d1d8..000000000 --- a/cli/tests/testdata/lsp/registries/complex_efg.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - "0.2.2", - "0.2.1", - "0.2.0", - "0.1.0" -] diff --git a/cli/tests/testdata/lsp/registries/complex_efg_0.2.0.json b/cli/tests/testdata/lsp/registries/complex_efg_0.2.0.json deleted file mode 100644 index d333b9e28..000000000 --- a/cli/tests/testdata/lsp/registries/complex_efg_0.2.0.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - "mod.ts", - "example/mod.ts", - "CHANGELOG.md", - "deps.ts" -] diff --git a/cli/tests/testdata/lsp/registries/def_tags.json b/cli/tests/testdata/lsp/registries/def_tags.json deleted file mode 100644 index 5a33204f2..000000000 --- a/cli/tests/testdata/lsp/registries/def_tags.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - "3.0.0" -] diff --git a/cli/tests/testdata/lsp/registries/deno-import-intellisense-complex.json b/cli/tests/testdata/lsp/registries/deno-import-intellisense-complex.json deleted file mode 100644 index 98e913bdb..000000000 --- a/cli/tests/testdata/lsp/registries/deno-import-intellisense-complex.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "registries": [ - { - "schema": "/:module([a-zA-Z0-9_]*)@:version/:path*", - "variables": [ - { - "key": "module", - "url": "http://localhost:4545/lsp/registries/complex.json" - }, - { - "key": "version", - "url": "http://localhost:4545/lsp/registries/complex_${module}.json" - }, - { - "key": "path", - "url": "http://localhost:4545/lsp/registries/complex_${module}_${version}.json" - } - ] - } - ] -} diff --git a/cli/tests/testdata/lsp/registries/deno-import-intellisense-key-first.json b/cli/tests/testdata/lsp/registries/deno-import-intellisense-key-first.json deleted file mode 100644 index 9aa33ecd3..000000000 --- a/cli/tests/testdata/lsp/registries/deno-import-intellisense-key-first.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "registries": [ - { - "schema": "/:module([a-zA-Z0-9-_]+)@:tag([a-zA-Z0-9-_\\.]+)", - "variables": [ - { - "key": "module", - "url": "http://localhost:4545/lsp/registries/key_first.json" - }, - { - "key": "tag", - "url": "http://localhost:4545/lsp/registries/${module}_tags.json" - } - ] - } - ] -} diff --git a/cli/tests/testdata/lsp/registries/deno-import-intellisense.json b/cli/tests/testdata/lsp/registries/deno-import-intellisense.json deleted file mode 100644 index 5fd87085e..000000000 --- a/cli/tests/testdata/lsp/registries/deno-import-intellisense.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "version": 2, - "registries": [ - { - "schema": "/x/:module([a-z0-9_]*)@:version?/:path*", - "variables": [ - { - "key": "module", - "documentation": "/lsp/registries/doc_${module}.json", - "url": "/lsp/registries/modules_${module}.json" - }, - { - "key": "version", - "documentation": "/lsp/registries/doc_${module}_${{version}}.json", - "url": "/lsp/registries/${module}_versions_${{version}}.json" - }, - { - "key": "path", - "documentation": "/lsp/registries/doc_${module}_${{version}}_${path}.json", - "url": "/lsp/registries/${module}_${{version}}_${path}.json" - } - ] - }, - { - "schema": "/x/:module([a-z0-9_]*)/:path*", - "variables": [ - { - "key": "module", - "documentation": "/lsp/registries/doc_${module}.json", - "url": "/lsp/registries/modules_${module}.json" - }, - { - "key": "path", - "documentation": "/lsp/registries/doc_${module}_latest_${path}.json", - "url": "/lsp/registries/${module}_latest_${path}.json" - } - ] - }, - { - "schema": "/std@:version?/:path*", - "variables": [ - { - "key": "version", - "url": "/lsp/registries/std_${{version}}.json" - }, - { - "key": "path", - "url": "/lsp/registries/std_${{version}}_${path}.json" - } - ] - }, - { - "schema": "/std/:path*", - "variables": [ - { - "key": "path", - "url": "/lsp/registries/std_latest_${path}.json" - } - ] - } - ] -} diff --git a/cli/tests/testdata/lsp/registries/doc_a.json b/cli/tests/testdata/lsp/registries/doc_a.json deleted file mode 100644 index ecddb9144..000000000 --- a/cli/tests/testdata/lsp/registries/doc_a.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "kind": "markdown", - "value": "**a**" -} diff --git a/cli/tests/testdata/lsp/registries/doc_a_latest_mod.ts.json b/cli/tests/testdata/lsp/registries/doc_a_latest_mod.ts.json deleted file mode 100644 index 522f5b271..000000000 --- a/cli/tests/testdata/lsp/registries/doc_a_latest_mod.ts.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "kind": "markdown", - "value": "**a**\n\nmod.ts" -} diff --git a/cli/tests/testdata/lsp/registries/key_first.json b/cli/tests/testdata/lsp/registries/key_first.json deleted file mode 100644 index c95261b25..000000000 --- a/cli/tests/testdata/lsp/registries/key_first.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - "cde", - "cdef", - "def" -] diff --git a/cli/tests/testdata/lsp/registries/modules_.json b/cli/tests/testdata/lsp/registries/modules_.json deleted file mode 100644 index fae3b40a3..000000000 --- a/cli/tests/testdata/lsp/registries/modules_.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "items": [ - "a", - "b" - ], - "isIncomplete": true, - "preselect": "a" -} diff --git a/cli/tests/testdata/lsp/registries/modules_a.json b/cli/tests/testdata/lsp/registries/modules_a.json deleted file mode 100644 index 0163f18a4..000000000 --- a/cli/tests/testdata/lsp/registries/modules_a.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "items": [ - "a", - "aa", - "ab", - "aba" - ], - "isIncomplete": false, - "preselect": "a" -} -- cgit v1.2.3