From 256dcb058ac2dd2a935076922265278c56264050 Mon Sep 17 00:00:00 2001 From: Adilson Schmitt Junior Date: Mon, 2 May 2022 21:43:03 +0200 Subject: [PATCH] fix(test/bench): accept file protocol module specifier CLI args (#14429) --- cli/fs_util.rs | 1 + cli/tests/integration/bench_tests.rs | 17 +++++++++++++++++ cli/tests/integration/test_tests.rs | 17 +++++++++++++++++ cli/tests/testdata/bench/file_protocol.out | 8 ++++++++ cli/tests/testdata/bench/file_protocol.ts | 1 + cli/tests/testdata/test/file_protocol.out | 6 ++++++ cli/tests/testdata/test/file_protocol.ts | 1 + test_util/src/lib.rs | 14 +++++++------- 8 files changed, 58 insertions(+), 7 deletions(-) create mode 100644 cli/tests/testdata/bench/file_protocol.out create mode 100644 cli/tests/testdata/bench/file_protocol.ts create mode 100644 cli/tests/testdata/test/file_protocol.out create mode 100644 cli/tests/testdata/test/file_protocol.ts diff --git a/cli/fs_util.rs b/cli/fs_util.rs index 5a32d5c390..fe0ef88575 100644 --- a/cli/fs_util.rs +++ b/cli/fs_util.rs @@ -253,6 +253,7 @@ where let lowercase_path = path.to_lowercase(); if lowercase_path.starts_with("http://") || lowercase_path.starts_with("https://") + || lowercase_path.starts_with("file://") { let url = ModuleSpecifier::parse(&path)?; prepared.push(url); diff --git a/cli/tests/integration/bench_tests.rs b/cli/tests/integration/bench_tests.rs index 6199e5b80b..1d021b69b2 100644 --- a/cli/tests/integration/bench_tests.rs +++ b/cli/tests/integration/bench_tests.rs @@ -1,6 +1,7 @@ // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license. use crate::itest; +use deno_core::url::Url; use test_util as util; itest!(requires_unstable { @@ -171,3 +172,19 @@ fn recursive_permissions_pledge() { "pledge test permissions called before restoring previous pledge" )); } + +#[test] +fn file_protocol() { + let file_url = + Url::from_file_path(util::testdata_path().join("bench/file_protocol.ts")) + .unwrap() + .to_string(); + + (util::CheckOutputIntegrationTest { + args_vec: vec!["bench", "--unstable", &file_url], + exit_code: 0, + output: "bench/file_protocol.out", + ..Default::default() + }) + .run(); +} diff --git a/cli/tests/integration/test_tests.rs b/cli/tests/integration/test_tests.rs index 022e40f4b0..0cbc3130fd 100644 --- a/cli/tests/integration/test_tests.rs +++ b/cli/tests/integration/test_tests.rs @@ -1,6 +1,7 @@ // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license. use crate::itest; +use deno_core::url::Url; use test_util as util; #[test] @@ -351,3 +352,19 @@ fn recursive_permissions_pledge() { "pledge test permissions called before restoring previous pledge" )); } + +#[test] +fn file_protocol() { + let file_url = + Url::from_file_path(util::testdata_path().join("test/file_protocol.ts")) + .unwrap() + .to_string(); + + (util::CheckOutputIntegrationTest { + args_vec: vec!["test", &file_url], + exit_code: 0, + output: "test/file_protocol.out", + ..Default::default() + }) + .run(); +} diff --git a/cli/tests/testdata/bench/file_protocol.out b/cli/tests/testdata/bench/file_protocol.out new file mode 100644 index 0000000000..5a384e1fa7 --- /dev/null +++ b/cli/tests/testdata/bench/file_protocol.out @@ -0,0 +1,8 @@ +Check file://[WILDCARD]/bench/file_protocol.ts +cpu: [WILDCARD] +runtime: deno [WILDCARD] ([WILDCARD]) + +[WILDCARD]/bench/file_protocol.ts +benchmark time (avg) (min … max) p75 p99 p995 +------------------------------------------------- ----------------------------- +bench0 [WILDCARD] [WILDCARD]/iter[WILDCARD]([WILDCARD] … [WILDCARD]) [WILDCARD] diff --git a/cli/tests/testdata/bench/file_protocol.ts b/cli/tests/testdata/bench/file_protocol.ts new file mode 100644 index 0000000000..06a07bb38c --- /dev/null +++ b/cli/tests/testdata/bench/file_protocol.ts @@ -0,0 +1 @@ +Deno.bench("bench0", () => {}); diff --git a/cli/tests/testdata/test/file_protocol.out b/cli/tests/testdata/test/file_protocol.out new file mode 100644 index 0000000000..252165950c --- /dev/null +++ b/cli/tests/testdata/test/file_protocol.out @@ -0,0 +1,6 @@ +Check file://[WILDCARD]/test/file_protocol.ts +running 1 test from ./test/file_protocol.ts +test 0 ... ok ([WILDCARD]) + +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out ([WILDCARD]) + diff --git a/cli/tests/testdata/test/file_protocol.ts b/cli/tests/testdata/test/file_protocol.ts new file mode 100644 index 0000000000..79128c2b39 --- /dev/null +++ b/cli/tests/testdata/test/file_protocol.ts @@ -0,0 +1 @@ +Deno.test("test 0", () => {}); diff --git a/test_util/src/lib.rs b/test_util/src/lib.rs index ee8c363ebb..59a777d401 100644 --- a/test_util/src/lib.rs +++ b/test_util/src/lib.rs @@ -1728,18 +1728,18 @@ pub fn run_powershell_script_file( } #[derive(Debug, Default)] -pub struct CheckOutputIntegrationTest { - pub args: &'static str, - pub args_vec: Vec<&'static str>, - pub output: &'static str, - pub input: Option<&'static str>, - pub output_str: Option<&'static str>, +pub struct CheckOutputIntegrationTest<'a> { + pub args: &'a str, + pub args_vec: Vec<&'a str>, + pub output: &'a str, + pub input: Option<&'a str>, + pub output_str: Option<&'a str>, pub exit_code: i32, pub http_server: bool, pub envs: Vec<(String, String)>, } -impl CheckOutputIntegrationTest { +impl<'a> CheckOutputIntegrationTest<'a> { pub fn run(&self) { let args = if self.args_vec.is_empty() { std::borrow::Cow::Owned(self.args.split_whitespace().collect::>())