summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHasanAlrimawi <141642411+HasanAlrimawi@users.noreply.github.com>2024-09-03 18:14:19 +0300
committerGitHub <noreply@github.com>2024-09-03 15:14:19 +0000
commit1d04c84c8f36a88697c82cf98587a5728952314f (patch)
tree16d57ecda9e50197a2f6e8443bb6b6eebd92ec86
parentb8ed6f822174b2322fbe9f8b58698b76b5505b4a (diff)
chore: deprecate eval itests (#25382)
This PR serves as a part of #22907 . --------- Signed-off-by: David Sherret <dsherret@users.noreply.github.com> Co-authored-by: Bartek IwaƄczuk <biwanczuk@gmail.com> Co-authored-by: David Sherret <dsherret@users.noreply.github.com>
-rw-r--r--tests/integration/eval_tests.rs63
-rw-r--r--tests/specs/eval/check_local/__test__.jsonc4
-rw-r--r--tests/specs/eval/check_local/main.out (renamed from tests/testdata/eval/check_local_by_default.out)0
-rw-r--r--tests/specs/eval/check_local_by_default2/__test__.jsonc4
-rw-r--r--tests/specs/eval/check_local_by_default2/check_local_by_default2.ts (renamed from tests/testdata/eval/check_local_by_default2.ts)0
-rw-r--r--tests/specs/eval/check_local_by_default2/main.out (renamed from tests/testdata/eval/check_local_by_default2.out)0
-rw-r--r--tests/specs/eval/dyn_import_eval/__test__.jsonc4
-rw-r--r--tests/specs/eval/dyn_import_eval/main.out (renamed from tests/testdata/eval/dyn_import_eval.out)0
-rw-r--r--tests/specs/eval/dyn_import_eval/mod4.js1
-rw-r--r--tests/specs/eval/env_file/__test__.jsonc4
-rw-r--r--tests/specs/eval/env_file/env_file4
-rw-r--r--tests/specs/eval/env_file/main.out1
-rw-r--r--tests/specs/eval/env_file_missing/__test__.jsonc4
-rw-r--r--tests/specs/eval/env_file_missing/main.out (renamed from tests/testdata/eval/env_file_missing.out)0
-rw-r--r--tests/specs/eval/env_unparsable_file/__test__.jsonc2
-rw-r--r--tests/specs/eval/env_unparsable_file/env_unparsable4
-rw-r--r--tests/specs/eval/env_unparsable_file/main.out2
-rw-r--r--tests/specs/eval/eval_basic/__test__.jsonc4
-rw-r--r--tests/specs/eval/eval_basic/main.out1
-rw-r--r--tests/specs/eval/eval_p/__test__.jsonc4
-rw-r--r--tests/specs/eval/eval_p/main.out1
-rw-r--r--tests/specs/eval/eval_ts/__test__.jsonc4
-rw-r--r--tests/specs/eval/eval_ts/main.out1
-rw-r--r--tests/specs/eval/v8_flags_eval/__test__.jsonc4
-rw-r--r--tests/specs/eval/v8_flags_eval/main.out1
-rwxr-xr-xtools/lint.js2
26 files changed, 53 insertions, 66 deletions
diff --git a/tests/integration/eval_tests.rs b/tests/integration/eval_tests.rs
index 3f4c6a3a6..198be3a4e 100644
--- a/tests/integration/eval_tests.rs
+++ b/tests/integration/eval_tests.rs
@@ -1,24 +1,6 @@
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
use test_util as util;
-use test_util::itest;
-
-#[test]
-fn eval_p() {
- let output = util::deno_cmd()
- .arg("eval")
- .arg("-p")
- .arg("1+2")
- .stdout_piped()
- .spawn()
- .unwrap()
- .wait_with_output()
- .unwrap();
- assert!(output.status.success());
- let stdout_str =
- util::strip_ansi_codes(std::str::from_utf8(&output.stdout).unwrap().trim());
- assert_eq!("3", stdout_str);
-}
// Make sure that snapshot flags don't affect runtime.
#[test]
@@ -43,48 +25,3 @@ fn eval_randomness() {
numbers.dedup();
assert!(numbers.len() > 1);
}
-
-itest!(eval_basic {
- args: "eval console.log(\"hello\")",
- output_str: Some("hello\n"),
-});
-
-// Ugly parentheses due to whitespace delimiting problem.
-itest!(eval_ts {
- args: "eval --quiet --ext=ts console.log((123)as(number))", // 'as' is a TS keyword only
- output_str: Some("123\n"),
-});
-
-itest!(dyn_import_eval {
- args: "eval import('./subdir/mod4.js').then(console.log)",
- output: "eval/dyn_import_eval.out",
-});
-
-// Cannot write the expression to evaluate as "console.log(typeof gc)"
-// because itest! splits args on whitespace.
-itest!(v8_flags_eval {
- args: "eval --v8-flags=--expose-gc console.log(typeof(gc))",
- output: "run/v8_flags.js.out",
-});
-
-itest!(check_local_by_default {
- args: "eval --quiet import('http://localhost:4545/subdir/type_error.ts').then(console.log);",
- output: "eval/check_local_by_default.out",
- http_server: true,
-});
-
-itest!(check_local_by_default2 {
- args: "eval --quiet import('./eval/check_local_by_default2.ts').then(console.log);",
- output: "eval/check_local_by_default2.out",
- http_server: true,
-});
-
-itest!(env_file {
- args: "eval --env=env console.log(Deno.env.get(\"ANOTHER_FOO\"))",
- output_str: Some("ANOTHER_BAR\n"),
-});
-
-itest!(env_file_missing {
- args: "eval --env=missing console.log(Deno.env.get(\"ANOTHER_FOO\"))",
- output: "eval/env_file_missing.out",
-});
diff --git a/tests/specs/eval/check_local/__test__.jsonc b/tests/specs/eval/check_local/__test__.jsonc
new file mode 100644
index 000000000..e9253803c
--- /dev/null
+++ b/tests/specs/eval/check_local/__test__.jsonc
@@ -0,0 +1,4 @@
+{
+ "args": "eval --quiet import('http://localhost:4545/subdir/type_error.ts').then(console.log);",
+ "output": "main.out"
+}
diff --git a/tests/testdata/eval/check_local_by_default.out b/tests/specs/eval/check_local/main.out
index 52d98849f..52d98849f 100644
--- a/tests/testdata/eval/check_local_by_default.out
+++ b/tests/specs/eval/check_local/main.out
diff --git a/tests/specs/eval/check_local_by_default2/__test__.jsonc b/tests/specs/eval/check_local_by_default2/__test__.jsonc
new file mode 100644
index 000000000..b6188b8ce
--- /dev/null
+++ b/tests/specs/eval/check_local_by_default2/__test__.jsonc
@@ -0,0 +1,4 @@
+{
+ "args": "eval --quiet import('./check_local_by_default2.ts').then(console.log);",
+ "output": "main.out"
+}
diff --git a/tests/testdata/eval/check_local_by_default2.ts b/tests/specs/eval/check_local_by_default2/check_local_by_default2.ts
index 5177ff944..5177ff944 100644
--- a/tests/testdata/eval/check_local_by_default2.ts
+++ b/tests/specs/eval/check_local_by_default2/check_local_by_default2.ts
diff --git a/tests/testdata/eval/check_local_by_default2.out b/tests/specs/eval/check_local_by_default2/main.out
index 26a1fe6f8..26a1fe6f8 100644
--- a/tests/testdata/eval/check_local_by_default2.out
+++ b/tests/specs/eval/check_local_by_default2/main.out
diff --git a/tests/specs/eval/dyn_import_eval/__test__.jsonc b/tests/specs/eval/dyn_import_eval/__test__.jsonc
new file mode 100644
index 000000000..34e573493
--- /dev/null
+++ b/tests/specs/eval/dyn_import_eval/__test__.jsonc
@@ -0,0 +1,4 @@
+{
+ "args": "eval import('./mod4.js').then(console.log)",
+ "output": "main.out"
+}
diff --git a/tests/testdata/eval/dyn_import_eval.out b/tests/specs/eval/dyn_import_eval/main.out
index 89e16b478..89e16b478 100644
--- a/tests/testdata/eval/dyn_import_eval.out
+++ b/tests/specs/eval/dyn_import_eval/main.out
diff --git a/tests/specs/eval/dyn_import_eval/mod4.js b/tests/specs/eval/dyn_import_eval/mod4.js
new file mode 100644
index 000000000..71332dbc4
--- /dev/null
+++ b/tests/specs/eval/dyn_import_eval/mod4.js
@@ -0,0 +1 @@
+export const isMod4 = true;
diff --git a/tests/specs/eval/env_file/__test__.jsonc b/tests/specs/eval/env_file/__test__.jsonc
new file mode 100644
index 000000000..b2e8f87b8
--- /dev/null
+++ b/tests/specs/eval/env_file/__test__.jsonc
@@ -0,0 +1,4 @@
+{
+ "args": "eval --env-file=env_file console.log(Deno.env.get(\"ANOTHER_FOO\"));",
+ "output": "main.out"
+}
diff --git a/tests/specs/eval/env_file/env_file b/tests/specs/eval/env_file/env_file
new file mode 100644
index 000000000..c41732d30
--- /dev/null
+++ b/tests/specs/eval/env_file/env_file
@@ -0,0 +1,4 @@
+FOO=BAR
+ANOTHER_FOO=ANOTHER_${FOO}
+MULTILINE="First Line
+Second Line" \ No newline at end of file
diff --git a/tests/specs/eval/env_file/main.out b/tests/specs/eval/env_file/main.out
new file mode 100644
index 000000000..01fcfbd29
--- /dev/null
+++ b/tests/specs/eval/env_file/main.out
@@ -0,0 +1 @@
+ANOTHER_BAR
diff --git a/tests/specs/eval/env_file_missing/__test__.jsonc b/tests/specs/eval/env_file_missing/__test__.jsonc
new file mode 100644
index 000000000..fc4e46380
--- /dev/null
+++ b/tests/specs/eval/env_file_missing/__test__.jsonc
@@ -0,0 +1,4 @@
+{
+ "args": "eval --env-file=missing console.log(Deno.env.get(\"ANOTHER_FOO\"));",
+ "output": "main.out"
+}
diff --git a/tests/testdata/eval/env_file_missing.out b/tests/specs/eval/env_file_missing/main.out
index b9e219af3..b9e219af3 100644
--- a/tests/testdata/eval/env_file_missing.out
+++ b/tests/specs/eval/env_file_missing/main.out
diff --git a/tests/specs/eval/env_unparsable_file/__test__.jsonc b/tests/specs/eval/env_unparsable_file/__test__.jsonc
index cf5e9a99b..8c8dbf5a9 100644
--- a/tests/specs/eval/env_unparsable_file/__test__.jsonc
+++ b/tests/specs/eval/env_unparsable_file/__test__.jsonc
@@ -1,4 +1,4 @@
{
- "args": "eval --env=../../../testdata/env_unparsable console.log(Deno.env.get(\"Another_FOO\"))",
+ "args": "eval --env-file=env_unparsable console.log(Deno.env.get(\"ANOTHER_FOO\"));",
"output": "main.out"
}
diff --git a/tests/specs/eval/env_unparsable_file/env_unparsable b/tests/specs/eval/env_unparsable_file/env_unparsable
new file mode 100644
index 000000000..5542b80bc
--- /dev/null
+++ b/tests/specs/eval/env_unparsable_file/env_unparsable
@@ -0,0 +1,4 @@
+FOO=valid
+ANOTHER_FOO=c:\path
+MULTILINE="First Line
+Second Line" \ No newline at end of file
diff --git a/tests/specs/eval/env_unparsable_file/main.out b/tests/specs/eval/env_unparsable_file/main.out
index 18d7856b4..1b3f7047a 100644
--- a/tests/specs/eval/env_unparsable_file/main.out
+++ b/tests/specs/eval/env_unparsable_file/main.out
@@ -1,2 +1,2 @@
-Warning Parsing failed within the specified environment file: ../../../testdata/env_unparsable at index: 3 of the value: c:\path
+Warning Parsing failed within the specified environment file: env_unparsable at index: 3 of the value: c:\path
undefined
diff --git a/tests/specs/eval/eval_basic/__test__.jsonc b/tests/specs/eval/eval_basic/__test__.jsonc
new file mode 100644
index 000000000..ebc973236
--- /dev/null
+++ b/tests/specs/eval/eval_basic/__test__.jsonc
@@ -0,0 +1,4 @@
+{
+ "args": "eval console.log(\"hello\")",
+ "output": "main.out"
+}
diff --git a/tests/specs/eval/eval_basic/main.out b/tests/specs/eval/eval_basic/main.out
new file mode 100644
index 000000000..ce0136250
--- /dev/null
+++ b/tests/specs/eval/eval_basic/main.out
@@ -0,0 +1 @@
+hello
diff --git a/tests/specs/eval/eval_p/__test__.jsonc b/tests/specs/eval/eval_p/__test__.jsonc
new file mode 100644
index 000000000..bd34d67e3
--- /dev/null
+++ b/tests/specs/eval/eval_p/__test__.jsonc
@@ -0,0 +1,4 @@
+{
+ "args": "eval -p 1+2",
+ "output": "main.out"
+}
diff --git a/tests/specs/eval/eval_p/main.out b/tests/specs/eval/eval_p/main.out
new file mode 100644
index 000000000..00750edc0
--- /dev/null
+++ b/tests/specs/eval/eval_p/main.out
@@ -0,0 +1 @@
+3
diff --git a/tests/specs/eval/eval_ts/__test__.jsonc b/tests/specs/eval/eval_ts/__test__.jsonc
new file mode 100644
index 000000000..4e8b9c2ae
--- /dev/null
+++ b/tests/specs/eval/eval_ts/__test__.jsonc
@@ -0,0 +1,4 @@
+{
+ "args": "eval --quiet --ext=ts console.log((123)as(number))",
+ "output": "main.out"
+}
diff --git a/tests/specs/eval/eval_ts/main.out b/tests/specs/eval/eval_ts/main.out
new file mode 100644
index 000000000..190a18037
--- /dev/null
+++ b/tests/specs/eval/eval_ts/main.out
@@ -0,0 +1 @@
+123
diff --git a/tests/specs/eval/v8_flags_eval/__test__.jsonc b/tests/specs/eval/v8_flags_eval/__test__.jsonc
new file mode 100644
index 000000000..23b59d482
--- /dev/null
+++ b/tests/specs/eval/v8_flags_eval/__test__.jsonc
@@ -0,0 +1,4 @@
+{
+ "args": "eval --v8-flags=--expose-gc console.log(typeof(gc))",
+ "output": "main.out"
+}
diff --git a/tests/specs/eval/v8_flags_eval/main.out b/tests/specs/eval/v8_flags_eval/main.out
new file mode 100644
index 000000000..e2dbde096
--- /dev/null
+++ b/tests/specs/eval/v8_flags_eval/main.out
@@ -0,0 +1 @@
+function
diff --git a/tools/lint.js b/tools/lint.js
index 6784ec630..d40b1b1fd 100755
--- a/tools/lint.js
+++ b/tools/lint.js
@@ -202,7 +202,7 @@ async function ensureNoNewITests() {
"compile_tests.rs": 0,
"coverage_tests.rs": 0,
"doc_tests.rs": 15,
- "eval_tests.rs": 9,
+ "eval_tests.rs": 0,
"flags_tests.rs": 0,
"fmt_tests.rs": 17,
"info_tests.rs": 18,