chore: move test_ffi and test_nap to tests/ [WIP] (#22394)

Moving some additional NAPI and. FFI tests out of the tree root.
denoland · Feb 12, 2024 · f607200 · f607200
1 parent bd1358e
commit f607200
Show file tree

Hide file tree

Showing 71 changed files with 66 additions and 24 deletions.
diff --git a/.dprint.json b/.dprint.json
@@ -45,7 45,7 @@
  "cli/tsc/*typescript.js",
  "gh-pages",
  "target",
- "test_ffi/tests/test.js",
  "tests/ffi/tests/test.js",
  "test_util/std",
  "test_util/wpt",
  "third_party",

diff --git a/.gitignore b/.gitignore
@@ -12,9 12,9 @@ gclient_config.py_entries
 /std/hash/_wasm/target
 /tools/wpt/manifest.json
 /third_party/
-/test_napi/node_modules
-/test_napi/build
-/test_napi/third_party_tests/node_modules
 /tests/napi/node_modules
 /tests/napi/build
 /tests/napi/third_party_tests/node_modules
 
 # MacOS generated files
 .DS_Store

diff --git a/Cargo.toml b/Cargo.toml
@@ -28,10 28,10 @@ members = [
  "ext/websocket",
  "ext/webstorage",
  "runtime",
- "test_ffi",
- "test_napi",
  "test_util",
  "tests",
  "tests/ffi",
  "tests/napi",
 ]
 exclude = ["test_util/std/hash/_wasm"]
 

diff --git a/cli/bench/napi/bench.js b/cli/bench/napi/bench.js
@@ -1,6 1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { loadTestLibrary } from "../../../test_napi/common.js";
 import { loadTestLibrary } from "../../../tests/napi/common.js";
 
 const lib = loadTestLibrary();
 

diff --git a/cli/bench/napi/bench_node.mjs b/cli/bench/napi/bench_node.mjs
@@ -2,7 2,7 @@ import { bench, run } from "mitata";
 import { createRequire } from "module";
 
 const require = createRequire(import.meta.url);
-const lib = require("../../../test_napi.node");
 const lib = require("../../../tests/napi.node");
 
 bench("warmup", () => {});
 bench("napi_get_undefined", () => lib.test_get_undefined(0));

diff --git a/cli/napi/README.md b/cli/napi/README.md
@@ -50,11 50,11 @@ Update the generated symbol lists using the script:
 deno run --allow-write tools/napi/generate_symbols_lists.js
 ```
 
-Add a test in [`/test_napi`](../../test_napi/). You can also refer to Node.js
 Add a test in [`/tests/napi`](../../tests/napi/). You can also refer to Node.js
 test suite for Node-API.
 
 ```js
-// test_napi/boolean_test.js
 // tests/napi/boolean_test.js
 import { assertEquals, loadTestLibrary } from "./common.js";
 const lib = loadTestLibrary();
 Deno.test("napi get boolean", function () {
@@ -64,7 64,7 @@ Deno.test("napi get boolean", function () {
 ```
 
 ```rust
-// test_napi/src/boolean.rs
 // tests/napi/src/boolean.rs
 
 use napi_sys::Status::napi_ok;
 use napi_sys::ValueType::napi_boolean;
@@ -96,7 96,7 @@ pub fn init(env: napi_env, exports: napi_value) {
 ```
 
 ```diff
-// test_napi/src/lib.rs
 // tests/napi/src/lib.rs
 
   mod boolean;
 
@@ -114,4 114,4 @@ unsafe extern "C" fn napi_register_module_v1(
 }
 ```
 
-Run the test using `cargo test -p test_napi`.
 Run the test using `cargo test -p tests/napi`.
diff --git a/ext/ffi/README.md b/ext/ffi/README.md
@@ -21,5 21,5 @@ MacOS.
 To run benchmarks:
 
 ```bash
-target/release/deno bench --allow-ffi --allow-read --unstable-ffi ./test_ffi/tests/bench.js
 target/release/deno bench --allow-ffi --allow-read --unstable-ffi ./tests/ffi/tests/bench.js
 ```
diff --git a/test_util/src/lib.rs b/test_util/src/lib.rs
@@ -87,8 87,16 @@ pub fn third_party_path() -> PathRef {
  root_path().join("third_party")
 }
 
 pub fn ffi_tests_path() -> PathRef {
  root_path().join("tests").join("ffi")
 }
 
 pub fn napi_tests_path() -> PathRef {
- root_path().join("test_napi")
  root_path().join("tests").join("napi")
 }
 
 pub fn deno_config_path() -> PathRef {
  root_path().join("tests").join("config").join("deno.json")
 }
 
 /// Test server registry url.

diff --git a/tests/config/deno.json b/tests/config/deno.json
@@ -1,5 1,6 @@
 {
  "imports": {
- "@test_util/": "../../test_util/"
  "@test_util/": "../../test_util/",
  "@std/": "../../test_util/std/"
  }
 }
diff --git a/test_ffi/Cargo.toml → tests/ffi/Cargo.toml b/test_ffi/Cargo.toml → tests/ffi/Cargo.toml
diff --git a/test_ffi/README.md → tests/ffi/README.md b/test_ffi/README.md → tests/ffi/README.md
diff --git a/test_ffi/src/lib.rs → tests/ffi/src/lib.rs b/test_ffi/src/lib.rs → tests/ffi/src/lib.rs
diff --git a/test_ffi/tests/bench.js → tests/ffi/tests/bench.js b/test_ffi/tests/bench.js → tests/ffi/tests/bench.js
diff --git a/test_ffi/tests/event_loop_integration.ts → tests/ffi/tests/event_loop_integration.ts b/test_ffi/tests/event_loop_integration.ts → tests/ffi/tests/event_loop_integration.ts
diff --git a/test_ffi/tests/ffi_callback_errors.ts → tests/ffi/tests/ffi_callback_errors.ts b/test_ffi/tests/ffi_callback_errors.ts → tests/ffi/tests/ffi_callback_errors.ts
diff --git a/test_ffi/tests/ffi_types.ts → tests/ffi/tests/ffi_types.ts b/test_ffi/tests/ffi_types.ts → tests/ffi/tests/ffi_types.ts
diff --git a/test_ffi/tests/integration_tests.rs → tests/ffi/tests/integration_tests.rs b/test_ffi/tests/integration_tests.rs → tests/ffi/tests/integration_tests.rs
@@ -3,6 3,8 @@
 use pretty_assertions::assert_eq;
 use std::process::Command;
 use test_util::deno_cmd;
 use test_util::deno_config_path;
 use test_util::ffi_tests_path;
 
 #[cfg(debug_assertions)]
 const BUILD_VARIANT: &str = "debug";
@@ -26,7 28,11 @@ fn basic() {
  build();
 
  let output = deno_cmd()
  .current_dir(ffi_tests_path())
  .arg("run")
  .arg("--config")
  .arg(deno_config_path())
  .arg("--no-lock")
  .arg("--allow-ffi")
  .arg("--allow-read")
  .arg("--unstable-ffi")
@@ -134,7 140,11 @@ fn symbol_types() {
  build();
 
  let output = deno_cmd()
  .current_dir(ffi_tests_path())
  .arg("check")
  .arg("--config")
  .arg(deno_config_path())
  .arg("--no-lock")
  .arg("--unstable-ffi")
  .arg("--quiet")
  .arg("tests/ffi_types.ts")
@@ -157,7 167,11 @@ fn thread_safe_callback() {
  build();
 
  let output = deno_cmd()
  .current_dir(ffi_tests_path())
  .arg("run")
  .arg("--config")
  .arg(deno_config_path())
  .arg("--no-lock")
  .arg("--allow-ffi")
  .arg("--allow-read")
  .arg("--unstable-ffi")
@@ -191,7 205,11 @@ fn event_loop_integration() {
  build();
 
  let output = deno_cmd()
  .current_dir(ffi_tests_path())
  .arg("run")
  .arg("--config")
  .arg(deno_config_path())
  .arg("--no-lock")
  .arg("--allow-ffi")
  .arg("--allow-read")
  .arg("--unstable-ffi")
@@ -243,7 261,11 @@ fn ffi_callback_errors_test() {
  build();
 
  let output = deno_cmd()
  .current_dir(ffi_tests_path())
  .arg("run")
  .arg("--config")
  .arg(deno_config_path())
  .arg("--no-lock")
  .arg("--allow-ffi")
  .arg("--allow-read")
  .arg("--unstable-ffi")

diff --git a/test_ffi/tests/test.js → tests/ffi/tests/test.js b/test_ffi/tests/test.js → tests/ffi/tests/test.js
@@ -10,7 10,7 @@ import {
  assertInstanceOf,
  assertEquals,
  assertFalse,
-} from "../../test_util/std/assert/mod.ts";
 } from "@std/assert/mod.ts";
 
 const targetDir = Deno.execPath().replace(/[^\/\\] $/, "");
 const [libPrefix, libSuffix] = {

diff --git a/test_ffi/tests/thread_safe_test.js → tests/ffi/tests/thread_safe_test.js b/test_ffi/tests/thread_safe_test.js → tests/ffi/tests/thread_safe_test.js
diff --git a/test_ffi/tests/thread_safe_test_worker.js → tests/ffi/tests/thread_safe_test_worker.js b/test_ffi/tests/thread_safe_test_worker.js → tests/ffi/tests/thread_safe_test_worker.js
diff --git a/tests/integration/js_unit_tests.rs b/tests/integration/js_unit_tests.rs
@@ -120,7 120,7 @@ fn js_unit_test(test: String) {
  .current_dir(util::root_path())
  .arg("test")
  .arg("--config")
- .arg("tests/config/deno.json")
  .arg(util::deno_config_path())
  .arg("--no-lock")
  .arg("--unstable")
  .arg("--location=http://127.0.0.1:4545/")

diff --git a/tests/integration/node_compat_tests.rs b/tests/integration/node_compat_tests.rs
@@ -1,6 1,7 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
 use test_util as util;
 use util::deno_config_path;
 use util::env_vars_for_npm_tests;
 
 #[test]
@@ -9,7 10,7 @@ fn node_compat_tests() {
  .current_dir(util::root_path())
  .arg("test")
  .arg("--config")
- .arg("tests/config/deno.json")
  .arg(deno_config_path())
  .arg("--no-lock")
  .arg("--unstable")
  .arg("-A")

diff --git a/tests/integration/node_unit_tests.rs b/tests/integration/node_unit_tests.rs
@@ -4,6 4,7 @@ use std::io::BufReader;
 use std::time::Duration;
 use std::time::Instant;
 use test_util as util;
 use util::deno_config_path;
 use util::env_vars_for_npm_tests;
 
 util::unit_test_factory!(
@@ -97,7 98,7 @@ fn node_unit_test(test: String) {
  .current_dir(util::root_path())
  .arg("test")
  .arg("--config")
- .arg("tests/config/deno.json")
  .arg(deno_config_path())
  .arg("--no-lock")
  .arg("--unstable")
  // TODO(kt3k): This option is required to pass tls_test.ts,

diff --git a/test_napi/.gitignore → tests/napi/.gitignore b/test_napi/.gitignore → tests/napi/.gitignore
diff --git a/test_napi/Cargo.toml → tests/napi/Cargo.toml b/test_napi/Cargo.toml → tests/napi/Cargo.toml
diff --git a/test_napi/array_test.js → tests/napi/array_test.js b/test_napi/array_test.js → tests/napi/array_test.js
diff --git a/test_napi/arraybuffer_test.js → tests/napi/arraybuffer_test.js b/test_napi/arraybuffer_test.js → tests/napi/arraybuffer_test.js
diff --git a/test_napi/async_test.js → tests/napi/async_test.js b/test_napi/async_test.js → tests/napi/async_test.js
diff --git a/test_napi/bigint_test.js → tests/napi/bigint_test.js b/test_napi/bigint_test.js → tests/napi/bigint_test.js
diff --git a/test_napi/build.rs → tests/napi/build.rs b/test_napi/build.rs → tests/napi/build.rs
diff --git a/test_napi/callback_test.js → tests/napi/callback_test.js b/test_napi/callback_test.js → tests/napi/callback_test.js
diff --git a/test_napi/cleanup_hook_test.js → tests/napi/cleanup_hook_test.js b/test_napi/cleanup_hook_test.js → tests/napi/cleanup_hook_test.js
@@ -12,6 12,9 @@ if (import.meta.main) {
  const { stdout, stderr, code } = await new Deno.Command(Deno.execPath(), {
  args: [
  "run",
  "--config",
  Deno.realPathSync("../config/deno.json"),
  "--no-lock",
  "--allow-read",
  "--allow-run",
  "--allow-ffi",
@@ -20,8 23,8 @@ if (import.meta.main) {
  ],
  }).output();
 
- assertEquals(code, 0);
  assertEquals(new TextDecoder().decode(stderr), "");
  assertEquals(code, 0);
 
  const stdoutText = new TextDecoder().decode(stdout);
  const stdoutLines = stdoutText.split("\n");

diff --git a/test_napi/coerce_test.js → tests/napi/coerce_test.js b/test_napi/coerce_test.js → tests/napi/coerce_test.js
diff --git a/test_napi/common.js → tests/napi/common.js b/test_napi/common.js → tests/napi/common.js
@@ -5,8 5,8 @@ export {
  assertEquals,
  assertRejects,
  assertThrows,
-} from "../test_util/std/assert/mod.ts";
-export { fromFileUrl } from "../test_util/std/path/mod.ts";
 } from "@std/assert/mod.ts";
 export { fromFileUrl } from "@std/path/mod.ts";
 import process from "node:process";
 
 const targetDir = Deno.execPath().replace(/[^\/\\] $/, "");

diff --git a/test_napi/date_test.js → tests/napi/date_test.js b/test_napi/date_test.js → tests/napi/date_test.js
diff --git a/test_napi/env_test.js → tests/napi/env_test.js b/test_napi/env_test.js → tests/napi/env_test.js
diff --git a/test_napi/error_test.js → tests/napi/error_test.js b/test_napi/error_test.js → tests/napi/error_test.js
diff --git a/test_napi/init_test.js → tests/napi/init_test.js b/test_napi/init_test.js → tests/napi/init_test.js
diff --git a/test_napi/make_callback_test.js → tests/napi/make_callback_test.js b/test_napi/make_callback_test.js → tests/napi/make_callback_test.js
diff --git a/test_napi/mem_test.js → tests/napi/mem_test.js b/test_napi/mem_test.js → tests/napi/mem_test.js
diff --git a/test_napi/module.c → tests/napi/module.c b/test_napi/module.c → tests/napi/module.c
diff --git a/test_napi/numbers_test.js → tests/napi/numbers_test.js b/test_napi/numbers_test.js → tests/napi/numbers_test.js
diff --git a/test_napi/object_wrap_test.js → tests/napi/object_wrap_test.js b/test_napi/object_wrap_test.js → tests/napi/object_wrap_test.js
diff --git a/test_napi/promise_test.js → tests/napi/promise_test.js b/test_napi/promise_test.js → tests/napi/promise_test.js
diff --git a/test_napi/properties_test.js → tests/napi/properties_test.js b/test_napi/properties_test.js → tests/napi/properties_test.js
diff --git a/test_napi/src/array.rs → tests/napi/src/array.rs b/test_napi/src/array.rs → tests/napi/src/array.rs
diff --git a/test_napi/src/arraybuffer.rs → tests/napi/src/arraybuffer.rs b/test_napi/src/arraybuffer.rs → tests/napi/src/arraybuffer.rs
diff --git a/test_napi/src/async.rs → tests/napi/src/async.rs b/test_napi/src/async.rs → tests/napi/src/async.rs
diff --git a/test_napi/src/bigint.rs → tests/napi/src/bigint.rs b/test_napi/src/bigint.rs → tests/napi/src/bigint.rs
diff --git a/test_napi/src/callback.rs → tests/napi/src/callback.rs b/test_napi/src/callback.rs → tests/napi/src/callback.rs
diff --git a/test_napi/src/coerce.rs → tests/napi/src/coerce.rs b/test_napi/src/coerce.rs → tests/napi/src/coerce.rs
diff --git a/test_napi/src/date.rs → tests/napi/src/date.rs b/test_napi/src/date.rs → tests/napi/src/date.rs
diff --git a/test_napi/src/env.rs → tests/napi/src/env.rs b/test_napi/src/env.rs → tests/napi/src/env.rs
diff --git a/test_napi/src/error.rs → tests/napi/src/error.rs b/test_napi/src/error.rs → tests/napi/src/error.rs
diff --git a/test_napi/src/finalizer.rs → tests/napi/src/finalizer.rs b/test_napi/src/finalizer.rs → tests/napi/src/finalizer.rs
diff --git a/test_napi/src/lib.rs → tests/napi/src/lib.rs b/test_napi/src/lib.rs → tests/napi/src/lib.rs
diff --git a/test_napi/src/make_callback.rs → tests/napi/src/make_callback.rs b/test_napi/src/make_callback.rs → tests/napi/src/make_callback.rs
diff --git a/test_napi/src/mem.rs → tests/napi/src/mem.rs b/test_napi/src/mem.rs → tests/napi/src/mem.rs
diff --git a/test_napi/src/numbers.rs → tests/napi/src/numbers.rs b/test_napi/src/numbers.rs → tests/napi/src/numbers.rs
diff --git a/test_napi/src/object_wrap.rs → tests/napi/src/object_wrap.rs b/test_napi/src/object_wrap.rs → tests/napi/src/object_wrap.rs
diff --git a/test_napi/src/primitives.rs → tests/napi/src/primitives.rs b/test_napi/src/primitives.rs → tests/napi/src/primitives.rs
diff --git a/test_napi/src/promise.rs → tests/napi/src/promise.rs b/test_napi/src/promise.rs → tests/napi/src/promise.rs
diff --git a/test_napi/src/properties.rs → tests/napi/src/properties.rs b/test_napi/src/properties.rs → tests/napi/src/properties.rs
diff --git a/test_napi/src/strings.rs → tests/napi/src/strings.rs b/test_napi/src/strings.rs → tests/napi/src/strings.rs
diff --git a/test_napi/src/symbol.rs → tests/napi/src/symbol.rs b/test_napi/src/symbol.rs → tests/napi/src/symbol.rs
diff --git a/test_napi/src/tsfn.rs → tests/napi/src/tsfn.rs b/test_napi/src/tsfn.rs → tests/napi/src/tsfn.rs
diff --git a/test_napi/src/typedarray.rs → tests/napi/src/typedarray.rs b/test_napi/src/typedarray.rs → tests/napi/src/typedarray.rs
diff --git a/test_napi/strings_test.js → tests/napi/strings_test.js b/test_napi/strings_test.js → tests/napi/strings_test.js
diff --git a/test_napi/symbol_test.js → tests/napi/symbol_test.js b/test_napi/symbol_test.js → tests/napi/symbol_test.js
diff --git a/test_napi/tests/napi_tests.rs → tests/napi/tests/napi_tests.rs b/test_napi/tests/napi_tests.rs → tests/napi/tests/napi_tests.rs
@@ -2,8 2,10 @@
 
 use std::process::Command;
 use test_util::deno_cmd;
 use test_util::deno_config_path;
 use test_util::env_vars_for_npm_tests;
 use test_util::http_server;
 use test_util::napi_tests_path;
 
 #[cfg(debug_assertions)]
 const BUILD_VARIANT: &str = "debug";
@@ -57,13 59,17 @@ fn napi_tests() {
 
  let _http_guard = http_server();
  let output = deno_cmd()
- .current_dir(test_util::napi_tests_path())
  .current_dir(napi_tests_path())
  .env("RUST_BACKTRACE", "1")
  .arg("test")
  .arg("--allow-read")
  .arg("--allow-env")
  .arg("--allow-ffi")
  .arg("--allow-run")
  .arg("--config")
  .arg(deno_config_path())
  .arg("--no-lock")
  .arg(".")
  .envs(env_vars_for_npm_tests())
  .spawn()
  .unwrap()

diff --git a/test_napi/typedarray_test.js → tests/napi/typedarray_test.js b/test_napi/typedarray_test.js → tests/napi/typedarray_test.js