diff options
author | smikes <smikes@cubane.com> | 2015-05-01 12:00:03 -0600 |
---|---|---|
committer | smikes <smikes@cubane.com> | 2015-05-02 05:12:53 -0600 |
commit | 9824be68252038980107561ea7f2d03a234d6693 (patch) | |
tree | 3f2a0eb986b1cd8b76eaf9c79eaabe599f12478d /test/built-ins | |
parent | fc10b8c6072750d877eb0fc1585527fd6cea4bbf (diff) | |
download | qtdeclarative-testsuites-9824be68252038980107561ea7f2d03a234d6693.tar.gz |
rewrite tests to work in strict mode, use helpers
Diffstat (limited to 'test/built-ins')
171 files changed, 1162 insertions, 1819 deletions
diff --git a/test/built-ins/Object/create/15.2.3.5-4-100.js b/test/built-ins/Object/create/15.2.3.5-4-100.js index 54946e2bd..b5348592e 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-100.js +++ b/test/built-ins/Object/create/15.2.3.5-4-100.js @@ -9,21 +9,14 @@ es5id: 15.2.3.5-4-100 description: > Object.create - 'configurable' property of one property in 'Properties' is not present (8.10.5 step 4) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - value: "ownDataProperty" - } - }); - - var result1 = newObj.hasOwnProperty("prop"); - delete newObj.prop; - var result2 = newObj.hasOwnProperty("prop"); - - return result1 === true && result2 === true; +var newObj = Object.create({}, { + prop: { + value: "ownDataProperty" } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop"), "expected newObj to have 'prop'"); +verifyNotConfigurable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-101.js b/test/built-ins/Object/create/15.2.3.5-4-101.js index 3eeba23d9..d2e625f6b 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-101.js +++ b/test/built-ins/Object/create/15.2.3.5-4-101.js @@ -9,21 +9,14 @@ es5id: 15.2.3.5-4-101 description: > Object.create - 'configurable' property of one property in 'Properties' is own data property (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - configurable: false - } - }); - - var result1 = newObj.hasOwnProperty("prop"); - delete newObj.prop; - var result2 = newObj.hasOwnProperty("prop"); - - return result1 === true && result2 === true; +var newObj = Object.create({}, { + prop: { + configurable: false } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-103.js b/test/built-ins/Object/create/15.2.3.5-4-103.js index de387bee3..18d045bad 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-103.js +++ b/test/built-ins/Object/create/15.2.3.5-4-103.js @@ -10,30 +10,25 @@ description: > Object.create - 'configurable' property of one property in 'Properties' is own data property that overrides an inherited data property (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { +var proto = { + configurable: true +}; - var proto = { - configurable: true - }; +var ConstructFun = function () { }; +ConstructFun.prototype = proto; +var descObj = new ConstructFun(); - var ConstructFun = function () { }; - ConstructFun.prototype = proto; - var descObj = new ConstructFun(); +Object.defineProperty(descObj, "configurable", { + value: false +}); - Object.defineProperty(descObj, "configurable", { - value: false - }); +var newObj = Object.create({}, { + prop: descObj +}); - var newObj = Object.create({}, { - prop: descObj - }); - var result1 = newObj.hasOwnProperty("prop"); - delete newObj.prop; - var result2 = newObj.hasOwnProperty("prop"); +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); - return result1 === true && result2 === true; - } -runTestCase(testcase); diff --git a/test/built-ins/Object/create/15.2.3.5-4-104.js b/test/built-ins/Object/create/15.2.3.5-4-104.js index 46efe998e..2904c6446 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-104.js +++ b/test/built-ins/Object/create/15.2.3.5-4-104.js @@ -10,33 +10,27 @@ description: > Object.create - 'configurable' property of one property in 'Properties' is own data property that overrides an inherited accessor property (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var proto = {}; - Object.defineProperty(proto, "configurable", { - get: function () { - return true; - } - }); +var proto = {}; +Object.defineProperty(proto, "configurable", { + get: function () { + return true; + } +}); - var ConstructFun = function () { }; - ConstructFun.prototype = proto; - var descObj = new ConstructFun(); +var ConstructFun = function () { }; +ConstructFun.prototype = proto; +var descObj = new ConstructFun(); - Object.defineProperty(descObj, "configurable", { - value: false - }); +Object.defineProperty(descObj, "configurable", { + value: false +}); - var newObj = Object.create({}, { - prop: descObj - }); - var result1 = newObj.hasOwnProperty("prop"); - delete newObj.prop; - var result2 = newObj.hasOwnProperty("prop"); +var newObj = Object.create({}, { + prop: descObj +}); - return result1 === true && result2 === true; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-107.js b/test/built-ins/Object/create/15.2.3.5-4-107.js index b46f0aed1..89198579b 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-107.js +++ b/test/built-ins/Object/create/15.2.3.5-4-107.js @@ -10,32 +10,27 @@ description: > Object.create - 'configurable' property of one property in 'Properties' is own accessor property that overrides an inherited data property (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { +var proto = { + configurable: true +}; - var proto = { - configurable: true - }; +var ConstructFun = function () { }; +ConstructFun.prototype = proto; +var descObj = new ConstructFun(); - var ConstructFun = function () { }; - ConstructFun.prototype = proto; - var descObj = new ConstructFun(); +Object.defineProperty(descObj, "configurable", { + get: function () { + return false; + } +}); - Object.defineProperty(descObj, "configurable", { - get: function () { - return false; - } - }); +var newObj = Object.create({}, { + prop: descObj +}); - var newObj = Object.create({}, { - prop: descObj - }); - var result1 = newObj.hasOwnProperty("prop"); - delete newObj.prop; - var result2 = newObj.hasOwnProperty("prop"); +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); - return result1 === true && result2 === true; - } -runTestCase(testcase); diff --git a/test/built-ins/Object/create/15.2.3.5-4-108.js b/test/built-ins/Object/create/15.2.3.5-4-108.js index fdae7da9d..ff6e584d6 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-108.js +++ b/test/built-ins/Object/create/15.2.3.5-4-108.js @@ -10,35 +10,29 @@ description: > Object.create - 'configurable' property of one property in 'Properties' is own accessor property that overrides an inherited accessor property (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var proto = {}; - Object.defineProperty(proto, "configurable", { - get: function () { - return true; - } - }); +var proto = {}; +Object.defineProperty(proto, "configurable", { + get: function () { + return true; + } +}); - var ConstructFun = function () { }; - ConstructFun.prototype = proto; - var descObj = new ConstructFun(); +var ConstructFun = function () { }; +ConstructFun.prototype = proto; +var descObj = new ConstructFun(); - Object.defineProperty(descObj, "configurable", { - get: function () { - return false; - } - }); +Object.defineProperty(descObj, "configurable", { + get: function () { + return false; + } +}); - var newObj = Object.create({}, { - prop: descObj - }); - var result1 = newObj.hasOwnProperty("prop"); - delete newObj.prop; - var result2 = newObj.hasOwnProperty("prop"); +var newObj = Object.create({}, { + prop: descObj +}); - return result1 === true && result2 === true; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-109.js b/test/built-ins/Object/create/15.2.3.5-4-109.js index ce2f39ee9..08cd172b8 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-109.js +++ b/test/built-ins/Object/create/15.2.3.5-4-109.js @@ -10,23 +10,17 @@ description: > Object.create - 'configurable' property of one property in 'Properties' is own accessor property without a get function (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { +var descObj = {}; +Object.defineProperty(descObj, "configurable", { + set: function () { } +}); - var descObj = {}; - Object.defineProperty(descObj, "configurable", { - set: function () { } - }); +var newObj = Object.create({}, { + prop: descObj +}); - var newObj = Object.create({}, { - prop: descObj - }); - var result1 = newObj.hasOwnProperty("prop"); - delete newObj.prop; - var result2 = newObj.hasOwnProperty("prop"); - - return result1 === true && result2 === true; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-110.js b/test/built-ins/Object/create/15.2.3.5-4-110.js index 0813fa1a2..61fbe3872 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-110.js +++ b/test/built-ins/Object/create/15.2.3.5-4-110.js @@ -10,33 +10,27 @@ description: > Object.create - 'configurable' property of one property in 'Properties' is own accessor property without a get function, which overrides an inherited accessor property (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var proto = {}; - Object.defineProperty(proto, "configurable", { - get: function () { - return true; - } - }); +var proto = {}; +Object.defineProperty(proto, "configurable", { + get: function () { + return true; + } +}); - var ConstructFun = function () { }; - ConstructFun.prototype = proto; - var descObj = new ConstructFun(); +var ConstructFun = function () { }; +ConstructFun.prototype = proto; +var descObj = new ConstructFun(); - Object.defineProperty(descObj, "configurable", { - set: function () { } - }); +Object.defineProperty(descObj, "configurable", { + set: function () { } +}); - var newObj = Object.create({}, { - prop: descObj - }); - var result1 = newObj.hasOwnProperty("prop"); - delete newObj.prop; - var result2 = newObj.hasOwnProperty("prop"); +var newObj = Object.create({}, { + prop: descObj +}); - return result1 === true && result2 === true; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-111.js b/test/built-ins/Object/create/15.2.3.5-4-111.js index ce4312252..0735f1fd4 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-111.js +++ b/test/built-ins/Object/create/15.2.3.5-4-111.js @@ -10,28 +10,22 @@ description: > Object.create - 'configurable' property of one property in 'Properties' is an inherited accessor property without a get function (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { +var proto = {}; - var proto = {}; +Object.defineProperty(proto, "configurable", { + set: function () { } +}); - Object.defineProperty(proto, "configurable", { - set: function () { } - }); +var ConstructFun = function () { }; +ConstructFun.prototype = proto; +var descObj = new ConstructFun(); - var ConstructFun = function () { }; - ConstructFun.prototype = proto; - var descObj = new ConstructFun(); +var newObj = Object.create({}, { + prop: descObj +}); - var newObj = Object.create({}, { - prop: descObj - }); - var result1 = newObj.hasOwnProperty("prop"); - delete newObj.prop; - var result2 = newObj.hasOwnProperty("prop"); - - return result1 === true && result2 === true; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-125.js b/test/built-ins/Object/create/15.2.3.5-4-125.js index d7820db41..62596a5ba 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-125.js +++ b/test/built-ins/Object/create/15.2.3.5-4-125.js @@ -9,21 +9,15 @@ es5id: 15.2.3.5-4-125 description: > Object.create - 'configurable' property of one property in 'Properties' is undefined (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - configurable: undefined - } - }); +var newObj = Object.create({}, { + prop: { + configurable: undefined + } +}); - var result1 = newObj.hasOwnProperty("prop"); - delete newObj.prop; - var result2 = newObj.hasOwnProperty("prop"); - return result1 === true && result2 === true; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-126.js b/test/built-ins/Object/create/15.2.3.5-4-126.js index 43a8a222a..fffac6182 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-126.js +++ b/test/built-ins/Object/create/15.2.3.5-4-126.js @@ -9,23 +9,14 @@ es5id: 15.2.3.5-4-126 description: > Object.create - 'configurable' property of one property in 'Properties' is null (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - configurable: null - } - }); - - var beforeDeleted = newObj.hasOwnProperty("prop"); - - delete newObj.prop; - - var afterDeleted = newObj.hasOwnProperty("prop"); - - return beforeDeleted === true && afterDeleted === true; +var newObj = Object.create({}, { + prop: { + configurable: null } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-128.js b/test/built-ins/Object/create/15.2.3.5-4-128.js index 732ce93df..8c2414388 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-128.js +++ b/test/built-ins/Object/create/15.2.3.5-4-128.js @@ -9,23 +9,14 @@ es5id: 15.2.3.5-4-128 description: > Object.create - 'configurable' property of one property in 'Properties' is false (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - configurable: false - } - }); - - var beforeDeleted = newObj.hasOwnProperty("prop"); - - delete newObj.prop; - - var afterDeleted = newObj.hasOwnProperty("prop"); - - return beforeDeleted === true && afterDeleted === true; +var newObj = Object.create({}, { + prop: { + configurable: false } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-129.js b/test/built-ins/Object/create/15.2.3.5-4-129.js index 4c4e1670d..0a4984091 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-129.js +++ b/test/built-ins/Object/create/15.2.3.5-4-129.js @@ -9,23 +9,14 @@ es5id: 15.2.3.5-4-129 description: > Object.create - 'configurable' property of one property in 'Properties' is 0 (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - configurable: 0 - } - }); - - var beforeDeleted = newObj.hasOwnProperty("prop"); - - delete newObj.prop; - - var afterDeleted = newObj.hasOwnProperty("prop"); - - return beforeDeleted === true && afterDeleted === true; +var newObj = Object.create({}, { + prop: { + configurable: 0 } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-130.js b/test/built-ins/Object/create/15.2.3.5-4-130.js index ec8f536ab..9443114ed 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-130.js +++ b/test/built-ins/Object/create/15.2.3.5-4-130.js @@ -9,23 +9,15 @@ es5id: 15.2.3.5-4-130 description: > Object.create - 'configurable' property of one property in 'Properties' is +0 (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - configurable: +0 - } - }); - - var beforeDeleted = newObj.hasOwnProperty("prop"); - - delete newObj.prop; +var newObj = Object.create({}, { + prop: { + configurable: +0 + } +}); - var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === true; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-131.js b/test/built-ins/Object/create/15.2.3.5-4-131.js index 0fe7a559a..60ca3b787 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-131.js +++ b/test/built-ins/Object/create/15.2.3.5-4-131.js @@ -9,23 +9,14 @@ es5id: 15.2.3.5-4-131 description: > Object.create - 'configurable' property of one property in 'Properties' is -0 (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - configurable: -0 - } - }); - - var beforeDeleted = newObj.hasOwnProperty("prop"); - - delete newObj.prop; - - var afterDeleted = newObj.hasOwnProperty("prop"); - - return beforeDeleted === true && afterDeleted === true; +var newObj = Object.create({}, { + prop: { + configurable: -0 } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-132.js b/test/built-ins/Object/create/15.2.3.5-4-132.js index b48bb3507..fff12ff0e 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-132.js +++ b/test/built-ins/Object/create/15.2.3.5-4-132.js @@ -9,23 +9,14 @@ es5id: 15.2.3.5-4-132 description: > Object.create - 'configurable' property of one property in 'Properties' is NaN (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - configurable: NaN - } - }); - - var beforeDeleted = newObj.hasOwnProperty("prop"); - - delete newObj.prop; - - var afterDeleted = newObj.hasOwnProperty("prop"); - - return beforeDeleted === true && afterDeleted === true; +var newObj = Object.create({}, { + prop: { + configurable: NaN } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-135.js b/test/built-ins/Object/create/15.2.3.5-4-135.js index ccd7200a5..64e7fc1ce 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-135.js +++ b/test/built-ins/Object/create/15.2.3.5-4-135.js @@ -9,23 +9,14 @@ es5id: 15.2.3.5-4-135 description: > Object.create - 'configurable' property of one property in 'Properties' is an empty string (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - configurable: "" - } - }); - - var beforeDeleted = newObj.hasOwnProperty("prop"); - - delete newObj.prop; - - var afterDeleted = newObj.hasOwnProperty("prop"); - - return beforeDeleted === true && afterDeleted === true; +var newObj = Object.create({}, { + prop: { + configurable: "" } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-179.js b/test/built-ins/Object/create/15.2.3.5-4-179.js index bd1a51247..1a6108937 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-179.js +++ b/test/built-ins/Object/create/15.2.3.5-4-179.js @@ -9,23 +9,14 @@ es5id: 15.2.3.5-4-179 description: > Object.create - 'writable' property of one property in 'Properties' is not present (8.10.5 step 6) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - value: 100 - } - }); - - var beforeWrite = (newObj.prop === 100); - - newObj.prop = "isWritable"; - - var afterWrite = (newObj.prop === 100); - - return beforeWrite === true && afterWrite === true; +var newObj = Object.create({}, { + prop: { + value: 100 } -runTestCase(testcase); +}); + +assert.sameValue(newObj.prop, 100); +verifyNotWritable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-188.js b/test/built-ins/Object/create/15.2.3.5-4-188.js index 19e357ea3..921ac5ced 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-188.js +++ b/test/built-ins/Object/create/15.2.3.5-4-188.js @@ -10,27 +10,18 @@ description: > Object.create - 'writable' property of one property in 'Properties' is own accessor property without a get function (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { +var descObj = { value: 100 }; - var descObj = { value: 100 }; +Object.defineProperty(descObj, "writable", { + set: function () { } +}); - Object.defineProperty(descObj, "writable", { - set: function () { } - }); +var newObj = Object.create({}, { + prop: descObj +}); - var newObj = Object.create({}, { - prop: descObj - }); - - var beforeWrite = (newObj.prop === 100); - - newObj.prop = "isWritable"; - - var afterWrite = (newObj.prop === 100); - - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, 100); +verifyNotWritable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-189.js b/test/built-ins/Object/create/15.2.3.5-4-189.js index 2454ae2c7..2c4c3116f 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-189.js +++ b/test/built-ins/Object/create/15.2.3.5-4-189.js @@ -10,38 +10,30 @@ description: > Object.create - 'writable' property of one property in 'Properties' is own accessor property without a get function, which overrides an inherited accessor property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { +var proto = {}; - var proto = {}; - - Object.defineProperty(proto, "writable", { - get: function () { - return true; - } - }); - - var ConstructFun = function () { }; - ConstructFun.prototype = proto; - - var descObj = new ConstructFun(); - - Object.defineProperty(descObj, "writable", { - set: function () { } - }); +Object.defineProperty(proto, "writable", { + get: function () { + return true; + } +}); - var newObj = Object.create({}, { - prop: descObj - }); +var ConstructFun = function () { }; +ConstructFun.prototype = proto; - var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined"); +var descObj = new ConstructFun(); - newObj.prop = "isWritable"; +Object.defineProperty(descObj, "writable", { + set: function () { } +}); - var afterWrite = (newObj.prop === "isWritable"); +var newObj = Object.create({}, { + prop: descObj +}); - return beforeWrite === true && afterWrite === false; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop")) +assert.sameValue(typeof (newObj.prop), "undefined"); +verifyNotWritable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-190.js b/test/built-ins/Object/create/15.2.3.5-4-190.js index c9d5746dd..21c7586e2 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-190.js +++ b/test/built-ins/Object/create/15.2.3.5-4-190.js @@ -10,32 +10,23 @@ description: > Object.create - 'writable' property of one property in 'Properties' is an inherited accessor property without a get function (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { +var proto = { value: 100 }; - var proto = { value: 100 }; +Object.defineProperty(proto, "writable", { + set: function () { } +}); - Object.defineProperty(proto, "writable", { - set: function () { } - }); +var ConstructFun = function () { }; +ConstructFun.prototype = proto; - var ConstructFun = function () { }; - ConstructFun.prototype = proto; +var descObj = new ConstructFun(); - var descObj = new ConstructFun(); +var newObj = Object.create({}, { + prop: descObj +}); - var newObj = Object.create({}, { - prop: descObj - }); - - var beforeWrite = (newObj.prop === 100); - - newObj.prop = "isWritable"; - - var afterWrite = (newObj.prop === 100); - - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, 100); +verifyNotWritable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-204.js b/test/built-ins/Object/create/15.2.3.5-4-204.js index a3cc23d73..1ad274d89 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-204.js +++ b/test/built-ins/Object/create/15.2.3.5-4-204.js @@ -9,20 +9,15 @@ es5id: 15.2.3.5-4-204 description: > Object.create - 'writable' property of one property in 'Properties' is undefined (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var newObj = Object.create({}, { - prop: { - writable: undefined - } - }); - - var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined"; - - newObj.prop = 121; - - return hasProperty && typeof newObj.prop === "undefined"; +var newObj = Object.create({}, { + prop: { + writable: undefined } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +assert.sameValue(typeof newObj.prop, "undefined"); +verifyNotWritable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-205.js b/test/built-ins/Object/create/15.2.3.5-4-205.js index 6001a5e23..75143b36a 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-205.js +++ b/test/built-ins/Object/create/15.2.3.5-4-205.js @@ -9,20 +9,15 @@ es5id: 15.2.3.5-4-205 description: > Object.create - 'writable' property of one property in 'Properties' is null (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - writable: null - } - }); - var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined"; - - newObj.prop = 121; - - return hasProperty && typeof newObj.prop === "undefined"; +var newObj = Object.create({}, { + prop: { + writable: null } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +assert.sameValue(typeof newObj.prop, "undefined"); +verifyNotWritable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-207.js b/test/built-ins/Object/create/15.2.3.5-4-207.js index f2de55adc..7ce5b9baf 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-207.js +++ b/test/built-ins/Object/create/15.2.3.5-4-207.js @@ -9,20 +9,15 @@ es5id: 15.2.3.5-4-207 description: > Object.create - 'writable' property of one property in 'Properties' is false (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - writable: false - } - }); - var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined"; - - newObj.prop = 121; - - return hasProperty && typeof newObj.prop === "undefined"; +var newObj = Object.create({}, { + prop: { + writable: false } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +assert.sameValue(typeof newObj.prop, "undefined"); +verifyNotWritable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-208.js b/test/built-ins/Object/create/15.2.3.5-4-208.js index 5833446e2..0830630f0 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-208.js +++ b/test/built-ins/Object/create/15.2.3.5-4-208.js @@ -9,20 +9,15 @@ es5id: 15.2.3.5-4-208 description: > Object.create - 'writable' property of one property in 'Properties' is 0 (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - writable: 0 - } - }); - var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined"; - - newObj.prop = 121; - - return hasProperty && typeof newObj.prop === "undefined"; +var newObj = Object.create({}, { + prop: { + writable: 0 } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +assert.sameValue(typeof newObj.prop, "undefined"); +verifyNotWritable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-209.js b/test/built-ins/Object/create/15.2.3.5-4-209.js index 07ceb4a0d..efce6f6fb 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-209.js +++ b/test/built-ins/Object/create/15.2.3.5-4-209.js @@ -9,20 +9,15 @@ es5id: 15.2.3.5-4-209 description: > Object.create - 'writable' property of one property in 'Properties' is +0 (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - writable: +0 - } - }); - var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined"; - - newObj.prop = 121; - - return hasProperty && typeof newObj.prop === "undefined"; +var newObj = Object.create({}, { + prop: { + writable: +0 } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +assert.sameValue(typeof newObj.prop, "undefined"); +verifyNotWritable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-210.js b/test/built-ins/Object/create/15.2.3.5-4-210.js index 99cf167a8..3c52f342e 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-210.js +++ b/test/built-ins/Object/create/15.2.3.5-4-210.js @@ -9,20 +9,15 @@ es5id: 15.2.3.5-4-210 description: > Object.create - 'writable' property of one property in 'Properties' is -0 (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - writable: -0 - } - }); - var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined"; - - newObj.prop = 121; - - return hasProperty && typeof newObj.prop === "undefined"; +var newObj = Object.create({}, { + prop: { + writable: -0 } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")) +assert.sameValue(typeof newObj.prop, "undefined"); +verifyNotWritable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-211.js b/test/built-ins/Object/create/15.2.3.5-4-211.js index ee514260a..1e613f058 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-211.js +++ b/test/built-ins/Object/create/15.2.3.5-4-211.js @@ -9,20 +9,15 @@ es5id: 15.2.3.5-4-211 description: > Object.create - 'writable' property of one property in 'Properties' is NaN (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - writable: NaN - } - }); - var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined"; - - newObj.prop = 121; - - return hasProperty && typeof newObj.prop === "undefined"; +var newObj = Object.create({}, { + prop: { + writable: NaN } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +assert.sameValue(typeof newObj.prop, "undefined") +verifyNotWritable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-214.js b/test/built-ins/Object/create/15.2.3.5-4-214.js index b31462556..6ed2f7b4a 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-214.js +++ b/test/built-ins/Object/create/15.2.3.5-4-214.js @@ -9,21 +9,17 @@ es5id: 15.2.3.5-4-214 description: > Object.create - 'writable' property of one property in 'Properties' is an empty string (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var descObj = { - writable: "" - }; +var descObj = { + writable: "" +}; - var newObj = Object.create({}, { - prop: descObj - }); - var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined"; +var newObj = Object.create({}, { + prop: descObj +}); - newObj.prop = 121; - - return hasProperty && typeof newObj.prop === "undefined"; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop")) +assert.sameValue(typeof newObj.prop, "undefined"); +verifyNotWritable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-267.js b/test/built-ins/Object/create/15.2.3.5-4-267.js index 8f1cf5816..247824ee8 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-267.js +++ b/test/built-ins/Object/create/15.2.3.5-4-267.js @@ -9,22 +9,16 @@ es5id: 15.2.3.5-4-267 description: > Object.create - 'set' property of one property in 'Properties' is not present (8.10.5 step 8) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var newObj = Object.create({}, { - prop: { - get: function () { - return "data"; - } - } - }); - - var hasProperty = newObj.hasOwnProperty("prop"); - - newObj.prop = "overrideData"; - - return hasProperty && newObj.prop === "data"; +var newObj = Object.create({}, { + prop: { + get: function () { + return "data"; + } } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +verifyNotWritable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-292.js b/test/built-ins/Object/create/15.2.3.5-4-292.js index ca442da2e..663fd1893 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-292.js +++ b/test/built-ins/Object/create/15.2.3.5-4-292.js @@ -9,19 +9,14 @@ es5id: 15.2.3.5-4-292 description: > Object.create - 'set' property of one property in 'Properties' is undefined (8.10.5 step 8.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - - var newObj = Object.create({}, { - prop: { - set: undefined - } - }); - - newObj.prop = "overrideData"; - - return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined"; +var newObj = Object.create({}, { + prop: { + set: undefined } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +verifyNotWritable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-307.js b/test/built-ins/Object/create/15.2.3.5-4-307.js index f95c34d06..e99505c06 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-307.js +++ b/test/built-ins/Object/create/15.2.3.5-4-307.js @@ -9,22 +9,16 @@ es5id: 15.2.3.5-4-307 description: > Object.create - [[Writable]] is set as false if it is absent in data descriptor of one property in 'Properties' (8.12.9 step 4.a.i) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var newObj = Object.create({}, { - prop: { - value: 1001, - configurable: true, - enumerable: true - } - }); - - var hasProperty = newObj.hasOwnProperty("prop"); - - newObj.prop = 12; - - return hasProperty && newObj.prop === 1001; +var newObj = Object.create({}, { + prop: { + value: 1001, + configurable: true, + enumerable: true } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +verifyNotWritable(newObj, "prop"); diff --git a/test/built-ins/Object/create/15.2.3.5-4-309.js b/test/built-ins/Object/create/15.2.3.5-4-309.js index f4df7a154..d8053d1dc 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-309.js +++ b/test/built-ins/Object/create/15.2.3.5-4-309.js @@ -10,26 +10,17 @@ description: > Object.create - [[Configurable]] is set as false if it is absent in data descriptor of one property in 'Properties' (8.12.9 step 4.a.i) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var isNotConfigurable = false; - - try { - var newObj = Object.create({}, { - prop: { - value: 1001, - writable: true, - enumerable: true - } - }); - var hasProperty = newObj.hasOwnProperty("prop"); - delete newObj.prop; - isNotConfigurable = newObj.hasOwnProperty("prop"); - return hasProperty && isNotConfigurable; - } catch (e) { - return false; - } +var newObj = Object.create({}, { + prop: { + value: 1001, + writable: true, + enumerable: true } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); + diff --git a/test/built-ins/Object/create/15.2.3.5-4-313.js b/test/built-ins/Object/create/15.2.3.5-4-313.js index f68d1b2f6..d9f098da8 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-313.js +++ b/test/built-ins/Object/create/15.2.3.5-4-313.js @@ -10,20 +10,16 @@ description: > Object.create - [[Configurable]] is set as false if it is absent in accessor descriptor of one property in 'Properties' (8.12.9 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var newObj = Object.create({}, { - prop: { - set: function () { }, - get: function () { }, - enumerable: true - } - }); - var hasProperty = newObj.hasOwnProperty("prop"); - delete newObj.prop; - var isNotConfigurable = newObj.hasOwnProperty("prop"); - return hasProperty && isNotConfigurable; +var newObj = Object.create({}, { + prop: { + set: function () { }, + get: function () { }, + enumerable: true } -runTestCase(testcase); +}); + +assert(newObj.hasOwnProperty("prop")); +verifyNotConfigurable(newObj, "prop"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-138.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-138.js index 90f74b537..09c82f105 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-138.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-138.js @@ -9,20 +9,16 @@ es5id: 15.2.3.7-5-b-138 description: > Object.defineProperties - 'writable' property of 'descObj' is present (8.10.5 step 6) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - writable: false - } - }); - - obj.property = "isWritable"; - - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; +Object.defineProperties(obj, { + property: { + writable: false } -runTestCase(testcase); +}); + +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-139.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-139.js index bd4d829b3..d0401102b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-139.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-139.js @@ -9,20 +9,16 @@ es5id: 15.2.3.7-5-b-139 description: > Object.defineProperties - 'writable' property of 'descObj' is not present (8.10.5 step 6) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - value: "abc" - } - }); +Object.defineProperties(obj, { + property: { + value: "abc" + } +}); - obj.property = "isWritable"; +verifyNotWritable(obj, "property"); - return obj.property === "abc"; - } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-140.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-140.js index b4713fff3..fd608636a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-140.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-140.js @@ -9,20 +9,17 @@ es5id: 15.2.3.7-5-b-140 description: > Object.defineProperties - 'writable' property of 'descObj' is own data property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - writable: false - } - }); +Object.defineProperties(obj, { + property: { + writable: false + } +}); - obj.property = "isWritable"; +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-141.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-141.js index 3e96bb06b..a3f2080ad 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-141.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-141.js @@ -9,27 +9,23 @@ es5id: 15.2.3.7-5-b-141 description: > Object.defineProperties - 'writable' property of 'descObj' is inherited data property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var proto = { - writable: false - }; +var proto = { + writable: false +}; - var Con = function () { }; - Con.prototype = proto; +var Con = function () { }; +Con.prototype = proto; - var descObj = new Con(); +var descObj = new Con(); - Object.defineProperties(obj, { - property: descObj - }); +Object.defineProperties(obj, { + property: descObj +}); - obj.property = "isWritable"; - - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-142.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-142.js index c8d773512..1de758c89 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-142.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-142.js @@ -10,29 +10,25 @@ description: > Object.defineProperties - 'writable' property of 'descObj' is own data property that overrides an inherited data property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var proto = { - writable: true - }; +var proto = { + writable: true +}; - var Con = function () { }; - Con.prototype = proto; +var Con = function () { }; +Con.prototype = proto; - var descObj = new Con(); +var descObj = new Con(); - descObj.writable = false; +descObj.writable = false; - Object.defineProperties(obj, { - property: descObj - }); +Object.defineProperties(obj, { + property: descObj +}); - obj.property = "isWritable"; - - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-143.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-143.js index 4d9c84a2f..0b4f22455 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-143.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-143.js @@ -10,35 +10,32 @@ description: > Object.defineProperties - 'writable' property of 'descObj' is own data property that overrides an inherited accessor property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var proto = { value: 120 }; +var proto = { value: 120 }; - Object.defineProperty(proto, "writable", { - get: function () { - return true; - } - }); +Object.defineProperty(proto, "writable", { + get: function () { + return true; + } +}); - var Con = function () { }; - Con.prototype = proto; +var Con = function () { }; +Con.prototype = proto; - var descObj = new Con(); +var descObj = new Con(); - Object.defineProperty(descObj, "writable", { - value: false - }); +Object.defineProperty(descObj, "writable", { + value: false +}); - Object.defineProperties(obj, { - property: descObj - }); +Object.defineProperties(obj, { + property: descObj +}); - obj.property = "isWritable"; +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); - return obj.hasOwnProperty("property") && obj.property === 120; - } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-144.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-144.js index 285610f21..337853994 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-144.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-144.js @@ -9,26 +9,22 @@ es5id: 15.2.3.7-5-b-144 description: > Object.defineProperties - 'writable' property of 'descObj' is own accessor property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var descObj = {}; +var descObj = {}; - Object.defineProperty(descObj, "writable", { - get: function () { - return false; - } - }); - - Object.defineProperties(obj, { - property: descObj - }); +Object.defineProperty(descObj, "writable", { + get: function () { + return false; + } +}); - obj.property = "isWritable"; +Object.defineProperties(obj, { + property: descObj +}); - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-146.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-146.js index abfba42d5..d255ced59 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-146.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-146.js @@ -10,33 +10,29 @@ description: > Object.defineProperties - 'writable' property of 'descObj' is own accessor property that overrides an inherited data property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var proto = { - writable: true - }; +var proto = { + writable: true +}; - var Con = function () { }; - Con.prototype = proto; +var Con = function () { }; +Con.prototype = proto; - var descObj = new Con(); +var descObj = new Con(); - Object.defineProperty(descObj, "writable", { - get: function () { - return false; - } - }); - - Object.defineProperties(obj, { - property: descObj - }); +Object.defineProperty(descObj, "writable", { + get: function () { + return false; + } +}); - obj.property = "isWritable"; +Object.defineProperties(obj, { + property: descObj +}); - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-147.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-147.js index 4db49aa11..ac2320185 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-147.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-147.js @@ -10,37 +10,33 @@ description: > Object.defineProperties - 'writable' property of 'descObj' is own accessor property that overrides an inherited accessor property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var proto = {}; +var proto = {}; - Object.defineProperty(proto, "writable", { - get: function () { - return true; - } - }); - - var Con = function () { }; - Con.prototype = proto; +Object.defineProperty(proto, "writable", { + get: function () { + return true; + } +}); - var descObj = new Con(); +var Con = function () { }; +Con.prototype = proto; - Object.defineProperty(descObj, "writable", { - get: function () { - return false; - } - }); +var descObj = new Con(); - Object.defineProperties(obj, { - property: descObj - }); +Object.defineProperty(descObj, "writable", { + get: function () { + return false; + } +}); - obj.property = "isWritable"; +Object.defineProperties(obj, { + property: descObj +}); - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-148.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-148.js index 72c5c9bda..bcb3ad69b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-148.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-148.js @@ -9,24 +9,20 @@ es5id: 15.2.3.7-5-b-148 description: > Object.defineProperties - 'writable' property of 'descObj' is own accessor property without a get function (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var descObj = {}; +var descObj = {}; - Object.defineProperty(descObj, "writable", { - set: function () { } - }); +Object.defineProperty(descObj, "writable", { + set: function () { } +}); - Object.defineProperties(obj, { - property: descObj - }); +Object.defineProperties(obj, { + property: descObj +}); - obj.property = "isWritable"; - - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-149.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-149.js index b984febec..a2c597412 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-149.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-149.js @@ -10,35 +10,31 @@ description: > Object.defineProperties - 'writable' property of 'descObj' is own accessor property without a get function that overrides an inherited accessor property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var proto = {}; +var proto = {}; - Object.defineProperty(proto, "writable", { - get: function () { - return true; - } - }); - - var Con = function () { }; - Con.prototype = proto; +Object.defineProperty(proto, "writable", { + get: function () { + return true; + } +}); - var descObj = new Con(); +var Con = function () { }; +Con.prototype = proto; - Object.defineProperty(descObj, "writable", { - set: function () { } - }); +var descObj = new Con(); - Object.defineProperties(obj, { - property: descObj - }); +Object.defineProperty(descObj, "writable", { + set: function () { } +}); - obj.property = "isWritable"; +Object.defineProperties(obj, { + property: descObj +}); - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-150.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-150.js index 283fe2c27..7ae7e05ea 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-150.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-150.js @@ -10,29 +10,25 @@ description: > Object.defineProperties - 'writable' property of 'descObj' is inherited accessor property without a get function (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var proto = {}; +var proto = {}; - Object.defineProperty(proto, "writable", { - set: function () { } - }); +Object.defineProperty(proto, "writable", { + set: function () { } +}); - var Con = function () { }; - Con.prototype = proto; +var Con = function () { }; +Con.prototype = proto; - var descObj = new Con(); +var descObj = new Con(); - Object.defineProperties(obj, { - property: descObj - }); +Object.defineProperties(obj, { + property: descObj +}); - obj.property = "isWritable"; - - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-151.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-151.js index 4efab8a00..e2a12fd80 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-151.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-151.js @@ -10,24 +10,20 @@ description: > Object.defineProperties - 'descObj' is a Function object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var func = function (a, b) { - return a + b; - }; +var func = function (a, b) { + return a + b; +}; - func.writable = false; +func.writable = false; - Object.defineProperties(obj, { - property: func - }); +Object.defineProperties(obj, { + property: func +}); - obj.property = "isWritable"; - - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-152.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-152.js index 512eda784..aefd8d97a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-152.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-152.js @@ -10,22 +10,18 @@ description: > Object.defineProperties - 'descObj' is an Array object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var arr = [1, 2, 3]; +var arr = [1, 2, 3]; - arr.writable = false; +arr.writable = false; - Object.defineProperties(obj, { - property: arr - }); +Object.defineProperties(obj, { + property: arr +}); - obj.property = "isWritable"; - - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-153.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-153.js index a1e80ba2a..959745efc 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-153.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-153.js @@ -10,22 +10,18 @@ description: > Object.defineProperties - 'descObj' is a String object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var str = new String("abc"); +var str = new String("abc"); - str.writable = false; +str.writable = false; - Object.defineProperties(obj, { - property: str - }); +Object.defineProperties(obj, { + property: str +}); - obj.property = "isWritable"; - - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-154.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-154.js index 995f522e5..3df5fe791 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-154.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-154.js @@ -10,22 +10,18 @@ description: > Object.defineProperties - 'descObj' is a Boolean object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var descObj = new Boolean(false); +var descObj = new Boolean(false); - descObj.writable = false; +descObj.writable = false; - Object.defineProperties(obj, { - property: descObj - }); +Object.defineProperties(obj, { + property: descObj +}); - obj.property = "isWritable"; - - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-155.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-155.js index 790b335ef..5d562bd6d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-155.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-155.js @@ -10,22 +10,18 @@ description: > Object.defineProperties - 'descObj' is a Number object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var descObj = new Number(-9); +var descObj = new Number(-9); - descObj.writable = false; +descObj.writable = false; - Object.defineProperties(obj, { - property: descObj - }); +Object.defineProperties(obj, { + property: descObj +}); - obj.property = "isWritable"; - - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-156.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-156.js index 33127f81a..1219e7dcc 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-156.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-156.js @@ -10,25 +10,22 @@ description: > Object.defineProperties - 'descObj' is the Math object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - try { - Math.writable = false; +try { + Math.writable = false; - Object.defineProperties(obj, { - property: Math - }); + Object.defineProperties(obj, { + property: Math + }); - obj.property = "isWritable"; + assert(obj.hasOwnProperty("property")); + verifyNotWritable(obj, "property"); - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } finally { - delete Math.writable; - } - } -runTestCase(testcase); +} finally { + delete Math.writable; +} diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-157.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-157.js index a7bfc4745..597476f54 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-157.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-157.js @@ -10,22 +10,18 @@ description: > Object.defineProperties - 'descObj' is a Date object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var descObj = new Date(); +var descObj = new Date(); - descObj.writable = false; +descObj.writable = false; - Object.defineProperties(obj, { - property: descObj - }); +Object.defineProperties(obj, { + property: descObj +}); - obj.property = "isWritable"; - - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-158.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-158.js index 090aa0ff9..dffb8f924 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-158.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-158.js @@ -10,22 +10,19 @@ description: > Object.defineProperties - 'descObj' is a RegExp object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var descObj = new RegExp(); +var descObj = new RegExp(); - descObj.writable = false; +descObj.writable = false; - Object.defineProperties(obj, { - property: descObj - }); +Object.defineProperties(obj, { + property: descObj +}); - obj.property = "isWritable"; +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-159.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-159.js index 75abd9a4b..580541232 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-159.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-159.js @@ -10,25 +10,22 @@ description: > Object.defineProperties - 'descObj' is the JSON object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { +var obj = {}; - var obj = {}; +try { + JSON.writable = false; - try { - JSON.writable = false; + Object.defineProperties(obj, { + property: JSON + }); - Object.defineProperties(obj, { - property: JSON - }); + assert(obj.hasOwnProperty("property")); + verifyNotWritable(obj, "property"); - obj.property = "isWritable"; +} finally { + delete JSON.writable; +} - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } finally { - delete JSON.writable; - } - } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-160.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-160.js index e1285a5f2..548bbc94c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-160.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-160.js @@ -10,22 +10,18 @@ description: > Object.defineProperties - 'descObj' is an Error object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var descObj = new Error(); +var descObj = new Error(); - descObj.writable = false; +descObj.writable = false; - Object.defineProperties(obj, { - property: descObj - }); +Object.defineProperties(obj, { + property: descObj +}); - obj.property = "isWritable"; - - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-161.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-161.js index 506f36a79..76004214f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-161.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-161.js @@ -10,24 +10,21 @@ description: > Object.defineProperties - 'descObj' is the Arguments object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - var func = function (a, b) { - arguments.writable = false; +var func = function (a, b) { + arguments.writable = false; - Object.defineProperties(obj, { - property: arguments - }); + Object.defineProperties(obj, { + property: arguments + }); - obj.property = "isWritable"; + assert(obj.hasOwnProperty("property")); + verifyNotWritable(obj, "property"); +}; - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - }; +func(); - return func(); - } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-163.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-163.js index d485dae30..c69d8c0d9 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-163.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-163.js @@ -11,26 +11,25 @@ description: > implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a) includes: - - runTestCase.js + - propertyHelper.js - fnGlobalObject.js ---*/ -function testcase() { - var obj = {}; +var obj = {}; - try { - fnGlobalObject().writable = false; +try { + fnGlobalObject().writable = false; - Object.defineProperties(obj, { - property: fnGlobalObject() - }); + Object.defineProperties(obj, { + property: fnGlobalObject() + }); + + assert(obj.hasOwnProperty("property")); + verifyNotWritable(obj, "property"); + +} finally { + delete fnGlobalObject().writable; +} - obj.property = "isWritable"; - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } finally { - delete fnGlobalObject().writable; - } - } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-164.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-164.js index 0ed8c7625..ed1d34c1d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-164.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-164.js @@ -9,20 +9,16 @@ es5id: 15.2.3.7-5-b-164 description: > Object.defineProperties - value of 'writable' property of 'descObj' is undefined (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - writable: undefined - } - }); - - obj.property = "isWritable"; - - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; +Object.defineProperties(obj, { + property: { + writable: undefined } -runTestCase(testcase); +}); + +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-165.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-165.js index 93162ef63..c38462228 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-165.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-165.js @@ -9,20 +9,16 @@ es5id: 15.2.3.7-5-b-165 description: > Object.defineProperties - value of 'writable' property of 'descObj' is null (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - writable: null - } - }); - - obj.property = "isWritable"; - - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; +Object.defineProperties(obj, { + property: { + writable: null } -runTestCase(testcase); +}); + +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-167.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-167.js index b4a58a8d8..d4ee02660 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-167.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-167.js @@ -9,20 +9,17 @@ es5id: 15.2.3.7-5-b-167 description: > Object.defineProperties - value of 'writable' property of 'descObj' is false (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - writable: false - } - }); +Object.defineProperties(obj, { + property: { + writable: false + } +}); - obj.property = "isWritable"; +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-168.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-168.js index 4cc9e32f7..ac5376010 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-168.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-168.js @@ -9,20 +9,16 @@ es5id: 15.2.3.7-5-b-168 description: > Object.defineProperties - value of 'writable' property of 'descObj' is 0 (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - writable: 0 - } - }); - - obj.property = "isWritable"; - - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; +Object.defineProperties(obj, { + property: { + writable: 0 } -runTestCase(testcase); +}); + +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-169.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-169.js index 0642bd9fa..7cdbb6d90 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-169.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-169.js @@ -9,20 +9,17 @@ es5id: 15.2.3.7-5-b-169 description: > Object.defineProperties - value of 'writable' property of 'descObj' is +0 (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - writable: +0 - } - }); +Object.defineProperties(obj, { + property: { + writable: +0 + } +}); - obj.property = "isWritable"; +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-170.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-170.js index 06def7b7c..cf2278135 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-170.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-170.js @@ -9,20 +9,17 @@ es5id: 15.2.3.7-5-b-170 description: > Object.defineProperties - value of 'writable' property of 'descObj' is -0 (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - writable: -0 - } - }); +Object.defineProperties(obj, { + property: { + writable: -0 + } +}); - obj.property = "isWritable"; +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-171.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-171.js index ba567b9be..41522f889 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-171.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-171.js @@ -9,20 +9,17 @@ es5id: 15.2.3.7-5-b-171 description: > Object.defineProperties - value of 'writable' property of 'descObj' is NaN (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - writable: NaN - } - }); +Object.defineProperties(obj, { + property: { + writable: NaN + } +}); - obj.property = "isWritable"; +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-174.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-174.js index 5dde2bfc0..3e191f2af 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-174.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-174.js @@ -9,10 +9,9 @@ es5id: 15.2.3.7-5-b-174 description: > Object.defineProperties - value of 'writable' property of 'descObj' is empty string (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -26,4 +25,6 @@ function testcase() { return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; } -runTestCase(testcase); +assert(obj.hasOwnProperty("property")); +verifyNotWritable(obj, "property"); +assert(obj.hasOwnProperty("property")); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-227.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-227.js index f8a0874bc..287e5d643 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-227.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-227.js @@ -9,30 +9,24 @@ es5id: 15.2.3.7-5-b-227 description: > Object.defineProperties - 'set' property of 'descObj' is not present (8.10.5 step 8) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var data = "data"; - var obj = {}; +var data = "data"; +var obj = {}; - try { - Object.defineProperties(obj, { - descObj: { - get: function () { - return data; - } - } - }); +Object.defineProperties(obj, { + descObj: { + get: function () { + return data; + } + } +}); - obj.descObj = "overrideData"; +assert(obj.hasOwnProperty("descObj")); +verifyNotWritable(obj, "descObj"); - var desc = Object.getOwnPropertyDescriptor(obj, "descObj"); - return obj.hasOwnProperty("descObj") && typeof (desc.set) === "undefined" && data === "data"; - } catch (e) { - return false; - } +var desc = Object.getOwnPropertyDescriptor(obj, "descObj"); +assert.sameValue(typeof (desc.set), "undefined") - } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-60.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-60.js index 272b02e98..8fd7fc9c3 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-60.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-60.js @@ -9,21 +9,15 @@ es5id: 15.2.3.7-5-b-60 description: > Object.defineProperties - 'configurable' property of 'descObj' is not present (8.10.5 step 4) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - prop: {} - }); +Object.defineProperties(obj, { + prop: {} +}); - var result1 = obj.hasOwnProperty("prop"); - delete obj.prop; - var result2 = obj.hasOwnProperty("prop"); - - return result1 === true && result2 === true; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop")); +verifyNotConfigurable(obj, "prop"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-63.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-63.js index 9d208285f..aab94d98f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-63.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-63.js @@ -10,31 +10,26 @@ description: > Object.defineProperties - 'configurable' property of 'descObj' is own data property that overrides an inherited data property (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; - var proto = { - configurable: true - }; +var obj = {}; +var proto = { + configurable: true +}; - var Con = function () { }; - Con.prototype = proto; - var descObj = new Con(); +var Con = function () { }; +Con.prototype = proto; +var descObj = new Con(); - Object.defineProperty(descObj, "configurable", { - value: false - }); +Object.defineProperty(descObj, "configurable", { + value: false +}); - Object.defineProperties(obj, { - prop: descObj - }); - var result1 = obj.hasOwnProperty("prop"); - delete obj.prop; - var result2 = obj.hasOwnProperty("prop"); +Object.defineProperties(obj, { + prop: descObj +}); - return result1 === true && result2 === true; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop")); +verifyNotConfigurable(obj, "prop"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-64.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-64.js index f754ca4fc..38ddeec3a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-64.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-64.js @@ -10,34 +10,29 @@ description: > Object.defineProperties - 'configurable' property of 'descObj' is own data property that overrides an inherited accessor property (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; - var proto = {}; - Object.defineProperty(proto, "configurable", { - get: function () { - return true; - } - }); +var obj = {}; +var proto = {}; +Object.defineProperty(proto, "configurable", { + get: function () { + return true; + } +}); - var Con = function () { }; - Con.prototype = proto; - var descObj = new Con(); +var Con = function () { }; +Con.prototype = proto; +var descObj = new Con(); - Object.defineProperty(descObj, "configurable", { - value: false - }); +Object.defineProperty(descObj, "configurable", { + value: false +}); - Object.defineProperties(obj, { - prop: descObj - }); - var result1 = obj.hasOwnProperty("prop"); - delete obj.prop; - var result2 = obj.hasOwnProperty("prop"); +Object.defineProperties(obj, { + prop: descObj +}); - return result1 === true && result2 === true; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop")); +verifyNotConfigurable(obj, "prop"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-67.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-67.js index eec0dbc5d..0456492cc 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-67.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-67.js @@ -10,33 +10,28 @@ description: > Object.defineProperties - 'configurable' property of 'descObj' is own accessor property that overrides an inherited data property (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; - var proto = { - configurable: true - }; +var obj = {}; +var proto = { + configurable: true +}; - var Con = function () { }; - Con.prototype = proto; - var descObj = new Con(); +var Con = function () { }; +Con.prototype = proto; +var descObj = new Con(); - Object.defineProperty(descObj, "configurable", { - get: function () { - return false; - } - }); +Object.defineProperty(descObj, "configurable", { + get: function () { + return false; + } +}); - Object.defineProperties(obj, { - prop: descObj - }); - var result1 = obj.hasOwnProperty("prop"); - delete obj.prop; - var result2 = obj.hasOwnProperty("prop"); +Object.defineProperties(obj, { + prop: descObj +}); - return result1 === true && result2 === true; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop")); +verifyNotConfigurable(obj, "prop"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-68.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-68.js index e46ce6803..2326f56dd 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-68.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-68.js @@ -10,10 +10,9 @@ description: > Object.defineProperties - 'configurable' property of 'descObj' is own accessor property that overrides an inherited accessor property (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -42,4 +41,3 @@ function testcase() { return result1 === true && result2 === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-69.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-69.js index 4f43dd026..a50f0700b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-69.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-69.js @@ -9,25 +9,19 @@ es5id: 15.2.3.7-5-b-69 description: > Object.defineProperties - 'configurable' property of 'descObj' is own accessor property without a get function (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { +var obj = {}; - var obj = {}; +var descObj = {}; +Object.defineProperty(descObj, "configurable", { + set: function () { } +}); - var descObj = {}; - Object.defineProperty(descObj, "configurable", { - set: function () { } - }); +Object.defineProperties(obj, { + prop: descObj +}); - Object.defineProperties(obj, { - prop: descObj - }); - var result1 = obj.hasOwnProperty("prop"); - delete obj.prop; - var result2 = obj.hasOwnProperty("prop"); - - return result1 === true && result2 === true; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop")); +verifyNotConfigurable(obj, "prop"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-70.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-70.js index 850343a50..56f3a40e2 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-70.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-70.js @@ -10,34 +10,29 @@ description: > Object.defineProperties - 'configurable' property of 'descObj' is own accessor property without a get function that overrides an inherited accessor property (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; - var proto = {}; - Object.defineProperty(proto, "configurable", { - get: function () { - return true; - } - }); +var obj = {}; +var proto = {}; +Object.defineProperty(proto, "configurable", { + get: function () { + return true; + } +}); - var Con = function () { }; - Con.prototype = proto; - var descObj = new Con(); +var Con = function () { }; +Con.prototype = proto; +var descObj = new Con(); - Object.defineProperty(descObj, "configurable", { - set: function () { } - }); +Object.defineProperty(descObj, "configurable", { + set: function () { } +}); - Object.defineProperties(obj, { - prop: descObj - }); - var result1 = obj.hasOwnProperty("prop"); - delete obj.prop; - var result2 = obj.hasOwnProperty("prop"); +Object.defineProperties(obj, { + prop: descObj +}); - return result1 === true && result2 === true; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop")); +verifyNotConfigurable(obj, "prop"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-71.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-71.js index 4b4b639c6..8e50e813d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-71.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-71.js @@ -10,30 +10,23 @@ description: > Object.defineProperties - 'configurable' property of 'descObj' is inherited accessor property without a get function (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { +var obj = {}; +var proto = {}; - var obj = {}; - var proto = {}; +Object.defineProperty(proto, "configurable", { + set: function () { } +}); - Object.defineProperty(proto, "configurable", { - set: function () { } - }); +var Con = function () { }; +Con.prototype = proto; +var descObj = new Con(); - var Con = function () { }; - Con.prototype = proto; - var descObj = new Con(); +Object.defineProperties(obj, { + prop: descObj +}); - Object.defineProperties(obj, { - prop: descObj - }); - - var result1 = obj.hasOwnProperty("prop"); - delete obj.prop; - var result2 = obj.hasOwnProperty("prop"); - - return result1 === true && result2 === true; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop")); +verifyNotConfigurable(obj, "prop"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-85.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-85.js index 6136a39e9..91adb0f85 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-85.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-85.js @@ -9,22 +9,16 @@ es5id: 15.2.3.7-5-b-85 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is undefined (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - configurable: undefined - } - }); - - var hadOwnProperty = obj.hasOwnProperty("property"); - - delete obj.property; - - return obj.hasOwnProperty("property") && hadOwnProperty; +Object.defineProperties(obj, { + property: { + configurable: undefined } -runTestCase(testcase); +}); + +assert(obj.hasOwnProperty("property")); +verifyNotConfigurable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-86.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-86.js index 71374c29e..0873475de 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-86.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-86.js @@ -9,23 +9,16 @@ es5id: 15.2.3.7-5-b-86 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is null (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; - - Object.defineProperties(obj, { - property: { - configurable: null - } - }); - - var hadOwnProperty = obj.hasOwnProperty("property"); - - delete obj.property; - - return obj.hasOwnProperty("property") && hadOwnProperty; +var obj = {}; +Object.defineProperties(obj, { + property: { + configurable: null } -runTestCase(testcase); +}); + +assert(obj.hasOwnProperty("property")); +verifyNotConfigurable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-88.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-88.js index 0e2a6410e..a774714c8 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-88.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-88.js @@ -9,22 +9,16 @@ es5id: 15.2.3.7-5-b-88 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is false (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - configurable: false - } - }); - - var hadOwnProperty = obj.hasOwnProperty("property"); - - delete obj.property; - - return obj.hasOwnProperty("property") && hadOwnProperty; +Object.defineProperties(obj, { + property: { + configurable: false } -runTestCase(testcase); +}); + +assert(obj.hasOwnProperty("property")); +verifyNotConfigurable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-89.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-89.js index cc88c7b20..74934fdab 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-89.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-89.js @@ -9,22 +9,16 @@ es5id: 15.2.3.7-5-b-89 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is 0 (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - configurable: 0 - } - }); - - var hadOwnProperty = obj.hasOwnProperty("property"); - - delete obj.property; - - return obj.hasOwnProperty("property") && hadOwnProperty; +Object.defineProperties(obj, { + property: { + configurable: 0 } -runTestCase(testcase); +}); + +assert(obj.hasOwnProperty("property")); +verifyNotConfigurable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-90.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-90.js index aea69a8b4..fdd4ddfcf 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-90.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-90.js @@ -9,22 +9,16 @@ es5id: 15.2.3.7-5-b-90 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is +0 (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - configurable: +0 - } - }); - - var hadOwnProperty = obj.hasOwnProperty("property"); - - delete obj.property; - - return obj.hasOwnProperty("property") && hadOwnProperty; +Object.defineProperties(obj, { + property: { + configurable: +0 } -runTestCase(testcase); +}); + +assert(obj.hasOwnProperty("property")); +verifyNotConfigurable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-91.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-91.js index 594e4ed61..514017fca 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-91.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-91.js @@ -9,22 +9,16 @@ es5id: 15.2.3.7-5-b-91 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is -0 (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - configurable: -0 - } - }); - - var hadOwnProperty = obj.hasOwnProperty("property"); - - delete obj.property; - - return obj.hasOwnProperty("property") && hadOwnProperty; +Object.defineProperties(obj, { + property: { + configurable: -0 } -runTestCase(testcase); +}); + +assert(obj.hasOwnProperty("property")); +verifyNotConfigurable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-92.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-92.js index eb014efe3..d9d7e3f39 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-92.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-92.js @@ -9,22 +9,16 @@ es5id: 15.2.3.7-5-b-92 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is NaN (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - configurable: NaN - } - }); - - var hadOwnProperty = obj.hasOwnProperty("property"); - - delete obj.property; - - return obj.hasOwnProperty("property") && hadOwnProperty; +Object.defineProperties(obj, { + property: { + configurable: NaN } -runTestCase(testcase); +}); + +assert(obj.hasOwnProperty("property")); +verifyNotConfigurable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-95.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-95.js index f98aad24c..f7d7ef3a4 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-95.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-95.js @@ -9,22 +9,16 @@ es5id: 15.2.3.7-5-b-95 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is empty string (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - Object.defineProperties(obj, { - property: { - configurable: "" - } - }); - - var hadOwnProperty = obj.hasOwnProperty("property"); - - delete obj.property; - - return obj.hasOwnProperty("property") && hadOwnProperty; +Object.defineProperties(obj, { + property: { + configurable: "" } -runTestCase(testcase); +}); + +assert(obj.hasOwnProperty("property")); +verifyNotConfigurable(obj, "property"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-115.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-115.js index 1a8c5d204..5b6201274 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-115.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-115.js @@ -11,38 +11,24 @@ description: > property of 'O', the [[Value]] field of 'desc' is absent, test every field in 'desc' is same with corresponding attribute value of the length property in 'O' (15.4.5.1 step 3.a.i) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var arr = []; +var arr = []; - Object.defineProperties(arr, { - length: { - writable: true, - enumerable: false, - configurable: false - } - }); - - var verifyValue = false; - verifyValue = (arr.length === 0); +Object.defineProperties(arr, { + length: { + writable: true, + enumerable: false, + configurable: false + } +}); - var verifyWritable = false; - arr.length = 2; - verifyWritable = (arr.length === 2); +assert.sameValue(arr.length, 0); - var verifyEnumerable = false; - for (var p in arr) { - if (p === "length") { - verifyEnumerable = true; - } - } +arr.length = 2; +assert.sameValue(arr.length, 2); - var verifyConfigurable = false; - delete arr.length; - verifyConfigurable = arr.hasOwnProperty("length"); +verifyNotEnumerable(arr, "length"); - return verifyValue && verifyWritable && !verifyEnumerable && verifyConfigurable; - } -runTestCase(testcase); +verifyNotConfigurable(arr, "length"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-163.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-163.js index de3c9f8e6..343ea4ce7 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-163.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-163.js @@ -13,21 +13,22 @@ description: > length property is set to false at last after deleting properties with large index named if the [[Writable]] field of 'desc' is false (15.4.5.1 step 3.i.ii) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var arr = [0, 1]; +var arr = [0, 1]; - Object.defineProperties(arr, { - length: { - value: 1, - writable: false - } - }); - - arr.length = 10; //try to overwrite length value of arr - return !arr.hasOwnProperty("1") && arr.length === 1 && arr[0] === 0; +Object.defineProperties(arr, { + length: { + value: 1, + writable: false } -runTestCase(testcase); +}); + +//try to overwrite length value of arr +verifyNotWritable(arr, "length") + +assert(!arr.hasOwnProperty("1")); +assert.sameValue(arr.length, 1); +assert.sameValue(arr[0], 0); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-164.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-164.js index b88842d5e..eedc9c6aa 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-164.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-164.js @@ -12,31 +12,29 @@ description: > of the length property, test the [[Writable]] attribute of the length property in 'O' is set as true before deleting properties with large index named (15.4.5.1 step 3.i.iii) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var arr = [0, 1, 2]; - var result = 0; +var arr = [0, 1, 2]; +var result = 0; - try { - Object.defineProperty(arr, "1", { - configurable: false - }); +try { + Object.defineProperty(arr, "1", { + configurable: false + }); - Object.defineProperties(arr, { - length: { - value: 0, - writable: false - } - }); - - return false; - } catch (e) { - result = (arr.length === 2); - arr.length = 10; - return (e instanceof TypeError) && result && arr.length === 2; + Object.defineProperties(arr, { + length: { + value: 0, + writable: false } - } -runTestCase(testcase); + }); + + $ERROR("expected to throw TypeError") +} catch (e) { + assert(e instanceof TypeError); + assert.sameValue(arr.length, 2); + verifyNotWritable(arr, "length"); +} + diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-176.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-176.js index 2dcebe5c5..c934263d7 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-176.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-176.js @@ -13,29 +13,31 @@ description: > length property is set to false at last when the [[Writable]] field of 'desc' is false and 'O' contains non-configurable large index named property (15.4.5.1 step 3.l.iii.2) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var arr = [0, 1]; +var arr = [0, 1]; - try { - Object.defineProperty(arr, "1", { - configurable: false - }); +try { + Object.defineProperty(arr, "1", { + configurable: false + }); - Object.defineProperties(arr, { - length: { - value: 1, - writable: false - } - }); - return false; - } catch (e) { - arr.length = 10; //try to overwrite length value of arr - return e instanceof TypeError && arr.hasOwnProperty("1") && - arr.length === 2 && arr[0] === 0 && arr[1] === 1; + Object.defineProperties(arr, { + length: { + value: 1, + writable: false } - } -runTestCase(testcase); + }); + + $ERROR("Expected to throw TypeError"); +} catch (e) { + assert(e instanceof TypeError); + assert(arr.hasOwnProperty("1")); + verifyNotWritable(arr, "length"); + assert.sameValue(arr[0], 0); + assert.sameValue(arr[1], 1); + assert.sameValue(arr.length, 2) +} + diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-177.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-177.js index 0fe59a849..ee384faa5 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-177.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-177.js @@ -13,25 +13,20 @@ description: > length property is set to false at last when the [[Writable]] field of 'desc' is false and 'O' doesn't contain non-configurable large index named property (15.4.5.1 step 3.m) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var arr = [0, 1]; +var arr = [0, 1]; - try { - Object.defineProperties(arr, { - length: { - value: 0, - writable: false - } - }); - - arr.length = 10; //try to overwrite length value of arr - return !arr.hasOwnProperty("1") && arr.length === 0 && !arr.hasOwnProperty("0"); - } catch (e) { - return false; - } +Object.defineProperties(arr, { + length: { + value: 0, + writable: false } -runTestCase(testcase); +}); + +assert(!arr.hasOwnProperty("1")); +assert.sameValue(arr.length, 0); +assert(!arr.hasOwnProperty("0")); +verifyNotWritable(arr, "length"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-197.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-197.js index 1303906dc..c4700d07c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-197.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-197.js @@ -12,28 +12,21 @@ description: > [[Writable]] of 'P' property in 'Attributes' is set as false value if [[Writable]] is absent in data descriptor 'desc' (15.4.5.1 step 4.c) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var arr = []; - var isOwnProperty = false; - var canWritable = false; +var arr = []; +var isOwnProperty = false; +var canWritable = false; - Object.defineProperties(arr, { - "0": { - value: 1001, - enumerable: true, - configurable: false - } - }); - - isOwnProperty = arr.hasOwnProperty("0"); - - arr[0] = 12; - - canWritable = (arr[0] === 12); - - return isOwnProperty && !canWritable && arr[0] === 1001; +Object.defineProperties(arr, { + "0": { + value: 1001, + enumerable: true, + configurable: false } -runTestCase(testcase); +}); + +assert(arr.hasOwnProperty("0")); +verifyNotWritable(arr, "0"); +assert.sameValue(arr[0], 1001); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-199.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-199.js index e2b155f59..e54516952 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-199.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-199.js @@ -12,25 +12,21 @@ description: > [[Configurable]] of 'P' property in 'Attributes' is set as false value if [[Configurable]] is absent in data descriptor 'desc' (15.4.5.1 step 4.c) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var arr = []; - var beforeDeleted = false; - var afterDeleted = false; +var arr = []; +var beforeDeleted = false; +var afterDeleted = false; - Object.defineProperties(arr, { - "0": { - value: 1001, - writable: true, - enumerable: true - } - }); - - beforeDeleted = arr.hasOwnProperty("0"); - delete arr[0]; - afterDeleted = arr.hasOwnProperty("0"); - return beforeDeleted && afterDeleted && arr[0] === 1001; +Object.defineProperties(arr, { + "0": { + value: 1001, + writable: true, + enumerable: true } -runTestCase(testcase); +}); + +assert(arr.hasOwnProperty("0")); +verifyNotConfigurable(arr, "0"); +assert(arr.hasOwnProperty("0")); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-44.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-44.js index b573b3b85..a2c04a3d4 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-44.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-44.js @@ -9,10 +9,9 @@ es5id: 15.2.3.7-6-a-44 description: > Object.defineProperties - both desc.value and P.value are NaN (8.12.9 step 6) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; @@ -42,4 +41,3 @@ function testcase() { return verifyConfigurable && !verifyEnumerable && verifyValue; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-57.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-57.js index 1fe32cd97..cadd6a94c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-57.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-57.js @@ -9,42 +9,28 @@ es5id: 15.2.3.7-6-a-57 description: > Object.defineProperties - both desc.[[Get]] and P.[[Get]] are two objects which refer to the same object (8.12.9 step 6) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; +var obj = {}; - function get_Func() { - return 10; - } +function get_Func() { + return 10; +} - Object.defineProperty(obj, "foo", { - get: get_Func - }); +Object.defineProperty(obj, "foo", { + get: get_Func +}); - Object.defineProperties(obj, { - foo: { - get: get_Func - } - }); - - var verifyEnumerable = false; - for (var p in obj) { - if (p === "foo") { - verifyEnumerable = true; - } - } +Object.defineProperties(obj, { + foo: { + get: get_Func + } +}); - var verifyValue = false; - verifyValue = (obj.foo === 10); +verifyNotEnumerable(obj, "foo"); +assert.sameValue(obj.foo, 10); - var verifyConfigurable = false; - delete obj.foo; - verifyConfigurable = obj.hasOwnProperty("foo"); +verifyNotConfigurable(obj, "foo") - var desc = Object.getOwnPropertyDescriptor(obj, "foo"); - return verifyConfigurable && !verifyEnumerable && verifyValue && typeof (desc.set) === "undefined" && desc.get === get_Func; - } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-67.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-67.js index d800cad55..b24209d85 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-67.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-67.js @@ -10,48 +10,39 @@ description: > Object.defineProperties throws TypeError when P is accessor property and P.configurable is false, desc is data property (8.12.9 step 9.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { +var obj = {}; - var obj = {}; +function get_Func() { + return 10; +} - function get_Func() { - return 10; - } +Object.defineProperty(obj, "foo", { + get: get_Func, + configurable: false +}); - Object.defineProperty(obj, "foo", { - get: get_Func, - configurable: false - }); - - try { - Object.defineProperties(obj, { - foo: { - value: 11 - } - }); - return false; - } catch (e) { - var verifyEnumerable = false; - for (var p in obj) { - if (p === "foo") { - verifyEnumerable = true; - } - } - - var verifyValue = false; - verifyValue = (obj.foo === 10); - - var desc = Object.getOwnPropertyDescriptor(obj, "foo"); - - var verifyConfigurable = false; - delete obj.foo; - verifyConfigurable = obj.hasOwnProperty("foo"); - - return e instanceof TypeError && verifyConfigurable && !verifyEnumerable && - verifyValue && typeof (desc.set) === "undefined" && desc.get === get_Func; +try { + Object.defineProperties(obj, { + foo: { + value: 11 } - } -runTestCase(testcase); + }); + + $ERROR("Expected TypeError"); +} catch (e) { + assert(e instanceof TypeError); + verifyNotEnumerable(obj, "foo"); + + assert.sameValue(obj.foo, 10); + + verifyNotConfigurable(obj, "foo"); + + var desc = Object.getOwnPropertyDescriptor(obj, "foo"); + + assert.sameValue(typeof (desc.set), "undefined"); + assert.sameValue(desc.get, get_Func); +} + diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-75.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-75.js index 305a4fc34..efbcc1562 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-75.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-75.js @@ -10,43 +10,26 @@ description: > Object.defineProperties will not throw TypeError if P.configurable is false, P.writalbe is false, P.value is NaN and properties.value is NaN (8.12.9 step 10.a.ii.1) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { - var obj = {}; - var accessed = false; +var obj = {}; +var accessed = false; - Object.defineProperty(obj, "foo", { - value: NaN, - writable: false, - configurable: false - }); +Object.defineProperty(obj, "foo", { + value: NaN, + writable: false, + configurable: false +}); - Object.defineProperties(obj, { - foo: { - value: NaN - } - }); - - var verifyEnumerable = false; - for (var p in obj) { - if (p === "foo") { - verifyEnumerable = true; - } - } - - obj.prop = "overrideData"; - var verifyValue = false; - verifyValue = obj.foo !== obj.foo && isNaN(obj.foo); - - var desc = Object.getOwnPropertyDescriptor(obj, "foo"); +Object.defineProperties(obj, { + foo: { + value: NaN + } +}); - var verifyConfigurable = false; - delete obj.foo; - verifyConfigurable = obj.hasOwnProperty("foo"); +verifyNotEnumerable(obj, "foo"); +verifyNotWritable(obj, "foo"); +verifyNotConfigurable(obj, "foo"); - return verifyValue && !verifyEnumerable && verifyConfigurable; - } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-100.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-100.js index ea910978e..11288266c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-100.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-100.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-100 description: > Object.defineProperty - 'configurable' property in 'Attributes' is null (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = { }; Object.defineProperty(obj, "property", { configurable: null }); @@ -25,4 +24,3 @@ function testcase() { return beforeDeleted === true && afterDeleted === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-102.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-102.js index 895f16d93..260f289e5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-102.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-102.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-102 description: > Object.defineProperty - 'configurable' property in 'Attributes' is false (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = { }; Object.defineProperty(obj, "property", { configurable: false }); @@ -25,4 +24,3 @@ function testcase() { return beforeDeleted === true && afterDeleted === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-103.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-103.js index 893ab5fd4..e0c5d1a0a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-103.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-103.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-103 description: > Object.defineProperty - 'configurable' property in 'Attributes' is 0 (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = { }; Object.defineProperty(obj, "property", { configurable: 0 }); @@ -25,4 +24,3 @@ function testcase() { return beforeDeleted === true && afterDeleted === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-104.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-104.js index af48c109c..b6f676fd4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-104.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-104.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-104 description: > Object.defineProperty - 'configurable' property in 'Attributes' is +0 (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { configurable: +0 }); @@ -25,4 +24,3 @@ function testcase() { return beforeDeleted === true && afterDeleted === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-105.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-105.js index 977f5035f..7b87534a8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-105.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-105.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-105 description: > Object.defineProperty - 'configurable' property in 'Attributes' is -0 (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = { }; Object.defineProperty(obj, "property", { configurable: -0 }); @@ -25,4 +24,3 @@ function testcase() { return beforeDeleted === true && afterDeleted === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-106.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-106.js index 5861657f4..6244d2598 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-106.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-106.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-106 description: > Object.defineProperty - 'configurable' property in 'Attributes' is NaN (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = { }; Object.defineProperty(obj, "property", { configurable: NaN }); @@ -25,4 +24,3 @@ function testcase() { return beforeDeleted === true && afterDeleted === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-109.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-109.js index a02187def..f0a80e849 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-109.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-109.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-109 description: > Object.defineProperty - 'configurable' property in 'Attributes' is an empty string (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = { }; Object.defineProperty(obj, "property", { configurable: "" }); @@ -25,4 +24,3 @@ function testcase() { return beforeDeleted === true && afterDeleted === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-152.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-152.js index fd02b8007..8ac30dace 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-152.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-152.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-152 description: > Object.defineProperty - 'writable' property in 'Attributes' is present (8.10.5 step 6) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var attr = { @@ -29,4 +28,3 @@ function testcase() { return beforeWrite === true && afterWrite === false; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-153.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-153.js index 9a762117c..45883fe9e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-153.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-153.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-153 description: > Object.defineProperty - 'writable' property in 'Attributes' is not present (8.10.5 step 6) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var attr = { @@ -29,4 +28,3 @@ function testcase() { return beforeWrite === true && afterWrite === false; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-162.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-162.js index 93b038073..59694cf22 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-162.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-162.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-162 description: > Object.defineProperty - 'writable' property in 'Attributes' is own accessor property without a get function (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var attr = {}; @@ -30,4 +29,3 @@ function testcase() { return beforeWrite === true && afterWrite === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-163.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-163.js index eec5ba503..d3ae486cc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-163.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-163.js @@ -10,10 +10,9 @@ description: > Object.defineProperty - 'writable' property in 'Attributes' is own accessor property(without a get function) that overrides an inherited accessor property (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -41,4 +40,3 @@ function testcase() { return beforeWrite === true && afterWrite === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-164.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-164.js index 6af11bec0..44f347895 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-164.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-164.js @@ -10,10 +10,9 @@ description: > Object.defineProperty - 'writable' property in 'Attributes' is an inherited accessor property without a get function (8.10.5 step 6.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -36,4 +35,3 @@ function testcase() { return beforeWrite === true && afterWrite === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-171-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-171-1.js index 5489c6786..80b1ed0fe 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-171-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-171-1.js @@ -10,10 +10,9 @@ description: > Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'writable' property of prototype object (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; try { Date.prototype.writable = true; @@ -33,4 +32,3 @@ function testcase() { delete Date.prototype.writable; } } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-178.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-178.js index 74c841e6a..1a40c0e7d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-178.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-178.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-178 description: > Object.defineProperty - 'writable' property in 'Attributes' is undefined (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { @@ -27,4 +26,3 @@ function testcase() { return beforeWrite === true && afterWrite === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-179.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-179.js index 3cbdc5966..8e954ed5e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-179.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-179.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-179 description: > Object.defineProperty - 'writable' property in 'Attributes' is null (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = { }; Object.defineProperty(obj, "property", { writable: null }); @@ -25,4 +24,3 @@ function testcase() { return beforeWrite === true && afterWrite === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-181.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-181.js index 7588e920a..26858aaff 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-181.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-181.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-181 description: > Object.defineProperty - 'writable' property in 'Attributes' is false (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = { }; Object.defineProperty(obj, "property", { writable: false }); @@ -25,4 +24,3 @@ function testcase() { return beforeWrite === true && afterWrite === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-182.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-182.js index 071ace447..382d6002b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-182.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-182.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-182 description: > Object.defineProperty - 'writable' property in 'Attributes' is 0 (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = { }; Object.defineProperty(obj, "property", { writable: 0 }); @@ -25,4 +24,3 @@ function testcase() { return beforeWrite === true && afterWrite === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-183.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-183.js index ed45254df..a3b58bfb3 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-183.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-183.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-183 description: > Object.defineProperty - 'writable' property in 'Attributes' is +0 (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { writable: +0 }); @@ -25,4 +24,3 @@ function testcase() { return beforeWrite === true && afterWrite === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-184.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-184.js index a568063d0..3af70ccd0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-184.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-184.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-184 description: > Object.defineProperty - 'writable' property in 'Attributes' is -0 (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = { }; Object.defineProperty(obj, "property", { writable: -0 }); @@ -25,4 +24,3 @@ function testcase() { return beforeWrite === true && afterWrite === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-185.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-185.js index 0a06885de..0933e5afc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-185.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-185.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-185 description: > Object.defineProperty - 'writable' property in 'Attributes' is NaN (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = { }; Object.defineProperty(obj, "property", { writable: NaN}); @@ -25,4 +24,3 @@ function testcase() { return beforeWrite === true && afterWrite === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-188.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-188.js index 28f3049f0..d76ebccad 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-188.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-188.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-188 description: > Object.defineProperty - 'writable' property in 'Attributes' is an empty string (8.10.5 step 6.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { writable: "" }); @@ -25,4 +24,3 @@ function testcase() { return beforeWrite === true && afterWrite === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-236.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-236.js index 190c9dfb8..2402f3303 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-236.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-236.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-236 description: > Object.defineProperty - 'set' property in 'Attributes' is not present (8.10.5 step 8) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { @@ -25,4 +24,3 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "property"); return obj.hasOwnProperty("property") && obj.property === 11 && typeof desc.set === "undefined"; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-245.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-245.js index 62697ae08..73238c9db 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-245.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-245.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-245 description: > Object.defineProperty - 'set' property in 'Attributes' is own accessor property without a get function (8.10.5 step 8.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var attributes = {}; @@ -28,4 +27,3 @@ function testcase() { return obj.hasOwnProperty("property") && typeof obj.property === "undefined" && typeof desc.set === "undefined"; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-246.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-246.js index c103ec3cc..1c32ab0a6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-246.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-246.js @@ -10,10 +10,9 @@ description: > Object.defineProperty - 'set' property in 'Attributes' is own accessor property(without a get function) that overrides an inherited accessor property (8.10.5 step 8.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var proto = {}; var data = "data"; @@ -38,4 +37,3 @@ function testcase() { obj.property = "overrideData"; return obj.hasOwnProperty("property") && typeof obj.property === "undefined" && data === "data"; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-247.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-247.js index 926b3bcab..f074f45cf 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-247.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-247.js @@ -10,10 +10,9 @@ description: > Object.defineProperty - 'set' property in 'Attributes' is an inherited accessor property without a get function (8.10.5 step 8.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var proto = {}; Object.defineProperty(proto, "set", { @@ -30,4 +29,3 @@ function testcase() { obj.property = "overrideData"; return obj.hasOwnProperty("property") && typeof obj.property === "undefined"; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-261.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-261.js index bfe3d3c77..71cb7f92e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-261.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-261.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-261 description: > Object.defineProperty - value of 'set' property in 'Attributes' is undefined (8.10.5 step 8.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { @@ -24,4 +23,3 @@ function testcase() { return obj.hasOwnProperty("property") && typeof obj.property === "undefined" && typeof desc.set === "undefined"; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-73.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-73.js index 18397ac58..e7fd0e0e5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-73.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-73.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-73 description: > Object.defineProperty - 'configurable' property in 'Attributes' is present (8.10.5 step 4) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { @@ -27,4 +26,3 @@ function testcase() { return beforeDeleted === true && afterDeleted === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-74.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-74.js index 89ff175bb..18303ccb4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-74.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-74.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-74 description: > Object.defineProperty - 'configurable' property in 'Attributes' is not present (8.10.5 step 4) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = { }; Object.defineProperty(obj, "property", { value: 100 }); @@ -26,4 +25,3 @@ function testcase() { return beforeDeleted === true && afterDeleted === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-76.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-76.js index 5d6e235bf..c18a8614b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-76.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-76.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-76 description: > Object.defineProperty - 'configurable' property in 'Attributes' is an inherited data property (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = { }; var proto = { @@ -33,4 +32,3 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); return beforeDeleted && afterDeleted && typeof (obj.property) === "undefined"; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-83.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-83.js index cfb52b80a..025056104 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-83.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-83.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-83 description: > Object.defineProperty - 'configurable' property in 'Attributes' is own accessor property without a get function (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = { }; var attr = {}; @@ -30,4 +29,3 @@ function testcase() { return beforeDeleted === true && afterDeleted === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-84.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-84.js index 233fecf25..f8d1d6457 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-84.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-84.js @@ -10,10 +10,9 @@ description: > Object.defineProperty - 'configurable' property in 'Attributes' is own accessor property(without a get function) that overrides an inherited accessor property (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -41,4 +40,3 @@ function testcase() { return beforeDeleted === true && afterDeleted === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-85.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-85.js index e5d79605b..704e84f69 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-85.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-85.js @@ -10,10 +10,9 @@ description: > Object.defineProperty - 'configurable' property in 'Attributes' is an inherited accessor property without a get function (8.10.5 step 4.a) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -36,4 +35,3 @@ function testcase() { return beforeDeleted === true && afterDeleted === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-99.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-99.js index 3a724aaf7..5931b7eb7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-99.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-99.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-3-99 description: > Object.defineProperty - 'configurable' property in 'Attributes' is undefined (8.10.5 step 4.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = { }; Object.defineProperty(obj, "property", { configurable: undefined }); @@ -25,4 +24,3 @@ function testcase() { return beforeDeleted === true && afterDeleted === true; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-118.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-118.js index b9322775d..9dcc95272 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-118.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-118.js @@ -10,10 +10,9 @@ description: > Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is absent, test every field in 'desc' is absent (15.4.5.1 step 3.a.i) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var arrObj = []; Object.defineProperty(arrObj, "length", {}); @@ -38,4 +37,3 @@ function testcase() { return verifyValue && verifyWritable && !verifyEnumerable && verifyConfigurable; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-119.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-119.js index 1fc02fddb..6ac91c4fd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-119.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-119.js @@ -11,10 +11,9 @@ description: > property of 'O', the [[Value]] field of 'desc' is absent, test every field in 'desc' is same with corresponding attribute value of the length property in 'O' (15.4.5.1 step 3.a.i) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var arrObj = []; Object.defineProperty(arrObj, "length", { @@ -43,4 +42,3 @@ function testcase() { return verifyValue && verifyWritable && !verifyEnumerable && verifyConfigurable; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-167.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-167.js index 03dd2fbab..bf41f0119 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-167.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-167.js @@ -13,10 +13,9 @@ description: > length property is set to false after deleting properties with large index named if the [[Writable]] field of 'desc' is false (15.4.5.1 step 3.i.ii) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var arrObj = [0, 1]; @@ -31,4 +30,3 @@ function testcase() { return indexDeleted && arrObj.length === 1; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-181.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-181.js index b25f7a081..d7ba9c904 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-181.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-181.js @@ -13,10 +13,9 @@ description: > length property is set to false at last when the [[Writable]] field of 'desc' is false and 'O' doesn't contain non-configurable large index named property (15.4.5.1 step 3.m) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var arrObj = [0, 1]; @@ -28,4 +27,3 @@ function testcase() { arrObj.length = 10; //try to overwrite length value of arr return !arrObj.hasOwnProperty("1") && arrObj.length === 0; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-217.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-217.js index b61efc91c..60c8b09ac 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-217.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-217.js @@ -10,10 +10,9 @@ description: > Object.defineProperty - 'O' is an Array, 'name' is an array index property, both the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are NaN (15.4.5.1 step 4.c) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var arrObj = []; Object.defineProperty(arrObj, "0", { value: NaN }); @@ -40,4 +39,3 @@ function testcase() { return hasProperty && verifyValue && verifyWritable && !verifyEnumerable && verifyConfigurable; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-254.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-254.js index ea8a6097e..cfbbfc23a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-254.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-254.js @@ -13,10 +13,9 @@ description: > false, test TypeError is not thrown if the [[Set]] field of 'desc' is present, and the [[Set]] field of 'desc' and the [[Set]] attribute value of 'name' are undefined (15.4.5.1 step 4.c) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var arrObj = []; Object.defineProperty(arrObj, "1", { @@ -47,4 +46,3 @@ function testcase() { return hasProperty && verifyGet && verifySet && !verifyEnumerable && verifyConfigurable; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-255.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-255.js index 590d8aeb9..03709f3b5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-255.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-255.js @@ -14,10 +14,9 @@ description: > present, and the [[Get]] field of 'desc' and the [[Get]] attribute value of 'name' are two objects which refer to the different objects (15.4.5.1 step 4.c) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var arrObj = []; function getFunc() { @@ -58,4 +57,3 @@ function testcase() { verifySet && !verifyEnumerable && verifyConfigurable; } } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-256.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-256.js index e0d480001..9d671b1d3 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-256.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-256.js @@ -13,10 +13,9 @@ description: > false, test TypeError is thrown if the [[Get]] field of 'desc' is present, and the [[Get]] field of 'desc' is an object and the [[Get]] attribute value of 'name' is undefined (15.4.5.1 step 4.c) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var arrObj = []; function getFunc() { return 12; @@ -54,4 +53,3 @@ function testcase() { verifySet && !verifyEnumerable && verifyConfigurable; } } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-335.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-335.js index 435c74aa3..e3b88b85e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-335.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-335.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-4-335 description: > ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is false) is undeletable -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -26,4 +25,3 @@ function testcase() { var afterDelete = obj.hasOwnProperty("prop"); return beforeDelete && obj.prop === 2010 && afterDelete; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-349.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-349.js index c2996028c..8d1167131 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-349.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-349.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-4-349 description: > ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is false) is undeletable -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -26,4 +25,3 @@ function testcase() { var afterDelete = obj.hasOwnProperty("prop"); return beforeDelete && obj.prop === 2010 && afterDelete; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-15.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-15.js index 03a93ff7f..f5cca7c55 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-15.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-15.js @@ -10,10 +10,9 @@ description: > Object.defineProperty - Named property 'P' with attributes [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true is non-writable using simple assignment, 'A' is an Array object -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = []; Object.defineProperty(obj, "prop", { @@ -27,4 +26,3 @@ function testcase() { return verifyValue && obj.prop === 2010; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-16.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-16.js index 765de208f..5c8c05a99 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-16.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-16.js @@ -11,10 +11,9 @@ description: > attributes [[Writable]]: false, [[Enumerable]]: true, [[Configurable]] : true) is non-writable using simple assignment, 'O' is an Arguments object -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = (function () { return arguments; }()); @@ -30,4 +29,3 @@ function testcase() { return valueVerify && obj[0] === 2010; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-6.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-6.js index 21fbcfc95..d5750e786 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-6.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-6.js @@ -10,10 +10,9 @@ description: > Object.defineProperty - Indexed property 'P' with attributes [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true is non-writable using simple assignment, 'A' is an Array object -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = []; Object.defineProperty(obj, "0", { @@ -27,4 +26,3 @@ function testcase() { return verifyValue && obj[0] === 2010; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-7.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-7.js index 8cfed4fc2..fe3a1c41a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-7.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-7.js @@ -10,10 +10,9 @@ description: > ES5 Attributes - property 'P' with attributes [[Writable]]: false, [[Enumerable]]: true, [[Configurable]] : true) is non-writable using simple assignment, 'O' is an Arguments object -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = (function () { return arguments; }()); @@ -29,4 +28,3 @@ function testcase() { return valueVerify && obj.prop === 2010; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-8.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-8.js index 8c3d61e92..86ec8cbdd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-8.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-8.js @@ -11,11 +11,10 @@ description: > [[Enumerable]]: true, [[Configurable]]: true is non-writable using simple assignment, 'O' is the global object includes: - - runTestCase.js + - propertyHelper.js - fnGlobalObject.js ---*/ -function testcase() { var obj = fnGlobalObject(); try { Object.defineProperty(obj, "prop", { @@ -32,4 +31,3 @@ function testcase() { delete obj.prop; } } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354.js index 928550170..288dc7477 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-4-354 description: > ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is true) is unwritable -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -26,4 +25,3 @@ function testcase() { return propertyDefineCorrect && obj.prop === 2010; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-361.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-361.js index 79ec2298e..b19db726e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-361.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-361.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-4-361 description: > ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is false) is unwritable -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -26,4 +25,3 @@ function testcase() { return propertyDefineCorrect && obj.prop === 2010; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-363.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-363.js index 85d87f129..835b48ed8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-363.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-363.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-4-363 description: > ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is false) is undeletable -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -26,4 +25,3 @@ function testcase() { var afterDelete = obj.hasOwnProperty("prop"); return beforeDelete && obj.prop === 2010 && afterDelete; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-368.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-368.js index 3b2d1fb08..4b181c79d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-368.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-368.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-4-368 description: > ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is true) is unwritable -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -26,4 +25,3 @@ function testcase() { return propertyDefineCorrect && obj.prop === 2010; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-375.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-375.js index 003d4cdfc..35a4aec7a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-375.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-375.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-4-375 description: > ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is false) is unwritable -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -26,4 +25,3 @@ function testcase() { return propertyDefineCorrect && obj.prop === 2010; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-377.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-377.js index 9a0819298..335e8cca2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-377.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-377.js @@ -9,10 +9,9 @@ es5id: 15.2.3.6-4-377 description: > ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is false) is undeletable -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -26,4 +25,3 @@ function testcase() { var afterDelete = obj.hasOwnProperty("prop"); return beforeDelete && obj.prop === 2010 && afterDelete; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-405.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-405.js index 4a8308f4f..18b1bdf26 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-405.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-405.js @@ -10,10 +10,9 @@ description: > ES5 Attributes - Failed to add a property to an object when the object's object has a property with same name and [[Writable]] attribute is set to false (Number instance) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { try { Object.defineProperty(Number.prototype, "prop", { value: 1001, @@ -29,4 +28,3 @@ function testcase() { delete Number.prototype.prop; } } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-410.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-410.js index 7f0a26713..3a56b4ec5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-410.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-410.js @@ -10,10 +10,9 @@ description: > ES5 Attributes - Failed to add a property to an object when the object's prototype has a property with the same name and [[Writable]] set to false (JSON) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { try { Object.defineProperty(Object.prototype, "prop", { value: 1001, @@ -28,4 +27,3 @@ function testcase() { delete Object.prototype.prop; } } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-415.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-415.js index a94009512..8f0d35014 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-415.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-415.js @@ -10,10 +10,9 @@ description: > ES5 Attributes - Failed to add properties to an object when the object's prototype has properties with the same name and [[Writable]] set to false (Object.create) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var appointment = new Object(); Object.defineProperty(appointment, "startTime", { @@ -51,4 +50,3 @@ function testcase() { teamMeeting.startTime === 1001 && teamMeeting.conferenceCall === "In-person meeting"; } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-420.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-420.js index a24612f20..de25ea712 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-420.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-420.js @@ -10,10 +10,9 @@ description: > ES5 Attributes - Failed to add a property to an object when the object's prototype has a property with the same name and [[Writable]] set to false(Function.prototype.bind) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var foo = function () { }; try { Object.defineProperty(Function.prototype, "prop", { @@ -31,4 +30,3 @@ function testcase() { delete Function.prototype.prop; } } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-429.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-429.js index 2b5d02d37..87accfa68 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-429.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-429.js @@ -11,10 +11,9 @@ description: > accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -33,4 +32,3 @@ function testcase() { return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop"); } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-434.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-434.js index 24768ee82..e10127daa 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-434.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-434.js @@ -10,10 +10,9 @@ description: > ES5 Attributes - property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) is undeletable -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -30,4 +29,3 @@ function testcase() { return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop"); } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-438.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-438.js index 674c7b6d4..7b46c7f33 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-438.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-438.js @@ -11,10 +11,9 @@ description: > accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) to different value -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -38,4 +37,3 @@ function testcase() { return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError; } } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-447.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-447.js index 92a88f912..be415a16b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-447.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-447.js @@ -11,10 +11,9 @@ description: > accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -33,4 +32,3 @@ function testcase() { return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop"); } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-452.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-452.js index b66aecd8e..e46831027 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-452.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-452.js @@ -10,10 +10,9 @@ description: > ES5 Attributes - property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) is undeletable -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -30,4 +29,3 @@ function testcase() { return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop"); } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-456.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-456.js index 89b1e2645..26d42d007 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-456.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-456.js @@ -11,10 +11,9 @@ description: > accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) to different value -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -38,4 +37,3 @@ function testcase() { return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError; } } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-465.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-465.js index 171489311..e1b3a5e31 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-465.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-465.js @@ -11,10 +11,9 @@ description: > accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -38,4 +37,3 @@ function testcase() { return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop"); } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-470.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-470.js index 53caecb88..a63c2ed3e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-470.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-470.js @@ -10,10 +10,9 @@ description: > ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) is undeletable -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -35,4 +34,3 @@ function testcase() { return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop"); } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-474.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-474.js index e423c5807..dcfa38cdf 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-474.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-474.js @@ -11,10 +11,9 @@ description: > accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) to different value -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -43,4 +42,3 @@ function testcase() { return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError; } } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-483.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-483.js index 7a7c24c57..8f7e5313e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-483.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-483.js @@ -11,10 +11,9 @@ description: > accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -38,4 +37,3 @@ function testcase() { return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop"); } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-488.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-488.js index f207463a0..fafebace2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-488.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-488.js @@ -10,10 +10,9 @@ description: > ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) is undeletable -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -35,4 +34,3 @@ function testcase() { return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop"); } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-492.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-492.js index 68d32e80b..f90c1442f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-492.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-492.js @@ -11,10 +11,9 @@ description: > accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) to different value -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -43,4 +42,3 @@ function testcase() { return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError; } } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-501.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-501.js index 2f3baf5c5..162369b35 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-501.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-501.js @@ -11,10 +11,9 @@ description: > accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -37,4 +36,3 @@ function testcase() { return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop"); } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-506.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-506.js index 5492204e7..3756fe5b1 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-506.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-506.js @@ -10,10 +10,9 @@ description: > ES5 Attributes - property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) is undeletable -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -34,4 +33,3 @@ function testcase() { return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop"); } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-510.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-510.js index 55ff979fa..01f739cc7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-510.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-510.js @@ -11,10 +11,9 @@ description: > accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) to different value -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -42,4 +41,3 @@ function testcase() { return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError; } } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-519.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-519.js index fcf391261..080b2d1a8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-519.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-519.js @@ -11,10 +11,9 @@ description: > accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -37,4 +36,3 @@ function testcase() { return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop"); } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-524.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-524.js index 663300157..065df6752 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-524.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-524.js @@ -10,10 +10,9 @@ description: > ES5 Attributes - property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) is undeletable -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -34,4 +33,3 @@ function testcase() { return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop"); } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-528.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-528.js index c16ac8de1..643e382e4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-528.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-528.js @@ -11,10 +11,9 @@ description: > accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) to different value -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -42,4 +41,3 @@ function testcase() { return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError; } } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-6.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-6.js index f63bdf9e0..9b2f8b3da 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-6.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-6.js @@ -10,10 +10,9 @@ description: > ES5 Attributes - Updating an indexed accessor property 'P' without [[Set]] using simple assignment is failed, 'A' is an Array object (8.12.5 step 5.b) -includes: [runTestCase.js] +includes: [propertyHelper.js] ---*/ -function testcase() { var obj = []; var verifySetFunc = "data"; @@ -33,4 +32,3 @@ function testcase() { return propertyDefineCorrect && typeof desc.set === "undefined" && obj[0] === "data"; } -runTestCase(testcase); |