From e108e876cd850562385259195413e50f0e11fb82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bargull?= Date: Thu, 28 Sep 2023 15:15:42 +0200 Subject: [PATCH] Update built-ins/Object/{create,freeze,seal} to use verifyProperty --- .../built-ins/Object/create/15.2.3.5-4-100.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-101.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-103.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-104.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-107.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-108.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-109.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-110.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-111.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-125.js | 6 +-- .../built-ins/Object/create/15.2.3.5-4-126.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-128.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-129.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-130.js | 6 +-- .../built-ins/Object/create/15.2.3.5-4-131.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-132.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-135.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-179.js | 6 ++- .../built-ins/Object/create/15.2.3.5-4-188.js | 6 ++- .../built-ins/Object/create/15.2.3.5-4-189.js | 7 +-- .../built-ins/Object/create/15.2.3.5-4-190.js | 6 ++- .../built-ins/Object/create/15.2.3.5-4-204.js | 7 +-- .../built-ins/Object/create/15.2.3.5-4-205.js | 7 +-- .../built-ins/Object/create/15.2.3.5-4-207.js | 7 +-- .../built-ins/Object/create/15.2.3.5-4-208.js | 7 +-- .../built-ins/Object/create/15.2.3.5-4-209.js | 7 +-- .../built-ins/Object/create/15.2.3.5-4-210.js | 7 +-- .../built-ins/Object/create/15.2.3.5-4-211.js | 7 +-- .../built-ins/Object/create/15.2.3.5-4-214.js | 7 +-- .../built-ins/Object/create/15.2.3.5-4-307.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-309.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-311.js | 20 +++------ .../built-ins/Object/create/15.2.3.5-4-313.js | 5 ++- .../built-ins/Object/create/15.2.3.5-4-315.js | 20 ++++----- test/built-ins/Object/create/name.js | 11 ++--- test/built-ins/Object/freeze/15.2.3.9-2-4.js | 7 +-- .../built-ins/Object/freeze/15.2.3.9-2-a-1.js | 9 ++-- .../Object/freeze/15.2.3.9-2-a-10.js | 9 ++-- .../Object/freeze/15.2.3.9-2-a-11.js | 10 ++--- .../Object/freeze/15.2.3.9-2-a-12.js | 9 ++-- .../Object/freeze/15.2.3.9-2-a-13.js | 9 ++-- .../Object/freeze/15.2.3.9-2-a-14.js | 8 ++-- .../built-ins/Object/freeze/15.2.3.9-2-a-2.js | 9 ++-- .../built-ins/Object/freeze/15.2.3.9-2-a-3.js | 8 ++-- .../built-ins/Object/freeze/15.2.3.9-2-a-4.js | 5 ++- .../built-ins/Object/freeze/15.2.3.9-2-a-5.js | 5 ++- .../built-ins/Object/freeze/15.2.3.9-2-a-6.js | 5 ++- .../built-ins/Object/freeze/15.2.3.9-2-a-7.js | 8 ++-- .../built-ins/Object/freeze/15.2.3.9-2-a-8.js | 8 ++-- .../built-ins/Object/freeze/15.2.3.9-2-a-9.js | 9 ++-- .../Object/freeze/15.2.3.9-2-b-i-1.js | 22 +++------ .../Object/freeze/15.2.3.9-2-b-i-2.js | 45 +++++-------------- .../built-ins/Object/freeze/15.2.3.9-2-c-1.js | 22 +++------ .../built-ins/Object/freeze/15.2.3.9-2-c-2.js | 13 +++--- .../built-ins/Object/freeze/15.2.3.9-2-c-3.js | 32 +++++++------ .../built-ins/Object/freeze/15.2.3.9-2-c-4.js | 29 ++++++------ test/built-ins/Object/freeze/name.js | 11 ++--- ...om-true-to-false-property-are-unaltered.js | 21 +++++---- ...om-true-to-false-property-are-unaltered.js | 7 +-- test/built-ins/Object/seal/length.js | 11 ++--- test/built-ins/Object/seal/name.js | 11 ++--- ...rties-of-o-are-already-non-configurable.js | 19 ++++---- ...ttributes-of-the-property-are-unaltered.js | 13 +++--- ...-enumerable-own-property-of-o-is-sealed.js | 5 ++- ...verrides-an-inherited-accessor-property.js | 5 ++- ...at-overrides-an-inherited-data-property.js | 5 ++- .../object-seal-p-is-own-accessor-property.js | 5 ++- ...verrides-an-inherited-accessor-property.js | 6 ++- ...at-overrides-an-inherited-data-property.js | 6 ++- .../object-seal-p-is-own-data-property.js | 6 ++- ...ect-that-uses-object-s-get-own-property.js | 6 ++- ...ect-that-uses-object-s-get-own-property.js | 6 ++- ...ect-that-uses-object-s-get-own-property.js | 6 ++- ...ect-that-uses-object-s-get-own-property.js | 6 ++- ...ect-that-uses-object-s-get-own-property.js | 6 ++- ...ich-implements-its-own-get-own-property.js | 6 ++- ...ich-implements-its-own-get-own-property.js | 6 ++- ...ect-that-uses-object-s-get-own-property.js | 6 ++- ...ect-that-uses-object-s-get-own-property.js | 6 ++- 79 files changed, 372 insertions(+), 328 deletions(-) diff --git a/test/built-ins/Object/create/15.2.3.5-4-100.js b/test/built-ins/Object/create/15.2.3.5-4-100.js index d219852c9f..9df41abaa9 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-100.js +++ b/test/built-ins/Object/create/15.2.3.5-4-100.js @@ -15,5 +15,6 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop"), "expected newObj to have 'prop'"); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-101.js b/test/built-ins/Object/create/15.2.3.5-4-101.js index 84bcf29eb5..d4bd1ad67a 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-101.js +++ b/test/built-ins/Object/create/15.2.3.5-4-101.js @@ -15,5 +15,6 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-103.js b/test/built-ins/Object/create/15.2.3.5-4-103.js index cd95c4308e..c49aa2cd20 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-103.js +++ b/test/built-ins/Object/create/15.2.3.5-4-103.js @@ -26,5 +26,6 @@ var newObj = Object.create({}, { prop: descObj }); -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-104.js b/test/built-ins/Object/create/15.2.3.5-4-104.js index 1d9346fd8e..48542bca4d 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-104.js +++ b/test/built-ins/Object/create/15.2.3.5-4-104.js @@ -29,5 +29,6 @@ var newObj = Object.create({}, { prop: descObj }); -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-107.js b/test/built-ins/Object/create/15.2.3.5-4-107.js index 0f1b7c6465..6317a1dc8f 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-107.js +++ b/test/built-ins/Object/create/15.2.3.5-4-107.js @@ -28,5 +28,6 @@ var newObj = Object.create({}, { prop: descObj }); -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-108.js b/test/built-ins/Object/create/15.2.3.5-4-108.js index bd69f790ef..7169d8a440 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-108.js +++ b/test/built-ins/Object/create/15.2.3.5-4-108.js @@ -31,5 +31,6 @@ var newObj = Object.create({}, { prop: descObj }); -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-109.js b/test/built-ins/Object/create/15.2.3.5-4-109.js index c8e9df1d83..136d2bb065 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-109.js +++ b/test/built-ins/Object/create/15.2.3.5-4-109.js @@ -19,5 +19,6 @@ var newObj = Object.create({}, { prop: descObj }); -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-110.js b/test/built-ins/Object/create/15.2.3.5-4-110.js index 0f45922d8a..7056799067 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-110.js +++ b/test/built-ins/Object/create/15.2.3.5-4-110.js @@ -29,5 +29,6 @@ var newObj = Object.create({}, { prop: descObj }); -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-111.js b/test/built-ins/Object/create/15.2.3.5-4-111.js index 523c329b87..4e682e6cdd 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-111.js +++ b/test/built-ins/Object/create/15.2.3.5-4-111.js @@ -24,5 +24,6 @@ var newObj = Object.create({}, { prop: descObj }); -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-125.js b/test/built-ins/Object/create/15.2.3.5-4-125.js index 1ea05541e9..530f6ddcf5 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-125.js +++ b/test/built-ins/Object/create/15.2.3.5-4-125.js @@ -15,6 +15,6 @@ var newObj = Object.create({}, { } }); - -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-126.js b/test/built-ins/Object/create/15.2.3.5-4-126.js index 4e100ce381..e5de241967 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-126.js +++ b/test/built-ins/Object/create/15.2.3.5-4-126.js @@ -15,5 +15,6 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-128.js b/test/built-ins/Object/create/15.2.3.5-4-128.js index c8a10125c5..7ecc2637da 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-128.js +++ b/test/built-ins/Object/create/15.2.3.5-4-128.js @@ -15,5 +15,6 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-129.js b/test/built-ins/Object/create/15.2.3.5-4-129.js index 14c74b0473..0f21154c1e 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-129.js +++ b/test/built-ins/Object/create/15.2.3.5-4-129.js @@ -15,5 +15,6 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-130.js b/test/built-ins/Object/create/15.2.3.5-4-130.js index 83769b6caa..cb80a33814 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-130.js +++ b/test/built-ins/Object/create/15.2.3.5-4-130.js @@ -15,6 +15,6 @@ var newObj = Object.create({}, { } }); - -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-131.js b/test/built-ins/Object/create/15.2.3.5-4-131.js index e855085d7c..9ecd0d5eb6 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-131.js +++ b/test/built-ins/Object/create/15.2.3.5-4-131.js @@ -15,5 +15,6 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-132.js b/test/built-ins/Object/create/15.2.3.5-4-132.js index 15f8487974..214af762e0 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-132.js +++ b/test/built-ins/Object/create/15.2.3.5-4-132.js @@ -15,5 +15,6 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-135.js b/test/built-ins/Object/create/15.2.3.5-4-135.js index d675ebc245..4c0729ec85 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-135.js +++ b/test/built-ins/Object/create/15.2.3.5-4-135.js @@ -15,5 +15,6 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-179.js b/test/built-ins/Object/create/15.2.3.5-4-179.js index 1c71b6ebc8..c5d71576d4 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-179.js +++ b/test/built-ins/Object/create/15.2.3.5-4-179.js @@ -15,5 +15,7 @@ var newObj = Object.create({}, { } }); -assert.sameValue(newObj.prop, 100); -verifyNotWritable(newObj, "prop"); +verifyProperty(newObj, "prop", { + value: 100, + writable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-188.js b/test/built-ins/Object/create/15.2.3.5-4-188.js index 25ae2dfc30..e446e87175 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-188.js +++ b/test/built-ins/Object/create/15.2.3.5-4-188.js @@ -22,5 +22,7 @@ var newObj = Object.create({}, { prop: descObj }); -assert.sameValue(newObj.prop, 100); -verifyNotWritable(newObj, "prop"); +verifyProperty(newObj, "prop", { + value: 100, + writable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-189.js b/test/built-ins/Object/create/15.2.3.5-4-189.js index 1f4ef0c787..6159bb0d28 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-189.js +++ b/test/built-ins/Object/create/15.2.3.5-4-189.js @@ -31,6 +31,7 @@ var newObj = Object.create({}, { prop: descObj }); -assert(newObj.hasOwnProperty("prop")) -assert.sameValue(typeof(newObj.prop), "undefined"); -verifyNotWritable(newObj, "prop"); +verifyProperty(newObj, "prop", { + value: undefined, + writable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-190.js b/test/built-ins/Object/create/15.2.3.5-4-190.js index a2d96068e9..90295605ea 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-190.js +++ b/test/built-ins/Object/create/15.2.3.5-4-190.js @@ -27,5 +27,7 @@ var newObj = Object.create({}, { prop: descObj }); -assert.sameValue(newObj.prop, 100); -verifyNotWritable(newObj, "prop"); +verifyProperty(newObj, "prop", { + value: 100, + writable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-204.js b/test/built-ins/Object/create/15.2.3.5-4-204.js index 26bd33b2fc..554b982d98 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-204.js +++ b/test/built-ins/Object/create/15.2.3.5-4-204.js @@ -15,6 +15,7 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")); -assert.sameValue(typeof newObj.prop, "undefined"); -verifyNotWritable(newObj, "prop"); +verifyProperty(newObj, "prop", { + value: undefined, + writable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-205.js b/test/built-ins/Object/create/15.2.3.5-4-205.js index 62ef931158..a6faaf9cab 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-205.js +++ b/test/built-ins/Object/create/15.2.3.5-4-205.js @@ -15,6 +15,7 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")); -assert.sameValue(typeof newObj.prop, "undefined"); -verifyNotWritable(newObj, "prop"); +verifyProperty(newObj, "prop", { + value: undefined, + writable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-207.js b/test/built-ins/Object/create/15.2.3.5-4-207.js index e7b26dcb0c..5ed581bf3b 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-207.js +++ b/test/built-ins/Object/create/15.2.3.5-4-207.js @@ -15,6 +15,7 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")); -assert.sameValue(typeof newObj.prop, "undefined"); -verifyNotWritable(newObj, "prop"); +verifyProperty(newObj, "prop", { + value: undefined, + writable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-208.js b/test/built-ins/Object/create/15.2.3.5-4-208.js index 3934339394..7cfd558203 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-208.js +++ b/test/built-ins/Object/create/15.2.3.5-4-208.js @@ -15,6 +15,7 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")); -assert.sameValue(typeof newObj.prop, "undefined"); -verifyNotWritable(newObj, "prop"); +verifyProperty(newObj, "prop", { + value: undefined, + writable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-209.js b/test/built-ins/Object/create/15.2.3.5-4-209.js index c7f0534ccc..29496e527c 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-209.js +++ b/test/built-ins/Object/create/15.2.3.5-4-209.js @@ -15,6 +15,7 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")); -assert.sameValue(typeof newObj.prop, "undefined"); -verifyNotWritable(newObj, "prop"); +verifyProperty(newObj, "prop", { + value: undefined, + writable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-210.js b/test/built-ins/Object/create/15.2.3.5-4-210.js index dd792fb506..61c75df0ba 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-210.js +++ b/test/built-ins/Object/create/15.2.3.5-4-210.js @@ -15,6 +15,7 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")) -assert.sameValue(typeof newObj.prop, "undefined"); -verifyNotWritable(newObj, "prop"); +verifyProperty(newObj, "prop", { + value: undefined, + writable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-211.js b/test/built-ins/Object/create/15.2.3.5-4-211.js index 859704cac2..851ccaa473 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-211.js +++ b/test/built-ins/Object/create/15.2.3.5-4-211.js @@ -15,6 +15,7 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")); -assert.sameValue(typeof newObj.prop, "undefined") -verifyNotWritable(newObj, "prop"); +verifyProperty(newObj, "prop", { + value: undefined, + writable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-214.js b/test/built-ins/Object/create/15.2.3.5-4-214.js index 1e18925d27..8226fe588f 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-214.js +++ b/test/built-ins/Object/create/15.2.3.5-4-214.js @@ -17,6 +17,7 @@ var newObj = Object.create({}, { prop: descObj }); -assert(newObj.hasOwnProperty("prop")) -assert.sameValue(typeof newObj.prop, "undefined"); -verifyNotWritable(newObj, "prop"); +verifyProperty(newObj, "prop", { + value: undefined, + writable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-307.js b/test/built-ins/Object/create/15.2.3.5-4-307.js index fd79b1d4ad..52bcfe9b91 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-307.js +++ b/test/built-ins/Object/create/15.2.3.5-4-307.js @@ -17,5 +17,6 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")); -verifyNotWritable(newObj, "prop"); +verifyProperty(newObj, "prop", { + writable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-309.js b/test/built-ins/Object/create/15.2.3.5-4-309.js index a9143455b0..f226172d64 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-309.js +++ b/test/built-ins/Object/create/15.2.3.5-4-309.js @@ -18,5 +18,6 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-311.js b/test/built-ins/Object/create/15.2.3.5-4-311.js index fa6f42a1ed..bce659433d 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-311.js +++ b/test/built-ins/Object/create/15.2.3.5-4-311.js @@ -7,6 +7,7 @@ description: > Object.create - [[Set]] is set as undefined if it is absent in accessor descriptor of one property in 'Properties' (8.12.9 step 4.b) +includes: [propertyHelper.js] ---*/ var newObj = Object.create({}, { @@ -27,19 +28,10 @@ if (newObj.prop === "verifyCreate") { verifyGet = true; } -var verifyEnumerable = false; -for (var p in newObj) { - if (p === "prop") { - verifyEnumerable = true; - } -} - -var verifyConfigurable = false; -var hasProperty = newObj.hasOwnProperty("prop"); -delete newObj.prop; -verifyConfigurable = !newObj.hasOwnProperty("prop") && hasProperty; - assert(verifySet, 'verifySet !== true'); assert(verifyGet, 'verifyGet !== true'); -assert(verifyEnumerable, 'verifyEnumerable !== true'); -assert(verifyConfigurable, 'verifyConfigurable !== true'); + +verifyProperty(newObj, "prop", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-313.js b/test/built-ins/Object/create/15.2.3.5-4-313.js index 9ab55313b8..00c97033d3 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-313.js +++ b/test/built-ins/Object/create/15.2.3.5-4-313.js @@ -18,5 +18,6 @@ var newObj = Object.create({}, { } }); -assert(newObj.hasOwnProperty("prop")); -verifyNotConfigurable(newObj, "prop"); +verifyProperty(newObj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/create/15.2.3.5-4-315.js b/test/built-ins/Object/create/15.2.3.5-4-315.js index d4bfc58cf3..19d3ed023c 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-315.js +++ b/test/built-ins/Object/create/15.2.3.5-4-315.js @@ -34,18 +34,18 @@ newObj = Object.create({}, { } }); -verifyEqualTo(newObj, "foo1", 200); - -verifyWritable(newObj, "foo1"); - -verifyEnumerable(newObj, "foo1"); - -verifyConfigurable(newObj, "foo1"); +verifyProperty(newObj, "foo1", { + value: 200, + writable: true, + enumerable: true, + configurable: true, +}); verifyEqualTo(newObj, "foo2", getFunc()); verifyWritable(newObj, "foo2", "setVerifyHelpProp"); -verifyEnumerable(newObj, "foo2"); - -verifyConfigurable(newObj, "foo2"); +verifyProperty(newObj, "foo2", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/create/name.js b/test/built-ins/Object/create/name.js index 0e144913b7..39d370fad3 100644 --- a/test/built-ins/Object/create/name.js +++ b/test/built-ins/Object/create/name.js @@ -19,8 +19,9 @@ info: | includes: [propertyHelper.js] ---*/ -assert.sameValue(Object.create.name, "create"); - -verifyNotEnumerable(Object.create, "name"); -verifyNotWritable(Object.create, "name"); -verifyConfigurable(Object.create, "name"); +verifyProperty(Object.create, "name", { + value: "create", + writable: false, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-4.js b/test/built-ins/Object/freeze/15.2.3.9-2-4.js index ba3d34bae3..af09940ac4 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-4.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-4.js @@ -17,6 +17,7 @@ Object.defineProperty(obj, "foo", { Object.freeze(obj); -assert(obj.hasOwnProperty("foo")); -verifyNotWritable(obj, "foo"); -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + writable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-a-1.js b/test/built-ins/Object/freeze/15.2.3.9-2-a-1.js index b63d6ce339..9464fdb302 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-a-1.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-a-1.js @@ -13,7 +13,8 @@ obj.foo = 10; // default [[Configurable]] attribute value of foo: true Object.freeze(obj); -verifyNotWritable(obj, "foo"); -verifyNotConfigurable(obj, "foo"); - -assert.sameValue(obj.foo, 10); +verifyProperty(obj, "foo", { + value: 10, + writable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-a-10.js b/test/built-ins/Object/freeze/15.2.3.9-2-a-10.js index fc408cffb9..41d0db5612 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-a-10.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-a-10.js @@ -15,7 +15,8 @@ arrObj.foo = 10; // default [[Configurable]] attribute value of foo: true Object.freeze(arrObj); -verifyNotWritable(arrObj, "foo"); -verifyNotConfigurable(arrObj, "foo"); - -assert.sameValue(arrObj.foo, 10); +verifyProperty(arrObj, "foo", { + value: 10, + writable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-a-11.js b/test/built-ins/Object/freeze/15.2.3.9-2-a-11.js index 9148948646..aae9885444 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-a-11.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-a-11.js @@ -17,8 +17,8 @@ var argObj = (function() { Object.freeze(argObj); -var desc = Object.getOwnPropertyDescriptor(argObj, "0"); - -verifyNotWritable(argObj, "0"); -verifyNotConfigurable(argObj, "0"); -assert.sameValue(argObj[0], 1); +verifyProperty(argObj, "0", { + value: 1, + writable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-a-12.js b/test/built-ins/Object/freeze/15.2.3.9-2-a-12.js index e6f8d02e51..520dc902cd 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-a-12.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-a-12.js @@ -15,7 +15,8 @@ var strObj = new String("abc"); Object.freeze(strObj); -verifyNotWritable(strObj, "0"); -verifyNotConfigurable(strObj, "0"); - -assert.sameValue(strObj[0], "a"); +verifyProperty(strObj, "0", { + value: "a", + writable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-a-13.js b/test/built-ins/Object/freeze/15.2.3.9-2-a-13.js index ed8efa0fd6..1b36c91c1d 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-a-13.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-a-13.js @@ -17,7 +17,8 @@ var obj = { Object.freeze(obj); -verifyNotWritable(obj, "0"); -verifyNotConfigurable(obj, "0"); - -assert.sameValue(obj[0], 0); +verifyProperty(obj, "0", { + value: 0, + writable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-a-14.js b/test/built-ins/Object/freeze/15.2.3.9-2-a-14.js index da9173b9ce..ea1567b5da 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-a-14.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-a-14.js @@ -14,6 +14,8 @@ var arrObj = [0, 1, 2]; Object.freeze(arrObj); -verifyNotWritable(arrObj, "0"); -verifyNotConfigurable(arrObj, "0"); -assert.sameValue(arrObj[0], 0); +verifyProperty(arrObj, "0", { + value: 0, + writable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-a-2.js b/test/built-ins/Object/freeze/15.2.3.9-2-a-2.js index 23e20c4256..753ba092a7 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-a-2.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-a-2.js @@ -23,7 +23,8 @@ child.foo = 10; // default [[Configurable]] attribute value of foo: true Object.freeze(child); -verifyNotWritable(child, "foo"); -verifyNotConfigurable(child, "foo"); - -assert.sameValue(child.foo, 10); +verifyProperty(child, "foo", { + value: 10, + writable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-a-3.js b/test/built-ins/Object/freeze/15.2.3.9-2-a-3.js index f84894b00e..58d4e1b8bb 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-a-3.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-a-3.js @@ -29,6 +29,8 @@ Object.defineProperty(child, "foo", { Object.freeze(child); -verifyNotWritable(child, "foo"); -verifyNotConfigurable(child, "foo"); -assert.sameValue(child.foo, 10); +verifyProperty(child, "foo", { + value: 10, + writable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-a-4.js b/test/built-ins/Object/freeze/15.2.3.9-2-a-4.js index e8d22fca04..bbedf457ff 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-a-4.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-a-4.js @@ -18,5 +18,8 @@ Object.defineProperty(obj, "foo", { Object.freeze(obj); -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + configurable: false, +}); + assert.sameValue(obj.foo, 10); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-a-5.js b/test/built-ins/Object/freeze/15.2.3.9-2-a-5.js index 598187ff97..cb1944b2d1 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-a-5.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-a-5.js @@ -28,5 +28,8 @@ Object.defineProperty(child, "foo", { Object.freeze(child); -verifyNotConfigurable(child, "foo"); +verifyProperty(child, "foo", { + configurable: false, +}); + assert.sameValue(child.foo, 10); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-a-6.js b/test/built-ins/Object/freeze/15.2.3.9-2-a-6.js index 6295b1f087..6692942aff 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-a-6.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-a-6.js @@ -32,5 +32,8 @@ Object.defineProperty(child, "foo", { Object.freeze(child); -verifyNotConfigurable(child, "foo"); +verifyProperty(child, "foo", { + configurable: false, +}); + assert.sameValue(child.foo, 10); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-a-7.js b/test/built-ins/Object/freeze/15.2.3.9-2-a-7.js index 75024a84bc..527e996d21 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-a-7.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-a-7.js @@ -17,6 +17,8 @@ argObj.foo = 10; // default [[Configurable]] attribute value of foo: true Object.freeze(argObj); -verifyNotWritable(argObj, "foo"); -verifyNotConfigurable(argObj, "foo"); -assert.sameValue(argObj.foo, 10); +verifyProperty(argObj, "foo", { + value: 10, + writable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-a-8.js b/test/built-ins/Object/freeze/15.2.3.9-2-a-8.js index 972fb0263a..0517260ec3 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-a-8.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-a-8.js @@ -15,6 +15,8 @@ strObj.foo = 10; // default [[Configurable]] attribute value of foo: true Object.freeze(strObj); -verifyNotWritable(strObj, "foo"); -verifyNotConfigurable(strObj, "foo"); -assert.sameValue(strObj.foo, 10); +verifyProperty(strObj, "foo", { + value: 10, + writable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-a-9.js b/test/built-ins/Object/freeze/15.2.3.9-2-a-9.js index e4b21256b0..3d156bdb35 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-a-9.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-a-9.js @@ -15,7 +15,8 @@ funObj.foo = 10; // default [[Configurable]] attribute value of foo: true Object.freeze(funObj); -verifyNotWritable(funObj, "foo"); -verifyNotConfigurable(funObj, "foo"); - -assert.sameValue(funObj.foo, 10); +verifyProperty(funObj, "foo", { + value: 10, + writable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-b-i-1.js b/test/built-ins/Object/freeze/15.2.3.9-2-b-i-1.js index 3ee9e83aaa..a4d772e4fc 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-b-i-1.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-b-i-1.js @@ -19,20 +19,10 @@ Object.defineProperty(obj, "foo", { }); Object.freeze(obj); -var desc = Object.getOwnPropertyDescriptor(obj, "foo"); -verifyEqualTo(obj, "foo", 10); - -verifyNotWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); - -if (desc.writable !== false) { - throw new Test262Error('Expected desc.writable === false, actually ' + desc.writable); -} - -if (desc.configurable !== false) { - throw new Test262Error('Expected desc.configurable === false, actually ' + desc.configurable); -} +verifyProperty(obj, "foo", { + value: 10, + writable: false, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-b-i-2.js b/test/built-ins/Object/freeze/15.2.3.9-2-b-i-2.js index 41077c8f93..3e107b60ec 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-b-i-2.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-b-i-2.js @@ -28,37 +28,16 @@ Object.defineProperty(obj, "foo2", { Object.freeze(obj); -var desc1 = Object.getOwnPropertyDescriptor(obj, "foo1"); -var desc2 = Object.getOwnPropertyDescriptor(obj, "foo2"); +verifyProperty(obj, "foo1", { + value: 10, + writable: false, + enumerable: true, + configurable: false, +}); -verifyEqualTo(obj, "foo1", 10); - -verifyNotWritable(obj, "foo1"); - -verifyEnumerable(obj, "foo1"); - -verifyNotConfigurable(obj, "foo1"); - -verifyEqualTo(obj, "foo2", 20); - -verifyNotWritable(obj, "foo2"); - -verifyNotEnumerable(obj, "foo2"); - -verifyNotConfigurable(obj, "foo2"); - -if (desc1.configurable !== false) { - throw new Test262Error('Expected desc1.configurable === false, actually ' + desc1.configurable); -} - -if (desc1.writable !== false) { - throw new Test262Error('Expected desc1.writable === false, actually ' + desc1.writable); -} - -if (desc2.configurable !== false) { - throw new Test262Error('Expected desc2.configurable === false, actually ' + desc2.configurable); -} - -if (desc2.writable !== false) { - throw new Test262Error('Expected desc2.writable === false, actually ' + desc2.writable); -} +verifyProperty(obj, "foo2", { + value: 20, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-c-1.js b/test/built-ins/Object/freeze/15.2.3.9-2-c-1.js index 7fc4aba3f7..c1bbff7925 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-c-1.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-c-1.js @@ -21,19 +21,9 @@ Object.defineProperty(obj, "foo", { Object.freeze(obj); -var desc = Object.getOwnPropertyDescriptor(obj, "foo"); - -if (desc.configurable !== false) { - throw new Test262Error("Expected desc.configurable to be false, actually " + desc.configurable); -} -if (desc.writable !== false) { - throw new Test262Error("Expected desc.writable to be false, actually " + desc.writable); -} - -verifyEqualTo(obj, "foo", 10); - -verifyNotWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 10, + writable: false, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-c-2.js b/test/built-ins/Object/freeze/15.2.3.9-2-c-2.js index 59bdbad51b..f60b31c1f7 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-c-2.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-c-2.js @@ -31,15 +31,16 @@ Object.defineProperty(obj, "foo", { Object.freeze(obj); -assert(obj.hasOwnProperty("foo")); -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + configurable: false, +}); assert.sameValue(obj.foo, 10); obj.foo = 12; assert(set_funcCalled); -verifyEnumerable(obj, "foo"); - -var desc = Object.getOwnPropertyDescriptor(obj, "foo"); -assert.sameValue(desc.configurable, false); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-c-3.js b/test/built-ins/Object/freeze/15.2.3.9-2-c-3.js index 63b16a5087..3b6737bc03 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-c-3.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-c-3.js @@ -37,7 +37,10 @@ Object.defineProperty(obj, "foo2", { Object.freeze(obj); -verifyNotConfigurable(obj, "foo2"); +verifyProperty(obj, "foo2", { + configurable: false, +}); + verifyEqualTo(obj, "foo2", 10); obj.foo2 = 12; @@ -45,24 +48,19 @@ if (!resultSetFun) { throw new Test262Error('Expected obj["foo2"] set() to be called, but was not.'); } -if (!isEnumerable(obj, "foo2")) { - throw new Test262Error('Expected obj["foo2"] to be enumerable.'); -} - -var desc1 = Object.getOwnPropertyDescriptor(obj, "foo1"); -if (desc1.configurable || desc1.writable) { - throw new Test262Error('Expected obj["foo1"] to be non-writable, non-configurable; actually ' + JSON.stringify(desc1)); -} +verifyProperty(obj, "foo2", { + enumerable: true, + configurable: false, +}); var desc2 = Object.getOwnPropertyDescriptor(obj, "foo2"); -if (desc2.configurable || desc2.writable) { +if (desc2.writable) { throw new Test262Error('Expected obj["foo2"] to be non-writable, non-configurable; actually ' + JSON.stringify(desc2)); } -verifyEqualTo(obj, "foo1", 10); - -verifyNotWritable(obj, "foo1"); - -verifyEnumerable(obj, "foo1"); - -verifyNotConfigurable(obj, "foo1"); +verifyProperty(obj, "foo1", { + value: 10, + writable: false, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/15.2.3.9-2-c-4.js b/test/built-ins/Object/freeze/15.2.3.9-2-c-4.js index eb08e41d48..baa25e46c3 100644 --- a/test/built-ins/Object/freeze/15.2.3.9-2-c-4.js +++ b/test/built-ins/Object/freeze/15.2.3.9-2-c-4.js @@ -38,29 +38,28 @@ Object.freeze(obj); verifyEqualTo(obj, "foo2", 10); -verifyNotConfigurable(obj, "foo2"); +verifyProperty(obj, "foo2", { + configurable: false, +}); obj.foo2 = 12; if (!resultSetFun) { throw new Test262Error('Expected obj["foo2"] set() to be called, but was not.'); } -verifyEnumerable(obj, "foo2"); - -var desc1 = Object.getOwnPropertyDescriptor(obj, "foo1"); -if (desc1.configurable || desc1.writable) { - throw new Test262Error('Expected obj["foo1"] to be non-writable, non-configurable; actually ' + JSON.stringify(desc1)); -} +verifyProperty(obj, "foo2", { + enumerable: true, + configurable: false, +}); var desc2 = Object.getOwnPropertyDescriptor(obj, "foo2"); -if (desc2.configurable || desc2.writable) { +if (desc2.writable) { throw new Test262Error('Expected obj["foo2"] to be non-writable, non-configurable; actually ' + JSON.stringify(desc2)); } -verifyEqualTo(obj, "foo1", 10); - -verifyNotWritable(obj, "foo1"); - -verifyEnumerable(obj, "foo1"); - -verifyNotConfigurable(obj, "foo1"); +verifyProperty(obj, "foo1", { + value: 10, + writable: false, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/freeze/name.js b/test/built-ins/Object/freeze/name.js index be1ab47720..d39441e837 100644 --- a/test/built-ins/Object/freeze/name.js +++ b/test/built-ins/Object/freeze/name.js @@ -19,8 +19,9 @@ info: | includes: [propertyHelper.js] ---*/ -assert.sameValue(Object.freeze.name, "freeze"); - -verifyNotEnumerable(Object.freeze, "name"); -verifyNotWritable(Object.freeze, "name"); -verifyConfigurable(Object.freeze, "name"); +verifyProperty(Object.freeze, "name", { + value: "freeze", + writable: false, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/seal/configurable-attribute-all-own-properties-set-from-true-to-false-property-are-unaltered.js b/test/built-ins/Object/seal/configurable-attribute-all-own-properties-set-from-true-to-false-property-are-unaltered.js index 2434aa78fb..13cc3a1d9f 100644 --- a/test/built-ins/Object/seal/configurable-attribute-all-own-properties-set-from-true-to-false-property-are-unaltered.js +++ b/test/built-ins/Object/seal/configurable-attribute-all-own-properties-set-from-true-to-false-property-are-unaltered.js @@ -40,19 +40,18 @@ if (!preCheck) { throw new Test262Error('Expected preCheck to be true, actually ' + preCheck); } - -verifyEqualTo(obj, "foo1", 10); - -verifyWritable(obj, "foo1"); - -verifyEnumerable(obj, "foo1"); - -verifyNotConfigurable(obj, "foo1"); +verifyProperty(obj, "foo1", { + value: 10, + writable: true, + enumerable: true, + configurable: false, +}); verifyEqualTo(obj, "foo2", get_func()); verifyWritable(obj, "foo2", "variableForHelpVerify"); -verifyEnumerable(obj, "foo2"); - -verifyNotConfigurable(obj, "foo2"); +verifyProperty(obj, "foo2", { + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/seal/configurable-attribute-own-accessor-property-set-from-true-to-false-property-are-unaltered.js b/test/built-ins/Object/seal/configurable-attribute-own-accessor-property-set-from-true-to-false-property-are-unaltered.js index 6c1f428277..750474b64d 100644 --- a/test/built-ins/Object/seal/configurable-attribute-own-accessor-property-set-from-true-to-false-property-are-unaltered.js +++ b/test/built-ins/Object/seal/configurable-attribute-own-accessor-property-set-from-true-to-false-property-are-unaltered.js @@ -37,6 +37,7 @@ verifyEqualTo(obj, "foo", getFunc()); verifyWritable(obj, "foo", "variableForHelpVerify"); -verifyEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/seal/length.js b/test/built-ins/Object/seal/length.js index 4f7233f0d8..0ea257006a 100644 --- a/test/built-ins/Object/seal/length.js +++ b/test/built-ins/Object/seal/length.js @@ -14,8 +14,9 @@ info: | includes: [propertyHelper.js] ---*/ -assert.sameValue(Object.seal.length, 1); - -verifyNotEnumerable(Object.seal, "length"); -verifyNotWritable(Object.seal, "length"); -verifyConfigurable(Object.seal, "length"); +verifyProperty(Object.seal, "length", { + value: 1, + writable: false, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/seal/name.js b/test/built-ins/Object/seal/name.js index 0da5795642..71da6cbfd8 100644 --- a/test/built-ins/Object/seal/name.js +++ b/test/built-ins/Object/seal/name.js @@ -19,8 +19,9 @@ info: | includes: [propertyHelper.js] ---*/ -assert.sameValue(Object.seal.name, "seal"); - -verifyNotEnumerable(Object.seal, "name"); -verifyNotWritable(Object.seal, "name"); -verifyConfigurable(Object.seal, "name"); +verifyProperty(Object.seal, "name", { + value: "seal", + writable: false, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/seal/object-seal-all-own-properties-of-o-are-already-non-configurable.js b/test/built-ins/Object/seal/object-seal-all-own-properties-of-o-are-already-non-configurable.js index 819cc0c762..90812ec1db 100644 --- a/test/built-ins/Object/seal/object-seal-all-own-properties-of-o-are-already-non-configurable.js +++ b/test/built-ins/Object/seal/object-seal-all-own-properties-of-o-are-already-non-configurable.js @@ -43,17 +43,18 @@ if (Object.isExtensible(obj)) { throw new Test262Error('Expected obj NOT to be extensible, actually ' + Object.isExtensible(obj)); } -verifyEqualTo(obj, "foo1", 10); +verifyProperty(obj, "foo1", { + value: 10, + writable: true, + enumerable: true, + configurable: false, +}); -verifyWritable(obj, "foo1"); - -verifyEnumerable(obj, "foo1"); - -verifyNotConfigurable(obj, "foo1"); verifyEqualTo(obj, "foo2", get_func()); verifyWritable(obj, "foo2", "variableForHelpVerify"); -verifyEnumerable(obj, "foo2"); - -verifyNotConfigurable(obj, "foo2"); +verifyProperty(obj, "foo2", { + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/seal/object-seal-configurable-attribute-of-own-data-property-of-o-is-set-from-true-to-false-and-other-attributes-of-the-property-are-unaltered.js b/test/built-ins/Object/seal/object-seal-configurable-attribute-of-own-data-property-of-o-is-set-from-true-to-false-and-other-attributes-of-the-property-are-unaltered.js index 17f53602f9..adbe4085ab 100644 --- a/test/built-ins/Object/seal/object-seal-configurable-attribute-of-own-data-property-of-o-is-set-from-true-to-false-and-other-attributes-of-the-property-are-unaltered.js +++ b/test/built-ins/Object/seal/object-seal-configurable-attribute-of-own-data-property-of-o-is-set-from-true-to-false-and-other-attributes-of-the-property-are-unaltered.js @@ -25,10 +25,9 @@ if (!preCheck) { throw new Test262Error('Expected preCheck to be true, actually ' + preCheck); } -verifyEqualTo(obj, "foo", 10); - -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 10, + writable: true, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/seal/object-seal-non-enumerable-own-property-of-o-is-sealed.js b/test/built-ins/Object/seal/object-seal-non-enumerable-own-property-of-o-is-sealed.js index 7f28c892b7..80790dd0f4 100644 --- a/test/built-ins/Object/seal/object-seal-non-enumerable-own-property-of-o-is-sealed.js +++ b/test/built-ins/Object/seal/object-seal-non-enumerable-own-property-of-o-is-sealed.js @@ -18,5 +18,6 @@ Object.defineProperty(obj, "foo", { assert(Object.isExtensible(obj)); Object.seal(obj); -assert(obj.hasOwnProperty("foo")); -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + configurable: false, +}); diff --git a/test/built-ins/Object/seal/object-seal-p-is-own-accessor-property-that-overrides-an-inherited-accessor-property.js b/test/built-ins/Object/seal/object-seal-p-is-own-accessor-property-that-overrides-an-inherited-accessor-property.js index 95378480cd..5869950f5b 100644 --- a/test/built-ins/Object/seal/object-seal-p-is-own-accessor-property-that-overrides-an-inherited-accessor-property.js +++ b/test/built-ins/Object/seal/object-seal-p-is-own-accessor-property-that-overrides-an-inherited-accessor-property.js @@ -33,5 +33,8 @@ Object.defineProperty(obj, "foo", { assert(Object.isExtensible(obj)); Object.seal(obj); -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + configurable: false, +}); + assert.sameValue(obj.foo, 10); diff --git a/test/built-ins/Object/seal/object-seal-p-is-own-accessor-property-that-overrides-an-inherited-data-property.js b/test/built-ins/Object/seal/object-seal-p-is-own-accessor-property-that-overrides-an-inherited-data-property.js index d64d205998..c52fca8d4b 100644 --- a/test/built-ins/Object/seal/object-seal-p-is-own-accessor-property-that-overrides-an-inherited-data-property.js +++ b/test/built-ins/Object/seal/object-seal-p-is-own-accessor-property-that-overrides-an-inherited-data-property.js @@ -31,5 +31,8 @@ Object.defineProperty(obj, "foo", { assert(Object.isExtensible(obj)); Object.seal(obj); -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + configurable: false, +}); + assert.sameValue(obj.foo, 10); diff --git a/test/built-ins/Object/seal/object-seal-p-is-own-accessor-property.js b/test/built-ins/Object/seal/object-seal-p-is-own-accessor-property.js index f0c6fe77e0..ff5ad5131f 100644 --- a/test/built-ins/Object/seal/object-seal-p-is-own-accessor-property.js +++ b/test/built-ins/Object/seal/object-seal-p-is-own-accessor-property.js @@ -19,5 +19,8 @@ Object.defineProperty(obj, "foo", { assert(Object.isExtensible(obj)); Object.seal(obj); -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + configurable: false, +}); + assert.sameValue(obj.foo, 10); diff --git a/test/built-ins/Object/seal/object-seal-p-is-own-data-property-that-overrides-an-inherited-accessor-property.js b/test/built-ins/Object/seal/object-seal-p-is-own-data-property-that-overrides-an-inherited-accessor-property.js index 7e9a4df12b..c8132f5277 100644 --- a/test/built-ins/Object/seal/object-seal-p-is-own-data-property-that-overrides-an-inherited-accessor-property.js +++ b/test/built-ins/Object/seal/object-seal-p-is-own-data-property-that-overrides-an-inherited-accessor-property.js @@ -30,5 +30,7 @@ Object.defineProperty(obj, "foo", { assert(Object.isExtensible(obj)); Object.seal(obj); -verifyNotConfigurable(obj, "foo"); -assert.sameValue(obj.foo, 10); +verifyProperty(obj, "foo", { + value: 10, + configurable: false, +}); diff --git a/test/built-ins/Object/seal/object-seal-p-is-own-data-property-that-overrides-an-inherited-data-property.js b/test/built-ins/Object/seal/object-seal-p-is-own-data-property-that-overrides-an-inherited-data-property.js index 2810f976c7..960a565f7c 100644 --- a/test/built-ins/Object/seal/object-seal-p-is-own-data-property-that-overrides-an-inherited-data-property.js +++ b/test/built-ins/Object/seal/object-seal-p-is-own-data-property-that-overrides-an-inherited-data-property.js @@ -25,5 +25,7 @@ Object.defineProperty(obj, "foo", { assert(Object.isExtensible(obj)); Object.seal(obj); -verifyNotConfigurable(obj, "foo"); -assert.sameValue(obj.foo, 10); +verifyProperty(obj, "foo", { + value: 10, + configurable: false, +}); diff --git a/test/built-ins/Object/seal/object-seal-p-is-own-data-property.js b/test/built-ins/Object/seal/object-seal-p-is-own-data-property.js index d4277df307..f838179798 100644 --- a/test/built-ins/Object/seal/object-seal-p-is-own-data-property.js +++ b/test/built-ins/Object/seal/object-seal-p-is-own-data-property.js @@ -14,5 +14,7 @@ obj.foo = 10; // default [[Configurable]] attribute value of foo: true assert(Object.isExtensible(obj)); Object.seal(obj); -verifyNotConfigurable(obj, "foo"); -assert.sameValue(obj.foo, 10); +verifyProperty(obj, "foo", { + value: 10, + configurable: false, +}); diff --git a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-boolean-object-that-uses-object-s-get-own-property.js b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-boolean-object-that-uses-object-s-get-own-property.js index 153a874a5b..30dc9ef22f 100644 --- a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-boolean-object-that-uses-object-s-get-own-property.js +++ b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-boolean-object-that-uses-object-s-get-own-property.js @@ -16,5 +16,7 @@ obj.foo = 10; assert(Object.isExtensible(obj)); Object.seal(obj); -verifyNotConfigurable(obj, "foo"); -assert.sameValue(obj.foo, 10); +verifyProperty(obj, "foo", { + value: 10, + configurable: false, +}); diff --git a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-date-object-that-uses-object-s-get-own-property.js b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-date-object-that-uses-object-s-get-own-property.js index 23c9a59e5a..57824620c0 100644 --- a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-date-object-that-uses-object-s-get-own-property.js +++ b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-date-object-that-uses-object-s-get-own-property.js @@ -16,5 +16,7 @@ obj.foo = 10; assert(Object.isExtensible(obj)); Object.seal(obj); -verifyNotConfigurable(obj, "foo"); -assert.sameValue(obj.foo, 10); +verifyProperty(obj, "foo", { + value: 10, + configurable: false, +}); diff --git a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-function-object-that-uses-object-s-get-own-property.js b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-function-object-that-uses-object-s-get-own-property.js index d62223c33c..dc9a94aa51 100644 --- a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-function-object-that-uses-object-s-get-own-property.js +++ b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-function-object-that-uses-object-s-get-own-property.js @@ -16,5 +16,7 @@ obj.foo = 10; assert(Object.isExtensible(obj)); Object.seal(obj); -verifyNotConfigurable(obj, "foo"); -assert.sameValue(obj.foo, 10); +verifyProperty(obj, "foo", { + value: 10, + configurable: false, +}); diff --git a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-number-object-that-uses-object-s-get-own-property.js b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-number-object-that-uses-object-s-get-own-property.js index 1f306fd409..9334bd7f75 100644 --- a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-number-object-that-uses-object-s-get-own-property.js +++ b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-number-object-that-uses-object-s-get-own-property.js @@ -16,5 +16,7 @@ obj.foo = 10; assert(Object.isExtensible(obj)); Object.seal(obj); -verifyNotConfigurable(obj, "foo"); -assert.sameValue(obj.foo, 10); +verifyProperty(obj, "foo", { + value: 10, + configurable: false, +}); diff --git a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-reg-exp-object-that-uses-object-s-get-own-property.js b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-reg-exp-object-that-uses-object-s-get-own-property.js index 64e909185b..5c66aa4a07 100644 --- a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-reg-exp-object-that-uses-object-s-get-own-property.js +++ b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-reg-exp-object-that-uses-object-s-get-own-property.js @@ -16,5 +16,7 @@ obj.foo = 10; assert(Object.isExtensible(obj)); Object.seal(obj); -verifyNotConfigurable(obj, "foo"); -assert.sameValue(obj.foo, 10); +verifyProperty(obj, "foo", { + value: 10, + configurable: false, +}); diff --git a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-string-object-which-implements-its-own-get-own-property.js b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-string-object-which-implements-its-own-get-own-property.js index fce6ad9534..47da25a42b 100644 --- a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-string-object-which-implements-its-own-get-own-property.js +++ b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-a-string-object-which-implements-its-own-get-own-property.js @@ -16,5 +16,7 @@ obj.foo = 10; assert(Object.isExtensible(obj)); Object.seal(obj); -verifyNotConfigurable(obj, "foo"); -assert.sameValue(obj.foo, 10); +verifyProperty(obj, "foo", { + value: 10, + configurable: false, +}); diff --git a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-an-arguments-object-which-implements-its-own-get-own-property.js b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-an-arguments-object-which-implements-its-own-get-own-property.js index e12b8aebfc..863a5566cf 100644 --- a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-an-arguments-object-which-implements-its-own-get-own-property.js +++ b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-an-arguments-object-which-implements-its-own-get-own-property.js @@ -18,5 +18,7 @@ obj.foo = 10; assert(Object.isExtensible(obj)); Object.seal(obj); -verifyNotConfigurable(obj, "foo"); -assert.sameValue(obj.foo, 10); +verifyProperty(obj, "foo", { + value: 10, + configurable: false, +}); diff --git a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-an-array-object-that-uses-object-s-get-own-property.js b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-an-array-object-that-uses-object-s-get-own-property.js index 8be909d3fe..7cf1658174 100644 --- a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-an-array-object-that-uses-object-s-get-own-property.js +++ b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-an-array-object-that-uses-object-s-get-own-property.js @@ -16,5 +16,7 @@ obj.foo = 10; assert(Object.isExtensible(obj)); Object.seal(obj); -verifyNotConfigurable(obj, "foo"); -assert.sameValue(obj.foo, 10); +verifyProperty(obj, "foo", { + value: 10, + configurable: false, +}); diff --git a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-an-error-object-that-uses-object-s-get-own-property.js b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-an-error-object-that-uses-object-s-get-own-property.js index baeb4a18d1..54291f4b62 100644 --- a/test/built-ins/Object/seal/object-seal-p-is-own-property-of-an-error-object-that-uses-object-s-get-own-property.js +++ b/test/built-ins/Object/seal/object-seal-p-is-own-property-of-an-error-object-that-uses-object-s-get-own-property.js @@ -16,5 +16,7 @@ obj.foo = 10; assert(Object.isExtensible(obj)); Object.seal(obj); -verifyNotConfigurable(obj, "foo"); -assert.sameValue(obj.foo, 10); +verifyProperty(obj, "foo", { + value: 10, + configurable: false, +});