From 8ff30c73ce15bd40a394720ba136657d61c1c367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bargull?= Date: Mon, 11 Sep 2023 14:15:40 +0200 Subject: [PATCH] Use verifyProperty in language/eval-code tests --- .../eval-code/direct/var-env-func-init-global-new.js | 9 ++++++--- .../var-env-func-init-global-update-configurable.js | 9 ++++++--- .../var-env-func-init-global-update-non-configurable.js | 9 ++++++--- .../eval-code/direct/var-env-var-init-global-exstng.js | 9 ++++++--- .../eval-code/direct/var-env-var-init-global-new.js | 9 ++++++--- .../eval-code/indirect/var-env-func-init-global-new.js | 9 ++++++--- .../var-env-func-init-global-update-configurable.js | 9 ++++++--- .../var-env-func-init-global-update-non-configurable.js | 9 ++++++--- .../eval-code/indirect/var-env-var-init-global-exstng.js | 9 ++++++--- .../eval-code/indirect/var-env-var-init-global-new.js | 9 ++++++--- 10 files changed, 60 insertions(+), 30 deletions(-) diff --git a/test/language/eval-code/direct/var-env-func-init-global-new.js b/test/language/eval-code/direct/var-env-func-init-global-new.js index ade372a2d9..860955e90a 100644 --- a/test/language/eval-code/direct/var-env-func-init-global-new.js +++ b/test/language/eval-code/direct/var-env-func-init-global-new.js @@ -32,8 +32,11 @@ var initial; eval('initial = f; function f() { return 234; }'); -verifyEnumerable(this, 'f'); -verifyWritable(this, 'f'); -verifyConfigurable(this, 'f'); +verifyProperty(this, 'f', { + writable: true, + enumerable: true, + configurable: true, +}); + assert.sameValue(typeof initial, 'function'); assert.sameValue(initial(), 234); diff --git a/test/language/eval-code/direct/var-env-func-init-global-update-configurable.js b/test/language/eval-code/direct/var-env-func-init-global-update-configurable.js index 8d65f1c57b..dc1e9d6565 100644 --- a/test/language/eval-code/direct/var-env-func-init-global-update-configurable.js +++ b/test/language/eval-code/direct/var-env-func-init-global-update-configurable.js @@ -38,8 +38,11 @@ Object.defineProperty(this, 'f', { eval('initial = f; function f() { return 345; }'); -verifyEnumerable(this, 'f'); -verifyWritable(this, 'f'); -verifyConfigurable(this, 'f'); +verifyProperty(this, 'f', { + writable: true, + enumerable: true, + configurable: true, +}); + assert.sameValue(typeof initial, 'function'); assert.sameValue(initial(), 345); diff --git a/test/language/eval-code/direct/var-env-func-init-global-update-non-configurable.js b/test/language/eval-code/direct/var-env-func-init-global-update-non-configurable.js index c423aeec15..29574784e4 100644 --- a/test/language/eval-code/direct/var-env-func-init-global-update-non-configurable.js +++ b/test/language/eval-code/direct/var-env-func-init-global-update-non-configurable.js @@ -38,8 +38,11 @@ Object.defineProperty(this, 'f', { eval('initial = f; function f() { return 2222; }'); -verifyEnumerable(this, 'f'); -verifyWritable(this, 'f'); -verifyNotConfigurable(this, 'f'); +verifyProperty(this, 'f', { + writable: true, + enumerable: true, + configurable: false, +}); + assert.sameValue(typeof initial, 'function'); assert.sameValue(initial(), 2222); diff --git a/test/language/eval-code/direct/var-env-var-init-global-exstng.js b/test/language/eval-code/direct/var-env-var-init-global-exstng.js index f7fa64340a..55cd0cfbb1 100644 --- a/test/language/eval-code/direct/var-env-var-init-global-exstng.js +++ b/test/language/eval-code/direct/var-env-var-init-global-exstng.js @@ -26,8 +26,11 @@ var x = 23; eval('initial = x; var x = 45;'); -verifyEnumerable(this, 'x'); -verifyWritable(this, 'x'); -verifyNotConfigurable(this, 'x'); +verifyProperty(this, 'x', { + value: 45, + writable: true, + enumerable: true, + configurable: false, +}); assert.sameValue(initial, 23); diff --git a/test/language/eval-code/direct/var-env-var-init-global-new.js b/test/language/eval-code/direct/var-env-var-init-global-new.js index 38fb39113b..e5170dce35 100644 --- a/test/language/eval-code/direct/var-env-var-init-global-new.js +++ b/test/language/eval-code/direct/var-env-var-init-global-new.js @@ -26,8 +26,11 @@ var initial = null; eval('initial = x; var x;'); -verifyEnumerable(this, 'x'); -verifyWritable(this, 'x'); -verifyConfigurable(this, 'x'); +verifyProperty(this, 'x', { + value: undefined, + writable: true, + enumerable: true, + configurable: true, +}); assert.sameValue(initial, undefined); diff --git a/test/language/eval-code/indirect/var-env-func-init-global-new.js b/test/language/eval-code/indirect/var-env-func-init-global-new.js index 4e87e8a7c6..a99d5c81f2 100644 --- a/test/language/eval-code/indirect/var-env-func-init-global-new.js +++ b/test/language/eval-code/indirect/var-env-func-init-global-new.js @@ -31,8 +31,11 @@ var initial; (0, eval)('initial = f; function f() { return 234; }'); -verifyEnumerable(this, 'f'); -verifyWritable(this, 'f'); -verifyConfigurable(this, 'f'); +verifyProperty(this, 'f', { + writable: true, + enumerable: true, + configurable: true, +}); + assert.sameValue(typeof initial, 'function'); assert.sameValue(initial(), 234); diff --git a/test/language/eval-code/indirect/var-env-func-init-global-update-configurable.js b/test/language/eval-code/indirect/var-env-func-init-global-update-configurable.js index f036e31826..a44670a9b4 100644 --- a/test/language/eval-code/indirect/var-env-func-init-global-update-configurable.js +++ b/test/language/eval-code/indirect/var-env-func-init-global-update-configurable.js @@ -37,8 +37,11 @@ Object.defineProperty(this, 'f', { (0, eval)('initial = f; function f() { return 345; }'); -verifyEnumerable(this, 'f'); -verifyWritable(this, 'f'); -verifyConfigurable(this, 'f'); +verifyProperty(this, 'f', { + writable: true, + enumerable: true, + configurable: true, +}); + assert.sameValue(typeof initial, 'function'); assert.sameValue(initial(), 345); diff --git a/test/language/eval-code/indirect/var-env-func-init-global-update-non-configurable.js b/test/language/eval-code/indirect/var-env-func-init-global-update-non-configurable.js index e20e5a6c86..aea3f67d78 100644 --- a/test/language/eval-code/indirect/var-env-func-init-global-update-non-configurable.js +++ b/test/language/eval-code/indirect/var-env-func-init-global-update-non-configurable.js @@ -37,8 +37,11 @@ Object.defineProperty(this, 'f', { (0,eval)('initial = f; function f() { return 2222; }'); -verifyEnumerable(this, 'f'); -verifyWritable(this, 'f'); -verifyNotConfigurable(this, 'f'); +verifyProperty(this, 'f', { + writable: true, + enumerable: true, + configurable: false, +}); + assert.sameValue(typeof initial, 'function'); assert.sameValue(initial(), 2222); diff --git a/test/language/eval-code/indirect/var-env-var-init-global-exstng.js b/test/language/eval-code/indirect/var-env-var-init-global-exstng.js index c08d4f55c7..d1d18ec5a6 100644 --- a/test/language/eval-code/indirect/var-env-var-init-global-exstng.js +++ b/test/language/eval-code/indirect/var-env-var-init-global-exstng.js @@ -25,8 +25,11 @@ var x = 23; (0, eval)('initial = x; var x = 45;'); -verifyEnumerable(this, 'x'); -verifyWritable(this, 'x'); -verifyNotConfigurable(this, 'x'); +verifyProperty(this, 'x', { + value: 45, + writable: true, + enumerable: true, + configurable: false, +}); assert.sameValue(initial, 23); diff --git a/test/language/eval-code/indirect/var-env-var-init-global-new.js b/test/language/eval-code/indirect/var-env-var-init-global-new.js index daa9a1dbf6..c050fdb17c 100644 --- a/test/language/eval-code/indirect/var-env-var-init-global-new.js +++ b/test/language/eval-code/indirect/var-env-var-init-global-new.js @@ -25,8 +25,11 @@ var initial = null; (0, eval)('initial = x; var x = 9;'); -verifyEnumerable(this, 'x'); -verifyWritable(this, 'x'); -verifyConfigurable(this, 'x'); +verifyProperty(this, 'x', { + value: 9, + writable: true, + enumerable: true, + configurable: true, +}); assert.sameValue(initial, undefined);