diff options
Diffstat (limited to 'test/built-ins/Object/defineProperty')
30 files changed, 155 insertions, 232 deletions
diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-116.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-116.js index 90730a1bb..65a3d68c6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-116.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-116.js @@ -6,24 +6,22 @@ es5id: 15.2.3.6-4-116 description: > Object.defineProperty - 'O' is an Array, test the length property of 'O' is own data property (15.4.5.1 step 1) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = [0, 1]; Object.defineProperty(arrObj, "1", { value: 1, configurable: false }); - try { - Object.defineProperty(arrObj, "length", { value: 1 }); - return false; - } catch (e) { - var desc = Object.getOwnPropertyDescriptor(arrObj, "length"); - return Object.hasOwnProperty.call(arrObj, "length") && desc.value === 2 && - desc.writable === true && desc.configurable === false && desc.enumerable === false; - } - } -runTestCase(testcase); +assert.throws(TypeError, function() { + Object.defineProperty(arrObj, "length", { value: 1 }); +}); + +var desc = Object.getOwnPropertyDescriptor(arrObj, "length"); + +assert(Object.hasOwnProperty.call(arrObj, "length"), 'Object.hasOwnProperty.call(arrObj, "length")'); +assert.sameValue(desc.value, 2, 'desc.value'); +assert.sameValue(desc.writable, true, 'desc.writable'); +assert.sameValue(desc.configurable, false, 'desc.configurable'); +assert.sameValue(desc.enumerable, false, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-163.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-163.js index 20c373a46..99ad98928 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-163.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-163.js @@ -8,24 +8,14 @@ description: > property of 'O', the [[Value]] field of 'desc' equals to value of the length property, test no TypeError is thrown when the length property is not writable (15.4.5.1 step 3.f.i) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = []; Object.defineProperty(arrObj, "length", { writable: false }); - try { Object.defineProperty(arrObj, "length", { value: 0 }); - return true; - } catch (e) { - return false; - } - } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-187.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-187.js index f1580d62b..e6050fceb 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-187.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-187.js @@ -9,24 +9,15 @@ description: > attribute of the length property in 'O' is false and value of 'name' is less than value of the length property (15.4.5.1 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var arrObj = [1, 2, 3]; Object.defineProperty(arrObj, "length", { writable: false }); - try { Object.defineProperty(arrObj, 1, { value: "abc" }); - return true; - } catch (e) { - return false; - } - } -runTestCase(testcase); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-2.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-2.js index 392cff8df..d78cae826 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-2.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-2.js @@ -10,22 +10,16 @@ es5id: 15.2.3.6-4-2 description: > Object.defineProperty sets missing attributes to their default values (data properties)(8.12.9 step 4.a.i) -includes: [runTestCase.js] ---*/ -function testcase() { var o = {}; var desc = { value: 1 }; Object.defineProperty(o, "foo", desc); - + var propDesc = Object.getOwnPropertyDescriptor(o, "foo"); - - if (propDesc.value === 1 && // this is the value that was set - propDesc.writable === false && // false by default - propDesc.enumerable === false && // false by default - propDesc.configurable === false) { // false by default - return true; - } - } -runTestCase(testcase); + +assert.sameValue(propDesc.value, 1, 'propDesc.value'); // this is the value that was set +assert.sameValue(propDesc.writable, false, 'propDesc.writable'); // false by default +assert.sameValue(propDesc.enumerable, false, 'propDesc.enumerable'); // false by default +assert.sameValue(propDesc.configurable, false, 'propDesc.configurable'); // false by default diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-3.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-3.js index ffbfc155b..a3873b1e0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-3.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-3.js @@ -10,10 +10,8 @@ es5id: 15.2.3.6-4-3 description: > Object.defineProperty sets missing attributes to their default values (accessor)(8.12.9 step 4.b.i) -includes: [runTestCase.js] ---*/ -function testcase() { var o = {}; var getter = function () { return 1; }; @@ -23,11 +21,8 @@ function testcase() { var propDesc = Object.getOwnPropertyDescriptor(o, "foo"); - if (typeof(propDesc.get) === "function" && // the getter must be the function that was provided - propDesc.get === getter && - propDesc.enumerable === false && // false by default - propDesc.configurable === false) { // false by default - return true; - } - } -runTestCase(testcase); +assert.sameValue(typeof(propDesc.get), "function", 'typeof(propDesc.get)'); +assert.sameValue(propDesc.get, getter, 'propDesc.get'); // the getter must be the function that was provided +assert.sameValue(propDesc.set, undefined, 'propDesc.set'); // undefined by default +assert.sameValue(propDesc.enumerable, false, 'propDesc.enumerable'); // false by default +assert.sameValue(propDesc.configurable, false, 'propDesc.configurable'); // false by default
\ No newline at end of file diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-327.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-327.js index 787aecbc3..97d2ddcc7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-327.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-327.js @@ -6,10 +6,10 @@ es5id: 15.2.3.6-4-327 description: > ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is true) is enumerable -includes: [runTestCase.js] ---*/ -function testcase() { +var propertyFound = false; + var obj = {}; Object.defineProperty(obj, "prop", { @@ -22,9 +22,11 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); for (var property in obj) { if (property === "prop") { - return propertyDefineCorrect && desc.enumerable === true; + propertyFound = true; + break; } } - return false; - } -runTestCase(testcase); + +assert(propertyFound, 'Property not found'); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, true, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-334.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-334.js index 851160e7a..f4322915e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-334.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-334.js @@ -6,10 +6,10 @@ es5id: 15.2.3.6-4-334 description: > ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is false) is enumerable -includes: [runTestCase.js] ---*/ -function testcase() { +var propertyFound = false; + var obj = {}; Object.defineProperty(obj, "prop", { @@ -22,9 +22,11 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); for (var p in obj) { if (p === "prop") { - return propertyDefineCorrect && desc.enumerable === true; + propertyFound = true; + break; } } - return false; - } -runTestCase(testcase); + +assert(propertyFound, 'Property not found'); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, true, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-341.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-341.js index 87bfe8538..1a2324b5f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-341.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-341.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-341 description: > ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is true) is non-enumerable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -21,10 +19,8 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); for (var p in obj) { - if (p === "prop") { - return false; - } + assert.notSameValue(p, "prop", 'p'); } - return propertyDefineCorrect && desc.enumerable === false; - } -runTestCase(testcase); + +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, false, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-348.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-348.js index 701a132fb..90804ded5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-348.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-348.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-348 description: > ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is false) is non-enumerable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -21,10 +19,8 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); for (var p in obj) { - if (p === "prop") { - return false; - } + assert.notSameValue(p, "prop", 'p'); } - return propertyDefineCorrect && desc.enumerable === false; - } -runTestCase(testcase); + +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, false, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-355.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-355.js index b5d9f515f..7b08f6ee6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-355.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-355.js @@ -6,10 +6,10 @@ es5id: 15.2.3.6-4-355 description: > ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is true) is enumerable -includes: [runTestCase.js] ---*/ -function testcase() { +var propertyFound = false; + var obj = {}; Object.defineProperty(obj, "prop", { @@ -22,9 +22,11 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); for (var property in obj) { if (property === "prop") { - return propertyDefineCorrect && desc.enumerable === true; + propertyFound = true; + break; } } - return false; - } -runTestCase(testcase); + +assert(propertyFound, 'Property not found'); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, true, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-362.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-362.js index b829fc5a0..1e5d40c2e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-362.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-362.js @@ -6,10 +6,10 @@ es5id: 15.2.3.6-4-362 description: > ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is false) is enumerable -includes: [runTestCase.js] ---*/ -function testcase() { +var propertyFound = false; + var obj = {}; Object.defineProperty(obj, "prop", { value: 2010, @@ -21,9 +21,11 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); for (var property in obj) { if (property === "prop") { - return propertyDefineCorrect && desc.enumerable === true; + propertyFound = true; + break; } } - return false; - } -runTestCase(testcase); + +assert(propertyFound, 'Property not found'); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, true, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-369.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-369.js index 3104d404d..1950c4a80 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-369.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-369.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-369 description: > ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is true) is non-enumerable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -21,10 +19,8 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); for (var p in obj) { - if (p === "prop") { - return false; - } + assert.notSameValue(p, "prop", 'p'); } - return propertyDefineCorrect && desc.enumerable === false; - } -runTestCase(testcase); + +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, false, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-376.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-376.js index bffdefece..310fee16e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-376.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-376.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-376 description: > ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is false) is non-enumerable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -21,10 +19,8 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); for (var p in obj) { - if (p === "prop") { - return false; - } + assert.notSameValue(p, "prop", 'p'); } - return propertyDefineCorrect && desc.enumerable === false; - } -runTestCase(testcase); + +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, false, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-4.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-4.js index efe4a2288..5e08bb35a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-4.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-4.js @@ -10,21 +10,16 @@ es5id: 15.2.3.6-4-4 description: > Object.defineProperty defines a data property if given a generic desc(8.12.9 step 4.a.i) -includes: [runTestCase.js] ---*/ -function testcase() { var o = {}; var desc = {}; Object.defineProperty(o, "foo", desc); var propDesc = Object.getOwnPropertyDescriptor(o, "foo"); - if (propDesc.value === undefined && // this is the value that was set - propDesc.writable === false && // false by default - propDesc.enumerable === false && // false by default - propDesc.configurable === false) { // false by default - return true; - } - } -runTestCase(testcase); + +assert.sameValue(propDesc.value, undefined, 'propDesc.value'); // undefined by default +assert.sameValue(propDesc.writable, false, 'propDesc.writable'); // false by default +assert.sameValue(propDesc.enumerable, false, 'propDesc.enumerable'); // false by default +assert.sameValue(propDesc.configurable, false, 'propDesc.configurable'); // false by default diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-424.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-424.js index 4d09765c2..1cfca488e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-424.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-424.js @@ -7,10 +7,10 @@ description: > ES5 Attributes - property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) is enumerable -includes: [runTestCase.js] ---*/ -function testcase() { +var propertyFound = false; + var obj = {}; Object.defineProperty(obj, "prop", { @@ -25,10 +25,11 @@ function testcase() { for (var p in obj) { if (p === "prop") { - return propertyDefineCorrect && desc.enumerable === true; + propertyFound = true; + break; } } - return false; - } -runTestCase(testcase); +assert(propertyFound, 'Property not found'); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, true, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-433.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-433.js index 225bf4f4b..e374de5ab 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-433.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-433.js @@ -7,10 +7,10 @@ description: > ES5 Attributes - property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) is enumerable -includes: [runTestCase.js] ---*/ -function testcase() { +var propertyFound = false; + var obj = {}; Object.defineProperty(obj, "prop", { @@ -25,10 +25,11 @@ function testcase() { for (var p in obj) { if (p === "prop") { - return propertyDefineCorrect && desc.enumerable === true; + propertyFound = true; + break; } } - return false; - } -runTestCase(testcase); +assert(propertyFound, 'Property not found'); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, true, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-442.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-442.js index 8ba4f14f5..72f9bf32f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-442.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-442.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) is non-enumerable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -24,11 +22,8 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); for (var p in obj) { - if (p === "prop") { - return false; - } + assert.notSameValue(p, "prop", 'p'); } - return propertyDefineCorrect && desc.enumerable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, false, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-451.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-451.js index 538b67f16..ef9fb05c2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-451.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-451.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) is non-enumerable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -24,11 +22,8 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); for (var p in obj) { - if (p === "prop") { - return false; - } + assert.notSameValue(p, "prop", 'p'); } - return propertyDefineCorrect && desc.enumerable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, false, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-460.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-460.js index 17bb0bf7f..0ff4a8016 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-460.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-460.js @@ -7,10 +7,10 @@ description: > ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) is enumerable -includes: [runTestCase.js] ---*/ -function testcase() { +var propertyFound = false; + var obj = {}; var verifySetFunc = "data"; @@ -30,10 +30,11 @@ function testcase() { for (var p in obj) { if (p === "prop") { - return propertyDefineCorrect && desc.enumerable === true; + propertyFound = true; + break; } } - return false; - } -runTestCase(testcase); +assert(propertyFound, 'Property not found'); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, true, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-469.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-469.js index 1b7d816c2..391bbf7ae 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-469.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-469.js @@ -7,10 +7,10 @@ description: > ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) is enumerable -includes: [runTestCase.js] ---*/ -function testcase() { +var propertyFound = false; + var obj = {}; var verifySetFunc = "data"; @@ -30,10 +30,11 @@ function testcase() { for (var p in obj) { if (p === "prop") { - return propertyDefineCorrect && desc.enumerable === true; + propertyFound = true; + break; } } - return false; - } -runTestCase(testcase); +assert(propertyFound, 'Property not found'); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, true, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-478.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-478.js index 62d633da0..519d80e7b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-478.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-478.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) is non-enumerable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -29,11 +27,8 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); for (var p in obj) { - if (p === "prop") { - return false; - } + assert.notSameValue(p, "prop", 'p'); } - return propertyDefineCorrect && desc.enumerable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, false, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-487.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-487.js index a9595e094..8aaf8e2ba 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-487.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-487.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) is non-enumerable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -29,11 +27,8 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); for (var p in obj) { - if (p === "prop") { - return false; - } + assert.notSameValue(p, "prop", 'p'); } - return propertyDefineCorrect && desc.enumerable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, false, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-496.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-496.js index 9610f8355..2e63e773b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-496.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-496.js @@ -7,10 +7,10 @@ description: > ES5 Attributes - property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) is enumerable -includes: [runTestCase.js] ---*/ -function testcase() { +var propertyFound = false; + var obj = {}; var getFunc = function () { @@ -29,10 +29,11 @@ function testcase() { for (var p in obj) { if (p === "prop") { - return propertyDefineCorrect && desc.enumerable === true; + propertyFound = true; + break; } } - return false; - } -runTestCase(testcase); +assert(propertyFound, 'Property not found'); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, true, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-505.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-505.js index aa37ba9ce..f15171ddc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-505.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-505.js @@ -7,10 +7,10 @@ description: > ES5 Attributes - property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) is enumerable -includes: [runTestCase.js] ---*/ -function testcase() { +var propertyFound = false; + var obj = {}; var getFunc = function () { @@ -29,10 +29,11 @@ function testcase() { for (var p in obj) { if (p === "prop") { - return propertyDefineCorrect && desc.enumerable === true; + propertyFound = true; + break; } } - return false; - } -runTestCase(testcase); +assert(propertyFound, 'Property not found'); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, true, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-514.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-514.js index b611b187e..6b80aa137 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-514.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-514.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) is non-enumerable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -28,11 +26,8 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); for (var p in obj) { - if (p === "prop") { - return false; - } + assert.notSameValue(p, "prop", 'p'); } - return propertyDefineCorrect && desc.enumerable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, false, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-523.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-523.js index 7355599c5..8c1377dc0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-523.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-523.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) is non-enumerable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -28,11 +26,8 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); for (var p in obj) { - if (p === "prop") { - return false; - } + assert.notSameValue(p, "prop", 'p'); } - return propertyDefineCorrect && desc.enumerable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, false, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-532.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-532.js index 2dcacdd23..ee3370eaf 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-532.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-532.js @@ -7,10 +7,10 @@ description: > ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) is enumerable -includes: [runTestCase.js] ---*/ -function testcase() { +var propertyFound = false; + var obj = {}; var getFunc = function () { @@ -34,10 +34,11 @@ function testcase() { for (var p in obj) { if (p === "prop") { - return propertyDefineCorrect && desc.enumerable === true; + propertyFound = true; + break; } } - return false; - } -runTestCase(testcase); +assert(propertyFound, 'Property not found'); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, true, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-541.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-541.js index d340a4fdf..4651f86e4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-541.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-541.js @@ -7,10 +7,10 @@ description: > ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) is enumerable -includes: [runTestCase.js] ---*/ -function testcase() { +var propertyFound = false; + var obj = {}; var getFunc = function () { @@ -34,10 +34,11 @@ function testcase() { for (var p in obj) { if (p === "prop") { - return propertyDefineCorrect && desc.enumerable === true; + propertyFound = true; + break; } } - return false; - } -runTestCase(testcase); +assert(propertyFound, 'Property not found'); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, true, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-550.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-550.js index 85840516a..bb17ddc1b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-550.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-550.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) is non-enumerable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -33,11 +31,8 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); for (var p in obj) { - if (p === "prop") { - return false; - } + assert.notSameValue(p, "prop", 'p'); } - return propertyDefineCorrect && desc.enumerable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, false, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-559.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-559.js index 40bbe96d5..f2f308b34 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-559.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-559.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) is non-enumerable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -33,11 +31,8 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); for (var p in obj) { - if (p === "prop") { - return false; - } + assert.notSameValue(p, "prop", 'p'); } - return propertyDefineCorrect && desc.enumerable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.enumerable, false, 'desc.enumerable'); |