diff options
| author | André Bargull <andre.bargull@gmail.com> | 2015-08-11 17:53:17 +0200 |
|---|---|---|
| committer | André Bargull <andre.bargull@gmail.com> | 2015-08-11 17:53:17 +0200 |
| commit | 44bc67797e18007cddc14ad2f41196abfe214129 (patch) | |
| tree | c1a95e3d18cbad5f15ee9ea4d809e5bd25278583 | |
| parent | 0a37298b4686b9f3a81a16036c9af1c1a18611bd (diff) | |
| download | qtdeclarative-testsuites-44bc67797e18007cddc14ad2f41196abfe214129.tar.gz | |
Replace runTestCase with assert helpers [test/built-ins/Object/defineProperties]
251 files changed, 503 insertions, 1430 deletions
diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-0-1.js b/test/built-ins/Object/defineProperties/15.2.3.7-0-1.js index 098593bcd..9bb699700 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-0-1.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-0-1.js @@ -4,13 +4,8 @@ /*--- es5id: 15.2.3.7-0-1 description: Object.defineProperties must exist as a function -includes: [runTestCase.js] ---*/ -function testcase() { var f = Object.defineProperties; - if (typeof(f) === "function") { - return true; - } - } -runTestCase(testcase); + +assert.sameValue(typeof(f), "function", 'typeof(f)'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-0-2.js b/test/built-ins/Object/defineProperties/15.2.3.7-0-2.js index 6f3644425..a5be3fa4d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-0-2.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-0-2.js @@ -6,12 +6,6 @@ es5id: 15.2.3.7-0-2 description: > Object.defineProperties must exist as a function taking 2 parameters -includes: [runTestCase.js] ---*/ -function testcase() { - if (Object.defineProperties.length === 2) { - return true; - } - } -runTestCase(testcase); +assert.sameValue(Object.defineProperties.length, 2, 'Object.defineProperties.length'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-2-10.js b/test/built-ins/Object/defineProperties/15.2.3.7-2-10.js index 10b81b7b3..87ca4be77 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-2-10.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-2-10.js @@ -4,11 +4,8 @@ /*--- es5id: 15.2.3.7-2-10 description: Object.defineProperties - argument 'Properties' is an Array object -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = []; var result = false; @@ -22,6 +19,5 @@ function testcase() { }); Object.defineProperties(obj, props); - return result; - } -runTestCase(testcase); + +assert(result, 'result !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-2-12.js b/test/built-ins/Object/defineProperties/15.2.3.7-2-12.js index 15c164a53..83f088938 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-2-12.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-2-12.js @@ -4,11 +4,8 @@ /*--- es5id: 15.2.3.7-2-12 description: Object.defineProperties - argument 'Properties' is a Date object -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = new Date(); var result = false; @@ -22,6 +19,5 @@ function testcase() { }); Object.defineProperties(obj, props); - return result; - } -runTestCase(testcase); + +assert(result, 'result !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-2-13.js b/test/built-ins/Object/defineProperties/15.2.3.7-2-13.js index aee4ab9b8..bea1c4158 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-2-13.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-2-13.js @@ -4,11 +4,8 @@ /*--- es5id: 15.2.3.7-2-13 description: Object.defineProperties - argument 'Properties' is a RegExp object -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = new RegExp(); var result = false; @@ -22,6 +19,5 @@ function testcase() { }); Object.defineProperties(obj, props); - return result; - } -runTestCase(testcase); + +assert(result, 'result !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-2-15.js b/test/built-ins/Object/defineProperties/15.2.3.7-2-15.js index f7ad61dc7..9a69dc5c2 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-2-15.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-2-15.js @@ -4,11 +4,8 @@ /*--- es5id: 15.2.3.7-2-15 description: Object.defineProperties - argument 'Properties' is an Error object -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = new Error("test"); var obj1 = { @@ -29,6 +26,5 @@ function testcase() { }); Object.defineProperties(obj, props); - return result; - } -runTestCase(testcase); + +assert(result, 'result !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-2-16.js b/test/built-ins/Object/defineProperties/15.2.3.7-2-16.js index 3e58899c1..702db6f17 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-2-16.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-2-16.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-2-16 description: > Object.defineProperties - argument 'Properties' is the Arguments object -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var result = false; @@ -28,6 +25,5 @@ function testcase() { }); Object.defineProperties(obj, props); - return result; - } -runTestCase(testcase); + +assert(result, 'result !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-2-3.js b/test/built-ins/Object/defineProperties/15.2.3.7-2-3.js index 2cfe128d5..828a76bdb 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-2-3.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-2-3.js @@ -6,13 +6,9 @@ es5id: 15.2.3.7-2-3 description: > Object.defineProperties - argument 'Properties' is a boolean whose value is false -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var obj1 = Object.defineProperties(obj, false); - return obj === obj1; - } -runTestCase(testcase); + +assert.sameValue(obj, obj1, 'obj'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-2-4.js b/test/built-ins/Object/defineProperties/15.2.3.7-2-4.js index 3e9e13705..6b5e9f202 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-2-4.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-2-4.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-2-4 description: > Object.defineProperties - argument 'Properties' is a Boolean object whose primitive value is true -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = new Boolean(true); var result = false; @@ -24,6 +21,5 @@ function testcase() { }); Object.defineProperties(obj, props); - return result; - } -runTestCase(testcase); + +assert(result, 'result !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-2-5.js b/test/built-ins/Object/defineProperties/15.2.3.7-2-5.js index ce23e557e..ba0c4c8ce 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-2-5.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-2-5.js @@ -6,14 +6,9 @@ es5id: 15.2.3.7-2-5 description: > Object.defineProperties - argument 'Properties' is any interesting number -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = { "123": 100 }; var obj1 = Object.defineProperties(obj, -12); - return obj === obj1; - } -runTestCase(testcase); +assert.sameValue(obj, obj1, 'obj'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-2-6.js b/test/built-ins/Object/defineProperties/15.2.3.7-2-6.js index ff55c8196..c18fee56f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-2-6.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-2-6.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-2-6 description: > Object.defineProperties - argument 'Properties' is a Number object whose primitive value is any interesting number -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = new Number(-12); var result = false; @@ -24,6 +21,5 @@ function testcase() { }); Object.defineProperties(obj, props); - return result; - } -runTestCase(testcase); + +assert(result, 'result !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-2-7.js b/test/built-ins/Object/defineProperties/15.2.3.7-2-7.js index cf2f0da0c..169fbe906 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-2-7.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-2-7.js @@ -6,14 +6,9 @@ es5id: 15.2.3.7-2-7 description: > Object.defineProperties - argument 'Properties' is a string whose value is any interesting string -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = { "123": 100 }; var obj1 = Object.defineProperties(obj, ""); - return obj === obj1; - } -runTestCase(testcase); +assert.sameValue(obj, obj1, 'obj'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-2-8.js b/test/built-ins/Object/defineProperties/15.2.3.7-2-8.js index 4a90494df..f880ec47a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-2-8.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-2-8.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-2-8 description: > Object.defineProperties - argument 'Properties' is a String object whose primitive value is any interesting string -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = new String(); var result = false; @@ -24,6 +21,5 @@ function testcase() { }); Object.defineProperties(obj, props); - return result; - } -runTestCase(testcase); + +assert(result, 'result !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-2-9.js b/test/built-ins/Object/defineProperties/15.2.3.7-2-9.js index 23069f8b6..16acd8a06 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-2-9.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-2-9.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-2-9 description: > Object.defineProperties - argument 'Properties' is a Function object -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = function () { }; var result = false; @@ -24,6 +21,5 @@ function testcase() { }); Object.defineProperties(obj, props); - return result; - } -runTestCase(testcase); + +assert(result, 'result !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-3-1.js b/test/built-ins/Object/defineProperties/15.2.3.7-3-1.js index 21426fa2d..c6d7775e2 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-3-1.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-3-1.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-3-1 description: > Object.defineProperties - enumerable own data property of 'Properties' is defined in 'O' -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = {}; Object.defineProperty(props, "prop", { @@ -20,6 +17,4 @@ function testcase() { Object.defineProperties(obj, props); - return obj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-3-2.js b/test/built-ins/Object/defineProperties/15.2.3.7-3-2.js index 86e16114d..3b32199bf 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-3-2.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-3-2.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-3-2 description: > Object.defineProperties - own data property of 'Properties' which is not enumerable is not defined in 'O' -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = {}; @@ -21,6 +18,4 @@ function testcase() { Object.defineProperties(obj, props); - return !obj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert.sameValue(obj.hasOwnProperty("prop"), false, 'obj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-3-3.js b/test/built-ins/Object/defineProperties/15.2.3.7-3-3.js index 5053b092b..d4dc3cafc 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-3-3.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-3-3.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-3-3 description: > Object.defineProperties - enumerable inherited data property of 'Properties' is not defined in 'O' -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var proto = {}; @@ -26,6 +23,4 @@ function testcase() { Object.defineProperties(obj, child); - return !obj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert.sameValue(obj.hasOwnProperty("prop"), false, 'obj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-3-4.js b/test/built-ins/Object/defineProperties/15.2.3.7-3-4.js index bc5cdf741..bbafb06c9 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-3-4.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-3-4.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-3-4 description: > Object.defineProperties - enumerable own accessor property of 'Properties' is defined in 'O' -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = {}; @@ -24,6 +21,4 @@ function testcase() { Object.defineProperties(obj, props); - return obj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-3-5.js b/test/built-ins/Object/defineProperties/15.2.3.7-3-5.js index 788adc6de..40efb3be2 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-3-5.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-3-5.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-3-5 description: > Object.defineProperties - own accessor property of 'Properties' which is not enumerable is not defined in 'O' -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = {}; @@ -24,6 +21,4 @@ function testcase() { Object.defineProperties(obj, props); - return !obj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert.sameValue(obj.hasOwnProperty("prop"), false, 'obj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-3-6.js b/test/built-ins/Object/defineProperties/15.2.3.7-3-6.js index 20bd7c32e..7efb02f66 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-3-6.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-3-6.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-3-6 description: > Object.defineProperties - enumerable inherited accessor property of 'Properties' is not defined in 'O' -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var proto = {}; @@ -27,6 +24,4 @@ function testcase() { Object.defineProperties(obj, child); - return !obj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert.sameValue(obj.hasOwnProperty("prop"), false, 'obj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-3-7.js b/test/built-ins/Object/defineProperties/15.2.3.7-3-7.js index c11f4eede..828fd9d14 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-3-7.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-3-7.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-3-7 description: > Object.defineProperties - no additional property is defined in 'O' when 'Properties' doesn't contain enumerable own property -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = {}; @@ -29,6 +26,5 @@ function testcase() { Object.defineProperties(obj, props); - return !obj.hasOwnProperty("prop1") && !obj.hasOwnProperty("prop2"); - } -runTestCase(testcase); +assert.sameValue(obj.hasOwnProperty("prop1"), false, 'obj.hasOwnProperty("prop1")'); +assert.sameValue(obj.hasOwnProperty("prop2"), false, 'obj.hasOwnProperty("prop2")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-3-8.js b/test/built-ins/Object/defineProperties/15.2.3.7-3-8.js index 8db5542a9..33d3a9f85 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-3-8.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-3-8.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-3-8 description: > Object.defineProperties - no additional property is defined in 'O' when 'Properties' doesn't contain enumerable own property -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = {}; @@ -29,6 +26,5 @@ function testcase() { Object.defineProperties(obj, props); - return !obj.hasOwnProperty("prop1") && obj.hasOwnProperty("prop2"); - } -runTestCase(testcase); +assert.sameValue(obj.hasOwnProperty("prop1"), false, 'obj.hasOwnProperty("prop1")'); +assert(obj.hasOwnProperty("prop2"), 'obj.hasOwnProperty("prop2") !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-1.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-1.js index a9489b30f..eb800c8e1 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-1.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-1.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'P' is own data property that overrides enumerable inherited data property of 'Properties' is defined in 'O' -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var proto = {}; @@ -36,6 +33,5 @@ function testcase() { Object.defineProperties(obj, child); - return obj.hasOwnProperty("prop") && obj.prop === 12; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 12, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-10.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-10.js index 3ce57ab89..a1bfc9a68 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-10.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-10.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-a-10 description: > Object.defineProperties - 'Properties' is a Boolean object which implements its own [[Get]] method to get enumerable own property -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = new Boolean(false); @@ -22,6 +19,5 @@ function testcase() { }); Object.defineProperties(obj, props); - return obj.hasOwnProperty("prop") && obj.prop === 10; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 10, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-11.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-11.js index 92bfc31c7..8a7abc5e9 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-11.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-11.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-a-11 description: > Object.defineProperties - 'Properties' is a Number object which implements its own [[Get]] method to get enumerable own property -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = new Number(-9); @@ -22,6 +19,5 @@ function testcase() { }); Object.defineProperties(obj, props); - return obj.hasOwnProperty("prop") && obj.prop === 12; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 12, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-13.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-13.js index 2841ce74a..22ea0f97f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-13.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-13.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-a-13 description: > Object.defineProperties - 'Properties' is a Date object which implements its own [[Get]] method to get enumerable own property -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = new Date(); @@ -22,6 +19,5 @@ function testcase() { }); Object.defineProperties(obj, props); - return obj.hasOwnProperty("prop") && obj.prop === 13; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 13, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-14.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-14.js index bf995c54c..a5c31d9bb 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-14.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-14.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-a-14 description: > Object.defineProperties - 'Properties' is a RegExp object which implements its own [[Get]] method to get enumerable own property -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = new RegExp(); @@ -22,6 +19,5 @@ function testcase() { }); Object.defineProperties(obj, props); - return obj.hasOwnProperty("prop") && obj.prop === 14; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 14, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-16.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-16.js index 1a96c0f71..2363f6785 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-16.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-16.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-a-16 description: > Object.defineProperties - 'Properties' is an Error object which implements its own [[Get]] method to get enumerable own property -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = new Error("test"); var obj1 = { @@ -25,6 +22,5 @@ function testcase() { }; Object.defineProperties(obj, props); - return obj.hasOwnProperty("prop") && obj.prop === 16; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 16, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-17.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-17.js index 5a2cec327..5d2cba017 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-17.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-17.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'Properties' is the Arguments object which implements its own [[Get]] method to get enumerable own property -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var arg; @@ -28,6 +25,5 @@ function testcase() { Object.defineProperties(obj, arg); - return obj.hasOwnProperty("prop") && obj.prop === 17; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 17, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-2.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-2.js index 3b4380972..9cbd29821 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-2.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-2.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'P' is own data property that overrides enumerable inherited accessor property of 'Properties' is defined in 'O' -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var proto = {}; @@ -36,6 +33,5 @@ function testcase() { }); Object.defineProperties(obj, child); - return obj.hasOwnProperty("prop") && obj.prop === 12; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 12, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-3.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-3.js index cd40eacc1..ce3cae1f6 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-3.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-3.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - enumerable own accessor property of 'Properties' that overrides enumerable inherited data property of 'Properties' is defined in 'O' -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var proto = {}; @@ -37,6 +34,5 @@ function testcase() { }); Object.defineProperties(obj, child); - return obj.hasOwnProperty("prop") && obj.prop === 12; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 12, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-4.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-4.js index ba4c5523f..79180ee5f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-4.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-4.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - enumerable own accessor property of 'Properties' that overrides enumerable inherited accessor property of 'Properties' is defined in 'O' -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var proto = {}; @@ -39,6 +36,5 @@ function testcase() { }); Object.defineProperties(obj, child); - return obj.hasOwnProperty("prop") && obj.prop === 12; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 12, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-5.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-5.js index a5cb3fb6a..f25ba775b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-5.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-5.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-a-5 description: > Object.defineProperties - enumerable own accessor property of 'Properties' without a get function is defined in 'O' -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = {}; @@ -25,6 +22,5 @@ function testcase() { Object.defineProperties(obj, props); - return obj.hasOwnProperty("prop") && typeof obj.prop === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof obj.prop, "undefined", 'typeof obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-6.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-6.js index 5d515db7d..9516041f8 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-6.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-6.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - enumerable own accessor property of 'Properties' without a get function that overrides enumerable inherited accessor property of 'Properties' is defined in 'O' -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var proto = {}; @@ -37,6 +34,5 @@ function testcase() { }); Object.defineProperties(obj, child); - return obj.hasOwnProperty("prop") && typeof obj.prop === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof obj.prop, "undefined", 'typeof obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-7.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-7.js index be584631c..a08c7d71b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-7.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-7.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-a-7 description: > Object.defineProperties - 'Properties' is a Function object which implements its own [[Get]] method to get enumerable own property -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = function () { }; @@ -23,6 +20,5 @@ function testcase() { Object.defineProperties(obj, props); - return obj.hasOwnProperty("prop") && obj.prop === 7; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 7, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-8.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-8.js index cff93c9da..76d2a34a6 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-8.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-8.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-a-8 description: > Object.defineProperties - 'Properties' is an Array object which implements its own [[Get]] method to get enumerable own property -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = []; var descObj = { @@ -23,6 +20,5 @@ function testcase() { }); Object.defineProperties(obj, props); - return obj.hasOwnProperty("prop") && obj.prop === 8; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 8, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-9.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-9.js index adcc9a5fa..679a4acaf 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-a-9.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-a-9.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-a-9 description: > Object.defineProperties - 'Properties' is a String object which implements its own [[Get]] method to get enumerable own property -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var props = new String(); @@ -22,6 +19,5 @@ function testcase() { }); Object.defineProperties(obj, props); - return obj.hasOwnProperty("prop") && obj.prop === 9; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 9, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-10.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-10.js index 8b5d344da..2161abbeb 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-10.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-10.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'enumerable' property of 'descObj' is own data property that overrides an inherited data property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -35,6 +32,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-100.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-100.js index 5cb561f80..931dbcfff 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-100.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-100.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-100 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is Boolean object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -21,6 +19,5 @@ function testcase() { var preCheck = obj.hasOwnProperty("property"); delete obj.property; - return preCheck && !obj.hasOwnProperty("property"); - } -runTestCase(testcase); +assert(preCheck, 'preCheck !== true'); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-101.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-101.js index 481254172..8fb9548c0 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-101.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-101.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-101 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is Number object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,5 @@ function testcase() { var preCheck = obj.hasOwnProperty("property"); delete obj.property; - return preCheck && !obj.hasOwnProperty("property"); - } -runTestCase(testcase); +assert(preCheck, 'preCheck !== true'); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-102.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-102.js index 4b38d220a..74577f689 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-102.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-102.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-102 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is the Math object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,5 @@ function testcase() { var preCheck = obj.hasOwnProperty("property"); delete obj.property; - return preCheck && !obj.hasOwnProperty("property"); - } -runTestCase(testcase); +assert(preCheck, 'preCheck !== true'); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-103.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-103.js index 7e819d813..dce33a54c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-103.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-103.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-103 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is Date object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,5 @@ function testcase() { var preCheck = obj.hasOwnProperty("property"); delete obj.property; - return preCheck && !obj.hasOwnProperty("property"); - } -runTestCase(testcase); +assert(preCheck, 'preCheck !== true'); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-104.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-104.js index c762d1c11..7b2464f4e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-104.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-104.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-104 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is RegExp object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,7 +18,5 @@ function testcase() { var preCheck = obj.hasOwnProperty("property"); delete obj.property; - return preCheck && !obj.hasOwnProperty("property"); - - } -runTestCase(testcase); +assert(preCheck, 'preCheck !== true'); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-105.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-105.js index 90e9d310f..a45f02039 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-105.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-105.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-105 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is the JSON object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,5 @@ function testcase() { var preCheck = obj.hasOwnProperty("property"); delete obj.property; - return preCheck && !obj.hasOwnProperty("property"); - } -runTestCase(testcase); +assert(preCheck, 'preCheck !== true'); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-106.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-106.js index cbc9e749e..2d4540410 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-106.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-106.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-106 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is Error object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,5 @@ function testcase() { var preCheck = obj.hasOwnProperty("property"); delete obj.property; - return preCheck && !obj.hasOwnProperty("property"); - } -runTestCase(testcase); +assert(preCheck, 'preCheck !== true'); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-107.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-107.js index d42a6d932..68bd1992d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-107.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-107.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-107 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is the Argument object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var func = function (a, b, c) { @@ -26,7 +24,5 @@ function testcase() { var preCheck = obj.hasOwnProperty("property"); delete obj.property; - return preCheck && !obj.hasOwnProperty("property"); - - } -runTestCase(testcase); +assert(preCheck, 'preCheck !== true'); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-109.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-109.js index d762c2c8d..dbeba830e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-109.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-109.js @@ -6,12 +6,9 @@ es5id: 15.2.3.7-5-b-109 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is the global object (8.10.5 step 4.b) -includes: - - runTestCase.js - - fnGlobalObject.js +includes: [fnGlobalObject.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -22,6 +19,5 @@ function testcase() { var preCheck = obj.hasOwnProperty("property"); delete obj.property; - return preCheck && !obj.hasOwnProperty("property"); - } -runTestCase(testcase); +assert(preCheck, 'preCheck !== true'); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-11.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-11.js index 341b549ac..c7fe92461 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-11.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-11.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'enumerable' property of 'descObj' is own data property that overrides an inherited accessor property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var proto = {}; var accessed = false; @@ -39,6 +36,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-110.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-110.js index c4544c260..bd7381728 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-110.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-110.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - value of 'configurable' property of 'descObj' is a string (value is 'false') which is treated as true value (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -21,6 +19,5 @@ function testcase() { var preCheck = obj.hasOwnProperty("property"); delete obj.property; - return preCheck && !obj.hasOwnProperty("property"); - } -runTestCase(testcase); +assert(preCheck, 'preCheck !== true'); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-111.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-111.js index b23c4d98e..60cd9d5f0 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-111.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-111.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - value of 'configurable' property of 'descObj' is new Boolean(false) which is treated as true value (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -21,6 +19,5 @@ function testcase() { var preCheck = obj.hasOwnProperty("property"); delete obj.property; - return preCheck && !obj.hasOwnProperty("property"); - } -runTestCase(testcase); +assert(preCheck, 'preCheck !== true'); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-112.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-112.js index c5bb3bae4..900faf15c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-112.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-112.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-112 description: > Object.defineProperties - 'value' property of 'descObj' is present (8.10.5 step 5) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -18,6 +16,4 @@ function testcase() { } }); - return obj.property === 300; - } -runTestCase(testcase); +assert.sameValue(obj.property, 300, 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-113.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-113.js index 51daf9c66..91a7cd1e9 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-113.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-113.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-113 description: > Object.defineProperties - 'value' property of 'descObj' is not present (8.10.5 step 5) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -18,6 +16,5 @@ function testcase() { } }); - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(typeof (obj.property), "undefined", 'typeof (obj.property)'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-114.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-114.js index 2a271cd85..f053943dc 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-114.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-114.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-114 description: > Object.defineProperties - 'value' property of 'descObj' is own data property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -18,6 +16,4 @@ function testcase() { } }); - return obj.property === "ownDataProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownDataProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-115.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-115.js index f2588dd9b..a1d384f96 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-115.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-115.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-115 description: > Object.defineProperties - 'value' property of 'descObj' is inherited data property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = { @@ -25,7 +23,4 @@ function testcase() { property: descObj }); - return obj.property === "inheritedDataProperty"; - - } -runTestCase(testcase); +assert.sameValue(obj.property, "inheritedDataProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-116.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-116.js index 2276531cb..57270ab35 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-116.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-116.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'value' property of 'descObj' is own data property that overrides an inherited data property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = { @@ -28,7 +26,4 @@ function testcase() { property: descObj }); - return obj.property === "ownDataProperty"; - - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownDataProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-117.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-117.js index e853b0172..56c96530f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-117.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-117.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'value' property of 'descObj' is own data property that overrides an inherited accessor property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -34,7 +32,4 @@ function testcase() { property: descObj }); - return obj.property === "ownDataProperty"; - - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownDataProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-118.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-118.js index fc3c93d40..981841728 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-118.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-118.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-118 description: > Object.defineProperties - 'value' property of 'descObj' is own accessor property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var descObj = {}; @@ -24,6 +22,4 @@ function testcase() { property: descObj }); - return obj.property === "ownAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownAccessorProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-119.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-119.js index ff29e0f09..3bb8efb11 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-119.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-119.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-119 description: > Object.defineProperties - 'value' property of 'descObj' is inherited accessor property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -29,7 +27,4 @@ function testcase() { property: descObj }); - return obj.property === "inheritedAccessorProperty"; - - } -runTestCase(testcase); +assert.sameValue(obj.property, "inheritedAccessorProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-12.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-12.js index 1aa390c68..d093f3e5e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-12.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-12.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-12 description: > Object.defineProperties - 'enumerable' property of 'descObj' is own accessor property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; var descObj = {}; @@ -29,6 +26,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-120.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-120.js index fcbaef2f7..0bbec160b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-120.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-120.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'value' property of 'descObj' is own accessor property that overrides an inherited data property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = { @@ -33,7 +31,4 @@ function testcase() { property: descObj }); - return obj.property === "ownAccessorProperty"; - - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownAccessorProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-121.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-121.js index 024c1ac69..3862ad1c2 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-121.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-121.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'value' property of 'descObj' is own accessor property that overrides an inherited accessor property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -36,7 +34,4 @@ function testcase() { property: descObj }); - return obj.property === "ownAccessorProperty"; - - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownAccessorProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-122.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-122.js index d227780d3..2092ebed2 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-122.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-122.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-122 description: > Object.defineProperties - 'value' property of 'descObj' is own accessor property without a get function (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var descObj = {}; @@ -22,6 +20,5 @@ function testcase() { property: descObj }); - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(typeof (obj.property), "undefined", 'typeof (obj.property)'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-123.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-123.js index f5e1e64a9..983674ece 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-123.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-123.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'value' property of 'descObj' is own accessor property without a get function that overrides an inherited accessor property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -34,6 +32,5 @@ function testcase() { property: descObj }); - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(typeof (obj.property), "undefined", 'typeof (obj.property)'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-124.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-124.js index 335db110c..0a4c48f91 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-124.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-124.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'value' property of 'descObj' is inherited accessor property without a get function (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -28,6 +26,5 @@ function testcase() { property: descObj }); - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(typeof (obj.property), "undefined", 'typeof (obj.property)'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-125.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-125.js index 8288212e7..7912b1555 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-125.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-125.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Function object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var func = function (a, b) { @@ -23,6 +21,4 @@ function testcase() { property: func }); - return obj.property === "Function"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Function", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-126.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-126.js index 0934c13c3..608948206 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-126.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-126.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is an Array object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var arr = [1, 2, 3]; @@ -21,6 +19,4 @@ function testcase() { property: arr }); - return obj.property === "Array"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Array", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-127.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-127.js index 6ed09838c..a46b6f6e0 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-127.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-127.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is a String object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var str = new String("abc"); @@ -21,6 +19,4 @@ function testcase() { property: str }); - return obj.property === "String"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "String", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-128.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-128.js index ddd482079..0d7d1b807 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-128.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-128.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Boolean object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var descObj = new Boolean(false); @@ -21,6 +19,4 @@ function testcase() { property: descObj }); - return obj.property === "Boolean"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Boolean", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-129.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-129.js index 6eb349169..fd46216dc 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-129.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-129.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Number object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var descObj = new Number(-9); @@ -21,6 +19,4 @@ function testcase() { property: descObj }); - return obj.property === "Number"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Number", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-13.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-13.js index 8367b104f..e841730be 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-13.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-13.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-13 description: > Object.defineProperties - 'enumerable' property of 'descObj' is inherited accessor property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var proto = {}; var accessed = false; @@ -33,6 +30,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-131.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-131.js index 64471d4b0..edfd9426f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-131.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-131.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Date object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var descObj = new Date(); @@ -21,6 +19,4 @@ function testcase() { property: descObj }); - return obj.property === "Date"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Date", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-132.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-132.js index 01d672b73..61e00df18 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-132.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-132.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is a RegExp object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var descObj = new RegExp(); @@ -21,6 +19,4 @@ function testcase() { property: descObj }); - return obj.property === "RegExp"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "RegExp", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-134.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-134.js index f9608e56b..1030ea5b6 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-134.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-134.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is an Error object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var descObj = new Error(); @@ -21,6 +19,4 @@ function testcase() { property: descObj }); - return obj.property === "Error"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Error", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-135.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-135.js index e52e5e47d..13b2ce71f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-135.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-135.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is the Arguments object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var func = function (a, b) { @@ -23,6 +21,4 @@ function testcase() { return obj.property === "arguments"; }; - return func(); - } -runTestCase(testcase); +assert(func(), 'func() !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-14.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-14.js index 7681e6bd1..01f7c1737 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-14.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-14.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'enumerable' property of 'descObj' is own accessor property that overrides an inherited data property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; var proto = { @@ -36,6 +33,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-145.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-145.js index 420816a72..0f311be2b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-145.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-145.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-145 description: > Object.defineProperties - 'writable' property of 'descObj' is inherited accessor property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -31,6 +29,5 @@ function testcase() { obj.property = "isWritable"; - return obj.hasOwnProperty("property") && obj.property === "isWritable"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-15.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-15.js index a6510028c..7acb69ba8 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-15.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-15.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'enumerable' property of 'descObj' is own accessor property that overrides an inherited accessor property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var proto = {}; var accessed = false; @@ -39,6 +36,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-16.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-16.js index c32d7c04c..b7a6286d6 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-16.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-16.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-16 description: > Object.defineProperties - 'enumerable' property of 'descObj' is own accessor property without a get function (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; var descObj = {}; @@ -27,6 +24,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-166.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-166.js index 5317385aa..1dfa84151 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-166.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-166.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-166 description: > Object.defineProperties - value of 'writable' property of 'descObj' is true (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-17.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-17.js index a49a7a114..10aeb9376 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-17.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-17.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'enumerable' property of 'descObj' is own accessor property without a get function that overrides an inherited accessor property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var proto = {}; var accessed = false; @@ -37,6 +34,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-172.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-172.js index 341a05854..adbe19cbc 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-172.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-172.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-172 description: > Object.defineProperties - value of 'writable' property of 'descObj' is positive number (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-173.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-173.js index 886b28964..019ce3f20 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-173.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-173.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-173 description: > Object.defineProperties - value of 'writable' property of 'descObj' is negative number (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-175.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-175.js index 44aa912c2..6d3ee51c0 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-175.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-175.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-175 description: > Object.defineProperties - value of 'writable' property of 'descObj' is non-empty string (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-176.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-176.js index 942d14761..23b0377fd 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-176.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-176.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-176 description: > Object.defineProperties - value of 'writable' property of 'descObj' is Function object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-177.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-177.js index 36bd1b30c..6434bd5e6 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-177.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-177.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-177 description: > Object.defineProperties - value of 'writable' property of 'descObj' is Array object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-178.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-178.js index 64913c00b..952b57cd8 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-178.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-178.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-178 description: > Object.defineProperties - value of 'writable' property of 'descObj' is String object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-179.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-179.js index 38fdec0e3..ddeb6b920 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-179.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-179.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-179 description: > Object.defineProperties - value of 'writable' property of 'descObj' is Boolean object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-18.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-18.js index 8c45252af..44323283a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-18.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-18.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'enumerable' property of 'descObj' is inherited accessor property without a get function (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var proto = {}; var accessed = false; @@ -32,6 +29,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-180.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-180.js index 55a7a0dad..8812433df 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-180.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-180.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-180 description: > Object.defineProperties - value of 'writable' property of 'descObj' is Number object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-181.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-181.js index f7af84d97..d3611a335 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-181.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-181.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-181 description: > Object.defineProperties - value of 'writable' property of 'descObj' is the Math object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-182.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-182.js index d76a52485..4d8cb3ec9 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-182.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-182.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-182 description: > Object.defineProperties - value of 'writable' property of 'descObj' is Date object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-183.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-183.js index 74269dd85..0127529df 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-183.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-183.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-183 description: > Object.defineProperties - value of 'writable' property of 'descObj' is RegExp object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-184.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-184.js index cfdebdad2..c7d1069d0 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-184.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-184.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-184 description: > Object.defineProperties - value of 'writable' property of 'descObj' is the JSON object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-185.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-185.js index 64ac16754..5f69925d0 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-185.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-185.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-185 description: > Object.defineProperties - value of 'writable' property of 'descObj' is Error object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -20,6 +18,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-186.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-186.js index d358c2297..5b9d21e6a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-186.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-186.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-186 description: > Object.defineProperties - value of 'writable' property of 'descObj' is the Argument object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var func = function (a, b, c) { @@ -24,6 +22,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-188.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-188.js index fd0f5db0d..d58c5a2c5 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-188.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-188.js @@ -6,12 +6,9 @@ es5id: 15.2.3.7-5-b-188 description: > Object.defineProperties - value of 'writable' property of 'descObj' is the global object (8.10.5 step 6.b) -includes: - - runTestCase.js - - fnGlobalObject.js +includes: [fnGlobalObject.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -22,6 +19,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-189.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-189.js index b3407388a..3cce69156 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-189.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-189.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - value of 'writable' property of 'descObj' is a string (value is 'false') which is treated as true value (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -21,6 +19,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-19.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-19.js index 95873ef72..8d08b9bf3 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-19.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-19.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Function object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var descObj = function () { }; var accessed = false; @@ -26,6 +23,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-190.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-190.js index a43bb6afe..693beb411 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-190.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-190.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - value of 'writable' property of 'descObj' is new Boolean(false) which is treated as true value (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -21,6 +19,4 @@ function testcase() { obj.property = "isWritable"; - return obj.property === "isWritable"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "isWritable", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-191.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-191.js index f2982d6d5..623b6e111 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-191.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-191.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-191 description: > Object.defineProperties - 'get' property of 'descObj' is present (8.10.5 step 7) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getter = function () { @@ -22,6 +20,4 @@ function testcase() { } }); - return obj.property === "present"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "present", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-192.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-192.js index 44f6719e9..0b5ac282c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-192.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-192.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-192 description: > Object.defineProperties - 'get' property of 'descObj' is not present (8.10.5 step 7) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var setter = function () { }; @@ -20,6 +18,5 @@ function testcase() { } }); - return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(typeof (obj.property), "undefined", 'typeof (obj.property)'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-193.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-193.js index 8af2a9b68..e6910e88d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-193.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-193.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-193 description: > Object.defineProperties - 'get' property of 'descObj' is own data property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getter = function () { @@ -22,6 +20,4 @@ function testcase() { } }); - return obj.property === "ownDataProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownDataProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-194.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-194.js index c4cee1260..d38ac2dce 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-194.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-194.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-194 description: > Object.defineProperties - 'get' property of 'descObj' is inherited data property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getter = function () { @@ -29,6 +27,4 @@ function testcase() { property: descObj }); - return obj.property === "inheritedDataProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "inheritedDataProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-195.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-195.js index 665483b52..6931583a6 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-195.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-195.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'get' property of 'descObj' is own data property that overrides an inherited data property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getter = function () { @@ -34,6 +32,4 @@ function testcase() { property: descObj }); - return obj.property === "ownDataProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownDataProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-196.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-196.js index 4bd47d97f..25abe43bb 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-196.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-196.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'get' property of 'descObj' is own data property that overrides an inherited accessor property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -38,6 +36,4 @@ function testcase() { property: descObj }); - return obj.property === "ownDataProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownDataProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-197.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-197.js index c9cbbd407..e75e2a810 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-197.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-197.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-197 description: > Object.defineProperties - 'get' property of 'descObj' is own accessor property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var descObj = {}; @@ -26,6 +24,4 @@ function testcase() { property: descObj }); - return obj.property === "ownAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownAccessorProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-198.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-198.js index 79af2fb68..ad065ec41 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-198.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-198.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-198 description: > Object.defineProperties - 'get' property of 'descObj' is inherited accessor property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -31,6 +29,4 @@ function testcase() { property: descObj }); - return obj.property === "inheritedAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "inheritedAccessorProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-199.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-199.js index e9216c35c..3cced9703 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-199.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-199.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'get' property of 'descObj' is own accessor property that overrides an inherited data property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = { @@ -36,6 +34,4 @@ function testcase() { property: descObj }); - return obj.property === "ownAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownAccessorProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-20.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-20.js index abbe3cfdb..77fa9fd97 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-20.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-20.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is an Array object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; var descObj = []; @@ -26,6 +23,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-200.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-200.js index 0b4fc2cc8..683fe441a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-200.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-200.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'get' property of 'descObj' is own accessor property that overrides an inherited accessor property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -40,6 +38,4 @@ function testcase() { property: descObj }); - return obj.property === "ownAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownAccessorProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-201.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-201.js index 11f6fd0da..b3cff0d0a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-201.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-201.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-201 description: > Object.defineProperties - 'get' property of 'descObj' is own accessor property without a get function (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var descObj = {}; @@ -22,6 +20,4 @@ function testcase() { property: descObj }); - return typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert.sameValue(typeof (obj.property), "undefined", 'typeof (obj.property)'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-202.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-202.js index 3d67e1a1f..1615f7be3 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-202.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-202.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'get' property of 'descObj' is own accessor property without a get function that overrides an inherited accessor property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -36,6 +34,4 @@ function testcase() { property: descObj }); - return typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert.sameValue(typeof (obj.property), "undefined", 'typeof (obj.property)'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-203.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-203.js index 86c32e9cd..2cd46064c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-203.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-203.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-203 description: > Object.defineProperties - 'get' property of 'descObj' is inherited accessor property without a get function (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -27,6 +25,4 @@ function testcase() { property: descObj }); - return typeof (obj.property) === "undefined"; - } -runTestCase(testcase); +assert.sameValue(typeof (obj.property), "undefined", 'typeof (obj.property)'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-204.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-204.js index ca45224b8..c92704618 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-204.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-204.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Function object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var func = function (a, b) { @@ -25,6 +23,4 @@ function testcase() { property: func }); - return obj.property === "Function"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Function", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-205.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-205.js index 441e678c6..5c2468064 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-205.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-205.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is an Array object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var arr = []; @@ -23,6 +21,4 @@ function testcase() { property: arr }); - return obj.property === "Array"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Array", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-206.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-206.js index 7d191599e..2f1bceec8 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-206.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-206.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is a String object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var str = new String("abc"); @@ -23,6 +21,4 @@ function testcase() { property: str }); - return obj.property === "string Object"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "string Object", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-207.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-207.js index ab4b22f43..d0914e4ce 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-207.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-207.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Boolean object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var descObj = new Boolean(false); @@ -23,6 +21,4 @@ function testcase() { property: descObj }); - return obj.property === "Boolean"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Boolean", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-208.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-208.js index ce8aa711c..687a062c8 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-208.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-208.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Number object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var descObj = new Number(-9); @@ -23,6 +21,4 @@ function testcase() { property: descObj }); - return obj.property === "Number"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Number", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-21.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-21.js index a8936a86e..bc0dcad7a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-21.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-21.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is a String object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var descObj = new String(); var accessed = false; @@ -25,6 +22,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-210.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-210.js index 3f316a217..6a7ff611f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-210.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-210.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Date object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var descObj = new Date(); @@ -23,6 +21,4 @@ function testcase() { property: descObj }); - return obj.property === "Date"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Date", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-211.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-211.js index 0480ae9ea..2ae4481c8 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-211.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-211.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is a RegExp object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var descObj = new RegExp(); @@ -23,6 +21,4 @@ function testcase() { property: descObj }); - return obj.property === "RegExp"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "RegExp", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-213.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-213.js index e5a3ba346..add8aeee1 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-213.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-213.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is an Error object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var descObj = new Error(); @@ -23,6 +21,4 @@ function testcase() { property: descObj }); - return obj.property === "Error"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Error", 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-214.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-214.js index f6a75522d..862bac611 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-214.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-214.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is the Arguments object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var func = function (a, b) { @@ -25,6 +23,4 @@ function testcase() { return obj.property === "arguments"; }; - return func(); - } -runTestCase(testcase); +assert(func(), 'func() !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-217.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-217.js index 26f5f3cf2..06f9e3e49 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-217.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-217.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-217 description: > Object.defineProperties - value of 'get' property of 'descObj' is undefined (8.10.5 step 7.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -18,6 +16,5 @@ function testcase() { } }); - return obj.hasOwnProperty("property") && typeof obj.property === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(typeof obj.property, "undefined", 'typeof obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-22.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-22.js index 26e3ad930..84dd886f1 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-22.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-22.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Boolean object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var descObj = new Boolean(false); var accessed = false; @@ -26,6 +23,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-223.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-223.js index 7bc8cc51e..74e72ca9b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-223.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-223.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-223 description: > Object.defineProperties - value of 'get' property of 'descObj' is a function (8.10.5 step 7.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getter = function () { @@ -22,6 +20,4 @@ function testcase() { } }); - return obj.property === 100; - } -runTestCase(testcase); +assert.sameValue(obj.property, 100, 'obj.property'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-226.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-226.js index ec5d4e079..da6e91356 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-226.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-226.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-226 description: > Object.defineProperties - 'set' property of 'descObj' is present (8.10.5 step 8) -includes: [runTestCase.js] ---*/ -function testcase() { var data = "data"; var obj = {}; @@ -23,6 +21,5 @@ function testcase() { obj.prop = "overrideData"; - return obj.hasOwnProperty("prop") && data === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-228.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-228.js index 05644f164..28010e240 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-228.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-228.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-228 description: > Object.defineProperties - 'set' property of 'descObj' is own data property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data = "data"; var obj = {}; @@ -23,6 +21,5 @@ function testcase() { obj.descObj = "overrideData"; - return obj.hasOwnProperty("descObj") && data === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("descObj"), 'obj.hasOwnProperty("descObj") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-229.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-229.js index 61abe17c9..5554bdbc3 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-229.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-229.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-229 description: > Object.defineProperties - 'set' property of 'descObj' is inherited data property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data = "data"; var proto = { set: function (value) { @@ -29,6 +27,5 @@ function testcase() { obj.prop = "overrideData"; - return obj.hasOwnProperty("prop") && data === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-23.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-23.js index b9ed981d1..57d4230ba 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-23.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-23.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Number object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var descObj = new Number(-9); var accessed = false; @@ -26,6 +23,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-230.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-230.js index 8bb7bda16..b15fbd6ec 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-230.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-230.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'set' property of 'descObj' is own data property that overrides an inherited data property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data1 = "data"; var data2 = "data"; var proto = { @@ -35,6 +33,6 @@ function testcase() { obj.prop = "overrideData"; - return obj.hasOwnProperty("prop") && data1 === "overrideData" && data2 === "data"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data1, "overrideData", 'data1'); +assert.sameValue(data2, "data", 'data2'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-231.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-231.js index 65ff0d9fd..082f642f7 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-231.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-231.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'set' property of 'descObj' is own data property that overrides an inherited accessor property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data1 = "data"; var data2 = "data"; var fun = function (value) { @@ -42,6 +40,6 @@ function testcase() { obj.prop = "overrideData"; - return obj.hasOwnProperty("prop") && data1 === "overrideData" && data2 === "data"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data1, "overrideData", 'data1'); +assert.sameValue(data2, "data", 'data2'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-232.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-232.js index 4496e4a7a..74230afae 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-232.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-232.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-232 description: > Object.defineProperties - 'set' property of 'descObj' is own accessor property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data = "data"; var setFun = function (value) { data = value; @@ -29,7 +27,5 @@ function testcase() { obj.prop = "overrideData"; - return obj.hasOwnProperty("prop") && data === "overrideData"; - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-233.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-233.js index 550927a61..613cd5dec 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-233.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-233.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-233 description: > Object.defineProperties - 'set' property of 'descObj' is inherited accessor property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data = "data"; var setFun = function (value) { data = value; @@ -32,7 +30,5 @@ function testcase() { }); obj.prop = "overrideData"; - return obj.hasOwnProperty("prop") && data === "overrideData"; - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-234.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-234.js index 07ea13877..323f7f972 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-234.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-234.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'set' property of 'descObj' is own accessor property that overrides an inherited data property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data1 = "data"; var data2 = "data"; @@ -38,7 +36,6 @@ function testcase() { }); obj.prop = "overrideData"; - return obj.hasOwnProperty("prop") && data2 === "overrideData" && data1 === "data"; - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data2, "overrideData", 'data2'); +assert.sameValue(data1, "data", 'data1'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-235.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-235.js index 498144735..e98a8856e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-235.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-235.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'set' property of 'descObj' is own accessor property that overrides an inherited accessor property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data1 = "data"; var data2 = "data"; @@ -43,6 +41,6 @@ function testcase() { obj.prop = "overrideData"; - return obj.hasOwnProperty("prop") && data2 === "overrideData" && data1 === "data"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data2, "overrideData", 'data2'); +assert.sameValue(data1, "data", 'data1'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-236.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-236.js index 9f7aef348..3c5f3888a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-236.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-236.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-236 description: > Object.defineProperties - 'set' property of 'descObj' is own accessor property without a get function (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var fun = function () { return 10; }; @@ -28,6 +26,6 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && typeof desc.set === "undefined" && obj.prop === 10; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); +assert.sameValue(obj.prop, 10, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-237.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-237.js index 5a5f1f77e..cd17ab0b9 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-237.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-237.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'set' property of 'descObj' is own accessor property without a get function that overrides an inherited accessor property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var fun = function () { return 10; }; @@ -42,6 +39,6 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && typeof (desc.set) === "undefined" && obj.prop === 10; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof (desc.set), "undefined", 'typeof (desc.set)'); +assert.sameValue(obj.prop, 10, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-238.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-238.js index 58a53b0da..044694163 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-238.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-238.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-238 description: > Object.defineProperties - 'set' property of 'descObj' is inherited accessor property without a get function (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var fun = function () { return 10; }; @@ -33,6 +30,6 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && typeof (desc.set) === "undefined" && obj.prop === 10; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof (desc.set), "undefined", 'typeof (desc.set)'); +assert.sameValue(obj.prop, 10, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-239.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-239.js index 70b12b6a5..fbdd5fe22 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-239.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-239.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Function object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data = "data"; var descFun = function () { }; var setFun = function (value) { @@ -24,6 +22,6 @@ function testcase() { var obj = {}; Object.defineProperties(obj, descFun); obj.prop = "funData"; - return obj.hasOwnProperty("prop") && data === "funData"; - } -runTestCase(testcase); + +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data, "funData", 'data'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-240.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-240.js index 89df034c0..62895cd66 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-240.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-240.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is an Array object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var data = "data"; var arr = []; var setFun = function (value) { @@ -24,6 +21,6 @@ function testcase() { var obj = {}; Object.defineProperties(obj, arr); obj.prop = "arrData"; - return obj.hasOwnProperty("prop") && data === "arrData"; - } -runTestCase(testcase); + +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data, "arrData", 'data'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-241.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-241.js index 619c15ff0..d8df00083 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-241.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-241.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is a String object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data = "data"; var descStr = new String(); var setFun = function (value) { @@ -24,6 +22,6 @@ function testcase() { var obj = {}; Object.defineProperties(obj, descStr); obj.prop = "strData"; - return obj.hasOwnProperty("prop") && data === "strData"; - } -runTestCase(testcase); + +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data, "strData", 'data'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-242.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-242.js index 85fb391c5..10187cbb8 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-242.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-242.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Boolean object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var data = "data"; var descObj = new Boolean(false); var setFun = function (value) { @@ -24,6 +21,6 @@ function testcase() { var obj = {}; Object.defineProperties(obj, descObj); obj.prop = "booleanData"; - return obj.hasOwnProperty("prop") && data === "booleanData"; - } -runTestCase(testcase); + +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data, "booleanData", 'data'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-243.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-243.js index 65c2d8a74..56bc91903 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-243.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-243.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Number object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var data = "data"; var descObj = new Number(-9); var setFun = function (value) { @@ -24,6 +21,6 @@ function testcase() { var obj = {}; Object.defineProperties(obj, descObj); obj.prop = "numberData"; - return obj.hasOwnProperty("prop") && data === "numberData"; - } -runTestCase(testcase); + +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data, "numberData", 'data'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-245.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-245.js index 671f3f96e..b6c0da717 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-245.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-245.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Date object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var data = "data"; var descObj = new Date(); var setFun = function (value) { @@ -24,6 +21,6 @@ function testcase() { var obj = {}; Object.defineProperties(obj, descObj); obj.prop = "dateData"; - return obj.hasOwnProperty("prop") && data === "dateData"; - } -runTestCase(testcase); + +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data, "dateData", 'data'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-246.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-246.js index 6a3e9cb5b..3e0f737a2 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-246.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-246.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is a RegExp object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var data = "data"; var descObj = new RegExp(); var setFun = function (value) { @@ -24,6 +21,6 @@ function testcase() { var obj = {}; Object.defineProperties(obj, descObj); obj.prop = "regExpData"; - return obj.hasOwnProperty("prop") && data === "regExpData"; - } -runTestCase(testcase); + +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data, "regExpData", 'data'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-248.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-248.js index f01edf46d..20779fb24 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-248.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-248.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is an Error object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var data = "data"; var descObj = new Error("test"); descObj.description = { value: 11 }; @@ -28,6 +25,6 @@ function testcase() { var obj = {}; Object.defineProperties(obj, descObj); obj.prop = "errorData"; - return obj.hasOwnProperty("prop") && data === "errorData"; - } -runTestCase(testcase); + +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data, "errorData", 'data'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-249.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-249.js index 9afadc46b..f09421051 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-249.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-249.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'descObj' is the Arguments object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data = "data"; var fun = function () { return arguments; @@ -27,6 +25,6 @@ function testcase() { var obj = {}; Object.defineProperties(obj, arg); obj.prop = "argData"; - return obj.hasOwnProperty("prop") && data === "argData"; - } -runTestCase(testcase); + +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data, "argData", 'data'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-25.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-25.js index 81dc74c4b..01e17e58b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-25.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-25.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Date object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var descObj = new Date(); var accessed = false; @@ -26,6 +23,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-258.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-258.js index cc741c889..cdf054713 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-258.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-258.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-258 description: > Object.defineProperties - value of 'set' property of 'descObj' is a function (8.10.5 step 8.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var data = "data"; var setFun = function (value) { data = value; @@ -24,6 +21,6 @@ function testcase() { } }); obj.prop = "funData"; - return obj.hasOwnProperty("prop") && data === "funData"; - } -runTestCase(testcase); + +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(data, "funData", 'data'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-26.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-26.js index 9c4a1ddc8..3b9c9f2a6 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-26.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-26.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is a RegExp object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var descObj = new RegExp(); var accessed = false; @@ -26,6 +23,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-28.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-28.js index 0912b9e1e..ab347d29b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-28.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-28.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is an Error object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var descObj = new Error(); var accessed = false; @@ -26,6 +23,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-29.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-29.js index 6a73ddf5d..473f0ef00 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-29.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-29.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is the Arguments object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var arg; var accessed = false; @@ -30,6 +27,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-32.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-32.js index dd64d4174..4d8a33928 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-32.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-32.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-32 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is undefined (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-33.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-33.js index 989893f1b..919b4258e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-33.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-33.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-33 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is null (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-34.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-34.js index e839ebce3..8a8d9568a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-34.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-34.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-34 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is true (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-35.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-35.js index 276856a72..5ca9aaee0 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-35.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-35.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-35 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is false (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-36.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-36.js index d1bfc3f54..b5804ca84 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-36.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-36.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-36 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is 0 (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-37.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-37.js index c15942ae6..4768009aa 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-37.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-37.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-37 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is +0 (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-38.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-38.js index 63a7d820a..1429ef412 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-38.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-38.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-38 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is -0 (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-39.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-39.js index d559dbdbb..451a7794d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-39.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-39.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-39 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is NaN (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-40.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-40.js index f596ea1a8..9a9c3a557 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-40.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-40.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-40 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is positive number (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-41.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-41.js index 205665db0..f5986377a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-41.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-41.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-41 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is negative number (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-42.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-42.js index 6c1f403ee..b36a0fa72 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-42.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-42.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-42 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is empty string (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-43.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-43.js index 59a7545ac..7b79f6d81 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-43.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-43.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-43 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is non-empty string (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-44.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-44.js index fd110f534..d76bdf16d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-44.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-44.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-44 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is a Function object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-45.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-45.js index 702294d1e..952f524d0 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-45.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-45.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-45 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is an Array object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-46.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-46.js index 296dc7361..df7e53b1c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-46.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-46.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-46 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is a String object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-47.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-47.js index 204c7a678..fdca287d0 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-47.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-47.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-47 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is a Boolean object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-48.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-48.js index 979d0e017..a79b3cd31 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-48.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-48.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-48 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is a Number object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-49.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-49.js index 857b029b4..cbf2194ed 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-49.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-49.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-49 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is the Math object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-50.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-50.js index 6be9cdd80..0a9d41888 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-50.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-50.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-50 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is a Date object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-51.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-51.js index 5ea5ac407..6ad0a15cd 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-51.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-51.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-51 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is a RegExp object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-52.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-52.js index 24555862c..b2c580c1b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-52.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-52.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-52 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is the JSON object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-53.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-53.js index b2f2c52b4..9136dc45d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-53.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-53.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-53 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is an Error object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-54.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-54.js index 118005de4..8ef7474cb 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-54.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-54.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-54 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is the Arguments object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; var arg; @@ -29,6 +26,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-56.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-56.js index 490860e48..06b5f3eee 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-56.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-56.js @@ -6,13 +6,9 @@ es5id: 15.2.3.7-5-b-56 description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is the global object (8.10.5 step 3.b) -includes: - - runTestCase.js - - fnGlobalObject.js +includes: [fnGlobalObject.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -26,6 +22,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-57.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-57.js index 1e942e763..4c796095a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-57.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-57.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is a string (value is 'false') which is treated as true value (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -25,6 +22,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-58.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-58.js index f55cd4bac..7f3278392 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-58.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-58.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - value of 'enumerable' property of 'descObj' is new Boolean(false) which is treated as true value (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -25,6 +22,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-59.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-59.js index ad02b553d..cc8495057 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-59.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-59.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-59 description: > Object.defineProperties - 'configurable' property of 'descObj' is present (8.10.5 step 4) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; Object.defineProperties(obj, { @@ -23,6 +20,5 @@ function testcase() { delete obj.prop; var result2 = obj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-6.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-6.js index f70ca834e..147b520d0 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-6.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-6.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-6 description: > Object.defineProperties - 'enumerable' property of 'descObj' is present (8.10.5 step 3) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -25,6 +22,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-61.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-61.js index dcdb74a4d..3db823b9d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-61.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-61.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-61 description: > Object.defineProperties - 'configurable' property of 'descObj' is own data property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; Object.defineProperties(obj, { @@ -23,7 +20,5 @@ function testcase() { delete obj.prop; var result2 = obj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-62.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-62.js index 8ba9e0e42..ba84be285 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-62.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-62.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-62 description: > Object.defineProperties - 'configurable' property of 'descObj' is inherited data property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var proto = { configurable: true @@ -27,7 +24,5 @@ function testcase() { delete obj.prop; var result2 = obj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-65.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-65.js index 366ad6677..ed481bf7c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-65.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-65.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-65 description: > Object.defineProperties - 'configurable' property of 'descObj' is own accessor property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var descObj = {}; @@ -27,6 +24,5 @@ function testcase() { delete obj.prop; var result2 = obj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-66.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-66.js index e322f12d8..fe7272240 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-66.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-66.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-66 description: > Object.defineProperties - 'configurable' property of 'descObj' is inherited accessor property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var proto = {}; @@ -32,6 +29,5 @@ function testcase() { delete obj.prop; var result2 = obj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-7.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-7.js index 5c21df2ad..afbd90c14 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-7.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-7.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-7 description: > Object.defineProperties - 'enumerable' property of 'descObj' is not present (8.10.5 step 3) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -23,6 +20,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-72.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-72.js index 3b5d88cb1..ad903b294 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-72.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-72.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Function object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var descObj = function () { }; @@ -25,6 +22,5 @@ function testcase() { delete obj.prop; var result2 = obj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-73.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-73.js index 5b2a2d91f..3687f4416 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-73.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-73.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is an Array object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var descObj = []; @@ -25,6 +22,5 @@ function testcase() { delete obj.prop; var result2 = obj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-74.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-74.js index 29e19e219..03d2e2f88 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-74.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-74.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is a String object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var descObj = new String(); @@ -24,6 +21,5 @@ function testcase() { delete obj.prop; var result2 = obj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-75.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-75.js index 77618f5e1..8b20c3bbf 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-75.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-75.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Boolean object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var descObj = new Boolean(false); @@ -25,6 +22,5 @@ function testcase() { delete obj.prop; var result2 = obj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-76.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-76.js index 5afcc665c..05bd0876a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-76.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-76.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Number object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var descObj = new Number(-9); @@ -25,6 +22,5 @@ function testcase() { delete obj.prop; var result2 = obj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-78.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-78.js index a3b251122..9b966b7c2 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-78.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-78.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is a Date object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var descObj = new Date(); @@ -25,6 +22,5 @@ function testcase() { delete obj.prop; var result2 = obj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-79.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-79.js index 8aa4f62a3..47be8aae9 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-79.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-79.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is a RegExp object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var descObj = new RegExp(); @@ -25,6 +22,5 @@ function testcase() { delete obj.prop; var result2 = obj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-8.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-8.js index 1a7468393..3c4d2415f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-8.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-8.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-8 description: > Object.defineProperties - 'enumerable' property of 'descObj' is own data property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -25,7 +22,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-81.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-81.js index 6061d2369..08b5b03fc 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-81.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-81.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is an Error object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var descObj = new Error(); @@ -25,6 +22,5 @@ function testcase() { delete obj.prop; var result2 = obj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-82.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-82.js index 8bb2df477..eea14bf01 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-82.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-82.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'descObj' is the Arguments object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var arg; @@ -29,6 +26,5 @@ function testcase() { delete obj.prop; var result2 = obj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-87.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-87.js index 6203b435c..968960c5e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-87.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-87.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-87 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is true (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -22,7 +20,5 @@ function testcase() { delete obj.property; - return !obj.hasOwnProperty("property") && hadOwnProperty; - - } -runTestCase(testcase); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); +assert(hadOwnProperty, 'hadOwnProperty !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-9.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-9.js index eb52db3b0..7aa7a3ace 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-9.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-9.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-5-b-9 description: > Object.defineProperties - 'enumerable' property of 'descObj' is inherited data property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -30,6 +27,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-93.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-93.js index 6ab295ec0..7eeee70d4 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-93.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-93.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-93 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is positive number (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -22,6 +20,5 @@ function testcase() { delete obj.property; - return !obj.hasOwnProperty("property") && hadOwnProperty; - } -runTestCase(testcase); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); +assert(hadOwnProperty, 'hadOwnProperty !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-94.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-94.js index a02b5e99e..384aaca35 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-94.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-94.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-94 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is negative number (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -22,7 +20,5 @@ function testcase() { delete obj.property; - return !obj.hasOwnProperty("property") && hadOwnProperty; - - } -runTestCase(testcase); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); +assert(hadOwnProperty, 'hadOwnProperty !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-96.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-96.js index e7ea2cb29..991dbb9d8 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-96.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-96.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-96 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is non-empty string (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -22,6 +20,5 @@ function testcase() { delete obj.property; - return !obj.hasOwnProperty("property") && hadOwnProperty; - } -runTestCase(testcase); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); +assert(hadOwnProperty, 'hadOwnProperty !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-97.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-97.js index 66195f4b3..1a96f98e6 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-97.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-97.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-97 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is Function object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -22,6 +20,5 @@ function testcase() { delete obj.property; - return !obj.hasOwnProperty("property") && hadOwnProperty; - } -runTestCase(testcase); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); +assert(hadOwnProperty, 'hadOwnProperty !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-98.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-98.js index 00f8fe187..63ccc0d77 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-98.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-98.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-98 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is Array object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -22,6 +20,5 @@ function testcase() { delete obj.property; - return !obj.hasOwnProperty("property") && hadOwnProperty; - } -runTestCase(testcase); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); +assert(hadOwnProperty, 'hadOwnProperty !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-99.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-99.js index 050cdde8b..105d97478 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-99.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-99.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-5-b-99 description: > Object.defineProperties - value of 'configurable' property of 'descObj' is String object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -22,6 +20,5 @@ function testcase() { delete obj.property; - return !obj.hasOwnProperty("property") && hadOwnProperty; - } -runTestCase(testcase); +assert.sameValue(obj.hasOwnProperty("property"), false, 'obj.hasOwnProperty("property")'); +assert(hadOwnProperty, 'hadOwnProperty !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-105.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-105.js index 92d26b922..54713ca36 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-105.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-105.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-6-a-105 description: > Object.defineProperties - 'P' is accessor property, P.[[Set]] is present and properties.[[Set]] is undefined (8.12.9 step 12) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; function get_func() { return 10; @@ -50,6 +48,8 @@ function testcase() { delete obj.property; verifyConfigurable = obj.hasOwnProperty("property"); - return hasProperty && verifyGet && verifySet && verifyEnumerable && !verifyConfigurable; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert(verifyGet, 'verifyGet !== true'); +assert(verifySet, 'verifySet !== true'); +assert(verifyEnumerable, 'verifyEnumerable !== true'); +assert.sameValue(verifyConfigurable, false, 'verifyConfigurable'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-11.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-11.js index f4a469806..2909b6d86 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-11.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-11.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-6-a-11 description: > Object.defineProperties - 'P' is inherited accessor property without a get function (8.12.9 step 1 ) -includes: [runTestCase.js] ---*/ -function testcase() { var proto = {}; Object.defineProperty(proto, "prop", { set: function () { }, @@ -28,7 +26,6 @@ function testcase() { configurable: true } }); - return obj.hasOwnProperty("prop") && obj.prop === 12; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 12, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-111.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-111.js index 7b0e43468..41a28895a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-111.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-111.js @@ -4,11 +4,8 @@ /*--- es5id: 15.2.3.7-6-a-111 description: Object.defineProperties - each properties are in list order -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; function get_func() { @@ -39,7 +36,7 @@ function testcase() { }; Object.defineProperties(obj, properties); - return (obj["a"] === 100 && obj["b"] === 20 && obj["c"] === 200); - } -runTestCase(testcase); +assert.sameValue(obj["a"], 100, 'obj["a"]'); +assert.sameValue(obj["b"], 20, 'obj["b"]'); +assert.sameValue(obj["c"], 200, 'obj["c"]'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-122.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-122.js index 031dd3909..ff7a58b01 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-122.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-122.js @@ -7,17 +7,12 @@ description: > Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', test setting the [[Value]] field of 'desc' to null actuall is set to 0 (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = [0, 1]; Object.defineProperties(arr, { length: { value: null } }); - return arr.length === 0; - } -runTestCase(testcase); +assert.sameValue(arr.length, 0, 'arr.length'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-123.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-123.js index d39987348..f91cf3bb3 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-123.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-123.js @@ -7,17 +7,12 @@ description: > Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a boolean with value false (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = [0, 1]; Object.defineProperties(arr, { length: { value: false } }); - return arr.length === 0; - } -runTestCase(testcase); +assert.sameValue(arr.length, 0, 'arr.length'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-124.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-124.js index a19fdd03b..50abc6041 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-124.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-124.js @@ -7,17 +7,12 @@ description: > Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a boolean with value true (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = []; Object.defineProperties(arr, { length: { value: true } }); - return arr.length === 1; - } -runTestCase(testcase); +assert.sameValue(arr.length, 1, 'arr.length'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-125.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-125.js index 488c0d833..d3f8838af 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-125.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-125.js @@ -7,17 +7,12 @@ description: > Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is 0 (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = [0, 1]; Object.defineProperties(arr, { length: { value: 0 } }); - return arr.length === 0; - } -runTestCase(testcase); +assert.sameValue(arr.length, 0, 'arr.length'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-126.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-126.js index 758f5fdd3..a6d959af0 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-126.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-126.js @@ -7,17 +7,12 @@ description: > Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is +0 (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = [0, 1]; Object.defineProperties(arr, { length: { value: +0 } }); - return arr.length === 0; - } -runTestCase(testcase); +assert.sameValue(arr.length, 0, 'arr.length'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-127.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-127.js index 18a852075..23a8af3c3 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-127.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-127.js @@ -7,17 +7,12 @@ description: > Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is -0 (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = [0, 1]; Object.defineProperties(arr, { length: { value: -0 } }); - return arr.length === 0; - } -runTestCase(testcase); +assert.sameValue(arr.length, 0, 'arr.length'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-128.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-128.js index a68d9d625..23a5a1f6e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-128.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-128.js @@ -7,17 +7,12 @@ description: > Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is positive number (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = []; Object.defineProperties(arr, { length: { value: 12 } }); - return arr.length === 12; - } -runTestCase(testcase); +assert.sameValue(arr.length, 12, 'arr.length'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-133.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-133.js index 2a874d723..c5c56bf55 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-133.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-133.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing a positive number (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = []; Object.defineProperties(arr, { @@ -19,6 +16,5 @@ function testcase() { value: "2" } }); - return arr.length === 2; - } -runTestCase(testcase); + +assert.sameValue(arr.length, 2, 'arr.length'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-138.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-138.js index 0a3dd79ea..26485cc64 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-138.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-138.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing an exponential number (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = []; Object.defineProperties(arr, { @@ -19,6 +16,5 @@ function testcase() { value: "2E3" } }); - return arr.length === 2E3; - } -runTestCase(testcase); + +assert.sameValue(arr.length, 2E3, 'arr.length'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-139.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-139.js index 5cafc5527..1239e6adf 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-139.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-139.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing an hex number (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = []; Object.defineProperties(arr, { @@ -19,6 +16,5 @@ function testcase() { value: "0x00B" } }); - return arr.length === 0x00B; - } -runTestCase(testcase); + +assert.sameValue(arr.length, 0x00B, 'arr.length'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-140.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-140.js index bf5dea99a..ba7093b93 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-140.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-140.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing an leading zero number (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = []; Object.defineProperties(arr, { @@ -19,6 +16,5 @@ function testcase() { value: "0002.0" } }); - return arr.length === 2; - } -runTestCase(testcase); + +assert.sameValue(arr.length, 2, 'arr.length'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-142.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-142.js index 78411312f..be1c55b0b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-142.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-142.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', test the [[Value]] field of 'desc' is an Object which has an own toString method (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = []; Object.defineProperties(arr, { @@ -24,6 +21,4 @@ function testcase() { } }); - return arr.length === 2; - } -runTestCase(testcase); +assert.sameValue(arr.length, 2, 'arr.length'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-143.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-143.js index 3231f5dc3..0e13bf117 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-143.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-143.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is an Object which has an own valueOf method (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = []; Object.defineProperties(arr, { @@ -23,7 +20,5 @@ function testcase() { } } }); - return arr.length === 2; - } -runTestCase(testcase); +assert.sameValue(arr.length, 2, 'arr.length'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-144.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-144.js index 439f77f91..d724d2d0f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-144.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-144.js @@ -8,11 +8,8 @@ description: > property of 'O', test the [[Value]] field of 'desc' is an Object which has an own valueOf method that returns an object and toString method that returns a string (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = []; var toStringAccessed = false; var valueOfAccessed = false; @@ -32,6 +29,7 @@ function testcase() { } } }); - return arr.length === 2 && toStringAccessed && valueOfAccessed; - } -runTestCase(testcase); + +assert.sameValue(arr.length, 2, 'arr.length'); +assert(toStringAccessed, 'toStringAccessed !== true'); +assert(valueOfAccessed, 'valueOfAccessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-145.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-145.js index 73377f09e..d63b5611a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-145.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-145.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is an Object which has an own toString and valueOf method (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = []; var toStringAccessed = false; var valueOfAccessed = false; @@ -31,6 +28,7 @@ function testcase() { } } }); - return arr.length === 3 && !toStringAccessed && valueOfAccessed; - } -runTestCase(testcase); + +assert.sameValue(arr.length, 3, 'arr.length'); +assert.sameValue(toStringAccessed, false, 'toStringAccessed'); +assert(valueOfAccessed, 'valueOfAccessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-147.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-147.js index a29bada96..0e9d72a6a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-147.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-147.js @@ -8,11 +8,8 @@ description: > property of 'O', test using inherited valueOf method when the [[Value]] field of 'desc' is an Objec with an own toString and inherited valueOf methods (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = []; var toStringAccessed = false; var valueOfAccessed = false; @@ -42,6 +39,7 @@ function testcase() { Object.defineProperties(arr, { length: child }); - return arr.length === 3 && toStringAccessed && !valueOfAccessed; - } -runTestCase(testcase); + +assert.sameValue(arr.length, 3, 'arr.length'); +assert(toStringAccessed, 'toStringAccessed !== true'); +assert.sameValue(valueOfAccessed, false, 'valueOfAccessed'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-150.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-150.js index 1f6464a17..7f6dc1136 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-150.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-150.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is boundary value 2^32 - 2 (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = []; Object.defineProperties(arr, { @@ -20,6 +17,4 @@ function testcase() { } }); - return arr.length === 4294967294; - } -runTestCase(testcase); +assert.sameValue(arr.length, 4294967294, 'arr.length'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-151.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-151.js index 99292e289..090d2e650 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-151.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-151.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is boundary value 2^32 - 1 (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = []; Object.defineProperties(arr, { @@ -20,6 +17,4 @@ function testcase() { } }); - return arr.length === 4294967295; - } -runTestCase(testcase); +assert.sameValue(arr.length, 4294967295, 'arr.length'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-157.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-157.js index e544d554b..c3fece46a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-157.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-157.js @@ -8,11 +8,8 @@ description: > property of 'O', test the [[Value]] field of 'desc' which is less than value of the length property is defined into 'O' with deleting properties with large index named (15.4.5.1 step 3.f) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = [0, 1]; Object.defineProperties(arr, { @@ -20,6 +17,7 @@ function testcase() { value: 1 } }); - return arr.length === 1 && !arr.hasOwnProperty("1") && arr[0] === 0; - } -runTestCase(testcase); + +assert.sameValue(arr.length, 1, 'arr.length'); +assert.sameValue(arr.hasOwnProperty("1"), false, 'arr.hasOwnProperty("1")'); +assert.sameValue(arr[0], 0, 'arr[0]'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-161.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-161.js index e00cc5b8e..94801d363 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-161.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-161.js @@ -10,11 +10,8 @@ description: > length property is set to true at last after deleting properties with large index named if the [[Writable]] field of 'desc' is absent (15.4.5.1 step 3.h) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = [0, 1]; Object.defineProperties(arr, { @@ -24,6 +21,7 @@ function testcase() { }); arr.length = 10; //try to overwrite length value of arr - return !arr.hasOwnProperty("1") && arr.length === 10 && arr[0] === 0; - } -runTestCase(testcase); + +assert.sameValue(arr.hasOwnProperty("1"), false, 'arr.hasOwnProperty("1")'); +assert.sameValue(arr.length, 10, 'arr.length'); +assert.sameValue(arr[0], 0, 'arr[0]'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-162.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-162.js index 839e50a8d..264929a73 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-162.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-162.js @@ -10,11 +10,8 @@ description: > length property is set to true at last after deleting properties with large index named if the [[Writable]] field of 'desc' is true (15.4.5.1 step 3.h) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = [0, 1]; Object.defineProperties(arr, { @@ -25,6 +22,7 @@ function testcase() { }); arr.length = 10; //try to overwrite length value of arr - return !arr.hasOwnProperty("1") && arr.length === 10 && arr[0] === 0; - } -runTestCase(testcase); + +assert.sameValue(arr.hasOwnProperty("1"), false, 'arr.hasOwnProperty("1")'); +assert.sameValue(arr.length, 10, 'arr.length'); +assert.sameValue(arr[0], 0, 'arr[0]'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-174.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-174.js index a6bb8774a..569dc35df 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-174.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-174.js @@ -8,11 +8,8 @@ description: > property of 'O', the [[Value]] field of 'desc' is less than value of the length property, test the configurable large index named property of 'O' can be deleted (15.4.5.1 step 3.l.ii) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = [0, 1]; Object.defineProperties(arr, { @@ -21,6 +18,4 @@ function testcase() { } }); - return !arr.hasOwnProperty("1"); - } -runTestCase(testcase); +assert.sameValue(arr.hasOwnProperty("1"), false, 'arr.hasOwnProperty("1")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-178.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-178.js index 87af2b88d..3beabc6fa 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-178.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-178.js @@ -7,11 +7,8 @@ description: > Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is available String values that convert to numbers (15.4.5.1 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = [0]; Object.defineProperties(arr, { @@ -19,6 +16,5 @@ function testcase() { value: 12 } }); - return arr[0] === 12; - } -runTestCase(testcase); + +assert.sameValue(arr[0], 12, 'arr[0]'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-179.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-179.js index 18a001889..7fa434696 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-179.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-179.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-6-a-179 description: > Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is boundary value 2^32 - 2 (15.4.5.1 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var arr = []; Object.defineProperties(arr, { @@ -18,6 +16,6 @@ function testcase() { } }); - return arr.hasOwnProperty("4294967294") && arr.length === 4294967295 && arr[4294967294] === 100; - } -runTestCase(testcase); +assert(arr.hasOwnProperty("4294967294"), 'arr.hasOwnProperty("4294967294") !== true'); +assert.sameValue(arr.length, 4294967295, 'arr.length'); +assert.sameValue(arr[4294967294], 100, 'arr[4294967294]'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-180.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-180.js index a005802ef..1e2c4de0d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-180.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-180.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-6-a-180 description: > Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is boundary value 2^32 - 1 (15.4.5.1 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var arr = []; Object.defineProperties(arr, { @@ -18,6 +16,6 @@ function testcase() { } }); - return arr.hasOwnProperty("4294967295") && arr.length === 0 && arr[4294967295] === 100; - } -runTestCase(testcase); +assert(arr.hasOwnProperty("4294967295"), 'arr.hasOwnProperty("4294967295") !== true'); +assert.sameValue(arr.length, 0, 'arr.length'); +assert.sameValue(arr[4294967295], 100, 'arr[4294967295]'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-181.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-181.js index 220b39c57..a04bc26f8 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-181.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-181.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-6-a-181 description: > Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is boundary value 2^32 (15.4.5.1 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var arr = []; Object.defineProperties(arr, { @@ -18,6 +16,6 @@ function testcase() { } }); - return arr.hasOwnProperty("4294967296") && arr.length === 0 && arr[4294967296] === 100; - } -runTestCase(testcase); +assert(arr.hasOwnProperty("4294967296"), 'arr.hasOwnProperty("4294967296") !== true'); +assert.sameValue(arr.length, 0, 'arr.length'); +assert.sameValue(arr[4294967296], 100, 'arr[4294967296]'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-182.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-182.js index 82d1a4a8b..53f196422 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-182.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-182.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-6-a-182 description: > Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is boundary value 2^32 + 1 (15.4.5.1 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var arr = []; Object.defineProperties(arr, { @@ -18,6 +16,6 @@ function testcase() { } }); - return arr.hasOwnProperty("4294967297") && arr.length === 0 && arr[4294967297] === 100; - } -runTestCase(testcase); +assert(arr.hasOwnProperty("4294967297"), 'arr.hasOwnProperty("4294967297") !== true'); +assert.sameValue(arr.length, 0, 'arr.length'); +assert.sameValue(arr[4294967297], 100, 'arr[4294967297]'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-183.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-183.js index c886c8be3..fc8c6fa11 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-183.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-183.js @@ -8,10 +8,8 @@ description: > Array, 'P' is an array index named property, [[Writable]] attribute of the length property in 'O' is false, value of 'P' is less than value of the length property in'O' (15.4.5.1 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var arr = [1, 2, 3]; Object.defineProperty(arr, "length", { @@ -24,6 +22,6 @@ function testcase() { } }); - return arr[0] === 1 && arr[1] === "abc" && arr[2] === 3; - } -runTestCase(testcase); +assert.sameValue(arr[0], 1, 'arr[0]'); +assert.sameValue(arr[1], "abc", 'arr[1]'); +assert.sameValue(arr[2], 3, 'arr[2]'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-196.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-196.js index b2dc231b5..4d826caed 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-196.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-196.js @@ -8,10 +8,8 @@ description: > named property, 'P' property doesn't exist in 'O', test [[Value]] of 'P' property in 'Attributes' is set as undefined value if [[Value]] is absent in data descriptor 'desc' (15.4.5.1 step 4.c) -includes: [runTestCase.js] ---*/ -function testcase() { var arr = []; Object.defineProperties(arr, { @@ -22,6 +20,5 @@ function testcase() { } }); - return arr.hasOwnProperty("0") && typeof (arr[0]) === "undefined"; - } -runTestCase(testcase); +assert(arr.hasOwnProperty("0"), 'arr.hasOwnProperty("0") !== true'); +assert.sameValue(typeof (arr[0]), "undefined", 'typeof (arr[0])'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-198.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-198.js index cb33304e8..2d19fa185 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-198.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-198.js @@ -9,10 +9,8 @@ description: > [[Enumerable]] of 'P' property in 'Attributes' is set as false value if [[Enumerable]] is absent in data descriptor 'desc' (15.4.5.1 step 4.c) -includes: [runTestCase.js] ---*/ -function testcase() { var arr = []; var isOwnProperty = false; var canEnumerable = false; @@ -31,6 +29,7 @@ function testcase() { canEnumerable = true; } } - return isOwnProperty && !canEnumerable && arr[0] === 1001; - } -runTestCase(testcase); + +assert(isOwnProperty, 'isOwnProperty !== true'); +assert.sameValue(canEnumerable, false, 'canEnumerable'); +assert.sameValue(arr[0], 1001, 'arr[0]'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-201.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-201.js index 91cbc681c..999c5ba75 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-201.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-201.js @@ -8,10 +8,8 @@ description: > named property, 'P' property doesn't exist in 'O', test [[Get]] of 'P' property in 'Attributes' is set as undefined value if [[Get]] is absent in accessor descriptor 'desc' (15.4.5.1 step 4.c) -includes: [runTestCase.js] ---*/ -function testcase() { var arr = []; Object.defineProperties(arr, { @@ -22,6 +20,5 @@ function testcase() { } }); - return arr.hasOwnProperty("0") && typeof (arr[0]) === "undefined"; - } -runTestCase(testcase); +assert(arr.hasOwnProperty("0"), 'arr.hasOwnProperty("0") !== true'); +assert.sameValue(typeof (arr[0]), "undefined", 'typeof (arr[0])'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-202.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-202.js index 355ca15da..b9c049421 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-202.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-202.js @@ -8,10 +8,8 @@ description: > named property, 'P' property doesn't exist in 'O', test [[Set]] of 'P' property in 'Attributes' is set as undefined value if [[Set]] is absent in accessor descriptor 'desc' (15.4.5.1 step 4.c) -includes: [runTestCase.js] ---*/ -function testcase() { var arr = []; var getFunc = function () { return 11; @@ -38,8 +36,9 @@ function testcase() { var verifyConfigurable = false; delete arr[0]; verifyConfigurable = arr.hasOwnProperty("0"); - return typeof desc.set === "undefined" && propertyDefineCorrect && - desc.get === getFunc && !verifyConfigurable && verifyEnumerable; - } -runTestCase(testcase); +assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.get, getFunc, 'desc.get'); +assert.sameValue(verifyConfigurable, false, 'verifyConfigurable'); +assert(verifyEnumerable, 'verifyEnumerable !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-26.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-26.js index 9063441d5..507a1c249 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-26.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-26.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'P' doesn't exist in 'O', test 'P' is defined as data property when 'desc' is generic descriptor (8.12.9 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -21,10 +19,13 @@ function testcase() { }); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc.hasOwnProperty("value") && typeof desc.value === "undefined" && - desc.hasOwnProperty("writable") && desc.writable === false && - desc.hasOwnProperty("configurable") && desc.configurable === true && - desc.hasOwnProperty("enumerable") && desc.enumerable === true && - !desc.hasOwnProperty("get") && !desc.hasOwnProperty("set"); - } -runTestCase(testcase); +assert(desc.hasOwnProperty("value"), 'desc.hasOwnProperty("value") !== true'); +assert.sameValue(typeof desc.value, "undefined", 'typeof desc.value'); +assert(desc.hasOwnProperty("writable"), 'desc.hasOwnProperty("writable") !== true'); +assert.sameValue(desc.writable, false, 'desc.writable'); +assert(desc.hasOwnProperty("configurable"), 'desc.hasOwnProperty("configurable") !== true'); +assert.sameValue(desc.configurable, true, 'desc.configurable'); +assert(desc.hasOwnProperty("enumerable"), 'desc.hasOwnProperty("enumerable") !== true'); +assert.sameValue(desc.enumerable, true, 'desc.enumerable'); +assert.sameValue(desc.hasOwnProperty("get"), false, 'desc.hasOwnProperty("get")'); +assert.sameValue(desc.hasOwnProperty("set"), false, 'desc.hasOwnProperty("set")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-263.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-263.js index 4a5404156..d0dbf4145 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-263.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-263.js @@ -8,11 +8,8 @@ description: > named property, test the length property of 'O' is not changed if ToUint32('P') is less than value of the length property in 'O' (15.4.5.1 step 4.e) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = []; arr.length = 3; // default value of length: writable: true, configurable: false, enumerable: false @@ -22,6 +19,6 @@ function testcase() { value: 26 } }); - return arr.length === 3 && arr[1] === 26; - } -runTestCase(testcase); + +assert.sameValue(arr.length, 3, 'arr.length'); +assert.sameValue(arr[1], 26, 'arr[1]'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-264.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-264.js index bc6b207f8..5fa17de2b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-264.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-264.js @@ -8,11 +8,8 @@ description: > named property, test the length property of 'O' is set as ToUint32('P') + 1 if ToUint32('P') equals to value of the length property in 'O' (15.4.5.1 step 4.e.ii) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = []; arr.length = 3; // default value of length: writable: true, configurable: false, enumerable: false @@ -22,6 +19,6 @@ function testcase() { value: 26 } }); - return arr.length === 4 && arr[3] === 26; - } -runTestCase(testcase); + +assert.sameValue(arr.length, 4, 'arr.length'); +assert.sameValue(arr[3], 26, 'arr[3]'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-265.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-265.js index 98efd5960..66cc2afd9 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-265.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-265.js @@ -8,11 +8,8 @@ description: > named property, test the length property of 'O' is set as ToUint32('P') + 1 if ToUint32('P') is greater than value of the length property in 'O' (15.4.5.1 step 4.e.ii) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = []; Object.defineProperties(arr, { @@ -20,6 +17,6 @@ function testcase() { value: 26 } }); - return arr.length === 6 && arr[5] === 26; - } -runTestCase(testcase); + +assert.sameValue(arr.length, 6, 'arr.length'); +assert.sameValue(arr[5], 26, 'arr[5]'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-27.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-27.js index e6892699f..a2b935595 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-27.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-27.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'P' doesn't exist in 'O', test [[Value]] of 'P' is set as undefined value if absent in data descriptor 'desc' (8.12.9 step 4.a.i) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { @@ -21,9 +19,11 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc.hasOwnProperty("value") && typeof desc.value === "undefined" && - desc.hasOwnProperty("writable") && desc.writable === true && - desc.hasOwnProperty("configurable") && desc.configurable === false && - desc.hasOwnProperty("enumerable") && desc.enumerable === false; - } -runTestCase(testcase); +assert(desc.hasOwnProperty("value"), 'desc.hasOwnProperty("value") !== true'); +assert.sameValue(typeof desc.value, "undefined", 'typeof desc.value'); +assert(desc.hasOwnProperty("writable"), 'desc.hasOwnProperty("writable") !== true'); +assert.sameValue(desc.writable, true, 'desc.writable'); +assert(desc.hasOwnProperty("configurable"), 'desc.hasOwnProperty("configurable") !== true'); +assert.sameValue(desc.configurable, false, 'desc.configurable'); +assert(desc.hasOwnProperty("enumerable"), 'desc.hasOwnProperty("enumerable") !== true'); +assert.sameValue(desc.enumerable, false, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-280.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-280.js index f85115956..4f4d8ef57 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-280.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-280.js @@ -8,11 +8,8 @@ description: > accessor property of 'O' which is also defined in [[ParameterMap]] of 'O', and 'desc' is accessor descriptor, test updating multiple attribute values of 'P' (10.6 [[DefineOwnProperty]] step 3) -includes: [runTestCase.js] ---*/ -function testcase() { - var arg; (function fun(a, b, c) { @@ -42,7 +39,8 @@ function testcase() { }); var desc = Object.getOwnPropertyDescriptor(arg, "0"); - return desc.get === get_func2 && typeof desc.set === "undefined" && - desc.configurable === false && desc.enumerable === false; - } -runTestCase(testcase); + +assert.sameValue(desc.get, get_func2, 'desc.get'); +assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); +assert.sameValue(desc.configurable, false, 'desc.configurable'); +assert.sameValue(desc.enumerable, false, 'desc.enumerable'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-314.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-314.js index e6c714e85..97f3e79dd 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-314.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-314.js @@ -8,10 +8,8 @@ description: > own property of [[ParameterMap]] of 'O', test 'name' is deleted if 'name' is configurable and 'desc' is accessor descriptor (10.6 [[DefineOwnProperty]] step 5.a.i) -includes: [runTestCase.js] ---*/ -function testcase() { var arg = (function () { return arguments; }(1, 2, 3)); @@ -26,6 +24,5 @@ function testcase() { } }); - return arg[0] === 12 && accessed; - } -runTestCase(testcase); +assert.sameValue(arg[0], 12, 'arg[0]'); +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-32.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-32.js index ee1d86c65..db3c9ed05 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-32.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-32.js @@ -7,20 +7,21 @@ description: > Object.defineProperties - 'desc' is generic descriptor without any attribute, test 'P' is defined in 'obj' with all default attribute values (8.12.9 step 4.a.i) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperties(obj, { prop: {} }); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc.hasOwnProperty("value") && typeof desc.value === "undefined" && - desc.hasOwnProperty("writable") && desc.writable === false && - desc.hasOwnProperty("configurable") && desc.configurable === false && - desc.hasOwnProperty("enumerable") && desc.enumerable === false && - !desc.hasOwnProperty("get") && !desc.hasOwnProperty("set"); - } -runTestCase(testcase); +assert(desc.hasOwnProperty("value"), 'desc.hasOwnProperty("value") !== true'); +assert.sameValue(typeof desc.value, "undefined", 'typeof desc.value'); +assert(desc.hasOwnProperty("writable"), 'desc.hasOwnProperty("writable") !== true'); +assert.sameValue(desc.writable, false, 'desc.writable'); +assert(desc.hasOwnProperty("configurable"), 'desc.hasOwnProperty("configurable") !== true'); +assert.sameValue(desc.configurable, false, 'desc.configurable'); +assert(desc.hasOwnProperty("enumerable"), 'desc.hasOwnProperty("enumerable") !== true'); +assert.sameValue(desc.enumerable, false, 'desc.enumerable'); +assert.sameValue(desc.hasOwnProperty("get"), false, 'desc.hasOwnProperty("get")'); +assert.sameValue(desc.hasOwnProperty("set"), false, 'desc.hasOwnProperty("set")'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-34.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-34.js index 8e0d832d9..3c3d69ebc 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-34.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-34.js @@ -7,10 +7,8 @@ description: > Object.defineProperties - 'P' doesn't exist in 'O', test [[Set]] of 'P' is set as undefined value if absent in accessor descriptor 'desc' (8.12.9 step 4.b.i) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { return 10; @@ -25,7 +23,6 @@ function testcase() { }); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && typeof (desc.set) === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof (desc.set), "undefined", 'typeof (desc.set)'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-58.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-58.js index 9873ad037..ecbde1f77 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-58.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-58.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-6-a-58 description: > Object.defineProperties - desc.[[Get]] and P.[[Get]] are two objects which refer to the different objects (8.12.9 step 6) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; function get_Func1() { @@ -48,6 +45,8 @@ function testcase() { delete obj.foo; verifyConfigurable = obj.hasOwnProperty("foo"); - return !verifyConfigurable && !verifyEnumerable && verifyValue && typeof (desc.set) === "undefined" && desc.get === get_Func2; - } -runTestCase(testcase); +assert.sameValue(verifyConfigurable, false, 'verifyConfigurable'); +assert.sameValue(verifyEnumerable, false, 'verifyEnumerable'); +assert(verifyValue, 'verifyValue !== true'); +assert.sameValue(typeof (desc.set), "undefined", 'typeof (desc.set)'); +assert.sameValue(desc.get, get_Func2, 'desc.get'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-6.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-6.js index 2054dfc8b..cdd976461 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-6.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-6.js @@ -6,10 +6,8 @@ es5id: 15.2.3.7-6-a-6 description: > Object.defineProperties - 'P' is inherited accessor property (8.12.9 step 1 ) -includes: [runTestCase.js] ---*/ -function testcase() { var proto = {}; Object.defineProperty(proto, "prop", { get: function () { @@ -30,6 +28,6 @@ function testcase() { configurable: true } }); - return obj.hasOwnProperty("prop") && obj.prop === 12; - } -runTestCase(testcase); + +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 12, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-69.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-69.js index be7406ba8..e0fb47e8e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-69.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-69.js @@ -6,11 +6,8 @@ es5id: 15.2.3.7-6-a-69 description: > Object.defineProperties - 'P' is data property and P.configurable is true, desc is accessor property (8.12.9 step 9.b.i) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; Object.defineProperty(obj, "foo", { @@ -44,7 +41,8 @@ function testcase() { delete obj.foo; verifyConfigurable = obj.hasOwnProperty("foo"); - return !verifyConfigurable && !verifyEnumerable && verifyValue && - typeof desc.set === "undefined" && desc.get === get_Func; - } -runTestCase(testcase); +assert.sameValue(verifyConfigurable, false, 'verifyConfigurable'); +assert.sameValue(verifyEnumerable, false, 'verifyEnumerable'); +assert(verifyValue, 'verifyValue !== true'); +assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); +assert.sameValue(desc.get, get_Func, 'desc.get'); |