Use verifyProperty in language/eval-code tests

tc39 · Sep 13, 2023 · 8ff30c7 · 8ff30c7
1 parent 08a7b9d
commit 8ff30c7
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);