diff options
Diffstat (limited to 'js/src/tests/test262/built-ins/Object/defineProperty')
371 files changed, 1923 insertions, 2271 deletions
diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-100.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-100.js index de37bdae68..0f9b56f06d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-100.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-100.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { configurable: null }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-102.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-102.js index a0abf592c3..9352cdf328 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-102.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-102.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { configurable: false }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-103.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-103.js index c9b59463af..e25a7ab12b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-103.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-103.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { configurable: 0 }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-104.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-104.js index 9ae7f58e48..ac87f08e86 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-104.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-104.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { configurable: +0 }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-105.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-105.js index 3055a6ff9f..ccff0ebded 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-105.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-105.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { configurable: -0 }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-106.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-106.js index c6a037f9a6..5c024dd411 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-106.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-106.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { configurable: NaN }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-109.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-109.js index 575c4c9459..f433030ddf 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-109.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-109.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { configurable: "" }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-152.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-152.js index 87913b2d2d..61d481e7e8 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-152.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-152.js @@ -17,8 +17,9 @@ var attr = { Object.defineProperty(obj, "property", attr); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-153.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-153.js index 20c3e5c191..9f2c747347 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-153.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-153.js @@ -17,7 +17,8 @@ var attr = { Object.defineProperty(obj, "property", attr); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-162.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-162.js index 088bb9d5d2..79882c4f16 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-162.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-162.js @@ -18,7 +18,8 @@ Object.defineProperty(attr, "writable", { Object.defineProperty(obj, "property", attr); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-163.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-163.js index bfd2ff3dfb..80b482d4f3 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-163.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-163.js @@ -29,7 +29,8 @@ Object.defineProperty(child, "writable", { Object.defineProperty(obj, "property", child); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-164.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-164.js index 61fe9a5583..2f270d9b9d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-164.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-164.js @@ -24,7 +24,8 @@ var child = new ConstructFun(); Object.defineProperty(obj, "property", child); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-171-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-171-1.js index d8ee8da884..feffeefe59 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-171-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-171-1.js @@ -17,8 +17,10 @@ try { var dateObj = new Date(); Object.defineProperty(obj, "property", dateObj); - verifyWritable(obj, "property"); + verifyProperty(obj, "property", { + writable: true, + }); } finally { delete Date.prototype.writable; } diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-178.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-178.js index 42ab36b422..9069d503ad 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-178.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-178.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { writable: undefined }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-179.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-179.js index be0fca785e..c4082a47cc 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-179.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-179.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { writable: null }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-181.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-181.js index 04a60062e3..1f47b6b09e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-181.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-181.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { writable: false }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-182.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-182.js index e1506931c8..b38cc2d799 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-182.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-182.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { writable: 0 }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-183.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-183.js index 08b46c555a..762d8861bd 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-183.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-183.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { writable: +0 }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-184.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-184.js index d456fbeb38..dca54d121b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-184.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-184.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { writable: -0 }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-185.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-185.js index 81061f91f0..d51323620d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-185.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-185.js @@ -15,10 +15,9 @@ Object.defineProperty(obj, "property", { writable: NaN }); -assert(obj.hasOwnProperty("property")); - -verifyNotWritable(obj, "property"); - -assert.sameValue(typeof(obj.property), "undefined"); +verifyProperty(obj, "property", { + value: undefined, + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-188.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-188.js index 29e6a06d42..554b370535 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-188.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-188.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { writable: "" }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-73.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-73.js index 965fa44537..816b74380c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-73.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-73.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { configurable: false }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-74.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-74.js index 443d61a4a7..5a2d1d8b46 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-74.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-74.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { value: 100 }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-76.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-76.js index 076c86ede5..70bbe20368 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-76.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-76.js @@ -22,12 +22,9 @@ var child = new ConstructFun(); Object.defineProperty(obj, "property", child); -assert(obj.hasOwnProperty("property")); - -verifyNotConfigurable(obj, "property"); - -assert(obj.hasOwnProperty("property")); - -assert.sameValue(typeof(obj.property), "undefined"); +verifyProperty(obj, "property", { + value: undefined, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-83.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-83.js index 1ab0672165..e08a8f1e06 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-83.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-83.js @@ -18,7 +18,8 @@ Object.defineProperty(attr, "configurable", { Object.defineProperty(obj, "property", attr); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-84.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-84.js index 2361aa0708..a5be67bd6f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-84.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-84.js @@ -29,7 +29,8 @@ Object.defineProperty(child, "configurable", { Object.defineProperty(obj, "property", child); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-85.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-85.js index 0b0868625f..cab6d919d0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-85.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-85.js @@ -24,11 +24,10 @@ var child = new ConstructFun(); Object.defineProperty(obj, "property", child); -assert(obj.hasOwnProperty("property")); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); -assert(obj.hasOwnProperty("property")); assert.sameValue(typeof(obj.property), "undefined"); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-99.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-99.js index aabe445bef..2e46f03642 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-99.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-99.js @@ -15,7 +15,8 @@ Object.defineProperty(obj, "property", { configurable: undefined }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-100.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-100.js index 34c2f090cd..4e92039f13 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-100.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-100.js @@ -16,12 +16,12 @@ obj.foo = 100; // default value of attributes: writable: true, configurable: tru Object.defineProperty(obj, "foo", { value: 200 }); -verifyEqualTo(obj, "foo", 200); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 200, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-101.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-101.js index 1da7826cf5..3dc30d6ed0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-101.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-101.js @@ -16,12 +16,12 @@ obj.foo = 100; // default value of attributes: writable: true, configurable: tru Object.defineProperty(obj, "foo", { value: undefined }); -verifyEqualTo(obj, "foo", undefined); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-102.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-102.js index 33d84c9f53..06fc9a4887 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-102.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-102.js @@ -16,12 +16,12 @@ obj.foo = undefined; // default value of attributes: writable: true, configurabl Object.defineProperty(obj, "foo", { value: 100 }); -verifyEqualTo(obj, "foo", 100); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 100, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-103.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-103.js index b98b2837f7..b179185952 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-103.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-103.js @@ -20,12 +20,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { writable: true }); -verifyEqualTo(obj, "foo", undefined); -verifyWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-104.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-104.js index 28de47218b..5ec8732e23 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-104.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-104.js @@ -20,12 +20,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { enumerable: true }); -verifyEqualTo(obj, "foo", undefined); -verifyNotWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: false, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-105.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-105.js index d1c51afdd3..9da65ba390 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-105.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-105.js @@ -23,12 +23,11 @@ Object.defineProperty(obj, "foo", { configurable: false }); -verifyEqualTo(obj, "foo", 200); - -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 200, + writable: true, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-106.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-106.js index 9d726fe9c3..d4897eb29c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-106.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-106.js @@ -24,12 +24,12 @@ Object.defineProperty(obj, "foo", { writable: false, enumerable: false }); -verifyEqualTo(obj, "foo", 200); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 200, + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-107.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-107.js index 949c297366..9c66006422 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-107.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-107.js @@ -38,8 +38,9 @@ verifyEqualTo(obj, "foo", getFunc2()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-108.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-108.js index c9f5864973..58e2152dc6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-108.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-108.js @@ -34,8 +34,9 @@ Object.defineProperty(obj, "foo", { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-109.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-109.js index 8093ffd718..fa2d599742 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-109.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-109.js @@ -34,8 +34,9 @@ verifyEqualTo(obj, "foo", getFunc()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-110.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-110.js index c94fbc8af0..bfbf658e9f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-110.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-110.js @@ -32,8 +32,9 @@ Object.defineProperty(obj, "foo", { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-112.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-112.js index 4a80f6b084..662a1cbdca 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-112.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-112.js @@ -35,8 +35,9 @@ verifyEqualTo(obj, "foo", getFunc()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-113.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-113.js index 48e4fa7f6d..bce7c0d28e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-113.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-113.js @@ -30,8 +30,9 @@ Object.defineProperty(obj, "foo", { verifyEqualTo(obj, "foo", getFunc()); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-114.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-114.js index a0a8bc367d..a8c2631ca3 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-114.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-114.js @@ -35,8 +35,9 @@ verifyEqualTo(obj, "foo", getFunc()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-115.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-115.js index 5481206420..6137b1d684 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-115.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-115.js @@ -42,8 +42,9 @@ verifyEqualTo(obj, "foo", getFunc2()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-118.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-118.js index 47a6508761..4407e43422 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-118.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-118.js @@ -16,8 +16,11 @@ Object.defineProperty(arrObj, "length", {}); assert.sameValue(arrObj.length, 0); arrObj.length = 2; -assert.sameValue(arrObj.length, 2); -verifyNotEnumerable(arrObj, "length"); -verifyNotConfigurable(arrObj, "length"); + +verifyProperty(arrObj, "length", { + value: 2, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-119.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-119.js index 0c07b625e0..5f50d645dc 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-119.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-119.js @@ -21,8 +21,11 @@ Object.defineProperty(arrObj, "length", { assert.sameValue(arrObj.length, 0); arrObj.length = 2; -assert.sameValue(arrObj.length, 2); -verifyNotEnumerable(arrObj, "length"); -verifyNotConfigurable(arrObj, "length"); + +verifyProperty(arrObj, "length", { + value: 2, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-124.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-124.js index 1dce4ea87c..ba58d7b69b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-124.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-124.js @@ -16,12 +16,12 @@ var arrObj = []; Object.defineProperty(arrObj, "length", { writable: false }); -verifyEqualTo(arrObj, "length", 0); -verifyNotWritable(arrObj, "length"); - -verifyNotEnumerable(arrObj, "length"); - -verifyNotConfigurable(arrObj, "length"); +verifyProperty(arrObj, "length", { + value: 0, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-167.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-167.js index 8c51484bd1..a611ceaf40 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-167.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-167.js @@ -22,7 +22,10 @@ Object.defineProperty(arrObj, "length", { }); assert(!arrObj.hasOwnProperty("1")) -assert.sameValue(arrObj.length, 1); -verifyNotWritable(arrObj, "length"); + +verifyProperty(arrObj, "length", { + value: 1, + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-181.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-181.js index 26f0e3e3cd..9b8881341b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-181.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-181.js @@ -21,9 +21,11 @@ Object.defineProperty(arrObj, "length", { writable: false }); -verifyNotWritable(arrObj, "length"); - assert(!arrObj.hasOwnProperty("1")); -assert.sameValue(arrObj.length, 0); + +verifyProperty(arrObj, "length", { + value: 0, + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-190.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-190.js index e9f7f17e6a..06d0f71da5 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-190.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-190.js @@ -24,17 +24,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "0", "ownDataProperty"); - - verifyNotWritable(arrObj, "0"); - - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } } +verifyProperty(arrObj, "0", { + value: "ownDataProperty", + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-194.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-194.js index c69f78bdbc..f1172f8810 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-194.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-194.js @@ -29,14 +29,14 @@ try { } catch (e) { verifyEqualTo(arrObj, "0", getFunc()); - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e.name); } - } +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-195.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-195.js index 56e50846b6..ff0dd05fa3 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-195.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-195.js @@ -41,9 +41,10 @@ try { verifyWritable(arrObj, "0", "helpVerifySet"); - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); + verifyProperty(arrObj, "0", { + enumerable: false, + configurable: false, + }); } finally { delete Array.prototype[0]; } diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-199.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-199.js index 98cefd1ded..80cbce9a39 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-199.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-199.js @@ -17,12 +17,11 @@ Object.defineProperty(arrObj, "0", { enumerable: true }); -verifyEqualTo(arrObj, "0", undefined); - -verifyNotWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: false, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-200.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-200.js index 2c0632c716..b727dfd394 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-200.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-200.js @@ -20,12 +20,11 @@ Object.defineProperty(arrObj, "0", { configurable: false }); -verifyEqualTo(arrObj, "0", undefined); - -verifyWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: true, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-201.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-201.js index ab771a71c0..67e5615699 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-201.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-201.js @@ -19,12 +19,12 @@ Object.defineProperty(arrObj, "0", { enumerable: true, configurable: false }); -verifyEqualTo(arrObj, "0", 1001); -verifyNotWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 1001, + writable: false, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-202.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-202.js index f6fe819199..bb074efafc 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-202.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-202.js @@ -19,12 +19,12 @@ Object.defineProperty(arrObj, "0", { writable: true, configurable: true }); -verifyEqualTo(arrObj, "0", 1001); -verifyWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 1001, + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-203.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-203.js index 9e6cad35fb..49840159a2 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-203.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-203.js @@ -19,12 +19,12 @@ Object.defineProperty(arrObj, "0", { writable: true, enumerable: true }); -verifyEqualTo(arrObj, "0", 1001); -verifyWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 1001, + writable: true, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-204.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-204.js index b513a1dbb9..49c684f429 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-204.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-204.js @@ -19,12 +19,11 @@ Object.defineProperty(arrObj, "0", { configurable: false }); -verifyEqualTo(arrObj, "0", 1001); - -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 1001, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-205.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-205.js index 72e179ef74..13a6128fa3 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-205.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-205.js @@ -24,8 +24,9 @@ Object.defineProperty(arrObj, "0", { verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-207.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-207.js index 966b1744bd..72501910fb 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-207.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-207.js @@ -28,8 +28,9 @@ verifyEqualTo(arrObj, "0", getFunc()); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-208.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-208.js index ba15c84b8e..be88bcd111 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-208.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-208.js @@ -27,8 +27,9 @@ verifyEqualTo(arrObj, "0", getFunc()); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-209.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-209.js index cdefdc539e..6a6284615f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-209.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-209.js @@ -38,8 +38,9 @@ verifyEqualTo(arrObj, "0", getFunc()); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-210.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-210.js index 3d5614db18..d94a0e32c2 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-210.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-210.js @@ -15,12 +15,12 @@ var arrObj = []; arrObj[0] = 101; // default value of attributes: writable: true, configurable: true, enumerable: true Object.defineProperty(arrObj, "0", {}); -verifyEqualTo(arrObj, "0", 101); -verifyWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 101, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-211.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-211.js index 74773a8b8c..963370db23 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-211.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-211.js @@ -32,8 +32,9 @@ verifyEqualTo(arrObj, "0", getFunc()); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-212.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-212.js index 60a73af96b..ac275e4b75 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-212.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-212.js @@ -22,12 +22,11 @@ Object.defineProperty(arrObj, "0", { configurable: true }); -verifyEqualTo(arrObj, "0", 100); - -verifyWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 100, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-213.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-213.js index aba7e1fb85..9af3a4f98e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-213.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-213.js @@ -39,8 +39,9 @@ verifyEqualTo(arrObj, "0", getFunc()); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-214.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-214.js index a68119a095..95c97dc221 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-214.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-214.js @@ -26,18 +26,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "0", 101); - - verifyNotWritable(arrObj, "0"); - - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "0", { + value: 101, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-215.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-215.js index f6fccd3a61..84af6b3d29 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-215.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-215.js @@ -19,12 +19,12 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { value: undefined }); -verifyEqualTo(arrObj, "0", undefined); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-216.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-216.js index ac7099d2bd..fd58d43e5c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-216.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-216.js @@ -19,12 +19,12 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { value: null }); -verifyEqualTo(arrObj, "0", null); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: null, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-217.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-217.js index 3b9df95a20..b539dc5c9d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-217.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-217.js @@ -20,11 +20,11 @@ Object.defineProperty(arrObj, "0", { value: NaN }); -assert(arrObj.hasOwnProperty("0")); -assert(arrObj[0] !== arrObj[0]); - -verifyNotWritable(arrObj, "0"); -verifyNotEnumerable(arrObj, "0"); -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: NaN, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-218.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-218.js index f9e2e8c567..4f1697f07b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-218.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-218.js @@ -23,18 +23,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "0", -0); - - verifyNotWritable(arrObj, "0"); - - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "0", { + value: -0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-219.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-219.js index 627a70f3ac..ef0742dce5 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-219.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-219.js @@ -23,18 +23,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "0", +0); - - verifyNotWritable(arrObj, "0"); - - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "0", { + value: +0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-220.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-220.js index 1e3d4a2d4c..a890330b36 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-220.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-220.js @@ -20,12 +20,12 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { value: 101 }); -verifyEqualTo(arrObj, "0", 101); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 101, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-221.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-221.js index 00732ff7be..441feff1b9 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-221.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-221.js @@ -25,18 +25,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "0", 101); - - verifyNotWritable(arrObj, "0"); - - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "0", { + value: 101, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-222.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-222.js index 88d73c0af9..93d15fbf4f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-222.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-222.js @@ -20,12 +20,12 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { value: "abcd" }); -verifyEqualTo(arrObj, "0", "abcd"); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: "abcd", + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-223.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-223.js index 7177f6a39a..b39670d94c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-223.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-223.js @@ -25,18 +25,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "0", "abcd"); - - verifyNotWritable(arrObj, "0"); - - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "0", { + value: "abcd", + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-224.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-224.js index 91cac8ffdc..01c57e38f7 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-224.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-224.js @@ -20,12 +20,12 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { value: true }); -verifyEqualTo(arrObj, "0", true); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: true, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-225.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-225.js index 28d8f74f8e..29b344eb75 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-225.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-225.js @@ -25,18 +25,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "0", true); - - verifyNotWritable(arrObj, "0"); - - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "0", { + value: true, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-226.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-226.js index d766b26449..1b02ed6bbb 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-226.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-226.js @@ -24,12 +24,13 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { value: obj1 }); -verifyEqualTo(arrObj, "0", obj1); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: obj1, + writable: false, + enumerable: false, + configurable: false, +}); -verifyNotConfigurable(arrObj, "0"); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-227.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-227.js index 1834373563..a01f415dac 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-227.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-227.js @@ -32,18 +32,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "0", obj1); - - verifyNotWritable(arrObj, "0"); - - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "0", { + value: obj1, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-228.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-228.js index 9316e59db2..c6a7bea532 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-228.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-228.js @@ -20,12 +20,12 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { writable: false }); -verifyEqualTo(arrObj, "0", undefined); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-229.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-229.js index e1dead5a60..7dc8b36836 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-229.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-229.js @@ -21,12 +21,12 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { writable: true }); -verifyEqualTo(arrObj, "0", undefined); -verifyWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-230.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-230.js index 61d0187d81..44305782dc 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-230.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-230.js @@ -34,8 +34,9 @@ verifyEqualTo(arrObj, "0", getFunc()); verifyWritable(arrObj, "0", "helpVerifySet"); -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-231.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-231.js index 40199bd209..9180a48ff8 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-231.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-231.js @@ -40,8 +40,9 @@ verifyEqualTo(arrObj, "0", getFunc2()); verifyWritable(arrObj, "0", "helpVerifySet"); -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-232.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-232.js index d22adbe6f1..b61f732589 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-232.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-232.js @@ -26,8 +26,9 @@ Object.defineProperty(arrObj, "0", { }); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-233.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-233.js index bd2f68977e..137485c1eb 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-233.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-233.js @@ -29,8 +29,9 @@ Object.defineProperty(arrObj, "0", { }); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-234.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-234.js index b67690ecd5..056b76e72c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-234.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-234.js @@ -20,12 +20,12 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { enumerable: false }); -verifyEqualTo(arrObj, "0", undefined); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-235.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-235.js index d10baaf8d4..6d46f6e47f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-235.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-235.js @@ -21,12 +21,12 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { enumerable: true }); -verifyEqualTo(arrObj, "0", undefined); -verifyNotWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: false, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-236.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-236.js index b7df65b72a..d403262794 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-236.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-236.js @@ -20,12 +20,12 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { configurable: false }); -verifyEqualTo(arrObj, "0", undefined); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-237.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-237.js index 59d2e8c84e..291c075755 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-237.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-237.js @@ -20,12 +20,12 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { configurable: false }); -verifyEqualTo(arrObj, "0", undefined); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-238.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-238.js index 9708bd0766..2afbac121c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-238.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-238.js @@ -27,20 +27,17 @@ try { configurable: true }); throw new Test262Error("Expected an exception."); - } catch (e) { - verifyEqualTo(arrObj, "1", 3); - - verifyWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "1", { + value: 3, + writable: true, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-239.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-239.js index 16a8aa0b1a..3036c00095 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-239.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-239.js @@ -29,20 +29,17 @@ try { enumerable: true }); throw new Test262Error("Expected an exception."); - } catch (e) { - verifyEqualTo(arrObj, "1", 3); - - verifyWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "1", { + value: 3, + writable: true, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-240.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-240.js index e74b2479d3..7c3712b1e3 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-240.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-240.js @@ -32,14 +32,14 @@ try { } catch (e) { verifyWritable(arrObj, "1", "setVerifyHelpProp"); - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-241.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-241.js index 8923abc966..6447fcad04 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-241.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-241.js @@ -24,20 +24,17 @@ try { set: function() {} }); throw new Test262Error("Expected an exception."); - } catch (e) { - verifyEqualTo(arrObj, "1", 3); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "1", { + value: 3, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-242-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-242-1.js index 7c21f48ca5..b943a2a765 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-242-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-242-1.js @@ -20,12 +20,11 @@ Object.defineProperty(arrObj, "0", { enumerable: false }); -verifyEqualTo(arrObj, "0", 1001); - -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 1001, + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-242.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-242.js index 5f1d4a8dce..29b55c9ba9 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-242.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-242.js @@ -24,8 +24,9 @@ Object.defineProperty(arrObj, "0", { verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-243-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-243-1.js index a87d6172ea..672f5cc677 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-243-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-243-1.js @@ -27,8 +27,9 @@ arrObj[1] = 4; verifyEqualTo(arrObj, "1", getFunc()); -verifyNotEnumerable(arrObj, "1"); - -verifyConfigurable(arrObj, "1"); +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-243-2-strict.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-243-2-strict.js index ef5649662c..6ac6382e7d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-243-2-strict.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-243-2-strict.js @@ -29,8 +29,9 @@ assert.throws(TypeError, function() { }); verifyEqualTo(arrObj, "1", getFunc()); -verifyNotEnumerable(arrObj, "1"); - -verifyConfigurable(arrObj, "1"); +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-243.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-243.js index 08a11f8705..c6be9ba3ec 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-243.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-243.js @@ -27,12 +27,11 @@ Object.defineProperty(arrObj, "1", { value: 12 }); -verifyEqualTo(arrObj, "1", 12); - -verifyNotWritable(arrObj, "1"); - -verifyNotEnumerable(arrObj, "1"); - -verifyConfigurable(arrObj, "1"); +verifyProperty(arrObj, "1", { + value: 12, + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-244.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-244.js index e5e1d30c7b..112dc0cbfd 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-244.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-244.js @@ -22,25 +22,21 @@ Object.defineProperty(arrObj, "1", { }); try { - Object.defineProperty(arrObj, "1", { writable: true }); throw new Test262Error("Expected an exception."); - } catch (e) { - verifyEqualTo(arrObj, "1", undefined); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "1", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-245.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-245.js index eae22cfee2..91c5b07da6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-245.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-245.js @@ -29,18 +29,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "1", 3); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "1", { + value: 3, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-246.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-246.js index dddbc50767..863f1a7c71 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-246.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-246.js @@ -18,7 +18,6 @@ var arrObj = []; Object.defineProperty(arrObj, "1", { value: -0 - }); try { @@ -27,18 +26,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "1", -0); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "1", { + value: -0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-247.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-247.js index 1a3085a231..fb296bd6b0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-247.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-247.js @@ -27,18 +27,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "1", +0); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "1", { + value: +0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-248.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-248.js index b946c44ae1..8bcd5768f8 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-248.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-248.js @@ -26,18 +26,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "1", 12); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "1", { + value: 12, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-249.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-249.js index 9a7132c20f..7753d29ba7 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-249.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-249.js @@ -26,18 +26,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "1", "abc"); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "1", { + value: "abc", + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-250.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-250.js index e4710d7ef8..5475d629db 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-250.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-250.js @@ -26,18 +26,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "1", false); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "1", { + value: false, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-251.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-251.js index 594cb3a3ee..90796842bc 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-251.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-251.js @@ -29,18 +29,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "1", obj); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "1", { + value: obj, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-252.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-252.js index ab56258dc1..a3ac4bf1ef 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-252.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-252.js @@ -32,14 +32,14 @@ try { } catch (e) { verifyWritable(arrObj, "1", "setVerifyHelpProp"); - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-253.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-253.js index a6fbb2221c..90c76748ad 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-253.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-253.js @@ -32,14 +32,14 @@ try { } catch (e) { verifyEqualTo(arrObj, "1", getFunc()); - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-254.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-254.js index 857f5bd3e1..3960688abb 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-254.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-254.js @@ -29,7 +29,9 @@ var desc = Object.getOwnPropertyDescriptor(arrObj, "1"); assert(desc.hasOwnProperty("get") && typeof desc.get === "undefined"); assert(desc.hasOwnProperty("set") && typeof desc.set === "undefined"); -verifyNotEnumerable(arrObj, "1"); -verifyNotConfigurable(arrObj, "1"); +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-255.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-255.js index 03e3d8a268..d4ec618a12 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-255.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-255.js @@ -40,9 +40,11 @@ try { assert(arrObj[1] === getFunc()); assert(desc.hasOwnProperty("set") && typeof desc.set === "undefined"); - - verifyNotEnumerable(arrObj, "1"); - verifyNotConfigurable(arrObj, "1"); } +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-256.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-256.js index a015f2a9a0..20fb18a60a 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-256.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-256.js @@ -38,8 +38,10 @@ try { assert(desc.hasOwnProperty("set") && typeof desc.set === "undefined"); verifyNotWritable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); } +verifyProperty(arrObj, "1", { + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-257.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-257.js index e6e8c2d369..96f9aae122 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-257.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-257.js @@ -31,8 +31,9 @@ Object.defineProperty(arrObj, "1", { verifyWritable(arrObj, "1", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "1"); - -verifyNotConfigurable(arrObj, "1"); +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-258.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-258.js index 9821d646bb..c1fe51cf10 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-258.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-258.js @@ -17,12 +17,12 @@ var arrObj = [100]; Object.defineProperty(arrObj, "0", { value: 200 }); -verifyEqualTo(arrObj, "0", 200); -verifyWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 200, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-259.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-259.js index b0fbd5e780..e7fbdc8f17 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-259.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-259.js @@ -17,12 +17,12 @@ var arrObj = [100]; Object.defineProperty(arrObj, "0", { value: undefined }); -verifyEqualTo(arrObj, "0", undefined); -verifyWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-260.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-260.js index 5e2b69c160..3a195ba846 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-260.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-260.js @@ -16,12 +16,12 @@ var arrObj = [undefined]; Object.defineProperty(arrObj, "0", { value: 100 }); -verifyEqualTo(arrObj, "0", 100); -verifyWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 100, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-261.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-261.js index e945f54eeb..7ecc70fc44 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-261.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-261.js @@ -16,12 +16,12 @@ var arrObj = [100]; Object.defineProperty(arrObj, "0", { writable: false }); -verifyEqualTo(arrObj, "0", 100); -verifyNotWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 100, + writable: false, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-262.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-262.js index aed61cb5ae..b9a6475463 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-262.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-262.js @@ -17,12 +17,12 @@ var arrObj = [100]; Object.defineProperty(arrObj, "0", { enumerable: false }); -verifyEqualTo(arrObj, "0", 100); -verifyWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 100, + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-263.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-263.js index b0b4ea2cc0..c0caa9fd90 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-263.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-263.js @@ -17,12 +17,12 @@ var arrObj = [100]; Object.defineProperty(arrObj, "0", { configurable: false }); -verifyEqualTo(arrObj, "0", 100); -verifyWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 100, + writable: true, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-264.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-264.js index a7d2eac7f2..97db5f6f91 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-264.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-264.js @@ -18,12 +18,12 @@ Object.defineProperty(arrObj, "0", { enumerable: false, configurable: false }); -verifyEqualTo(arrObj, "0", 100); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 100, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-265.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-265.js index f68fdd93f4..ae3d86596c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-265.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-265.js @@ -28,8 +28,9 @@ Object.defineProperty(arrObj, "0", { }); verifyEqualTo(arrObj, "0", getFunc()); -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-266.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-266.js index 98d664d424..7fd1bfcf7f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-266.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-266.js @@ -26,8 +26,10 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { get: undefined }); -verifyNotEnumerable(arrObj, "0"); -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-267.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-267.js index b1d1f3c19e..532c94c676 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-267.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-267.js @@ -27,8 +27,9 @@ Object.defineProperty(arrObj, "0", { }); verifyEqualTo(arrObj, "0", getFunc()); -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-268.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-268.js index 8f65ec43a1..3f60a9de36 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-268.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-268.js @@ -27,8 +27,9 @@ Object.defineProperty(arrObj, "0", { }); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-269.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-269.js index 84be2830ff..9f0535aa58 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-269.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-269.js @@ -22,8 +22,10 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { set: undefined }); -verifyNotEnumerable(arrObj, "0"); -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-270.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-270.js index 696ebb956a..5d22407b0b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-270.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-270.js @@ -28,8 +28,9 @@ Object.defineProperty(arrObj, "0", { }); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-271.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-271.js index e82084fe9e..f79b212fcf 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-271.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-271.js @@ -29,8 +29,9 @@ Object.defineProperty(arrObj, "0", { }); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-272.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-272.js index 663614560e..478981ccd2 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-272.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-272.js @@ -28,8 +28,9 @@ Object.defineProperty(arrObj, "0", { }); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-273.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-273.js index 14d45dbbb5..0855f67372 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-273.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-273.js @@ -39,8 +39,9 @@ verifyEqualTo(arrObj, "1", getFunc()); verifyWritable(arrObj, "1", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "1"); - -verifyNotConfigurable(arrObj, "1"); +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-277.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-277.js index 825c594a6b..919c7ebc51 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-277.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-277.js @@ -21,12 +21,11 @@ Object.defineProperty(arrObj, "property", { configurable: true }); -verifyEqualTo(arrObj, "property", 12); - -verifyWritable(arrObj, "property"); - -verifyEnumerable(arrObj, "property"); - -verifyConfigurable(arrObj, "property"); +verifyProperty(arrObj, "property", { + value: 12, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-278.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-278.js index 4ad70e2558..bf537c408d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-278.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-278.js @@ -32,8 +32,9 @@ verifyEqualTo(arrObj, "property", getFunc()); verifyWritable(arrObj, "property", "setVerifyHelpProp"); -verifyEnumerable(arrObj, "property"); - -verifyConfigurable(arrObj, "property"); +verifyProperty(arrObj, "property", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-279.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-279.js index 9f78e7cc67..6536ef9bdc 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-279.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-279.js @@ -38,8 +38,9 @@ verifyEqualTo(arrObj, "property", getFunc()); verifyWritable(arrObj, "property", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "property"); - -verifyNotConfigurable(arrObj, "property"); +verifyProperty(arrObj, "property", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-280.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-280.js index 7315c8c784..63f0d7d140 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-280.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-280.js @@ -21,12 +21,11 @@ Object.defineProperty(arrObj, "property", { configurable: false }); -verifyEqualTo(arrObj, "property", 12); - -verifyNotWritable(arrObj, "property"); - -verifyNotEnumerable(arrObj, "property"); - -verifyNotConfigurable(arrObj, "property"); +verifyProperty(arrObj, "property", { + value: 12, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-281.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-281.js index 67ec5776bc..36b8dc51e3 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-281.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-281.js @@ -23,18 +23,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "property", 12); - - verifyNotWritable(arrObj, "property"); - - verifyNotEnumerable(arrObj, "property"); - - verifyNotConfigurable(arrObj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "property", { + value: 12, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-282.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-282.js index 0b05899bc6..01f4174e22 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-282.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-282.js @@ -23,18 +23,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "property", undefined); - - verifyNotWritable(arrObj, "property"); - - verifyNotEnumerable(arrObj, "property"); - - verifyNotConfigurable(arrObj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "property", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-283.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-283.js index 7ca939b4f5..c106eef000 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-283.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-283.js @@ -23,18 +23,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "property", 12); - - verifyNotWritable(arrObj, "property"); - - verifyNotEnumerable(arrObj, "property"); - - verifyNotConfigurable(arrObj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "property", { + value: 12, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-284.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-284.js index 48bd118b9c..ef9e68ce98 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-284.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-284.js @@ -23,18 +23,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "property", 12); - - verifyNotWritable(arrObj, "property"); - - verifyNotEnumerable(arrObj, "property"); - - verifyNotConfigurable(arrObj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "property", { + value: 12, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-285.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-285.js index 055d7d32d7..5604a04a61 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-285.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-285.js @@ -37,14 +37,14 @@ try { verifyWritable(arrObj, "property", "setVerifyHelpProp"); - verifyNotEnumerable(arrObj, "property"); - - verifyNotConfigurable(arrObj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "property", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-286.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-286.js index ebf54b5e61..7c2317d15f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-286.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-286.js @@ -28,14 +28,14 @@ try { } catch (e) { verifyWritable(arrObj, "property", "setVerifyHelpProp"); - verifyNotEnumerable(arrObj, "property"); - - verifyNotConfigurable(arrObj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "property", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-287.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-287.js index 3aa609e301..28ce64b648 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-287.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-287.js @@ -29,14 +29,14 @@ try { } catch (e) { verifyWritable(arrObj, "property", "setVerifyHelpProp"); - verifyNotEnumerable(arrObj, "property"); - - verifyNotConfigurable(arrObj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "property", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-288.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-288.js index 99317bcbab..a022fc284d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-288.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-288.js @@ -29,14 +29,14 @@ try { } catch (e) { verifyWritable(arrObj, "property", "setVerifyHelpProp"); - verifyNotEnumerable(arrObj, "property"); - - verifyNotConfigurable(arrObj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arrObj, "property", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-289-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-289-1.js index 9c16dbb07a..83ecff8e49 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-289-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-289-1.js @@ -28,13 +28,12 @@ includes: [propertyHelper.js] throw new Test262Error("Expected a === 0, actually " + a); } - verifyEqualTo(arguments, "0", 10); - - verifyWritable(arguments, "0"); - - verifyEnumerable(arguments, "0"); - - verifyConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 10, + writable: true, + enumerable: true, + configurable: true, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-289.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-289.js index 4b90e38ef6..c5f4bc699a 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-289.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-289.js @@ -19,13 +19,13 @@ includes: [propertyHelper.js] enumerable: true, configurable: true }); - verifyEqualTo(arguments, "0", 10); - verifyWritable(arguments, "0"); - - verifyEnumerable(arguments, "0"); - - verifyConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 10, + writable: true, + enumerable: true, + configurable: true, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-290-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-290-1.js index 71fa4baeff..b31957da09 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-290-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-290-1.js @@ -37,9 +37,10 @@ includes: [propertyHelper.js] verifyWritable(arguments, "0", "setVerifyHelpProp"); - verifyEnumerable(arguments, "0"); - - verifyConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + enumerable: true, + configurable: true, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-290.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-290.js index 6b4d350268..204d9550c6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-290.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-290.js @@ -31,9 +31,10 @@ includes: [propertyHelper.js] verifyWritable(arguments, "0", "setVerifyHelpProp"); - verifyEnumerable(arguments, "0"); - - verifyConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + enumerable: true, + configurable: true, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-291-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-291-1.js index 04faea4a9e..98cac6c8b0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-291-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-291-1.js @@ -36,9 +36,10 @@ includes: [propertyHelper.js] verifyEqualTo(arguments, "0", getFunc2()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-291.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-291.js index 0d936a72a3..d7b113d7d4 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-291.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-291.js @@ -31,9 +31,10 @@ includes: [propertyHelper.js] }); verifyEqualTo(arguments, "0", getFunc2()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-292-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-292-1.js index 124143b87c..8eb28bae83 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-292-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-292-1.js @@ -25,13 +25,12 @@ flags: [noStrict] throw new Test262Error('Expected a === 20, actually ' + a); } - verifyEqualTo(arguments, "0", 20); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 20, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-292-2-strict.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-292-2-strict.js index 5327e61f5d..da294bea67 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-292-2-strict.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-292-2-strict.js @@ -26,13 +26,12 @@ flags: [onlyStrict] throw new Test262Error('Expected a === 0, actually ' + a); } - verifyEqualTo(arguments, "0", 20); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 20, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-292.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-292.js index 7091d42cf8..b96b3476f4 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-292.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-292.js @@ -18,13 +18,13 @@ includes: [propertyHelper.js] enumerable: false, configurable: false }); - verifyEqualTo(arguments, "0", 20); - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 20, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293-1.js index 642e95f413..f4d493bade 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293-1.js @@ -20,13 +20,13 @@ includes: [propertyHelper.js] Object.defineProperty(arguments, "0", { value: 20 }); - verifyEqualTo(arguments, "0", 20); - verifyNotWritable(arguments, "0"); - - verifyEnumerable(arguments, "0"); - - verifyConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 20, + writable: false, + enumerable: true, + configurable: true, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293-2.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293-2.js index 063ab121d1..9ed17e4bb3 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293-2.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293-2.js @@ -28,24 +28,21 @@ flags: [noStrict] throw new Test262Error("Expected an exception."); } catch (e) { - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - verifyEqualTo(arguments, "0", 10); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (a !== 10) { throw new Test262Error('Expected "a === 10", actually ' + a); } - } + + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293-3.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293-3.js index a27f584a65..bb3170d229 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293-3.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293-3.js @@ -26,13 +26,12 @@ flags: [noStrict] throw new Test262Error('Expected "a === 10", actually ' + a); } - verifyEqualTo(arguments, "0", 20); - - verifyNotWritable(arguments, "0"); - - verifyEnumerable(arguments, "0"); - - verifyConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 20, + writable: false, + enumerable: true, + configurable: true, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293-4-strict.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293-4-strict.js index 03ace78694..6e6c2d9eda 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293-4-strict.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293-4-strict.js @@ -27,13 +27,12 @@ flags: [onlyStrict] throw new Test262Error('Expected "a === 0", actually ' + a); } - verifyEqualTo(arguments, "0", 20); - - verifyNotWritable(arguments, "0"); - - verifyEnumerable(arguments, "0"); - - verifyConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 20, + writable: false, + enumerable: true, + configurable: true, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293.js index 4ca208ba8e..002556ebbe 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-293.js @@ -25,19 +25,17 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "0", 10); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-294-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-294-1.js index e358ab75e8..38413c6b14 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-294-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-294-1.js @@ -32,20 +32,17 @@ flags: [noStrict] throw new Test262Error("Expected TypeError, got " + e); } - verifyEqualTo(arguments, "0", 10); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (a !== 10) { throw new Test262Error('Expected "a === 10", actually ' + a); } - } + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-294.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-294.js index 08c69e755e..5138dc4c3f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-294.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-294.js @@ -24,19 +24,17 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "0", 10); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-295-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-295-1.js index 394066dfc2..3045dee339 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-295-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-295-1.js @@ -32,18 +32,17 @@ flags: [noStrict] throw new Test262Error("Expected TypeError, got " + e); } - verifyEqualTo(arguments, "0", 10); - - verifyNotWritable(arguments, "0"); - - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (a !== 10) { throw new Test262Error('Expected "a === 10", actually ' + a); } } + + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: true, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-295.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-295.js index cd7eb340b7..34df8eb700 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-295.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-295.js @@ -24,19 +24,17 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "0", 10); - - verifyNotWritable(arguments, "0"); - - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: true, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-296-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-296-1.js index 77e9fe1642..90a53ae720 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-296-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-296-1.js @@ -31,18 +31,17 @@ flags: [noStrict] throw new Test262Error("Expected TypeError, got " + e); } - verifyEqualTo(arguments, "0", 10); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (a !== 10) { throw new Test262Error('Expected "a === 10", actually ' + a); } } + + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-296.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-296.js index 8625821007..af40ff4d9c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-296.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-296.js @@ -24,19 +24,17 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "0", 10); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-297-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-297-1.js index 8627560fa9..ec2b3857da 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-297-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-297-1.js @@ -38,15 +38,15 @@ includes: [propertyHelper.js] verifyEqualTo(arguments, "0", getFunc1()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-297.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-297.js index e738fc84a3..fee2b5a6d6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-297.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-297.js @@ -32,15 +32,15 @@ includes: [propertyHelper.js] } catch (e) { verifyEqualTo(arguments, "0", getFunc1()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-298-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-298-1.js index 9cb976b0fd..3bf5f45f96 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-298-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-298-1.js @@ -39,15 +39,15 @@ includes: [propertyHelper.js] verifyEqualTo(arguments, "0", getFunc()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-298.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-298.js index 651330f8f5..e0f0627691 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-298.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-298.js @@ -33,15 +33,15 @@ includes: [propertyHelper.js] } catch (e) { verifyEqualTo(arguments, "0", getFunc()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-299-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-299-1.js index 2ef3e98416..f56db5b666 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-299-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-299-1.js @@ -33,15 +33,15 @@ includes: [propertyHelper.js] } verifyEqualTo(arguments, "0", getFunc()); - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: true, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-299.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-299.js index 8294112d3a..533e491194 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-299.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-299.js @@ -28,15 +28,15 @@ includes: [propertyHelper.js] } catch (e) { verifyEqualTo(arguments, "0", getFunc()); - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: true, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-300-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-300-1.js index 802dd24613..b3d77c7423 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-300-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-300-1.js @@ -33,15 +33,15 @@ includes: [propertyHelper.js] } verifyEqualTo(arguments, "0", getFunc()); - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: true, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-300.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-300.js index 2341d87dca..6e14aa45a6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-300.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-300.js @@ -28,15 +28,15 @@ includes: [propertyHelper.js] } catch (e) { verifyEqualTo(arguments, "0", getFunc()); - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: true, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-301-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-301-1.js index 50854b502f..ba3ff3691c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-301-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-301-1.js @@ -23,13 +23,13 @@ includes: [propertyHelper.js] if (a !== 0) { throw new Test262Error("Expected a === 0, actually " + a); } - verifyEqualTo(arguments, "0", 10); - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-301.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-301.js index 6387b45b3c..0f32d2e7bc 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-301.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-301.js @@ -20,13 +20,13 @@ includes: [propertyHelper.js] enumerable: false, configurable: false }); - verifyEqualTo(arguments, "0", 10); - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-302-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-302-1.js index d9e24450e1..2ccfa7b7b0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-302-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-302-1.js @@ -36,9 +36,10 @@ includes: [propertyHelper.js] verifyWritable(arguments, "0", "setVerifyHelpProp"); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-302.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-302.js index 40fe4d4fcd..a3818170b8 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-302.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-302.js @@ -32,9 +32,10 @@ includes: [propertyHelper.js] verifyWritable(arguments, "0", "setVerifyHelpProp"); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }(0, 1, 2)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-303.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-303.js index e1d15a9dcd..b627552c2b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-303.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-303.js @@ -32,9 +32,10 @@ includes: [propertyHelper.js] }); verifyEqualTo(arguments, "0", getFunc2()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }()); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-304.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-304.js index 058949b82b..a327b5b422 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-304.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-304.js @@ -19,13 +19,13 @@ includes: [propertyHelper.js] enumerable: false, configurable: false }); - verifyEqualTo(arguments, "0", 20); - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 20, + writable: false, + enumerable: false, + configurable: false, + }); }()); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-305.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-305.js index 88e3ea9526..fedd5c087c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-305.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-305.js @@ -25,19 +25,17 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "0", 0); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + value: 0, + writable: false, + enumerable: false, + configurable: false, + }); }()); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-306.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-306.js index a33eff559b..54208f8013 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-306.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-306.js @@ -25,19 +25,17 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "0", 0); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + value: 0, + writable: false, + enumerable: false, + configurable: false, + }); }()); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-307.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-307.js index c9fdf870ff..df233b482d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-307.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-307.js @@ -25,19 +25,17 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "0", 0); - - verifyNotWritable(arguments, "0"); - - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + value: 0, + writable: false, + enumerable: true, + configurable: false, + }); }()); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-308.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-308.js index aceabc53a0..e9cff62621 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-308.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-308.js @@ -25,19 +25,17 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "0", 0); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + value: 0, + writable: false, + enumerable: false, + configurable: false, + }); }()); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-309.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-309.js index f1803f13cd..36adce5824 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-309.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-309.js @@ -33,15 +33,15 @@ includes: [propertyHelper.js] } catch (e) { verifyEqualTo(arguments, "0", getFunc1()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }()); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-310.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-310.js index 094229861a..462d472756 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-310.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-310.js @@ -34,15 +34,15 @@ includes: [propertyHelper.js] } catch (e) { verifyEqualTo(arguments, "0", getFunc()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }()); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-311.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-311.js index ede81f7918..9a4c8172be 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-311.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-311.js @@ -29,15 +29,15 @@ includes: [propertyHelper.js] } catch (e) { verifyEqualTo(arguments, "0", getFunc()); - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: true, + configurable: false, + }); }()); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-312.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-312.js index eaf2c27fab..b906d92976 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-312.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-312.js @@ -27,15 +27,15 @@ includes: [propertyHelper.js] } catch (e) { verifyEqualTo(arguments, "0", getFunc()); - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: true, + configurable: false, + }); }()); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-313-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-313-1.js index 24f6b77d8b..f51e471fec 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-313-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-313-1.js @@ -18,13 +18,13 @@ includes: [propertyHelper.js] enumerable: true, configurable: true }); - verifyEqualTo(arguments, "genericProperty", 1001); - verifyWritable(arguments, "genericProperty"); - - verifyEnumerable(arguments, "genericProperty"); - - verifyConfigurable(arguments, "genericProperty"); + verifyProperty(arguments, "genericProperty", { + value: 1001, + writable: true, + enumerable: true, + configurable: true, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-313.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-313.js index 5f5650d942..815ad29d11 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-313.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-313.js @@ -18,13 +18,13 @@ includes: [propertyHelper.js] enumerable: true, configurable: true }); - verifyEqualTo(arguments, "genericProperty", 1001); - verifyWritable(arguments, "genericProperty"); - - verifyEnumerable(arguments, "genericProperty"); - - verifyConfigurable(arguments, "genericProperty"); + verifyProperty(arguments, "genericProperty", { + value: 1001, + writable: true, + enumerable: true, + configurable: true, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-314-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-314-1.js index aaa4d6a0fc..60c2f1066f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-314-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-314-1.js @@ -29,9 +29,10 @@ includes: [propertyHelper.js] verifyWritable(arguments, "genericProperty", "testgetFunction"); - verifyEnumerable(arguments, "genericProperty"); - - verifyConfigurable(arguments, "genericProperty"); + verifyProperty(arguments, "genericProperty", { + enumerable: true, + configurable: true, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-314.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-314.js index 707689d404..de44b05071 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-314.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-314.js @@ -29,9 +29,10 @@ includes: [propertyHelper.js] verifyWritable(arguments, "genericProperty", "testgetFunction"); - verifyEnumerable(arguments, "genericProperty"); - - verifyConfigurable(arguments, "genericProperty"); + verifyProperty(arguments, "genericProperty", { + enumerable: true, + configurable: true, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-315-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-315-1.js index 078b2b0c03..83290dddd1 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-315-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-315-1.js @@ -44,9 +44,10 @@ includes: [propertyHelper.js] verifyWritable(arguments, "genericProperty", "testgetFunction"); - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); + verifyProperty(arguments, "genericProperty", { + enumerable: false, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-315.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-315.js index f9e6b876a8..7d6c5b80c8 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-315.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-315.js @@ -40,9 +40,10 @@ includes: [propertyHelper.js] verifyWritable(arguments, "genericProperty", "testgetFunction"); - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); + verifyProperty(arguments, "genericProperty", { + enumerable: false, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-316-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-316-1.js index 4c18c0b45c..9d4203c2b7 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-316-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-316-1.js @@ -23,13 +23,13 @@ includes: [propertyHelper.js] enumerable: false, configurable: false }); - verifyEqualTo(arguments, "genericProperty", 1002); - verifyWritable(arguments, "genericProperty"); - - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); + verifyProperty(arguments, "genericProperty", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-316.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-316.js index 6683891473..7ed325b7ab 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-316.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-316.js @@ -23,13 +23,13 @@ includes: [propertyHelper.js] enumerable: false, configurable: false }); - verifyEqualTo(arguments, "genericProperty", 1002); - verifyWritable(arguments, "genericProperty"); - - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); + verifyProperty(arguments, "genericProperty", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-317-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-317-1.js index be820cbce1..5eec5035ee 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-317-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-317-1.js @@ -28,19 +28,17 @@ includes: [propertyHelper.js] throw new Test262Error('Expected "b === 2;", actually ' + b); } - verifyEqualTo(arguments, "genericProperty", 1001); - - verifyNotWritable(arguments, "genericProperty"); - - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + value: 1001, + writable: false, + enumerable: false, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-317.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-317.js index 77ca0ba862..0d7c8266b0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-317.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-317.js @@ -23,19 +23,17 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "genericProperty", 1001); - - verifyNotWritable(arguments, "genericProperty"); - - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + value: 1001, + writable: false, + enumerable: false, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-318-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-318-1.js index c275772feb..acd8d37483 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-318-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-318-1.js @@ -23,19 +23,17 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "genericProperty", undefined); - - verifyNotWritable(arguments, "genericProperty"); - - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-318.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-318.js index 95284091f6..ce31e7dc9f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-318.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-318.js @@ -22,21 +22,17 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "genericProperty", undefined); - - verifyNotWritable(arguments, "genericProperty"); - - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + verifyProperty(arguments, "genericProperty", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-319-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-319-1.js index 6f184f8196..449fdf3fbd 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-319-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-319-1.js @@ -23,20 +23,17 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "genericProperty", undefined); - - verifyNotWritable(arguments, "genericProperty"); - - verifyEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + value: undefined, + writable: false, + enumerable: true, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-319.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-319.js index d4c4c20dc9..a9059f043f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-319.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-319.js @@ -22,19 +22,17 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "genericProperty", undefined); - - verifyNotWritable(arguments, "genericProperty"); - - verifyEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + value: undefined, + writable: false, + enumerable: true, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-320-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-320-1.js index 794b689a98..343a81b5eb 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-320-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-320-1.js @@ -22,19 +22,17 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "genericProperty", undefined); - - verifyNotWritable(arguments, "genericProperty"); - - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-320.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-320.js index 2d16488d20..018b12ae85 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-320.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-320.js @@ -21,21 +21,17 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "genericProperty", undefined); - - verifyNotWritable(arguments, "genericProperty"); - - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + verifyProperty(arguments, "genericProperty", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-321-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-321-1.js index f0b19aff91..328f00ac56 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-321-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-321-1.js @@ -41,15 +41,15 @@ includes: [propertyHelper.js] verifyWritable(arguments, "genericProperty", "helpVerifyGet"); - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + enumerable: false, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-321.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-321.js index ce1ebc65ec..cc21c38b96 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-321.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-321.js @@ -36,15 +36,15 @@ includes: [propertyHelper.js] verifyWritable(arguments, "genericProperty", "helpVerifyGet"); - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + enumerable: false, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-322-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-322-1.js index 4261b4980b..e50a02d336 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-322-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-322-1.js @@ -30,15 +30,15 @@ includes: [propertyHelper.js] } catch (e) { verifyWritable(arguments, "genericProperty", "genericPropertyString"); - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + enumerable: false, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-322.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-322.js index 9414c90d54..3d52c42a3d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-322.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-322.js @@ -29,15 +29,15 @@ includes: [propertyHelper.js] } catch (e) { verifyWritable(arguments, "genericProperty", "genericPropertyString"); - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + enumerable: false, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-323-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-323-1.js index 769c0a8634..252fad78ae 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-323-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-323-1.js @@ -32,16 +32,15 @@ includes: [propertyHelper.js] } verifyWritable(arguments, "genericProperty", "genericPropertyString"); - verifyEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + verifyProperty(arguments, "genericProperty", { + enumerable: true, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-323.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-323.js index a6e17705ef..ee0cbf67ac 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-323.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-323.js @@ -28,15 +28,15 @@ includes: [propertyHelper.js] } catch (e) { verifyWritable(arguments, "genericProperty", "genericPropertyString"); - verifyEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + enumerable: true, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-324-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-324-1.js index 949102ee2f..0bffa63c65 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-324-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-324-1.js @@ -28,15 +28,15 @@ includes: [propertyHelper.js] } catch (e) { verifyWritable(arguments, "genericProperty", "genericPropertyString"); - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + enumerable: false, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-324.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-324.js index bd7e47b2d2..c7f0a023f6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-324.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-324.js @@ -27,16 +27,15 @@ includes: [propertyHelper.js] } catch (e) { verifyWritable(arguments, "genericProperty", "genericPropertyString"); - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } - false; + + verifyProperty(arguments, "genericProperty", { + enumerable: false, + configurable: false, + }); }(1, 2, 3)); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-1.js index b38f669f07..b1eb009f19 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-1.js @@ -24,12 +24,11 @@ Object.defineProperty(obj, "property", { value: 1002 }); -verifyEqualTo(obj, "property", 1002); - -verifyWritable(obj, "property"); - -verifyNotEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-2.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-2.js index 2c7ac9fd07..e2df9640ff 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-2.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-2.js @@ -24,12 +24,11 @@ Object.defineProperty(obj, "0", { value: 1002 }); -verifyEqualTo(obj, "0", 1002); - -verifyWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-3.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-3.js index 214436cb50..cd9db364ea 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-3.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-3.js @@ -26,12 +26,11 @@ Object.defineProperty(obj, "property", { value: 1002 }); -verifyEqualTo(obj, "property", 1002); - -verifyWritable(obj, "property"); - -verifyNotEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-6.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-6.js index 21265866ff..77186e1b85 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-6.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-6.js @@ -24,12 +24,11 @@ Object.defineProperty(obj, "0", { value: 1002 }); -verifyEqualTo(obj, "0", 1002); - -verifyWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-7.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-7.js index dea755a355..8881de5da7 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-7.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-7.js @@ -24,12 +24,11 @@ Object.defineProperty(obj, "prop", { value: 1002 }); -verifyEqualTo(obj, "prop", 1002); - -verifyWritable(obj, "prop"); - -verifyNotEnumerable(obj, "prop"); - -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-8.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-8.js index 785d0adc99..1e440f485b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-8.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-333-8.js @@ -26,12 +26,11 @@ Object.defineProperty(obj, "0", { value: 1002 }); -verifyEqualTo(obj, "0", 1002); - -verifyWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-335.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-335.js index 177a249f90..8afe8c12f0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-335.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-335.js @@ -18,8 +18,9 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); -assert.sameValue(obj.prop, 2010); +verifyProperty(obj, "prop", { + value: 2010, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-349.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-349.js index 143606c7a9..af098aa486 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-349.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-349.js @@ -18,8 +18,9 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); -assert.sameValue(obj.prop, 2010); +verifyProperty(obj, "prop", { + value: 2010, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-1.js index 3e580abc51..f17f51615c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-1.js @@ -24,12 +24,11 @@ Object.defineProperty(obj, "property", { value: 1002 }); -verifyEqualTo(obj, "property", 1002); - -verifyNotWritable(obj, "property"); - -verifyNotEnumerable(obj, "property"); - -verifyConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: 1002, + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-10.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-10.js index 4fa47d892d..78e8a4e234 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-10.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-10.js @@ -24,12 +24,11 @@ Object.defineProperty(obj, "0", { value: 1002 }); -verifyEqualTo(obj, "0", 1002); - -verifyNotWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1002, + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-11.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-11.js index 0f23373bff..3cde36b73f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-11.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-11.js @@ -24,12 +24,11 @@ Object.defineProperty(obj, "prop", { value: 1002 }); -verifyEqualTo(obj, "prop", 1002); - -verifyNotWritable(obj, "prop"); - -verifyNotEnumerable(obj, "prop"); - -verifyConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 1002, + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-12.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-12.js index c301667d62..762a767ecc 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-12.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-12.js @@ -26,12 +26,11 @@ Object.defineProperty(obj, "0", { value: 1002 }); -verifyEqualTo(obj, "0", 1002); - -verifyNotWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1002, + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-15.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-15.js index 42cf188ef5..df68d33fc5 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-15.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-15.js @@ -19,7 +19,9 @@ Object.defineProperty(obj, "prop", { configurable: true }); -assert.sameValue(obj.prop, 2010); -verifyNotWritable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 2010, + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-16.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-16.js index b5947a8818..94466d9dcf 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-16.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-16.js @@ -22,7 +22,9 @@ Object.defineProperty(obj, "0", { configurable: true }); -assert.sameValue(obj[0], 2010); -verifyNotWritable(obj, "0"); +verifyProperty(obj, "0", { + value: 2010, + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-2.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-2.js index 60ef5a8187..25c8fd2b22 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-2.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-2.js @@ -24,12 +24,11 @@ Object.defineProperty(obj, "0", { value: 1002 }); -verifyEqualTo(obj, "0", 1002); - -verifyNotWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1002, + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-3.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-3.js index fecfdd55a4..7567ddf16d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-3.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-3.js @@ -25,12 +25,11 @@ Object.defineProperty(obj, "property", { value: 1002 }); -verifyEqualTo(obj, "property", 1002); - -verifyNotWritable(obj, "property"); - -verifyNotEnumerable(obj, "property"); - -verifyConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: 1002, + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-6.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-6.js index 140bc5b7f7..58669c9a14 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-6.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-6.js @@ -19,7 +19,9 @@ Object.defineProperty(obj, "0", { configurable: true }); -assert.sameValue(obj[0], 2010); -verifyNotWritable(obj, "0"); +verifyProperty(obj, "0", { + value: 2010, + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-7.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-7.js index 31fffa2ee2..c7f38278ed 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-7.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354-7.js @@ -21,7 +21,9 @@ Object.defineProperty(obj, "prop", { configurable: true }); -assert.sameValue(obj.prop, 2010); -verifyNotWritable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 2010, + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354.js index dbf15887fb..d43159c7c6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-354.js @@ -18,7 +18,9 @@ Object.defineProperty(obj, "prop", { configurable: true }); -assert.sameValue(obj.prop, 2010); -verifyNotWritable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 2010, + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-361.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-361.js index ddaf657cd8..5369b5da0b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-361.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-361.js @@ -18,7 +18,9 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert.sameValue(obj.prop, 2010); -verifyNotWritable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 2010, + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-363.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-363.js index 5eb3404f36..cd9b1d6519 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-363.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-363.js @@ -18,7 +18,8 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-368.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-368.js index 1faaa98d37..1a9cb6b12b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-368.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-368.js @@ -18,7 +18,9 @@ Object.defineProperty(obj, "prop", { configurable: true }); -assert.sameValue(obj.prop, 2010); -verifyNotWritable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 2010, + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-375.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-375.js index b41c9513e2..9c9cbd5511 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-375.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-375.js @@ -18,7 +18,9 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert.sameValue(obj.prop, 2010); -verifyNotWritable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 2010, + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-377.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-377.js index efd2e54659..c9102fcc6f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-377.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-377.js @@ -18,7 +18,8 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-38.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-38.js index f40b4f152a..b3ac2b6d88 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-38.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-38.js @@ -16,13 +16,12 @@ try { configurable: true }); - verifyEqualTo(Math, "foo", 12); - - verifyNotWritable(Math, "foo"); - - verifyNotEnumerable(Math, "foo"); - - verifyConfigurable(Math, "foo"); + verifyProperty(Math, "foo", { + value: 12, + writable: false, + enumerable: false, + configurable: true, + }); } finally { delete Math.foo; } diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-41.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-41.js index e69119a145..df5be6a6c9 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-41.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-41.js @@ -16,13 +16,12 @@ Object.defineProperty(JSON, "foo", { configurable: true }); -verifyEqualTo(JSON, "foo", 12); - -verifyNotWritable(JSON, "foo"); - -verifyNotEnumerable(JSON, "foo"); - -verifyConfigurable(JSON, "foo"); +verifyProperty(JSON, "foo", { + value: 12, + writable: false, + enumerable: false, + configurable: true, +}); delete JSON.foo; diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-429.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-429.js index 1484ccd385..074908184e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-429.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-429.js @@ -24,11 +24,11 @@ var desc1 = Object.getOwnPropertyDescriptor(obj, "prop"); Object.defineProperty(obj, "prop", { configurable: false }); -var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); -verifyNotConfigurable(obj, "prop"); assert.sameValue(desc1.configurable, true); -assert.sameValue(desc2.configurable, false); -assert(obj.hasOwnProperty("prop")); + +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-434.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-434.js index 0c278f09b7..7d3bd1adc5 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-434.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-434.js @@ -19,12 +19,8 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); - -var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - -assert.sameValue(desc.configurable, false); - -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-438.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-438.js index ccf6b3d0aa..25bb6064b0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-438.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-438.js @@ -30,14 +30,11 @@ try { } catch (e) { assert(e instanceof TypeError); - var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, false); - assert.sameValue(desc2.configurable, false); - - verifyNotConfigurable(obj, "prop"); - - assert(obj.hasOwnProperty("prop")); } +verifyProperty(obj, "prop", { + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-447.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-447.js index e7580caeb2..e983a44b71 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-447.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-447.js @@ -25,12 +25,10 @@ Object.defineProperty(obj, "prop", { configurable: false }); -var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, true); -assert.sameValue(desc2.configurable, false); -verifyNotConfigurable(obj, "prop"); -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-45.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-45.js index 65701f6c78..63126072c2 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-45.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-45.js @@ -15,12 +15,11 @@ Object.defineProperty(this, "foo", { configurable: true }); -verifyEqualTo(this, "foo", 12); - -verifyNotWritable(this, "foo"); - -verifyNotEnumerable(this, "foo"); - -verifyConfigurable(this, "foo"); +verifyProperty(this, "foo", { + value: 12, + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-452.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-452.js index d099d78495..19a74b78ac 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-452.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-452.js @@ -19,12 +19,8 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); - -var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - -assert.sameValue(desc.configurable, false); - -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-456.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-456.js index da9397f14d..3f008f372c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-456.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-456.js @@ -30,14 +30,11 @@ try { } catch (e) { assert(e instanceof TypeError); - var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, false); - assert.sameValue(desc2.configurable, false); - - verifyNotConfigurable(obj, "prop"); - - assert(obj.hasOwnProperty("prop")); } +verifyProperty(obj, "prop", { + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-465.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-465.js index 6ff40b2cc5..f4071187d6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-465.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-465.js @@ -30,12 +30,10 @@ Object.defineProperty(obj, "prop", { configurable: false }); -var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, true); -assert.sameValue(desc2.configurable, false); -verifyNotConfigurable(obj, "prop"); -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-47.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-47.js index 4b8fd1bf7f..6734e898d6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-47.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-47.js @@ -18,12 +18,11 @@ Object.defineProperty(obj, "property", { configurable: false }); -verifyEqualTo(obj, "property", undefined); - -verifyWritable(obj, "property"); - -verifyEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: undefined, + writable: true, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-470.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-470.js index 39b025006b..9a8cdc0e77 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-470.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-470.js @@ -26,13 +26,10 @@ Object.defineProperty(obj, "prop", { assert(obj.hasOwnProperty("prop")); -var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - verifyNotWritable(obj, "prop"); -verifyNotConfigurable(obj, "prop"); - -assert.sameValue(desc.configurable, false); -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-474.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-474.js index ce3fa250dd..6c9bdd63e7 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-474.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-474.js @@ -35,14 +35,11 @@ try { } catch (e) { assert(e instanceof TypeError); - var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, false); - assert.sameValue(desc2.configurable, false); - - verifyNotConfigurable(obj, "prop"); - - assert(obj.hasOwnProperty("prop")); } +verifyProperty(obj, "prop", { + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-48.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-48.js index 1dcf25ea46..68228104fc 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-48.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-48.js @@ -18,12 +18,11 @@ Object.defineProperty(obj, "property", { configurable: false }); -verifyEqualTo(obj, "property", 1001); - -verifyNotWritable(obj, "property"); - -verifyEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: 1001, + writable: false, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-483.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-483.js index 118a8aac10..44225c7497 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-483.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-483.js @@ -30,13 +30,10 @@ Object.defineProperty(obj, "prop", { configurable: false }); -var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, true); -assert.sameValue(desc2.configurable, false); - -verifyNotConfigurable(obj, "prop"); -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-488.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-488.js index 0785a3996e..c6155cd8de 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-488.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-488.js @@ -24,13 +24,8 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); - -var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - -verifyNotConfigurable(obj, "prop"); -assert.sameValue(desc.configurable, false); - -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-49.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-49.js index 9e45eed271..5861ea3315 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-49.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-49.js @@ -17,12 +17,12 @@ Object.defineProperty(obj, "property", { writable: true, configurable: true }); -verifyEqualTo(obj, "property", 1001); -verifyWritable(obj, "property"); - -verifyNotEnumerable(obj, "property"); - -verifyConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: 1001, + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-492.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-492.js index cc418c9e12..08df806be9 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-492.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-492.js @@ -35,14 +35,11 @@ try { } catch (e) { assert(e instanceof TypeError); - var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - - verifyNotConfigurable(obj, "prop"); - assert.sameValue(desc1.configurable, false); - assert.sameValue(desc2.configurable, false); - - assert(obj.hasOwnProperty("prop")); } +verifyProperty(obj, "prop", { + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-50.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-50.js index f49f61a6c3..3a3a1ae707 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-50.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-50.js @@ -17,12 +17,12 @@ Object.defineProperty(obj, "property", { writable: true, enumerable: true }); -verifyEqualTo(obj, "property", 1001); -verifyWritable(obj, "property"); - -verifyEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: 1001, + writable: true, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-501.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-501.js index 7de38b5055..436f8d63e3 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-501.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-501.js @@ -29,14 +29,12 @@ Object.defineProperty(obj, "prop", { configurable: false }); -var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, true); -assert.sameValue(desc2.configurable, false); verifyNotWritable(obj, "prop"); -verifyNotConfigurable(obj, "prop"); -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-506.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-506.js index 8ad6ca3b7c..a65dd9b778 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-506.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-506.js @@ -23,14 +23,8 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); - -var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - -assert.sameValue(desc.configurable, false); - -verifyNotConfigurable(obj, "prop"); - -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-51.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-51.js index 989d71d164..7c987bdbb3 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-51.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-51.js @@ -20,12 +20,11 @@ Object.defineProperty(obj, "property", { configurable: false }); -verifyEqualTo(obj, "property", 1001); - -verifyNotWritable(obj, "property"); - -verifyNotEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: 1001, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-510.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-510.js index 325f76e16c..418d8113e1 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-510.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-510.js @@ -34,14 +34,11 @@ try { } catch (e) { assert(e instanceof TypeError); - var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, false); - assert.sameValue(desc2.configurable, false); - - verifyNotConfigurable(obj, "prop"); - - assert(obj.hasOwnProperty("prop")); } +verifyProperty(obj, "prop", { + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-519.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-519.js index 60baf731ee..b5305b02e3 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-519.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-519.js @@ -29,13 +29,10 @@ Object.defineProperty(obj, "prop", { configurable: false }); -var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, true); -assert.sameValue(desc2.configurable, false); - -verifyNotConfigurable(obj, "prop"); -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-52.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-52.js index 0d2ca8420a..4c2713c081 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-52.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-52.js @@ -14,12 +14,11 @@ var obj = {}; Object.defineProperty(obj, "property", {}); -verifyEqualTo(obj, "property", undefined); - -verifyNotWritable(obj, "property"); - -verifyNotEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-524.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-524.js index aa6fe43c25..7f2161477f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-524.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-524.js @@ -23,13 +23,8 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); -var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - -assert.sameValue(desc.configurable, false); - -verifyNotConfigurable(obj, "prop"); - -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-528.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-528.js index b666822536..5dab355151 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-528.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-528.js @@ -34,14 +34,11 @@ try { } catch (e) { assert(e instanceof TypeError); - var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, false); - assert.sameValue(desc2.configurable, false); - - verifyNotConfigurable(obj, "prop"); - - assert(obj.hasOwnProperty("prop")); } +verifyProperty(obj, "prop", { + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-53.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-53.js index b8dd34d5ab..2da947a546 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-53.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-53.js @@ -23,8 +23,9 @@ Object.defineProperty(obj, "property", { verifyWritable(obj, "property", "setVerifyHelpProp"); -verifyEnumerable(obj, "property"); - -verifyConfigurable(obj, "property"); +verifyProperty(obj, "property", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-1.js index 167099fb52..8326068541 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-1.js @@ -40,8 +40,9 @@ verifyEqualTo(obj, "property", getFunc()); verifyWritable(obj, "property", "verifySetFunction1"); -verifyNotEnumerable(obj, "property"); - -verifyConfigurable(obj, "property"); +verifyProperty(obj, "property", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-10.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-10.js index 50dbf751f4..a419791c35 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-10.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-10.js @@ -42,8 +42,9 @@ verifyEqualTo(obj, "0", getFunc()); verifyWritable(obj, "0", "verifySetFunction1"); -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-11.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-11.js index d23dfcde09..304b9db3bb 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-11.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-11.js @@ -41,8 +41,9 @@ verifyEqualTo(obj, "prop", getFunc()); verifyWritable(obj, "prop", "verifySetFunction1"); -verifyNotEnumerable(obj, "prop"); - -verifyConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-12.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-12.js index 05a7954bab..7cac1e393e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-12.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-12.js @@ -43,8 +43,9 @@ verifyEqualTo(obj, "0", getFunc()); verifyWritable(obj, "0", "verifySetFunction1"); -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-2.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-2.js index 6c459d0db2..2151ea314c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-2.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-2.js @@ -42,8 +42,9 @@ verifyEqualTo(obj, "0", getFunc()); verifyWritable(obj, "0", "verifySetFunction1"); -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-3.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-3.js index 0dc6f76257..9720210f17 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-3.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-531-3.js @@ -43,8 +43,9 @@ verifyEqualTo(obj, "property", getFunc()); verifyWritable(obj, "property", "verifySetFunction1"); -verifyNotEnumerable(obj, "property"); - -verifyConfigurable(obj, "property"); +verifyProperty(obj, "property", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-537.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-537.js index e05ce8fecf..a361819a17 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-537.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-537.js @@ -34,11 +34,11 @@ var desc1 = Object.getOwnPropertyDescriptor(obj, "prop"); Object.defineProperty(obj, "prop", { configurable: false }); -var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); -verifyNotConfigurable(obj, "prop"); assert.sameValue(desc1.configurable, true); -assert.sameValue(desc2.configurable, false); -assert(obj.hasOwnProperty("prop")); + +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538-1.js index 06dd0aa4b9..340bbd5aa2 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538-1.js @@ -54,8 +54,9 @@ verifyEqualTo(obj, "0", 1001); verifyNotWritable(obj, "0"); -verifyEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538-2.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538-2.js index c1a03d0ff9..89fcca4632 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538-2.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538-2.js @@ -56,8 +56,9 @@ verifyEqualTo(obj, "prop", 1001); verifyNotWritable(obj, "prop"); -verifyEnumerable(obj, "prop"); - -verifyConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538-5.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538-5.js index effdbc3676..146f5c421b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538-5.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538-5.js @@ -55,8 +55,9 @@ verifyEqualTo(obj, "prop", 1001); verifyNotWritable(obj, "prop"); -verifyEnumerable(obj, "prop"); - -verifyConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538-6.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538-6.js index 4bfe9d32ee..aa286ce903 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538-6.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538-6.js @@ -56,8 +56,9 @@ verifyEqualTo(obj, "0", 1001); verifyNotWritable(obj, "0"); -verifyEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538.js index 8943f5cff9..89f7fbe3e5 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-538.js @@ -51,8 +51,9 @@ verifyEqualTo(obj, "prop", 1001); verifyNotWritable(obj, "prop"); -verifyEnumerable(obj, "prop"); - -verifyConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-54.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-54.js index 34de6eff1d..e36e1e18ac 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-54.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-54.js @@ -26,7 +26,9 @@ assert.sameValue(obj.property, "property"); var desc = Object.getOwnPropertyDescriptor(obj, "property"); assert.sameValue(typeof desc.set, "undefined"); -verifyNotEnumerable(obj, "property"); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-1.js index ac2f8d5fb0..b7ccfef31f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-1.js @@ -38,12 +38,13 @@ try { verifyEqualTo(obj, "property", getFunc()); verifyWritable(obj, "property", "verifySetFunction"); - - verifyNotEnumerable(obj, "property"); - - verifyNotConfigurable(obj, "property"); } +verifyProperty(obj, "property", { + enumerable: false, + configurable: false, +}); + try { Object.defineProperty(obj, "property", { set: function(value) { @@ -59,14 +60,14 @@ try { verifyWritable(obj, "property", "verifySetFunction"); - verifyNotEnumerable(obj, "property"); - - verifyNotConfigurable(obj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "property", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-2.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-2.js index df61180433..4e2ac6db59 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-2.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-2.js @@ -38,12 +38,13 @@ try { verifyEqualTo(obj, "0", getFunc()); verifyWritable(obj, "0", "verifySetFunction"); - - verifyNotEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); } +verifyProperty(obj, "0", { + enumerable: false, + configurable: false, +}); + try { Object.defineProperty(obj, "0", { set: function(value) { @@ -59,14 +60,14 @@ try { verifyWritable(obj, "0", "verifySetFunction"); - verifyNotEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "0", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-3.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-3.js index f7018700c9..1aeb2c071d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-3.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-3.js @@ -39,12 +39,13 @@ try { verifyEqualTo(obj, "property", getFunc()); verifyWritable(obj, "property", "verifySetFunction"); - - verifyNotEnumerable(obj, "property"); - - verifyNotConfigurable(obj, "property"); } +verifyProperty(obj, "property", { + enumerable: false, + configurable: false, +}); + try { Object.defineProperty(obj, "property", { set: function(value) { @@ -61,14 +62,14 @@ try { verifyWritable(obj, "property", "verifySetFunction"); - verifyNotEnumerable(obj, "property"); - - verifyNotConfigurable(obj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "property", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-6.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-6.js index 64cc3ff55f..8431a64191 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-6.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-6.js @@ -39,12 +39,13 @@ try { verifyEqualTo(obj, "0", getFunc()); verifyWritable(obj, "0", "verifySetFunction"); - - verifyNotEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); } +verifyProperty(obj, "0", { + enumerable: false, + configurable: false, +}); + try { Object.defineProperty(obj, "0", { set: function(value) { @@ -60,15 +61,14 @@ try { verifyWritable(obj, "0", "verifySetFunction"); - verifyNotEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); - - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "0", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-7.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-7.js index bc90c7b983..1bc3fcfa22 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-7.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-7.js @@ -38,12 +38,13 @@ try { verifyEqualTo(obj, "prop", getFunc()); verifyWritable(obj, "prop", "verifySetFunction"); - - verifyNotEnumerable(obj, "prop"); - - verifyNotConfigurable(obj, "prop"); } +verifyProperty(obj, "prop", { + enumerable: false, + configurable: false, +}); + try { Object.defineProperty(obj, "prop", { set: function(value) { @@ -60,15 +61,14 @@ try { verifyWritable(obj, "prop", "verifySetFunction"); - verifyNotEnumerable(obj, "prop"); - - verifyNotConfigurable(obj, "prop"); - - if (!(e1 instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e1); } - } +verifyProperty(obj, "prop", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-8.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-8.js index 26be4c5177..cca11f6b53 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-8.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-540-8.js @@ -40,12 +40,13 @@ try { verifyEqualTo(obj, "0", getFunc()); verifyWritable(obj, "0", "verifySetFunction"); - - verifyNotEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); } +verifyProperty(obj, "0", { + enumerable: false, + configurable: false, +}); + try { Object.defineProperty(obj, "0", { set: function(value) { @@ -61,14 +62,14 @@ try { verifyWritable(obj, "0", "verifySetFunction"); - verifyNotEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "0", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-542.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-542.js index 0768fd3034..d1effa9fe0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-542.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-542.js @@ -28,7 +28,8 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-546.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-546.js index bd266dbcb3..2cefdfbb7f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-546.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-546.js @@ -29,6 +29,7 @@ Object.defineProperty(obj, "prop", { configurable: false }); var desc1 = Object.getOwnPropertyDescriptor(obj, "prop"); +assert.sameValue(desc1.configurable, false); try { Object.defineProperty(obj, "prop", { @@ -38,12 +39,10 @@ try { throw new Test262Error("Expected TypeError"); } catch (e) { assert(e instanceof TypeError); - assert.sameValue(desc1.configurable, false); - - var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc2.configurable, false); - - verifyNotConfigurable(obj, "prop"); } +verifyProperty(obj, "prop", { + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-547-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-547-1.js index ae003f7fdd..24c73a6f46 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-547-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-547-1.js @@ -51,15 +51,14 @@ try { verifyWritable(obj, "0", "verifySetFunc"); - verifyEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); - - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "0", { + enumerable: true, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-547-2.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-547-2.js index 6b40da84ff..1fc93445ef 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-547-2.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-547-2.js @@ -53,15 +53,14 @@ try { verifyWritable(obj, "prop", "verifySetFunc"); - verifyEnumerable(obj, "prop"); - - verifyNotConfigurable(obj, "prop"); - - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "prop", { + enumerable: true, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-547-3.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-547-3.js index db6e0fdd62..3e3815b131 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-547-3.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-547-3.js @@ -51,14 +51,15 @@ try { verifyWritable(obj, "prop", "verifySetFunc"); - verifyEnumerable(obj, "prop"); - - verifyNotConfigurable(obj, "prop"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } } +verifyProperty(obj, "prop", { + enumerable: true, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-547-4.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-547-4.js index ffc954933e..f5261f8ce5 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-547-4.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-547-4.js @@ -51,15 +51,14 @@ try { verifyWritable(obj, "0", "verifySetFunc"); - verifyEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); - - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "0", { + enumerable: true, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-55.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-55.js index ca020589dd..7fced08f66 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-55.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-55.js @@ -28,8 +28,9 @@ verifyEqualTo(obj, "property", getFunc()); verifyWritable(obj, "property", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "property"); - -verifyConfigurable(obj, "property"); +verifyProperty(obj, "property", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-555.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-555.js index 96f0f78ea5..64d8596265 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-555.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-555.js @@ -36,6 +36,8 @@ Object.defineProperty(obj, "prop", { configurable: false }); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-56.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-56.js index c5ea0ffad5..004dc7e27a 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-56.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-56.js @@ -27,8 +27,9 @@ verifyEqualTo(obj, "property", getFunc()); verifyWritable(obj, "property", "setVerifyHelpProp"); -verifyEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-560.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-560.js index 127e3d4d42..ce9172ee37 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-560.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-560.js @@ -28,7 +28,8 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-564.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-564.js index b4d0e29416..24c6c00d0b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-564.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-564.js @@ -28,7 +28,6 @@ Object.defineProperty(obj, "prop", { enumerable: false, configurable: false }); -var desc1 = Object.getOwnPropertyDescriptor(obj, "prop"); try { Object.defineProperty(obj, "prop", { @@ -38,8 +37,10 @@ try { throw new Test262Error("Expected TypeError"); } catch (e) { assert(e instanceof TypeError); - assert.sameValue(desc1.configurable, false); - verifyNotConfigurable(obj, "prop"); } +verifyProperty(obj, "prop", { + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-57.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-57.js index 5ad316ca51..3d010a65ec 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-57.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-57.js @@ -37,8 +37,9 @@ verifyEqualTo(obj, "property", getFunc()); verifyWritable(obj, "property", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-58.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-58.js index d561f384f6..0e63b0085c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-58.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-58.js @@ -15,12 +15,12 @@ var obj = {}; obj.foo = 101; // default value of attributes: writable: true, configurable: true, enumerable: true Object.defineProperty(obj, "foo", {}); -verifyEqualTo(obj, "foo", 101); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 101, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-59.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-59.js index 903ac63326..6621860c56 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-59.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-59.js @@ -30,8 +30,9 @@ verifyEqualTo(obj, "foo", getFunc()); verifyWritable(obj, "foo", "helpVerifySet"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-60.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-60.js index bb14e77bed..58699274f6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-60.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-60.js @@ -17,12 +17,12 @@ obj.foo = 101; // default value of attributes: writable: true, configurable: tru Object.defineProperty(obj, "foo", { value: "abc" }); -verifyEqualTo(obj, "foo", "abc"); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: "abc", + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-61.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-61.js index a59d8e6098..6e9ca52710 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-61.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-61.js @@ -19,12 +19,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { value: undefined }); -verifyEqualTo(obj, "foo", undefined); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-611.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-611.js index 19c0ef715c..29f1c7b0e6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-611.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-611.js @@ -6,33 +6,13 @@ es5id: 15.2.3.6-4-611 description: > ES5 Attributes - all attributes in Function.prototype.bind are correct +includes: [propertyHelper.js] ---*/ -var desc = Object.getOwnPropertyDescriptor(Function.prototype, "bind"); - -var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true); - -var temp = Function.prototype.bind; - -Function.prototype.bind = "2010"; - -var isWritable = (Function.prototype.bind === "2010"); - -var isEnumerable = false; - -for (var prop in Function.prototype) { - if (prop === "bind") { - isEnumerable = true; - } -} - -delete Function.prototype.bind; - -var isConfigurable = !Function.prototype.hasOwnProperty("bind"); - -assert(propertyAreCorrect, 'propertyAreCorrect !== true'); -assert(isWritable, 'isWritable !== true'); -assert.sameValue(isEnumerable, false, 'isEnumerable'); -assert(isConfigurable, 'isConfigurable !== true'); +verifyProperty(Function.prototype, "bind", { + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-612.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-612.js index e33d81a9c2..5669e33ad1 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-612.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-612.js @@ -6,33 +6,13 @@ es5id: 15.2.3.6-4-612 description: > ES5 Attributes - all attributes in Array.prototype.indexOf are correct +includes: [propertyHelper.js] ---*/ -var desc = Object.getOwnPropertyDescriptor(Array.prototype, "indexOf"); - -var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true); - -var temp = Array.prototype.indexOf; - -Array.prototype.indexOf = "2010"; - -var isWritable = (Array.prototype.indexOf === "2010"); - -var isEnumerable = false; - -for (var prop in Array.prototype) { - if (prop === "indexOf") { - isEnumerable = true; - } -} - -delete Array.prototype.indexOf; - -var isConfigurable = !Array.prototype.hasOwnProperty("indexOf"); - -assert(propertyAreCorrect, 'propertyAreCorrect !== true'); -assert(isWritable, 'isWritable !== true'); -assert.sameValue(isEnumerable, false, 'isEnumerable'); -assert(isConfigurable, 'isConfigurable !== true'); +verifyProperty(Array.prototype, "indexOf", { + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-613.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-613.js index 162333109f..3be61c6ded 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-613.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-613.js @@ -4,33 +4,13 @@ /*--- es5id: 15.2.3.6-4-613 description: ES5 Attributes - all attributes in Object.lastIndexOf are correct +includes: [propertyHelper.js] ---*/ -var desc = Object.getOwnPropertyDescriptor(Array.prototype, "lastIndexOf"); - -var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true); - -var temp = Array.prototype.lastIndexOf; - -Array.prototype.lastIndexOf = "2010"; - -var isWritable = (Array.prototype.lastIndexOf === "2010"); - -var isEnumerable = false; - -for (var prop in Array.prototype) { - if (prop === "lastIndexOf") { - isEnumerable = true; - } -} - -delete Array.prototype.lastIndexOf; - -var isConfigurable = !Array.prototype.hasOwnProperty("lastIndexOf"); - -assert(propertyAreCorrect, 'propertyAreCorrect !== true'); -assert(isWritable, 'isWritable !== true'); -assert.sameValue(isEnumerable, false, 'isEnumerable'); -assert(isConfigurable, 'isConfigurable !== true'); +verifyProperty(Array.prototype, "lastIndexOf", { + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-614.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-614.js index 368a3b8977..b4017c499c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-614.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-614.js @@ -6,33 +6,13 @@ es5id: 15.2.3.6-4-614 description: > ES5 Attributes - all attributes in Array.prototype.every are correct +includes: [propertyHelper.js] ---*/ -var desc = Object.getOwnPropertyDescriptor(Array.prototype, "every"); - -var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true); - -var temp = Array.prototype.every; - -Array.prototype.every = "2010"; - -var isWritable = (Array.prototype.every === "2010"); - -var isEnumerable = false; - -for (var prop in Array.prototype) { - if (prop === "every") { - isEnumerable = true; - } -} - -delete Array.prototype.every; - -var isConfigurable = !Array.prototype.hasOwnProperty("every"); - -assert(propertyAreCorrect, 'propertyAreCorrect !== true'); -assert(isWritable, 'isWritable !== true'); -assert.sameValue(isEnumerable, false, 'isEnumerable'); -assert(isConfigurable, 'isConfigurable !== true'); +verifyProperty(Array.prototype, "every", { + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-615.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-615.js index c4deed0cd6..de306634f0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-615.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-615.js @@ -4,33 +4,13 @@ /*--- es5id: 15.2.3.6-4-615 description: ES5 Attributes - all attributes in Array.prototype.some are correct +includes: [propertyHelper.js] ---*/ -var desc = Object.getOwnPropertyDescriptor(Array.prototype, "some"); - -var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true); - -var temp = Array.prototype.some; - -Array.prototype.some = "2010"; - -var isWritable = (Array.prototype.some === "2010"); - -var isEnumerable = false; - -for (var prop in Array.prototype) { - if (prop === "some") { - isEnumerable = true; - } -} - -delete Array.prototype.some; - -var isConfigurable = !Array.prototype.hasOwnProperty("some"); - -assert(propertyAreCorrect, 'propertyAreCorrect !== true'); -assert(isWritable, 'isWritable !== true'); -assert.sameValue(isEnumerable, false, 'isEnumerable'); -assert(isConfigurable, 'isConfigurable !== true'); +verifyProperty(Array.prototype, "some", { + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-616.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-616.js index d5547bda86..a55fea0497 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-616.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-616.js @@ -6,33 +6,13 @@ es5id: 15.2.3.6-4-616 description: > ES5 Attributes - all attributes in Array.prototype.forEach are correct +includes: [propertyHelper.js] ---*/ -var desc = Object.getOwnPropertyDescriptor(Array.prototype, "forEach"); - -var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true); - -var temp = Array.prototype.forEach; - -Array.prototype.forEach = "2010"; - -var isWritable = (Array.prototype.forEach === "2010"); - -var isEnumerable = false; - -for (var prop in Array.prototype) { - if (prop === "forEach") { - isEnumerable = true; - } -} - -delete Array.prototype.forEach; - -var isConfigurable = !Array.prototype.hasOwnProperty("forEach"); - -assert(propertyAreCorrect, 'propertyAreCorrect !== true'); -assert(isWritable, 'isWritable !== true'); -assert.sameValue(isEnumerable, false, 'isEnumerable'); -assert(isConfigurable, 'isConfigurable !== true'); +verifyProperty(Array.prototype, "forEach", { + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-617.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-617.js index 0d18438ceb..a2ba3ab540 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-617.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-617.js @@ -4,33 +4,13 @@ /*--- es5id: 15.2.3.6-4-617 description: ES5 Attributes - all attributes in Array.prototype.map are correct +includes: [propertyHelper.js] ---*/ -var desc = Object.getOwnPropertyDescriptor(Array.prototype, "map"); - -var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true); - -var temp = Array.prototype.map; - -Array.prototype.map = "2010"; - -var isWritable = (Array.prototype.map === "2010"); - -var isEnumerable = false; - -for (var prop in Array.prototype) { - if (prop === "map") { - isEnumerable = true; - } -} - -delete Array.prototype.map; - -var isConfigurable = !Array.prototype.hasOwnProperty("map"); - -assert(propertyAreCorrect, 'propertyAreCorrect !== true'); -assert(isWritable, 'isWritable !== true'); -assert.sameValue(isEnumerable, false, 'isEnumerable'); -assert(isConfigurable, 'isConfigurable !== true'); +verifyProperty(Array.prototype, "map", { + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-618.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-618.js index 3e21462908..8b7d744743 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-618.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-618.js @@ -6,33 +6,13 @@ es5id: 15.2.3.6-4-618 description: > ES5 Attributes - all attributes in Array.prototype.filter are correct +includes: [propertyHelper.js] ---*/ -var desc = Object.getOwnPropertyDescriptor(Array.prototype, "filter"); - -var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true); - -var temp = Array.prototype.filter; - -Array.prototype.filter = "2010"; - -var isWritable = (Array.prototype.filter === "2010"); - -var isEnumerable = false; - -for (var prop in Array.prototype) { - if (prop === "filter") { - isEnumerable = true; - } -} - -delete Array.prototype.filter; - -var isConfigurable = !Array.prototype.hasOwnProperty("filter"); - -assert(propertyAreCorrect, 'propertyAreCorrect !== true'); -assert(isWritable, 'isWritable !== true'); -assert.sameValue(isEnumerable, false, 'isEnumerable'); -assert(isConfigurable, 'isConfigurable !== true'); +verifyProperty(Array.prototype, "filter", { + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-619.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-619.js index 746209ea13..2bc25fcfe4 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-619.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-619.js @@ -6,33 +6,13 @@ es5id: 15.2.3.6-4-619 description: > ES5 Attributes - all attributes in Array.prototype.reduce are correct +includes: [propertyHelper.js] ---*/ -var desc = Object.getOwnPropertyDescriptor(Array.prototype, "reduce"); - -var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true); - -var temp = Array.prototype.reduce; - -Array.prototype.reduce = "2010"; - -var isWritable = (Array.prototype.reduce === "2010"); - -var isEnumerable = false; - -for (var prop in Array.prototype) { - if (prop === "reduce") { - isEnumerable = true; - } -} - -delete Array.prototype.reduce; - -var isConfigurable = !Array.prototype.hasOwnProperty("reduce"); - -assert(propertyAreCorrect, 'propertyAreCorrect !== true'); -assert(isWritable, 'isWritable !== true'); -assert.sameValue(isEnumerable, false, 'isEnumerable'); -assert(isConfigurable, 'isConfigurable !== true'); +verifyProperty(Array.prototype, "reduce", { + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-62.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-62.js index f16d18a98b..4faabfad64 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-62.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-62.js @@ -19,12 +19,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { value: null }); -verifyEqualTo(obj, "foo", null); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: null, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-620.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-620.js index 6ce2dbb7ce..d20710fc44 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-620.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-620.js @@ -6,33 +6,13 @@ es5id: 15.2.3.6-4-620 description: > ES5 Attributes - all attributes in Array.prototype.reduceRight are correct +includes: [propertyHelper.js] ---*/ -var desc = Object.getOwnPropertyDescriptor(Array.prototype, "reduceRight"); - -var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true); - -var temp = Array.prototype.reduceRight; - -Array.prototype.reduceRight = "2010"; - -var isWritable = (Array.prototype.reduceRight === "2010"); - -var isEnumerable = false; - -for (var prop in Array.prototype) { - if (prop === "reduceRight") { - isEnumerable = true; - } -} - -delete Array.prototype.reduceRight; - -var isConfigurable = !Array.prototype.hasOwnProperty("reduceRight"); - -assert(propertyAreCorrect, 'propertyAreCorrect !== true'); -assert(isWritable, 'isWritable !== true'); -assert.sameValue(isEnumerable, false, 'isEnumerable'); -assert(isConfigurable, 'isConfigurable !== true'); +verifyProperty(Array.prototype, "reduceRight", { + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-621.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-621.js index 5e00e1db4f..9bd87e96e3 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-621.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-621.js @@ -6,33 +6,13 @@ es5id: 15.2.3.6-4-621 description: > ES5 Attributes - all attributes in String.prototype.trim are correct +includes: [propertyHelper.js] ---*/ -var desc = Object.getOwnPropertyDescriptor(String.prototype, "trim"); - -var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true); - -var temp = String.prototype.trim; - -String.prototype.trim = "2010"; - -var isWritable = (String.prototype.trim === "2010"); - -var isEnumerable = false; - -for (var prop in String.prototype) { - if (prop === "trim") { - isEnumerable = true; - } -} - -delete String.prototype.trim; - -var isConfigurable = !String.prototype.hasOwnProperty("trim"); - -assert(propertyAreCorrect, 'propertyAreCorrect !== true'); -assert(isWritable, 'isWritable !== true'); -assert.sameValue(isEnumerable, false, 'isEnumerable'); -assert(isConfigurable, 'isConfigurable !== true'); +verifyProperty(String.prototype, "trim", { + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-622.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-622.js index db59aba810..fe21ad4d58 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-622.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-622.js @@ -4,33 +4,14 @@ /*--- es5id: 15.2.3.6-4-622 description: ES5 Attributes - all attributes in Date.now are correct +includes: [propertyHelper.js] ---*/ -var desc = Object.getOwnPropertyDescriptor(Date, "now"); +verifyProperty(Date, "now", { + writable: true, + enumerable: false, + configurable: true, +}); -var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true); - -var temp = Date.now; - -Date.now = "2010"; - -var isWritable = (Date.now === "2010"); - -var isEnumerable = false; - -for (var prop in Date) { - if (prop === "now") { - isEnumerable = true; - } -} - -delete Date.now; - -var isConfigurable = !Date.hasOwnProperty("now"); - -assert(propertyAreCorrect, 'propertyAreCorrect !== true'); -assert(isWritable, 'isWritable !== true'); -assert.sameValue(isEnumerable, false, 'isEnumerable'); -assert(isConfigurable, 'isConfigurable !== true'); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-623.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-623.js index a5c94f29b7..b314bc2c50 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-623.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-623.js @@ -6,33 +6,13 @@ es5id: 15.2.3.6-4-623 description: > ES5 Attributes - all attributes in Date.prototype.toISOString are correct +includes: [propertyHelper.js] ---*/ -var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toISOString"); - -var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true); - -var temp = Date.prototype.toISOString; - -Date.prototype.toISOString = "2010"; - -var isWritable = (Date.prototype.toISOString === "2010"); - -var isEnumerable = false; - -for (var prop in Date.prototype) { - if (prop === "toISOString") { - isEnumerable = true; - } -} - -delete Date.prototype.toISOString; - -var isConfigurable = !Date.prototype.hasOwnProperty("toISOString"); - -assert(propertyAreCorrect, 'propertyAreCorrect !== true'); -assert(isWritable, 'isWritable !== true'); -assert.sameValue(isEnumerable, false, 'isEnumerable'); -assert(isConfigurable, 'isConfigurable !== true'); +verifyProperty(Date.prototype, "toISOString", { + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-624.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-624.js index 4774991788..e2362387ca 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-624.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-624.js @@ -6,33 +6,13 @@ es5id: 15.2.3.6-4-624 description: > ES5 Attributes - all attributes in Date.prototype.toJSON are correct +includes: [propertyHelper.js] ---*/ -var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toJSON"); - -var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true); - -var temp = Date.prototype.toJSON; - -Date.prototype.toJSON = "2010"; - -var isWritable = (Date.prototype.toJSON === "2010"); - -var isEnumerable = false; - -for (var prop in Date.prototype) { - if (prop === "toJSON") { - isEnumerable = true; - } -} - -delete Date.prototype.toJSON; - -var isConfigurable = !Date.prototype.hasOwnProperty("toJSON"); - -assert(propertyAreCorrect, 'propertyAreCorrect !== true'); -assert(isWritable, 'isWritable !== true'); -assert.sameValue(isEnumerable, false, 'isEnumerable'); -assert(isConfigurable, 'isConfigurable !== true'); +verifyProperty(Date.prototype, "toJSON", { + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-63.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-63.js index feaf556cef..e92be049d0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-63.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-63.js @@ -19,12 +19,11 @@ Object.defineProperty(obj, "foo", { value: NaN }); -assert.sameValue(obj.foo, NaN); - -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: NaN, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-64.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-64.js index d627e8a13f..53599d36c6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-64.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-64.js @@ -23,18 +23,16 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", -0); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: -0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-65.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-65.js index ed2ac2cc12..f0abc12984 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-65.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-65.js @@ -22,18 +22,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", +0); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: +0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-66.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-66.js index 87fe39bdbd..3339c81706 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-66.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-66.js @@ -17,12 +17,12 @@ obj.foo = 101; // default value of attributes: writable: true, configurable: tru Object.defineProperty(obj, "foo", { value: 102 }); -verifyEqualTo(obj, "foo", 102); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 102, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-67.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-67.js index 6778b65e76..ab0c3fce02 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-67.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-67.js @@ -20,12 +20,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { value: "abcd" }); -verifyEqualTo(obj, "foo", "abcd"); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: "abcd", + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-68.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-68.js index f3f74ca0b1..e914ee7275 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-68.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-68.js @@ -17,12 +17,12 @@ obj.foo = "abcd"; // default value of attributes: writable: true, configurable: Object.defineProperty(obj, "foo", { value: "fghj" }); -verifyEqualTo(obj, "foo", "fghj"); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: "fghj", + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-69.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-69.js index 39244aa40a..682db19208 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-69.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-69.js @@ -19,12 +19,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { value: true }); -verifyEqualTo(obj, "foo", true); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: true, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-70.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-70.js index 24d4977637..c431b43b55 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-70.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-70.js @@ -17,12 +17,12 @@ obj.foo = true; // default value of attributes: writable: true, configurable: tr Object.defineProperty(obj, "foo", { value: false }); -verifyEqualTo(obj, "foo", false); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: false, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-71.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-71.js index c12aa123b1..146f1b2a92 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-71.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-71.js @@ -23,12 +23,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { value: obj1 }); -verifyEqualTo(obj, "foo", obj1); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: obj1, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-72.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-72.js index 36c4fe3a34..2e10a620e6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-72.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-72.js @@ -24,12 +24,12 @@ var obj2 = { Object.defineProperty(obj, "foo", { value: obj2 }); -verifyEqualTo(obj, "foo", obj2); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: obj2, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-73.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-73.js index e003f7060f..19ee10354a 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-73.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-73.js @@ -19,12 +19,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { writable: false }); -verifyEqualTo(obj, "foo", undefined); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-74.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-74.js index 735ff9e36d..a711a14148 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-74.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-74.js @@ -20,12 +20,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { writable: true }); -verifyEqualTo(obj, "foo", undefined); -verifyWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-75.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-75.js index ffb8fa59fc..b51fe84c77 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-75.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-75.js @@ -32,8 +32,9 @@ verifyEqualTo(obj, "foo", getFunc()); verifyWritable(obj, "foo", "helpVerifySet"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-76.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-76.js index 91a011f019..b6b16ff6ac 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-76.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-76.js @@ -37,8 +37,9 @@ verifyEqualTo(obj, "foo", getFunc2()); verifyWritable(obj, "foo", "helpVerifySet"); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-77.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-77.js index 11813c0338..6e9275c910 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-77.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-77.js @@ -25,8 +25,9 @@ Object.defineProperty(obj, "foo", { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-78.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-78.js index 9ffdeb435b..7be495b41e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-78.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-78.js @@ -28,8 +28,9 @@ Object.defineProperty(obj, "foo", { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-79.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-79.js index 0295f90eef..f82e5431b1 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-79.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-79.js @@ -19,12 +19,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { enumerable: false }); -verifyEqualTo(obj, "foo", undefined); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-80.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-80.js index 06c6f05859..f2595e67e6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-80.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-80.js @@ -20,12 +20,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { enumerable: true }); -verifyEqualTo(obj, "foo", undefined); -verifyNotWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: false, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-81.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-81.js index bb04cb882d..88b4844633 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-81.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-81.js @@ -19,12 +19,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { configurable: false }); -verifyEqualTo(obj, "foo", undefined); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-1.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-1.js index b2a9b4b8ae..c5dfda4bc9 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-1.js @@ -27,12 +27,11 @@ Object.defineProperty(obj, "foo", { enumerable: false }); -verifyEqualTo(obj, "foo", 1001); - -verifyWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 1001, + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-10.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-10.js index 4c2395e14d..ac6298f340 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-10.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-10.js @@ -38,8 +38,9 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "verifySetFunction"); -verifyEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-11.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-11.js index 0fefd5de68..416f684952 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-11.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-11.js @@ -38,8 +38,9 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "verifySetFunction"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-12.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-12.js index ba8dd041b1..14e09775c2 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-12.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-12.js @@ -37,8 +37,9 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "verifySetFunction"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-13.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-13.js index 4e954f0939..0e3cd8165c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-13.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-13.js @@ -27,12 +27,11 @@ Object.defineProperty(obj, "0", { enumerable: false }); -verifyEqualTo(obj, "0", 1001); - -verifyWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1001, + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-14.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-14.js index b91f538d57..3f21dbcd94 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-14.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-14.js @@ -28,12 +28,11 @@ Object.defineProperty(obj, "0", { configurable: true }); -verifyEqualTo(obj, "0", 1001); - -verifyWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1001, + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-15.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-15.js index 5a88b4781c..49d20e8780 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-15.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-15.js @@ -26,12 +26,11 @@ Object.defineProperty(obj, "0", { configurable: false }); -verifyEqualTo(obj, "0", 1001); - -verifyWritable(obj, "0"); - -verifyEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1001, + writable: true, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-16.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-16.js index fe07c56e74..b22ff1fb7c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-16.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-16.js @@ -28,12 +28,11 @@ Object.defineProperty(obj, "0", { configurable: false }); -verifyEqualTo(obj, "0", 1001); - -verifyWritable(obj, "0"); - -verifyEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1001, + writable: true, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-17.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-17.js index de43ae8048..acac52e8c1 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-17.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-17.js @@ -28,12 +28,11 @@ Object.defineProperty(obj, "0", { configurable: false }); -verifyEqualTo(obj, "0", 1001); - -verifyWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1001, + writable: true, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-18.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-18.js index 30b44c922c..063c7d48a1 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-18.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-18.js @@ -27,12 +27,11 @@ Object.defineProperty(obj, "0", { enumerable: true }); -verifyEqualTo(obj, "0", 1001); - -verifyWritable(obj, "0"); - -verifyEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1001, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-19.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-19.js index b8776f7da0..894860a0a6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-19.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-19.js @@ -37,8 +37,9 @@ verifyEqualTo(obj, "0", get_func()); verifyWritable(obj, "0", "verifySetFunction"); -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-2.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-2.js index e5093aeec7..0c3c12cb09 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-2.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-2.js @@ -28,12 +28,11 @@ Object.defineProperty(obj, "foo", { configurable: true }); -verifyEqualTo(obj, "foo", 1001); - -verifyWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 1001, + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-20.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-20.js index 4b4ee70a99..d05a255134 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-20.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-20.js @@ -38,8 +38,9 @@ verifyEqualTo(obj, "0", get_func()); verifyWritable(obj, "0", "verifySetFunction"); -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-21.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-21.js index f4d984ef54..c3f45f0fb5 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-21.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-21.js @@ -37,8 +37,9 @@ verifyEqualTo(obj, "0", get_func()); verifyWritable(obj, "0", "verifySetFunction"); -verifyEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-22.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-22.js index 4df84cf130..88c4a33a60 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-22.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-22.js @@ -38,8 +38,9 @@ verifyEqualTo(obj, "0", get_func()); verifyWritable(obj, "0", "verifySetFunction"); -verifyEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-23.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-23.js index a313d8ed02..8c9693671f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-23.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-23.js @@ -38,8 +38,9 @@ verifyEqualTo(obj, "0", get_func()); verifyWritable(obj, "0", "verifySetFunction"); -verifyNotEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-24.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-24.js index fd2e6d537b..199a0c8f9e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-24.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-24.js @@ -37,8 +37,9 @@ verifyEqualTo(obj, "0", get_func()); verifyWritable(obj, "0", "verifySetFunction"); -verifyEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-3.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-3.js index f031e54a38..083cd2a349 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-3.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-3.js @@ -26,12 +26,11 @@ Object.defineProperty(obj, "foo", { configurable: false }); -verifyEqualTo(obj, "foo", 1001); - -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 1001, + writable: true, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-4.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-4.js index 9e6bd3600a..341f8055ba 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-4.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-4.js @@ -28,12 +28,11 @@ Object.defineProperty(obj, "foo", { configurable: false }); -verifyEqualTo(obj, "foo", 1001); - -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 1001, + writable: true, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-5.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-5.js index d0dae554c5..431ae80ae1 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-5.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-5.js @@ -28,12 +28,11 @@ Object.defineProperty(obj, "foo", { configurable: false }); -verifyEqualTo(obj, "foo", 1001); - -verifyWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 1001, + writable: true, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-6.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-6.js index 265df4a1bb..c5821b1bba 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-6.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-6.js @@ -27,12 +27,11 @@ Object.defineProperty(obj, "foo", { enumerable: true }); -verifyEqualTo(obj, "foo", 1001); - -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 1001, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-7.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-7.js index 72e6355d42..d41b441ab0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-7.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-7.js @@ -37,8 +37,9 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "verifySetFunction"); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-8.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-8.js index 1238652846..3404e81fe0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-8.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-8.js @@ -38,8 +38,9 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "verifySetFunction"); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-9.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-9.js index 7f7b8b7a1d..e8a7bdfb6e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-9.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82-9.js @@ -37,8 +37,9 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "verifySetFunction"); -verifyEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82.js index f80c1afff1..961ee791bb 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-82.js @@ -19,12 +19,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { configurable: false }); -verifyEqualTo(obj, "foo", undefined); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-83.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-83.js index c9fb22b3d7..34d5c23c1f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-83.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-83.js @@ -24,12 +24,12 @@ Object.defineProperty(obj, "foo", { writable: false, configurable: false }); -verifyEqualTo(obj, "foo", undefined); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-84.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-84.js index fdb49395ee..cd1857b57f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-84.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-84.js @@ -24,12 +24,12 @@ Object.defineProperty(obj, "foo", { writable: false, configurable: false }); -verifyEqualTo(obj, "foo", null); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: null, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-85.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-85.js index 882a018143..077358427d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-85.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-85.js @@ -24,12 +24,11 @@ Object.defineProperty(obj, "foo", { configurable: false }); -assert.sameValue(obj.foo, NaN); - -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: NaN, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-86.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-86.js index 1bf35f3460..e06026db5f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-86.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-86.js @@ -25,18 +25,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", -0); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: -0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-87.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-87.js index cbf3421f4e..bb440cdfab 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-87.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-87.js @@ -25,18 +25,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", +0); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: +0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-88.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-88.js index 27b56ee337..acf4b9ef0b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-88.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-88.js @@ -23,12 +23,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { value: 100 }); -verifyEqualTo(obj, "foo", 100); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 100, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-89.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-89.js index a8b3ba707f..c2486ea1c9 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-89.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-89.js @@ -25,18 +25,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", 10); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: 10, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-90.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-90.js index 07438a7406..e5909987a0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-90.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-90.js @@ -23,12 +23,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { value: "abcd" }); -verifyEqualTo(obj, "foo", "abcd"); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: "abcd", + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-91.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-91.js index 665ae48b79..b8b341634e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-91.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-91.js @@ -25,18 +25,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", "abcd"); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: "abcd", + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-92.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-92.js index 780ad68e54..5eea0ded00 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-92.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-92.js @@ -23,12 +23,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { value: false }); -verifyEqualTo(obj, "foo", false); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: false, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-93.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-93.js index 27113a056f..ae20af55cb 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-93.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-93.js @@ -25,18 +25,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", false); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: false, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-94.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-94.js index 6a3a90950d..62816a425e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-94.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-94.js @@ -27,12 +27,12 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { value: obj1 }); -verifyEqualTo(obj, "foo", obj1); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: obj1, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-95.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-95.js index 9590be199b..d88f1f6a86 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-95.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-95.js @@ -34,18 +34,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", obj1); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: obj1, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-96.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-96.js index 6cc17c467e..f0629223d7 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-96.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-96.js @@ -27,8 +27,9 @@ Object.defineProperty(obj, "foo", { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-97.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-97.js index 6e3d07a24b..8a5ada0331 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-97.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-97.js @@ -33,14 +33,14 @@ try { } catch (e) { verifyEqualTo(obj, "property", getFunc()); - verifyNotEnumerable(obj, "property"); - - verifyNotConfigurable(obj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "property", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-98.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-98.js index 0b54b241d5..99cd678b2a 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-98.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-98.js @@ -35,8 +35,9 @@ verifyEqualTo(obj, "foo", getFunc()); verifyWritable(obj, "foo", "verifyGetHelpMethod"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-99.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-99.js index bc8efa7208..2d0cd0e7da 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-99.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-4-99.js @@ -35,14 +35,14 @@ try { } catch (e) { verifyWritable(obj, "foo", "setVerifyHelpProp"); - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/name.js b/js/src/tests/test262/built-ins/Object/defineProperty/name.js index 93e3066236..277210934e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/name.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/name.js @@ -19,10 +19,11 @@ info: | includes: [propertyHelper.js] ---*/ -assert.sameValue(Object.defineProperty.name, "defineProperty"); - -verifyNotEnumerable(Object.defineProperty, "name"); -verifyNotWritable(Object.defineProperty, "name"); -verifyConfigurable(Object.defineProperty, "name"); +verifyProperty(Object.defineProperty, "name", { + value: "defineProperty", + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/not-a-constructor.js b/js/src/tests/test262/built-ins/Object/defineProperty/not-a-constructor.js index 8c49a7085c..4b5af11af9 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperty/not-a-constructor.js +++ b/js/src/tests/test262/built-ins/Object/defineProperty/not-a-constructor.js @@ -29,7 +29,7 @@ assert.sameValue( assert.throws(TypeError, () => { new Object.defineProperty({}, '', {}); -}, '`new Object.defineProperty({}, \'\', {})` throws TypeError'); +}); reportCompare(0, 0); |