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. --- .../testdata/run/decorators/experimental/deno.json | 5 --- .../run/decorators/experimental/no_check/main.out | 3 -- .../run/decorators/experimental/no_check/main.ts | 21 ----------- .../run/decorators/experimental/runtime/main.out | 7 ---- .../run/decorators/experimental/runtime/main.ts | 42 ---------------------- .../run/decorators/experimental/ts/main.out | 2 -- .../run/decorators/experimental/ts/main.ts | 14 -------- .../testdata/run/decorators/tc39_proposal/main.out | 3 -- .../testdata/run/decorators/tc39_proposal/main.ts | 21 ----------- 9 files changed, 118 deletions(-) delete mode 100644 cli/tests/testdata/run/decorators/experimental/deno.json delete mode 100644 cli/tests/testdata/run/decorators/experimental/no_check/main.out delete mode 100644 cli/tests/testdata/run/decorators/experimental/no_check/main.ts delete mode 100644 cli/tests/testdata/run/decorators/experimental/runtime/main.out delete mode 100644 cli/tests/testdata/run/decorators/experimental/runtime/main.ts delete mode 100644 cli/tests/testdata/run/decorators/experimental/ts/main.out delete mode 100644 cli/tests/testdata/run/decorators/experimental/ts/main.ts delete mode 100644 cli/tests/testdata/run/decorators/tc39_proposal/main.out delete mode 100644 cli/tests/testdata/run/decorators/tc39_proposal/main.ts (limited to 'cli/tests/testdata/run/decorators') diff --git a/cli/tests/testdata/run/decorators/experimental/deno.json b/cli/tests/testdata/run/decorators/experimental/deno.json deleted file mode 100644 index 504cd646e..000000000 --- a/cli/tests/testdata/run/decorators/experimental/deno.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "compilerOptions": { - "experimentalDecorators": true - } -} diff --git a/cli/tests/testdata/run/decorators/experimental/no_check/main.out b/cli/tests/testdata/run/decorators/experimental/no_check/main.out deleted file mode 100644 index 015f7076e..000000000 --- a/cli/tests/testdata/run/decorators/experimental/no_check/main.out +++ /dev/null @@ -1,3 +0,0 @@ -a(): evaluated -a(): called -method diff --git a/cli/tests/testdata/run/decorators/experimental/no_check/main.ts b/cli/tests/testdata/run/decorators/experimental/no_check/main.ts deleted file mode 100644 index 9f7ec550d..000000000 --- a/cli/tests/testdata/run/decorators/experimental/no_check/main.ts +++ /dev/null @@ -1,21 +0,0 @@ -// deno-lint-ignore-file -function a() { - console.log("a(): evaluated"); - return ( - _target: any, - _propertyKey: string, - _descriptor: PropertyDescriptor, - ) => { - console.log("a(): called"); - }; -} - -class B { - @a() - method() { - console.log("method"); - } -} - -const b = new B(); -b.method(); diff --git a/cli/tests/testdata/run/decorators/experimental/runtime/main.out b/cli/tests/testdata/run/decorators/experimental/runtime/main.out deleted file mode 100644 index 0fc1d4590..000000000 --- a/cli/tests/testdata/run/decorators/experimental/runtime/main.out +++ /dev/null @@ -1,7 +0,0 @@ -@A evaluated -@B evaluated -@B called -@A called -fn() called from @A -fn() called from @B -C.test() called diff --git a/cli/tests/testdata/run/decorators/experimental/runtime/main.ts b/cli/tests/testdata/run/decorators/experimental/runtime/main.ts deleted file mode 100644 index 40a26bbd4..000000000 --- a/cli/tests/testdata/run/decorators/experimental/runtime/main.ts +++ /dev/null @@ -1,42 +0,0 @@ -// deno-lint-ignore-file -function a() { - console.log("@A evaluated"); - return function ( - target: any, - propertyKey: string, - descriptor: PropertyDescriptor, - ) { - console.log("@A called"); - const fn = descriptor.value; - descriptor.value = function () { - console.log("fn() called from @A"); - fn(); - }; - }; -} - -function b() { - console.log("@B evaluated"); - return function ( - target: any, - propertyKey: string, - descriptor: PropertyDescriptor, - ) { - console.log("@B called"); - const fn = descriptor.value; - descriptor.value = function () { - console.log("fn() called from @B"); - fn(); - }; - }; -} - -class C { - @a() - @b() - static test() { - console.log("C.test() called"); - } -} - -C.test(); diff --git a/cli/tests/testdata/run/decorators/experimental/ts/main.out b/cli/tests/testdata/run/decorators/experimental/ts/main.out deleted file mode 100644 index ee77417cf..000000000 --- a/cli/tests/testdata/run/decorators/experimental/ts/main.out +++ /dev/null @@ -1,2 +0,0 @@ -Check [WILDCARD] -SomeClass { someField: "asdf" } diff --git a/cli/tests/testdata/run/decorators/experimental/ts/main.ts b/cli/tests/testdata/run/decorators/experimental/ts/main.ts deleted file mode 100644 index 95fba6cd4..000000000 --- a/cli/tests/testdata/run/decorators/experimental/ts/main.ts +++ /dev/null @@ -1,14 +0,0 @@ -// deno-lint-ignore-file - -function Decorate() { - return function (constructor: any): any { - return class extends constructor { - protected someField: string = "asdf"; - }; - }; -} - -@Decorate() -class SomeClass {} - -console.log(new SomeClass()); diff --git a/cli/tests/testdata/run/decorators/tc39_proposal/main.out b/cli/tests/testdata/run/decorators/tc39_proposal/main.out deleted file mode 100644 index 39394952e..000000000 --- a/cli/tests/testdata/run/decorators/tc39_proposal/main.out +++ /dev/null @@ -1,3 +0,0 @@ -starting m with arguments 1 -C.m 1 -ending m diff --git a/cli/tests/testdata/run/decorators/tc39_proposal/main.ts b/cli/tests/testdata/run/decorators/tc39_proposal/main.ts deleted file mode 100644 index 00c8a8502..000000000 --- a/cli/tests/testdata/run/decorators/tc39_proposal/main.ts +++ /dev/null @@ -1,21 +0,0 @@ -// deno-lint-ignore no-explicit-any -function logged(value: any, { kind, name }: { kind: string; name: string }) { - if (kind === "method") { - return function (...args: unknown[]) { - console.log(`starting ${name} with arguments ${args.join(", ")}`); - // @ts-ignore this has implicit any type - const ret = value.call(this, ...args); - console.log(`ending ${name}`); - return ret; - }; - } -} - -class C { - @logged - m(arg: number) { - console.log("C.m", arg); - } -} - -new C().m(1); -- cgit v1.2.3