diff options
Diffstat (limited to 'test')
432 files changed, 972 insertions, 2293 deletions
diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-0-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-0-1.js index bdf7f2150..e552666a3 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-0-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-0-1.js @@ -4,13 +4,8 @@ /*--- es5id: 15.2.3.6-0-1 description: Object.defineProperty must exist as a function -includes: [runTestCase.js] ---*/ -function testcase() { var f = Object.defineProperty; - if (typeof(f) === "function") { - return true; - } - } -runTestCase(testcase); + +assert.sameValue(typeof(f), "function", 'typeof(f)'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-0-2.js b/test/built-ins/Object/defineProperty/15.2.3.6-0-2.js index 7926f2607..084a00bcb 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-0-2.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-0-2.js @@ -4,12 +4,6 @@ /*--- es5id: 15.2.3.6-0-2 description: Object.defineProperty must exist as a function taking 3 parameters -includes: [runTestCase.js] ---*/ -function testcase() { - if (Object.defineProperty.length === 3) { - return true; - } - } -runTestCase(testcase); +assert.sameValue(Object.defineProperty.length, 3, 'Object.defineProperty.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-1.js index a0631bb5e..7858e8907 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-1.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-1 description: > Object.defineProperty - argument 'P' is undefined that converts to string 'undefined' -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, undefined, {}); - return obj.hasOwnProperty("undefined"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("undefined"), 'obj.hasOwnProperty("undefined") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-10.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-10.js index 4ff49adc7..6c8c201fe 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-10.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-10.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-10 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is a negative number) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, -20, {}); - return obj.hasOwnProperty("-20"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("-20"), 'obj.hasOwnProperty("-20") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-11.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-11.js index c8fe68d11..bfc039d84 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-11.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-11.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-11 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is Infinity) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, Infinity, {}); - return obj.hasOwnProperty("Infinity"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("Infinity"), 'obj.hasOwnProperty("Infinity") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-12.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-12.js index 2ed69107c..63ef4f254 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-12.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-12.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-12 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is +Infinity) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, +Infinity, {}); - return obj.hasOwnProperty("Infinity"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("Infinity"), 'obj.hasOwnProperty("Infinity") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-13.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-13.js index 6907e6606..230e0f1c7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-13.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-13.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-13 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is -Infinity) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, -Infinity, {}); - return obj.hasOwnProperty("-Infinity"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("-Infinity"), 'obj.hasOwnProperty("-Infinity") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-14.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-14.js index 8a3a9f98a..5283705b2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-14.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-14.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-14 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 1(following 20 zeros)) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 100000000000000000000, {}); - return obj.hasOwnProperty("100000000000000000000"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("100000000000000000000"), 'obj.hasOwnProperty("100000000000000000000") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-15.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-15.js index 4bdbcf11a..e6dbae772 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-15.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-15.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-15 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 1(following 21 zeros)) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 1000000000000000000000, {}); - return obj.hasOwnProperty("1e+21"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("1e+21"), 'obj.hasOwnProperty("1e+21") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-16.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-16.js index 241268244..e3a21b972 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-16.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-16.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-16 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 1(following 22 zeros)) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 10000000000000000000000, {}); - return obj.hasOwnProperty("1e+22"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("1e+22"), 'obj.hasOwnProperty("1e+22") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-17-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-17-1.js index cfe656f93..2a57a5d35 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-17-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-17-1.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-17-1 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 1) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 1, {}); - return obj.hasOwnProperty("1"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("1"), 'obj.hasOwnProperty("1") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-17.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-17.js index bda543e71..9e8bb2ddb 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-17.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-17.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-17 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 1e+20) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 1e+20, {}); - return obj.hasOwnProperty("100000000000000000000"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("100000000000000000000"), 'obj.hasOwnProperty("100000000000000000000") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-18.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-18.js index 148e83e8e..0dbaf2e38 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-18.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-18.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-18 description: > Object.defineProperty - argument 'P' is a number that converts to string (value is 1e+21) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 1e+21, {}); - return obj.hasOwnProperty("1e+21"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("1e+21"), 'obj.hasOwnProperty("1e+21") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-19.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-19.js index 5c7af69e0..bda77ab5e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-19.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-19.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-19 description: > Object.defineProperty - argument 'P' is a number that converts to string (value is 1e+22) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 1e+22, {}); - return obj.hasOwnProperty("1e+22"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("1e+22"), 'obj.hasOwnProperty("1e+22") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-2.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-2.js index eef564186..31d6fb887 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-2.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-2.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-2 description: > Object.defineProperty - argument 'P' is null that converts to string 'null' -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, null, {}); - return obj.hasOwnProperty("null"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("null"), 'obj.hasOwnProperty("null") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-20.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-20.js index 82adc1a27..06d8aa82a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-20.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-20.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-20 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 0.000001) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 0.000001, {}); - return obj.hasOwnProperty("0.000001"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("0.000001"), 'obj.hasOwnProperty("0.000001") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-21.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-21.js index 275300014..287d8c1dd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-21.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-21.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-21 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 0.0000001) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 0.0000001, {}); - return obj.hasOwnProperty("1e-7"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("1e-7"), 'obj.hasOwnProperty("1e-7") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-22.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-22.js index 65e0add30..e803f48de 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-22.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-22.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-22 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 0.00000001) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 0.00000001, {}); - return obj.hasOwnProperty("1e-8"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("1e-8"), 'obj.hasOwnProperty("1e-8") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-23.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-23.js index c558ecfd6..3839f960d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-23.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-23.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-23 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 1e-7) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 1e-7, {}); - return obj.hasOwnProperty("1e-7"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("1e-7"), 'obj.hasOwnProperty("1e-7") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-24.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-24.js index da8334bf0..da1d927b5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-24.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-24.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-24 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 1e-6) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 1e-6, {}); - return obj.hasOwnProperty("0.000001"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("0.000001"), 'obj.hasOwnProperty("0.000001") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-25.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-25.js index 9c9e01d7d..740c0e3dd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-25.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-25.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-25 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 1e-5) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 1e-5, {}); - return obj.hasOwnProperty("0.00001"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("0.00001"), 'obj.hasOwnProperty("0.00001") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-26.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-26.js index 074dee6a2..e514f84ac 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-26.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-26.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-26 description: > Object.defineProperty - argument 'P' is an integer that converts to a string (value is 123) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 123, {}); - return obj.hasOwnProperty("123"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("123"), 'obj.hasOwnProperty("123") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-27.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-27.js index d231b2703..889ff4480 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-27.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-27.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-27 description: > Object.defineProperty - argument 'P' is a decimal that converts to a string (value is 123.456) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 123.456, {}); - return obj.hasOwnProperty("123.456"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("123.456"), 'obj.hasOwnProperty("123.456") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-28.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-28.js index 44c7dc14c..ac3077dbf 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-28.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-28.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-28 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 1(following 19 zeros).1) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 10000000000000000000.1, {}); - return obj.hasOwnProperty("10000000000000000000"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("10000000000000000000"), 'obj.hasOwnProperty("10000000000000000000") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-29.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-29.js index af37d9a68..c4cd44599 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-29.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-29.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-29 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 1(following 20 zeros).1) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 100000000000000000000.1, {}); - return obj.hasOwnProperty("100000000000000000000"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("100000000000000000000"), 'obj.hasOwnProperty("100000000000000000000") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-3.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-3.js index d4618f927..076c40166 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-3.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-3.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-3 description: > Object.defineProperty - argument 'P' is a boolean whose value is false -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, false, {}); - return obj.hasOwnProperty("false"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("false"), 'obj.hasOwnProperty("false") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-30.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-30.js index 50ac0b632..774bb3305 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-30.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-30.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-30 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 1(following 21 zeros).1) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 1000000000000000000000.1, {}); - return obj.hasOwnProperty("1e+21"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("1e+21"), 'obj.hasOwnProperty("1e+21") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-31.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-31.js index 39cf4a4ab..59dd29568 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-31.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-31.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-31 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 1(following 22 zeros).1) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 10000000000000000000000.1, {}); - return obj.hasOwnProperty("1e+22"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("1e+22"), 'obj.hasOwnProperty("1e+22") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-32.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-32.js index 84bde1084..fee7a1109 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-32.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-32.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-32 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 123.1234567) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 123.1234567, {}); - return obj.hasOwnProperty("123.1234567"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("123.1234567"), 'obj.hasOwnProperty("123.1234567") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-33.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-33.js index ecc6eb475..4e62e4a16 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-33.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-33.js @@ -4,14 +4,9 @@ /*--- es5id: 15.2.3.6-2-33 description: Object.defineProperty - argument 'P' is applied to an empty string -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "", {}); - return obj.hasOwnProperty(""); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty(""), 'obj.hasOwnProperty("") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-34.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-34.js index 90842848e..c8d127e5d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-34.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-34.js @@ -4,14 +4,9 @@ /*--- es5id: 15.2.3.6-2-34 description: Object.defineProperty - argument 'P' is applied to string 'AB \cd' -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "AB\n\\cd", {}); - return obj.hasOwnProperty("AB\n\\cd"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("AB\n\\cd"), 'obj.hasOwnProperty("AB\n\\cd") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-35.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-35.js index c5723270d..85150e3fc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-35.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-35.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-35 description: > Object.defineProperty - argument 'P' is applied to string 'undefined' -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "undefined", {}); - return obj.hasOwnProperty("undefined"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("undefined"), 'obj.hasOwnProperty("undefined") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-36.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-36.js index b6d89dc4d..1e63f2334 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-36.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-36.js @@ -4,14 +4,9 @@ /*--- es5id: 15.2.3.6-2-36 description: Object.defineProperty - argument 'P' is applied to string 'null' -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "null", {}); - return obj.hasOwnProperty("null"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("null"), 'obj.hasOwnProperty("null") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-37.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-37.js index 0887d7093..92fae11cd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-37.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-37.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-37 description: > Object.defineProperty - argument 'P' is applied to string '123αβπcd' -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "123αβπcd", {}); - return obj.hasOwnProperty("123αβπcd"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("123αβπcd"), 'obj.hasOwnProperty("123αβπcd") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-38.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-38.js index 51bcb504d..97470527a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-38.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-38.js @@ -4,14 +4,9 @@ /*--- es5id: 15.2.3.6-2-38 description: Object.defineProperty - argument 'P' is applied to string '1' -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "1", {}); - return obj.hasOwnProperty("1"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("1"), 'obj.hasOwnProperty("1") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-39.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-39.js index abcb87224..37a927863 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-39.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-39.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-39 description: > Object.defineProperty - argument 'P' is an array that converts to a string -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, [1, 2], {}); - return obj.hasOwnProperty("1,2"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("1,2"), 'obj.hasOwnProperty("1,2") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-4.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-4.js index 0e88d976b..5089fa099 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-4.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-4.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-4 description: > Object.defineProperty - argument 'P' is a boolean whose value is true -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, true, {}); - return obj.hasOwnProperty("true"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("true"), 'obj.hasOwnProperty("true") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-40.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-40.js index 7fe366ed1..af780b296 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-40.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-40.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-40 description: > Object.defineProperty - argument 'P' is a String Object that converts to a string -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, new String("Hello"), {}); - return obj.hasOwnProperty("Hello"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("Hello"), 'obj.hasOwnProperty("Hello") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-41.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-41.js index 6df269264..dcfcdc5d9 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-41.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-41.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-41 description: > Object.defineProperty - argument 'P' is a Boolean Object that converts to a string -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, new Boolean(false), {}); - return obj.hasOwnProperty("false"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("false"), 'obj.hasOwnProperty("false") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-42.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-42.js index d6ecd16e7..f2eab5c8b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-42.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-42.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-42 description: > Object.defineProperty - argument 'P' is a Number Object that converts to a string -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, new Number(123), {}); - return obj.hasOwnProperty("123"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("123"), 'obj.hasOwnProperty("123") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-43.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-43.js index bd37401e8..699492a0b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-43.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-43.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-2-43 description: > Object.defineProperty - argument 'P' is an object that has an own toString method -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var ownProp = { @@ -20,7 +18,4 @@ function testcase() { Object.defineProperty(obj, ownProp, {}); - return obj.hasOwnProperty("abc"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("abc"), 'obj.hasOwnProperty("abc") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-44.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-44.js index 7d794be11..ce1c4987e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-44.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-44.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-2-44 description: > Object.defineProperty - argument 'P' is an object that has an own valueOf method -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var ownProp = { @@ -21,7 +19,4 @@ function testcase() { Object.defineProperty(obj, ownProp, {}); - return obj.hasOwnProperty("abc"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("abc"), 'obj.hasOwnProperty("abc") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-45.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-45.js index 21ce8fcd9..09a51c198 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-45.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-45.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - argument 'P' is an object whose toString method returns an object and whose valueOf method returns a primitive value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var toStringAccessed = false; var valueOfAccessed = false; @@ -28,6 +26,6 @@ function testcase() { Object.defineProperty(obj, ownProp, {}); - return obj.hasOwnProperty("abc") && valueOfAccessed && toStringAccessed; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("abc"), 'obj.hasOwnProperty("abc") !== true'); +assert(valueOfAccessed, 'valueOfAccessed !== true'); +assert(toStringAccessed, 'toStringAccessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-46.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-46.js index 6e11faba2..cca20e2ee 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-46.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-46.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-2-46 description: > Object.defineProperty - argument 'P' is an object that has an own toString and valueOf method -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var toStringAccessed = false; var valueOfAccessed = false; @@ -26,7 +24,6 @@ function testcase() { }; Object.defineProperty(obj, ownProp, {}); - return obj.hasOwnProperty("abc") && !valueOfAccessed && toStringAccessed; - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("abc"), 'obj.hasOwnProperty("abc") !== true'); +assert.sameValue(valueOfAccessed, false, 'valueOfAccessed'); +assert(toStringAccessed, 'toStringAccessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-48.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-48.js index 22b057c71..4de8a76c9 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-48.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-48.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - an inherited toString method is invoked when 'P' is an object with an own valueOf and an inherited toString methods -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var toStringAccessed = false; var valueOfAccessed = false; @@ -33,6 +31,6 @@ function testcase() { Object.defineProperty(obj, child, {}); - return obj.hasOwnProperty("test") && !valueOfAccessed && toStringAccessed; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("test"), 'obj.hasOwnProperty("test") !== true'); +assert.sameValue(valueOfAccessed, false, 'valueOfAccessed'); +assert(toStringAccessed, 'toStringAccessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-5.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-5.js index 7f3882369..c0310cf55 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-5.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-5.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-5 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is NaN) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, NaN, {}); - return obj.hasOwnProperty("NaN"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("NaN"), 'obj.hasOwnProperty("NaN") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-6.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-6.js index f693f300c..2915e96e4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-6.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-6.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-6 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is 0) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 0, {}); - return obj.hasOwnProperty("0"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("0"), 'obj.hasOwnProperty("0") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-7.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-7.js index e0b07e597..907eb445b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-7.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-7.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-7 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is +0) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, +0, {}); - return obj.hasOwnProperty("0"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("0"), 'obj.hasOwnProperty("0") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-8.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-8.js index fe4cbfb51..5dd887196 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-8.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-8.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-8 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is -0) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, -0, {}); - return obj.hasOwnProperty("0"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("0"), 'obj.hasOwnProperty("0") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-2-9.js b/test/built-ins/Object/defineProperty/15.2.3.6-2-9.js index fa1ad90e5..409ef356e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-2-9.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-2-9.js @@ -6,14 +6,9 @@ es5id: 15.2.3.6-2-9 description: > Object.defineProperty - argument 'P' is a number that converts to a string (value is a positive number) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, 30, {}); - return obj.hasOwnProperty("30"); - - } -runTestCase(testcase); +assert(obj.hasOwnProperty("30"), 'obj.hasOwnProperty("30") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-101.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-101.js index aa4e6b5a3..6f424df92 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-101.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-101.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-101 description: > Object.defineProperty - 'configurable' property in 'Attributes' is true (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { configurable: true }); @@ -20,6 +18,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-107.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-107.js index 8f904729d..bfe8d6199 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-107.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-107.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-107 description: > Object.defineProperty - 'configurable' property in 'Attributes' is a positive number (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { configurable: 12345 }); @@ -20,6 +18,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-108.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-108.js index 834784363..533e2176e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-108.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-108.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-108 description: > Object.defineProperty - 'configurable' property in 'Attributes' is a negative number (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { configurable: -12345 }); @@ -20,6 +18,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-110.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-110.js index 00b6557c9..fa8d9108e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-110.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-110.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-110 description: > Object.defineProperty - 'configurable' property in 'Attributes' is a non-empty string (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { configurable: " " }); @@ -20,6 +18,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-111.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-111.js index d2ed346ca..03e65d3c8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-111.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-111.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-111 description: > Object.defineProperty - 'configurable' property in 'Attributes' is a Function object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { @@ -22,6 +20,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-112.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-112.js index 725a3ca8f..8b0def7fd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-112.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-112.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-112 description: > Object.defineProperty - 'configurable' property in 'Attributes' is an Array object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { configurable: [1, 2, 3] }); @@ -20,6 +18,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-113.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-113.js index 1fdc73f31..59b678107 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-113.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-113.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-113 description: > Object.defineProperty - 'configurable' property in 'Attributes' is a String object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { configurable: new String("bbq") }); @@ -20,6 +18,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-114.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-114.js index 7b925720c..c6a3e8cd2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-114.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-114.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-114 description: > Object.defineProperty - 'configurable' property in 'Attributes' is a Boolean object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { configurable: new Boolean(true) }); @@ -20,6 +18,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-115.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-115.js index 1a168f540..5907d7b81 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-115.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-115.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-115 description: > Object.defineProperty - 'configurable' property in 'Attributes' is a Number object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { configurable: new Number(0) }); @@ -20,6 +18,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-116.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-116.js index 562a2a2c9..2803afbe0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-116.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-116.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-116 description: > Object.defineProperty - 'configurable' property in 'Attributes' is the Math object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { configurable: Math }); @@ -20,6 +18,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-117.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-117.js index 8a89e3666..2daeab199 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-117.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-117.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-117 description: > Object.defineProperty - 'configurable' property in 'Attributes' is a Date object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { configurable: new Date() }); @@ -20,6 +18,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-118.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-118.js index 4fedb8837..76e6ed6d3 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-118.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-118.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-118 description: > Object.defineProperty - 'configurable' property in 'Attributes' is a RegExp object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var attr = { @@ -24,6 +22,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-119.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-119.js index bb863b556..7b4ff65cf 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-119.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-119.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-119 description: > Object.defineProperty - 'configurable' property in 'Attributes' is the JSON object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var attr = { @@ -24,6 +22,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-120.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-120.js index 07a0d00af..74acbbe02 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-120.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-120.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-120 description: > Object.defineProperty - 'configurable' property in 'Attributes' is a Error object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var attr = { @@ -24,6 +22,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-121.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-121.js index 5eb6cc863..d7c924ad5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-121.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-121.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-121 description: > Object.defineProperty - 'configurable' property in 'Attributes' is the Argument object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var argObj = (function () { return arguments; })(1, true, "a"); @@ -26,6 +24,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-123.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-123.js index ca6294369..bbe94b75a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-123.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-123.js @@ -6,12 +6,9 @@ es5id: 15.2.3.6-3-123 description: > Object.defineProperty - 'configurable' property in 'Attributes' is the global object (8.10.5 step 4.b) -includes: - - runTestCase.js - - fnGlobalObject.js +includes: [fnGlobalObject.js] ---*/ -function testcase() { var obj = {}; var attr = { @@ -26,6 +23,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-124.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-124.js index 94f7b350c..b4f1995e7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-124.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-124.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'configurable' property in 'Attributes' is treated as true when it is a string (value is 'false') (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var attr = { @@ -25,6 +23,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-125.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-125.js index fb6cd7aee..9c948ddaa 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-125.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-125.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-125 description: > Object.defineProperty - 'configurable' property in 'Attributes' is treated as true when it is new Boolean(false) (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var attr = { @@ -24,6 +22,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-126.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-126.js index cdf39190f..e6e27c455 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-126.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-126.js @@ -6,16 +6,12 @@ es5id: 15.2.3.6-3-126 description: > Object.defineProperty - 'value' property in 'Attributes' is present (8.10.5 step 5) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var attr = { value: 100 }; Object.defineProperty(obj, "property", attr); - return obj.property === 100; - } -runTestCase(testcase); +assert.sameValue(obj.property, 100, 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-127.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-127.js index 52ac002c7..2356a57b6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-127.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-127.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-127 description: > Object.defineProperty - 'value' property in 'Attributes' is not present (8.10.5 step 5) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var attr = { @@ -18,6 +16,5 @@ function testcase() { Object.defineProperty(obj, "property", attr); - 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/defineProperty/15.2.3.6-3-129.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-129.js index 0b026d856..6c0767ea0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-129.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-129.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-129 description: > Object.defineProperty - 'value' property in 'Attributes' is an inherited data property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var proto = { @@ -23,6 +21,4 @@ function testcase() { Object.defineProperty(obj, "property", child); - return obj.property === "inheritedDataProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "inheritedDataProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-130.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-130.js index f2fe4831c..d57fa6425 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-130.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-130.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'value' property in 'Attributes' 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 = { value: "inheritedDataProperty" }; @@ -24,6 +22,4 @@ function testcase() { Object.defineProperty(obj, "property", child); - return obj.property === "ownDataProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownDataProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-131.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-131.js index e547ea561..6490829bf 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-131.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-131.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'value' property in 'Attributes' 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 = {}; @@ -31,6 +29,4 @@ function testcase() { Object.defineProperty(obj, "property", child); - return obj.property === "ownDataProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownDataProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-132.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-132.js index be9b0f3af..dac5ac76f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-132.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-132.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-132 description: > Object.defineProperty - 'value' property in 'Attributes' is own accessor property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var attr = {}; @@ -21,6 +19,4 @@ function testcase() { Object.defineProperty(obj, "property", attr); - return obj.property === "ownAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownAccessorProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-133.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-133.js index a912dd168..0fbac7b7c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-133.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-133.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-133 description: > Object.defineProperty - 'value' property in 'Attributes' is an inherited accessor property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var proto = {}; @@ -26,6 +24,4 @@ function testcase() { Object.defineProperty(obj, "property", child); - return obj.property === "inheritedAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "inheritedAccessorProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-134.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-134.js index f6b14974d..25e3a8e4f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-134.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-134.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'value' property in 'Attributes' 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 = { @@ -29,6 +27,4 @@ function testcase() { Object.defineProperty(obj, "property", child); - return obj.property === "ownAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownAccessorProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-135.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-135.js index 639aa8667..81361b3a5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-135.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-135.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'value' property in 'Attributes' 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 = {}; @@ -32,6 +30,4 @@ function testcase() { Object.defineProperty(obj, "property", child); - return obj.property === "ownAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownAccessorProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-136.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-136.js index 66efebb86..6a3a9207e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-136.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-136.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-136 description: > Object.defineProperty - 'value' property in 'Attributes' is own accessor property without a get function (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var attr = {}; @@ -19,6 +17,5 @@ function testcase() { Object.defineProperty(obj, "property", attr); - 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/defineProperty/15.2.3.6-3-137.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-137.js index 99f46a84c..aafeec5ff 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-137.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-137.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'value' property in 'Attributes' 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 = {}; @@ -30,6 +28,5 @@ function testcase() { Object.defineProperty(obj, "property", child); - 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/defineProperty/15.2.3.6-3-138.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-138.js index 86f1242cd..1c0616d17 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-138.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-138.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'value' property in 'Attributes' is an inherited accessor property without a get function (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { property : 120 }; var proto = {}; @@ -25,6 +23,5 @@ function testcase() { Object.defineProperty(obj, "property", child); - 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/defineProperty/15.2.3.6-3-139.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-139.js index 705be1f2e..544b80e06 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-139.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-139.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var funObj = function (a, b) { @@ -21,6 +19,4 @@ function testcase() { Object.defineProperty(obj, "property", funObj); - return obj.property === "Function"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Function", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-140.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-140.js index 8240099f4..5dcb9fc1e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-140.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-140.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var arrObj = [1, 2, 3]; @@ -19,6 +17,4 @@ function testcase() { Object.defineProperty(obj, "property", arrObj); - return obj.property === "Array"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Array", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-141.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-141.js index 259c7c438..531b40470 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-141.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-141.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var strObj = new String("abc"); @@ -19,6 +17,4 @@ function testcase() { Object.defineProperty(obj, "property", strObj); - return obj.property === "String"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "String", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-142.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-142.js index 012d079c4..9daa893ce 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-142.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-142.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var boolObj = new Boolean(true); @@ -19,6 +17,4 @@ function testcase() { Object.defineProperty(obj, "property", boolObj); - return obj.property === "Boolean"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Boolean", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-143.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-143.js index 403b4f328..e321f1990 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-143.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-143.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var numObj = new Number(-2); @@ -19,6 +17,4 @@ function testcase() { Object.defineProperty(obj, "property", numObj); - return obj.property === "Number"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Number", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-145.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-145.js index b0ba8e378..0b7d5c75c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-145.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-145.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var dateObj = new Date(); @@ -19,6 +17,4 @@ function testcase() { Object.defineProperty(obj, "property", dateObj); - return obj.property === "Date"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Date", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-146.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-146.js index 60ee40575..fc99527fb 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-146.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-146.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a RegExp object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var regObj = new RegExp(); @@ -19,6 +17,4 @@ function testcase() { Object.defineProperty(obj, "property", regObj); - return obj.property === "RegExp"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "RegExp", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-148.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-148.js index 138728e4f..0e7a99843 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-148.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-148.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var errObj = new Error(); @@ -19,6 +17,4 @@ function testcase() { Object.defineProperty(obj, "property", errObj); - return obj.property === "Error"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "Error", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-149.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-149.js index c0544f24d..4385351de 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-149.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-149.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var argObj = (function () { return arguments; })(); @@ -19,6 +17,4 @@ function testcase() { Object.defineProperty(obj, "property", argObj); - return obj.property === "arguments"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "arguments", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-154.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-154.js index a571a877a..68f33cd8e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-154.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-154.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-154 description: > Object.defineProperty - 'writable' property in 'Attributes' is own data property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var attr = { @@ -24,6 +22,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-155.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-155.js index e97046994..da6d6e075 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-155.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-155.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-155 description: > Object.defineProperty - 'writable' property in 'Attributes' is an inherited data property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var proto = { @@ -29,6 +27,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-156.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-156.js index 319598ed3..18ef468a6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-156.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-156.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'writable' property in 'Attributes' is own data property that overrides an inherited data property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var proto = { @@ -31,6 +29,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-157.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-157.js index 7719052c1..eb343016d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-157.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-157.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'writable' property in 'Attributes' is own data property that overrides an inherited accessor property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var proto = { }; @@ -36,6 +34,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-158.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-158.js index b1c62bf81..38c165388 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-158.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-158.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-158 description: > Object.defineProperty - 'writable' property in 'Attributes' is own accessor property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var attr = { }; @@ -27,6 +25,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-159.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-159.js index 58a8c5573..32dbd5341 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-159.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-159.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-159 description: > Object.defineProperty - 'writable' property in 'Attributes' is an inherited accessor property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -32,6 +30,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-160.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-160.js index 5d8269ebf..b363def64 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-160.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-160.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'writable' property in 'Attributes' is own accessor property that overrides an inherited data property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = { @@ -35,6 +33,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-161.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-161.js index 9c1eb9e6b..e2e626d34 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-161.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-161.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'writable' property in 'Attributes' is own accessor property that overrides an inherited accessor property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -38,6 +36,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-165.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-165.js index 89b249cf8..3895b6f61 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-165.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-165.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var funObj = function (a, b) { @@ -27,6 +25,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-166.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-166.js index 234489a79..2781bbe76 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-166.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-166.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var arrObj = [1, 2, 3]; @@ -25,6 +23,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-167.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-167.js index 2f07f91a8..9514ee522 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-167.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-167.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var strObj = new String("abc"); @@ -25,6 +23,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-168.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-168.js index 7c0e0b78b..a81721331 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-168.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-168.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var boolObj = new Boolean(true); @@ -25,6 +23,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-169.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-169.js index c041e1663..4fbbfc386 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-169.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-169.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var numObj = new Number(-2); @@ -25,6 +23,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-171.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-171.js index 6320fd464..4cbcfcf9f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-171.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-171.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var dateObj = new Date(); @@ -25,6 +23,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-172.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-172.js index 93c604310..8c1f6a605 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-172.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-172.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a RegExp object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var regObj = new RegExp(); @@ -25,6 +23,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-174.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-174.js index d92558c7f..e29059c3b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-174.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-174.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var errObj = new Error(); @@ -25,6 +23,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-175.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-175.js index 3655f5eec..f816f7acf 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-175.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-175.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var argObj = (function () { return arguments; })(); @@ -25,6 +23,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-180.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-180.js index f2f00c7cf..41365f9ce 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-180.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-180.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-180 description: > Object.defineProperty - 'writable' property in 'Attributes' is true (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { writable: true }); @@ -20,6 +18,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-186.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-186.js index 641a8f703..1239edb9d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-186.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-186.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-186 description: > Object.defineProperty - 'writable' property in 'Attributes' is a positive number (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { writable: 12345 }); @@ -20,6 +18,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-187.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-187.js index 6cc0843a8..91c91c7f5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-187.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-187.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-187 description: > Object.defineProperty - 'writable' property in 'Attributes' is a negative number (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { writable: -12345 }); @@ -20,6 +18,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-189.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-189.js index e533cc62b..c3da81e30 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-189.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-189.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-189 description: > Object.defineProperty - 'writable' property in 'Attributes' is a non-empty string (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { writable: " " }); @@ -20,6 +18,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-190.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-190.js index d609930a6..a87d465a0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-190.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-190.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-190 description: > Object.defineProperty - 'writable' property in 'Attributes' is a Function object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { @@ -22,6 +20,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-191.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-191.js index abb0f6729..0bed96abc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-191.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-191.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-191 description: > Object.defineProperty - 'writable' property in 'Attributes' is an Array object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { writable: [1, 2, 3] }); @@ -20,6 +18,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-192.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-192.js index e3137fe3d..86a87b423 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-192.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-192.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-192 description: > Object.defineProperty - 'writable' property in 'Attributes' is a String object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { writable: new String("bbq") }); @@ -20,6 +18,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-193.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-193.js index bab0e5c30..66f9558d0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-193.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-193.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-193 description: > Object.defineProperty - 'writable' property in 'Attributes' is a Boolean object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { writable: new Boolean(true) }); @@ -20,6 +18,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-194.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-194.js index 8c1013f03..df8ac1084 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-194.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-194.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-194 description: > Object.defineProperty - 'writable' property in 'Attributes' is a Number object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { writable: new Number(123) }); @@ -20,6 +18,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-195.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-195.js index 68c0226d8..339bfc4c2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-195.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-195.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-195 description: > Object.defineProperty - 'writable' property in 'Attributes' is the Math object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { writable: Math }); @@ -20,6 +18,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-196.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-196.js index 1fed11a0f..2ce077a6e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-196.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-196.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-196 description: > Object.defineProperty - 'writable' property in 'Attributes' is a Date object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { writable: new Date() }); @@ -20,6 +18,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-197.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-197.js index 1b7d2416e..550d69b6b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-197.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-197.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-197 description: > Object.defineProperty - 'writable' property in 'Attributes' is a RegExp object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { @@ -22,6 +20,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite && afterWrite; - } -runTestCase(testcase); +assert(beforeWrite, 'beforeWrite !== true'); +assert(afterWrite, 'afterWrite !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-198.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-198.js index dbfc2e643..f5ccb8883 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-198.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-198.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-198 description: > Object.defineProperty - 'writable' property in 'Attributes' is the JSON object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { writable: JSON }); @@ -20,6 +18,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-199.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-199.js index c3bbdadc0..ffd301e24 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-199.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-199.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-199 description: > Object.defineProperty - 'writable' property in 'Attributes' is a Error object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { writable: new SyntaxError() }); @@ -20,6 +18,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-20.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-20.js index 6fb998df0..1873ba03e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-20.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-20.js @@ -6,11 +6,8 @@ es5id: 15.2.3.6-3-20 description: > Object.defineProperty - 'enumerable' property in 'Attributes' is present (8.10.5 step 3) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var accessed = false; @@ -23,6 +20,6 @@ function testcase() { accessed = true; } } - return !accessed && obj.hasOwnProperty("property"); - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-200.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-200.js index d744016c7..286cb4f5d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-200.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-200.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-200 description: > Object.defineProperty - 'writable' property in 'Attributes' is the Argument object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var argObj = (function () { return arguments; })(1, true, "a"); @@ -22,6 +20,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-202.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-202.js index c48f399e2..1a92e780e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-202.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-202.js @@ -6,12 +6,9 @@ es5id: 15.2.3.6-3-202 description: > Object.defineProperty - 'writable' property in 'Attributes' is the global object (8.10.5 step 6.b) -includes: - - runTestCase.js - - fnGlobalObject.js +includes: [fnGlobalObject.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { @@ -24,6 +21,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-203.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-203.js index d9485f69e..cb0c0e497 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-203.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-203.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'writable' property in 'Attributes' is treated as true when it is a string(value is 'false') (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { writable: "false" }); @@ -21,6 +19,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-204.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-204.js index f1d936065..a8d61b311 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-204.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-204.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-204 description: > Object.defineProperty - 'writable' property in 'Attributes' is treated as true when it is new Boolean(false) (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { writable: new Boolean(false) }); @@ -20,6 +18,5 @@ function testcase() { var afterWrite = (obj.property === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-205.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-205.js index d8ee0f61b..4d1f8183b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-205.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-205.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-205 description: > Object.defineProperty - 'get' property in 'Attributes' is present (8.10.5 step 7) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { @@ -18,6 +16,4 @@ function testcase() { } }); - return obj.property === "present"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "present", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-206.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-206.js index bb8d9995e..004e92a78 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-206.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-206.js @@ -6,16 +6,13 @@ es5id: 15.2.3.6-3-206 description: > Object.defineProperty - 'get' property in 'Attributes' is not present (8.10.5 step 7) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { set: function () {} }); - return typeof obj.property === "undefined" && obj.hasOwnProperty("property"); - } -runTestCase(testcase); +assert.sameValue(typeof obj.property, "undefined", 'typeof obj.property'); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-207.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-207.js index 954ed3da2..720e1e1c0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-207.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-207.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-207 description: > Object.defineProperty - 'get' property in 'Attributes' is own data property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var attributes = { get: function () { @@ -19,6 +17,4 @@ function testcase() { Object.defineProperty(obj, "property", attributes); - return obj.property === "ownDataProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownDataProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-208.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-208.js index f2effda83..3be19510a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-208.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-208.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-208 description: > Object.defineProperty - 'get' property in 'Attributes' is an inherited data property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = { get: function () { @@ -24,6 +22,4 @@ function testcase() { Object.defineProperty(obj, "property", child); - return obj.property === "inheritedDataProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "inheritedDataProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-209.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-209.js index 4ef877274..06e83faf6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-209.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-209.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'get' property in 'Attributes' is own data property that overrides an inherited data property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = { get: function () { @@ -28,6 +26,4 @@ function testcase() { Object.defineProperty(obj, "property", child); - return obj.property === "ownDataProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownDataProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-21.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-21.js index 700b211e0..24baf80a0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-21.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-21.js @@ -6,11 +6,8 @@ es5id: 15.2.3.6-3-21 description: > Object.defineProperty - 'enumerable' property in 'Attributes' is not present (8.10.5 step 3) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; var attr = {}; @@ -22,6 +19,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-210.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-210.js index c94409911..52122a629 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-210.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-210.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'get' property in 'Attributes' 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 = {}; var fun = function () { @@ -34,6 +32,4 @@ function testcase() { Object.defineProperty(obj, "property", child); - return obj.property === "ownDataProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownDataProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-211.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-211.js index ce1254ff1..543ef14fb 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-211.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-211.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-211 description: > Object.defineProperty - 'get' property in 'Attributes' is own accessor property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var attributes = {}; @@ -23,6 +21,4 @@ function testcase() { Object.defineProperty(obj, "property", attributes); - return obj.property === "ownAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownAccessorProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-212.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-212.js index 7ec4f0f1e..9cf8718b8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-212.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-212.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-212 description: > Object.defineProperty - 'get' property in 'Attributes' is an inherited accessor property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; Object.defineProperty(proto, "get", { @@ -27,6 +25,4 @@ function testcase() { Object.defineProperty(obj, "property", child); - return obj.property === "inheritedAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "inheritedAccessorProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-213.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-213.js index 3793e6032..2b51e1554 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-213.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-213.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'get' property in 'Attributes' 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 = { get: function () { @@ -32,6 +30,4 @@ function testcase() { Object.defineProperty(obj, "property", child); - return obj.property === "ownAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownAccessorProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-214.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-214.js index a2bfe24c1..b740fedec 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-214.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-214.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'get' property in 'Attributes' 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 = {}; Object.defineProperty(proto, "get", { @@ -35,6 +33,4 @@ function testcase() { Object.defineProperty(obj, "property", child); - return obj.property === "ownAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "ownAccessorProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-215.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-215.js index 551e510b7..0e03885d0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-215.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-215.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-215 description: > Object.defineProperty - 'get' property in 'Attributes' is own accessor property without a get function (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var attributes = {}; @@ -19,6 +17,5 @@ function testcase() { Object.defineProperty(obj, "property", attributes); - return typeof obj.property === "undefined" && obj.hasOwnProperty("property"); - } -runTestCase(testcase); +assert.sameValue(typeof obj.property, "undefined", 'typeof obj.property'); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-216.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-216.js index b866c7431..f80e5aa70 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-216.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-216.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'get' property in 'Attributes' 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 = {}; Object.defineProperty(proto, "get", { @@ -31,6 +29,5 @@ function testcase() { Object.defineProperty(obj, "property", child); - 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/defineProperty/15.2.3.6-3-217.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-217.js index 8eb3942d6..4454a148e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-217.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-217.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'get' property in 'Attributes' is an inherited accessor property without a get function (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; Object.defineProperty(proto, "get", { @@ -24,6 +22,5 @@ function testcase() { Object.defineProperty(obj, "property", child); - 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/defineProperty/15.2.3.6-3-218.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-218.js index 813608010..4b1b50bb7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-218.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-218.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var funObj = function () { }; @@ -21,6 +19,4 @@ function testcase() { Object.defineProperty(obj, "property", funObj); - return obj.property === "functionGetProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "functionGetProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-219.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-219.js index d424bd867..4586f5b9d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-219.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-219.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var arrObj = []; @@ -21,6 +19,4 @@ function testcase() { Object.defineProperty(obj, "property", arrObj); - return obj.property === "arrayGetProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "arrayGetProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-22.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-22.js index 18c385f65..e09e9b43b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-22.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-22.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-22 description: > Object.defineProperty - 'enumerable' property in 'Attributes' is own data property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -22,6 +20,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-220.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-220.js index 1388b6ef4..90284ea2d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-220.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-220.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var strObj = new String(); @@ -21,6 +19,4 @@ function testcase() { Object.defineProperty(obj, "property", strObj); - return obj.property === "stringGetProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "stringGetProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-221.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-221.js index c3a6f5464..d23d5d32a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-221.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-221.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var boolObj = new Boolean(true); @@ -21,6 +19,4 @@ function testcase() { Object.defineProperty(obj, "property", boolObj); - return obj.property === "booleanGetProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "booleanGetProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-222.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-222.js index a2978c19e..539969123 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-222.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-222.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var numObj = new Number(-2); @@ -21,6 +19,4 @@ function testcase() { Object.defineProperty(obj, "property", numObj); - return obj.property === "numberGetProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "numberGetProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-224.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-224.js index bffc291f5..aff1cffe0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-224.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-224.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var dateObj = new Date(); @@ -21,6 +19,4 @@ function testcase() { Object.defineProperty(obj, "property", dateObj); - return obj.property === "dateGetProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "dateGetProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-225.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-225.js index 05e477ab9..df394a642 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-225.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-225.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a RegExp object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var regObj = new RegExp(); @@ -21,6 +19,4 @@ function testcase() { Object.defineProperty(obj, "property", regObj); - return obj.property === "regExpGetProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "regExpGetProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-227.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-227.js index c1c524dd5..a61ca0f0c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-227.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-227.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var errObj = new Error(); @@ -21,6 +19,4 @@ function testcase() { Object.defineProperty(obj, "property", errObj); - return obj.property === "errorGetProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "errorGetProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-228.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-228.js index 15a13c135..abacba3aa 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-228.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-228.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var argObj = (function () { return arguments; })(); @@ -21,6 +19,4 @@ function testcase() { Object.defineProperty(obj, "property", argObj); - return obj.property === "argumentGetProperty"; - } -runTestCase(testcase); +assert.sameValue(obj.property, "argumentGetProperty", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-23.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-23.js index ed712ea3e..bb1b20d09 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-23.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-23.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-23 description: > Object.defineProperty - 'enumerable' property in 'Attributes' is an inherited data property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -30,6 +28,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-231.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-231.js index a323fbfff..3352bff3c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-231.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-231.js @@ -6,16 +6,13 @@ es5id: 15.2.3.6-3-231 description: > Object.defineProperty - value of 'get' property in 'Attributes' is undefined (8.10.5 step 7.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { get: undefined }); - 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/defineProperty/15.2.3.6-3-232.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-232.js index 6aa61c654..1556b1c7b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-232.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-232.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-232 description: > Object.defineProperty - value of 'get' property in 'Attributes' is a function (8.10.5 step 7.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { @@ -18,6 +16,5 @@ function testcase() { } }); - return obj.hasOwnProperty("property") && obj.property === "getFunction"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(obj.property, "getFunction", 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-235.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-235.js index cdfd17885..e4b65b842 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-235.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-235.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-235 description: > Object.defineProperty - 'set' property in 'Attributes' is present (8.10.5 step 8) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var data = "data"; @@ -21,6 +19,5 @@ function testcase() { obj.property = "overrideData"; - return obj.hasOwnProperty("property") && data === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-237.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-237.js index 3606bfd82..6f940328b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-237.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-237.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-237 description: > Object.defineProperty - 'set' property in 'Attributes' is own data property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var data = "data"; @@ -21,6 +19,5 @@ function testcase() { obj.property = "overrideData"; - return obj.hasOwnProperty("property") && data === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-238.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-238.js index 688f18d70..ee2a0704c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-238.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-238.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-238 description: > Object.defineProperty - 'set' property in 'Attributes' is an inherited data property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var data = "data"; var proto = { @@ -27,6 +25,5 @@ function testcase() { obj.property = "overrideData"; - return obj.hasOwnProperty("property") && data === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-239.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-239.js index c0ad75f03..fc8ab6600 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-239.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-239.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'set' property in 'Attributes' is own data property that overrides an inherited data property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var data1 = "data"; var data2 = "data"; @@ -32,6 +30,6 @@ function testcase() { obj.property = "overrideData"; - return obj.hasOwnProperty("property") && data1 === "data" && data2 === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data1, "data", 'data1'); +assert.sameValue(data2, "overrideData", 'data2'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-24.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-24.js index a3221c86f..bccb1de1e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-24.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-24.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'enumerable' property in 'Attributes' 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 +33,4 @@ function testcase() { } } - return accessed; - } -runTestCase(testcase); +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-240.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-240.js index fdd1ac00f..3a148ce82 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-240.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-240.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'set' property in 'Attributes' is own data property that overrides an inherited accessor property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; var data1 = "data"; @@ -38,6 +36,6 @@ function testcase() { obj.property = "overrideData"; - return obj.hasOwnProperty("property") && data1 === "data" && data2 === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data1, "data", 'data1'); +assert.sameValue(data2, "overrideData", 'data2'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-241.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-241.js index 8811a220b..17bf99c8a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-241.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-241.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-241 description: > Object.defineProperty - 'set' property in 'Attributes' is own accessor property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var data = "data"; var attributes = {}; @@ -24,6 +22,5 @@ function testcase() { Object.defineProperty(obj, "property", attributes); obj.property = "ownAccessorProperty"; - return obj.hasOwnProperty("property") && data === "ownAccessorProperty"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data, "ownAccessorProperty", 'data'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-242.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-242.js index 6ea449a37..132baba02 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-242.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-242.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-242 description: > Object.defineProperty - 'set' property in 'Attributes' is an inherited accessor property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; var data = "data"; @@ -29,6 +27,5 @@ function testcase() { Object.defineProperty(obj, "property", child); obj.property = "inheritedAccessorProperty"; - return obj.hasOwnProperty("property") && data === "inheritedAccessorProperty"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data, "inheritedAccessorProperty", 'data'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-243.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-243.js index 507afc20c..f343f73a4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-243.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-243.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'set' property in 'Attributes' is own accessor property that overrides an inherited data property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var data1 = "data"; var data2 = "data"; @@ -36,6 +34,6 @@ function testcase() { Object.defineProperty(obj, "property", child); obj.property = "ownAccessorProperty"; - return obj.hasOwnProperty("property") && data1 === "data" && data2 === "ownAccessorProperty"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data1, "data", 'data1'); +assert.sameValue(data2, "ownAccessorProperty", 'data2'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-244.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-244.js index 1072ac07c..1696066e4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-244.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-244.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'set' property in 'Attributes' is own accessor property that overrides an inherited accessor property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; var data1 = "data"; @@ -38,6 +36,6 @@ function testcase() { Object.defineProperty(obj, "property", child); obj.property = "ownAccessorProperty"; - return obj.hasOwnProperty("property") && data1 === "data" && data2 === "ownAccessorProperty"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data1, "data", 'data1'); +assert.sameValue(data2, "ownAccessorProperty", 'data2'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-248.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-248.js index 2bcb5703d..2f473b986 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-248.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-248.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var data = "data"; var funObj = function () { }; @@ -22,6 +20,5 @@ function testcase() { Object.defineProperty(obj, "property", funObj); obj.property = "overrideData"; - return obj.hasOwnProperty("property") && data === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-249.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-249.js index b05b8c0e4..dce84e78b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-249.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-249.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var data = "data"; var arrObj = []; @@ -22,6 +20,5 @@ function testcase() { Object.defineProperty(obj, "property", arrObj); obj.property = "overrideData"; - return obj.hasOwnProperty("property") && data === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-25.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-25.js index e5ed357aa..2b278d63b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-25.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-25.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'enumerable' property in 'Attributes' is own data property that overrides an inherited accessor property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -37,6 +35,4 @@ function testcase() { } } - return accessed; - } -runTestCase(testcase); +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-250.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-250.js index eb7197b0a..bfededf6b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-250.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-250.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var strObj = new String(); var data = "data"; @@ -22,6 +20,5 @@ function testcase() { Object.defineProperty(obj, "property", strObj); obj.property = "overrideData"; - return obj.hasOwnProperty("property") && data === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-251.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-251.js index f36d1c305..9bbccaff9 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-251.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-251.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var data = "data"; var boolObj = new Boolean(true); @@ -22,6 +20,5 @@ function testcase() { Object.defineProperty(obj, "property", boolObj); obj.property = "overrideData"; - return obj.hasOwnProperty("property") && data === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-252.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-252.js index f30a42abb..549dcd00e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-252.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-252.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var data = "data"; var numObj = new Number(-2); @@ -22,6 +20,5 @@ function testcase() { Object.defineProperty(obj, "property", numObj); obj.property = "overrideData"; - return obj.hasOwnProperty("property") && data === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-254.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-254.js index 32c2e69be..215cd639d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-254.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-254.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var data = "data"; var dateObj = new Date(); @@ -22,6 +20,5 @@ function testcase() { Object.defineProperty(obj, "property", dateObj); obj.property = "overrideData"; - return obj.hasOwnProperty("property") && data === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-255.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-255.js index 521f12042..058730c2f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-255.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-255.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a RegExp object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var data = "data"; var regObj = new RegExp(); @@ -22,6 +20,5 @@ function testcase() { Object.defineProperty(obj, "property", regObj); obj.property = "overrideData"; - return obj.hasOwnProperty("property") && data === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-257.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-257.js index 731d5dda8..944e77f98 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-257.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-257.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var data = "data"; var errObj = new Error(); @@ -22,6 +20,5 @@ function testcase() { Object.defineProperty(obj, "property", errObj); obj.property = "overrideData"; - return obj.hasOwnProperty("property") && data === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-258.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-258.js index 5d21ad400..3ec7fdcf0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-258.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-258.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var data = "data"; var argObj = (function () { return arguments; })(); @@ -21,6 +19,5 @@ function testcase() { Object.defineProperty(obj, "property", argObj); obj.property = "overrideData"; - return obj.hasOwnProperty("property") && data === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-26.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-26.js index e1e533476..cddcf00fa 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-26.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-26.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-26 description: > Object.defineProperty - 'enumerable' property in 'Attributes' is own accessor property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -27,6 +25,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-262.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-262.js index c37a166aa..0b8522c7f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-262.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-262.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-262 description: > Object.defineProperty - value of 'set' property in 'Attributes' is a function (8.10.5 step 8.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var data = "data"; @@ -20,6 +18,5 @@ function testcase() { }); obj.property = "overrideData"; - return obj.hasOwnProperty("property") && data === "overrideData"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-27.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-27.js index b8b99e547..83cb14573 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-27.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-27.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-27 description: > Object.defineProperty - 'enumerable' property in 'Attributes' is an inherited accessor property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -32,6 +30,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-28.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-28.js index 651055fbd..0de7fce4a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-28.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-28.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'enumerable' property in 'Attributes' 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; @@ -34,6 +32,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-29.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-29.js index 5c54d5dfc..665c3218e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-29.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-29.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'enumerable' property in 'Attributes' is own accessor property that overrides an inherited accessor property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; var proto = {}; @@ -39,6 +37,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-30.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-30.js index 0c0925fd9..54be326f7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-30.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-30.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-30 description: > Object.defineProperty - 'enumerable' property in 'Attributes' is own accessor property without a get function (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -25,6 +23,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-31.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-31.js index 6c1d1e2d4..476cf5038 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-31.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-31.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'enumerable' property in 'Attributes' 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 accessed = false; var proto = {}; @@ -37,6 +35,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-32.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-32.js index 4f7ac85ca..b1981975f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-32.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-32.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'enumerable' property in 'Attributes' is an inherited accessor property without a get function (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; var proto = {}; @@ -31,6 +29,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-33.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-33.js index 3aead0fa9..98980b1d5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-33.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-33.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -25,6 +23,4 @@ function testcase() { } } - return accessed; - } -runTestCase(testcase); +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-34.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-34.js index 94014a32d..83aba5145 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-34.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-34.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -25,6 +23,4 @@ function testcase() { } } - return accessed; - } -runTestCase(testcase); +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-35.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-35.js index c465992eb..00b780f0a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-35.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-35.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -25,6 +23,4 @@ function testcase() { } } - return accessed; - } -runTestCase(testcase); +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-36.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-36.js index 974b4997f..2ca7f9ab9 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-36.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-36.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -25,6 +23,4 @@ function testcase() { } } - return accessed; - } -runTestCase(testcase); +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-37.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-37.js index f30fcb241..291f1b0e3 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-37.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-37.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -25,6 +23,4 @@ function testcase() { } } - return accessed; - } -runTestCase(testcase); +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-39.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-39.js index cd25ba56d..476162159 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-39.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-39.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -24,6 +22,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-40.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-40.js index b3e4a16d4..46975d82c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-40.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-40.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an RegExp object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -25,6 +23,4 @@ function testcase() { } } - return accessed; - } -runTestCase(testcase); +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-42.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-42.js index 495cbb94f..909994b82 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-42.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-42.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -25,6 +23,4 @@ function testcase() { } } - return accessed; - } -runTestCase(testcase); +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-43.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-43.js index 2481988a4..8c2be1cae 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-43.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-43.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -25,6 +23,4 @@ function testcase() { } } - return accessed; - } -runTestCase(testcase); +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-46.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-46.js index dadd58c56..9e6003e7c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-46.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-46.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-46 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is undefined (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -22,6 +20,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-47.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-47.js index 97daddb85..2ed3c5efd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-47.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-47.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-47 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is null (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-48.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-48.js index 0191658ae..d1e420ea8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-48.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-48.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-48 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is true (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-49.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-49.js index 9bf3ba1cd..bed11ffd6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-49.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-49.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-49 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is false (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-50.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-50.js index 0664c777d..91a8d0906 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-50.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-50.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-50 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is 0 (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-51.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-51.js index f255817dc..ddea2dfa7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-51.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-51.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-51 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is +0 (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-52.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-52.js index 111a8524b..2fb433b80 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-52.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-52.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-52 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is -0 (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-53.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-53.js index 618eb75bb..aaa5fef8e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-53.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-53.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-53 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is NaN (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-54.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-54.js index 8f2fa8511..479ed01b7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-54.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-54.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-54 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is a positive number (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-55.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-55.js index 51bd1b07d..bba81e43e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-55.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-55.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-55 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is a negative number (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-56.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-56.js index 246958d8e..ff875f28a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-56.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-56.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-56 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is an empty string (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-57.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-57.js index 941d043d3..ec0bb7376 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-57.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-57.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-57 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is a non-empty string (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-58.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-58.js index 4b981b5b2..be5dd1d8d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-58.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-58.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-58 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is a Function object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -22,6 +20,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-59.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-59.js index 3fbe67f51..404f491ef 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-59.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-59.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-59 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is an Array object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-60.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-60.js index e3034bca4..b8a43aeb7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-60.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-60.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-60 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is a String Object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-61.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-61.js index ceae035c1..1e963978c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-61.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-61.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-61 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is a Boolean Object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-62.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-62.js index ee29f6ca9..60be30065 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-62.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-62.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-62 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is a Number Object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-63.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-63.js index 45d8c53cc..a18690aac 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-63.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-63.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-63 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is the Math Object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-64.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-64.js index b82227c84..8ede8c20e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-64.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-64.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-64 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is a Date Object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-65.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-65.js index 3318fc2c6..57380cd63 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-65.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-65.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-65 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is a RegExp Object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-66.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-66.js index aa47477ab..ec2550435 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-66.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-66.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-66 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is the JSON Object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-67.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-67.js index bd30d6be2..fe4c45f0e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-67.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-67.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-67 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is an Error Object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -20,6 +18,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-68.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-68.js index 4e5670710..842b98eb2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-68.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-68.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-68 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is an Arguments Object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; var argObj = (function () { return arguments; })(0, 1, 2); @@ -21,6 +19,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-70.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-70.js index e42112860..ba161b0f6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-70.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-70.js @@ -6,12 +6,9 @@ es5id: 15.2.3.6-3-70 description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' 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; @@ -22,6 +19,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-71.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-71.js index 475e786bb..d732a9523 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-71.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-71.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' is treated as true when it is a string (value is 'false') (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var accessed = false; @@ -21,6 +19,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-72.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-72.js index 854ab849f..64bd3d7e2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-72.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-72.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - value of 'enumerable' property in 'Attributes' 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; @@ -21,6 +19,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-75.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-75.js index 5dbc26706..57de46485 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-75.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-75.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-75 description: > Object.defineProperty - 'configurable' property in 'Attributes' is own data property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; Object.defineProperty(obj, "property", { @@ -22,6 +20,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-77.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-77.js index aef440656..9d80e8cb7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-77.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-77.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'configurable' property in 'Attributes' is own data property that overrides an inherited data property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var proto = { @@ -31,6 +29,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-78.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-78.js index 558de6488..7373f4374 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-78.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-78.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'configurable' property in 'Attributes' is own data property that overrides an inherited accessor property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = { }; @@ -37,6 +35,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-79.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-79.js index 27aad60b1..175d52cd6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-79.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-79.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-79 description: > Object.defineProperty - 'configurable' property in 'Attributes' is own accessor property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var attr = {}; @@ -27,6 +25,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-80.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-80.js index 9174edb63..c89606b69 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-80.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-80.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-3-80 description: > Object.defineProperty - 'configurable' property in 'Attributes' is an inherited accessor property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -32,6 +30,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-81.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-81.js index 225758235..a4f3021f6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-81.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-81.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'configurable' property in 'Attributes' is own accessor property that overrides an inherited data property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = { @@ -35,6 +33,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-82.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-82.js index b6ffa2939..ac8473eff 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-82.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-82.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'configurable' property in 'Attributes' is own accessor property that overrides an inherited accessor property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var proto = {}; @@ -38,6 +36,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-86.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-86.js index 1fe52cc2e..bccb67715 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-86.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-86.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var funObj = function (a, b) { @@ -27,6 +25,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-87.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-87.js index 5108d59d0..ed16679ea 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-87.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-87.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var arrObj = [1, 2, 3]; @@ -25,6 +23,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-88.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-88.js index c196bf2b6..4060b4f3a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-88.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-88.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var strObj = new String("abc"); @@ -25,6 +23,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-89.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-89.js index d741fb1e9..f39c1ed8d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-89.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-89.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var boolObj = new Boolean(true); @@ -25,6 +23,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-90.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-90.js index 5bba7fe0c..e3d3251d9 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-90.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-90.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var numObj = new Number(-2); @@ -25,6 +23,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-92.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-92.js index a3bc8f14d..b245dc17d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-92.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-92.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var dateObj = new Date(); @@ -25,6 +23,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-93.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-93.js index 3cc358ef3..3657fd461 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-93.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-93.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an RegExp object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var regObj = new RegExp(); @@ -25,6 +23,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-95.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-95.js index a804fa364..f0063df45 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-95.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-95.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { }; var errObj = new Error(); @@ -25,6 +23,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-96.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-96.js index 8cb7faeb0..97b7217a6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-96.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-96.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var argObj = (function () { return arguments; })(); @@ -24,7 +22,5 @@ function testcase() { var afterDeleted = obj.hasOwnProperty("property"); - return beforeDeleted === true && afterDeleted === false; - - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-111.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-111.js index 97562c8c0..c61565170 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-111.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-111.js @@ -7,11 +7,8 @@ description: > Object.defineProperty - 'name' and 'desc' are accessor properties, name.[[Set]] is present and desc.[[Set]] is undefined (8.12.9 step 12) -includes: [runTestCase.js] ---*/ -function testcase() { - var obj = {}; function getFunc() { @@ -36,6 +33,6 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "foo"); - return obj.hasOwnProperty("foo") && typeof (desc.set) === "undefined"; - } -runTestCase(testcase); + +assert(obj.hasOwnProperty("foo"), 'obj.hasOwnProperty("foo") !== true'); +assert.sameValue(typeof (desc.set), "undefined", 'typeof (desc.set)'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-126.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-126.js index 1315a184c..17c5c77b0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-126.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-126.js @@ -7,17 +7,12 @@ description: > Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is null (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = [0, 1]; Object.defineProperty(arrObj, "length", { value: null }); - return arrObj.length === 0; - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 0, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-127.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-127.js index 418e14ad0..ca691383c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-127.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-127.js @@ -7,17 +7,14 @@ description: > Object.defineProperty - '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 arrObj = [0, 1]; Object.defineProperty(arrObj, "length", { value: false }); - return arrObj.length === 0 && !arrObj.hasOwnProperty("0") && !arrObj.hasOwnProperty("1"); - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 0, 'arrObj.length'); +assert.sameValue(arrObj.hasOwnProperty("0"), false, 'arrObj.hasOwnProperty("0")'); +assert.sameValue(arrObj.hasOwnProperty("1"), false, 'arrObj.hasOwnProperty("1")'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-128.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-128.js index a1f49d180..29a46e6e9 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-128.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-128.js @@ -7,17 +7,12 @@ description: > Object.defineProperty - '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 arrObj = []; Object.defineProperty(arrObj, "length", { value: true }); - return arrObj.length === 1; - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 1, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-129.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-129.js index 87b6a515e..6bb132493 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-129.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-129.js @@ -7,17 +7,12 @@ description: > Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is not thrown when the [[Value]] field of 'desc' is 0 (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = [0, 1]; Object.defineProperty(arrObj, "length", { value: 0 }); - return arrObj.length === 0; - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 0, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-130.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-130.js index 9abd25c2b..d4d9bf8b7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-130.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-130.js @@ -7,17 +7,12 @@ description: > Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is not thrown when the [[Value]] field of 'desc' is +0 (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = [0, 1]; Object.defineProperty(arrObj, "length", { value: +0 }); - return arrObj.length === 0; - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 0, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-131.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-131.js index 33ef43f41..3a0b3de42 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-131.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-131.js @@ -7,16 +7,12 @@ description: > Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is not thrown when the [[Value]] field of 'desc' is -0 (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = [0, 1]; Object.defineProperty(arrObj, "length", { value: -0 }); - return arrObj.length === 0; - } -runTestCase(testcase); + +assert.sameValue(arrObj.length, 0, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-132.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-132.js index c1a02d42a..d431841b1 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-132.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-132.js @@ -7,16 +7,12 @@ description: > Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is not thrown when the [[Value]] field of 'desc' is a positive number (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = []; Object.defineProperty(arrObj, "length", { value: 12 }); - return arrObj.length === 12; - } -runTestCase(testcase); + +assert.sameValue(arrObj.length, 12, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-137.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-137.js index d7463717f..1e58b7dad 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-137.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-137.js @@ -8,17 +8,12 @@ description: > property of 'O', test RangeError exception is not thrown when 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 arrObj = []; Object.defineProperty(arrObj, "length", { value: "2" }); - return arrObj.length === 2; - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 2, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-14.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-14.js index cb5b1e859..6891f07e5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-14.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-14.js @@ -10,10 +10,8 @@ es5id: 15.2.3.6-4-14 description: > Object.defineProperty permits changing data property to accessor property for configurable properties -includes: [runTestCase.js] ---*/ -function testcase() { var o = {}; // create a data property. In this case, @@ -32,10 +30,6 @@ function testcase() { var d2 = Object.getOwnPropertyDescriptor(o, "foo"); - if (d2.get === getter && - d2.enumerable === true && - d2.configurable === true) { - return true; - } - } -runTestCase(testcase); +assert.sameValue(d2.get, getter, 'd2.get'); +assert.sameValue(d2.enumerable, true, 'd2.enumerable'); +assert.sameValue(d2.configurable, true, 'd2.configurable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-142.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-142.js index b58401faa..8880cf8cf 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-142.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-142.js @@ -7,16 +7,12 @@ description: > Object.defineProperty - '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 arrObj = []; Object.defineProperty(arrObj, "length", { value: "2E3" }); - return arrObj.length === 2E3; - } -runTestCase(testcase); + +assert.sameValue(arrObj.length, 2E3, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-143.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-143.js index 22814ff8d..55b9b1ffd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-143.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-143.js @@ -7,16 +7,12 @@ description: > Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing a hex number (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = []; Object.defineProperty(arrObj, "length", { value: "0x00B" }); - return arrObj.length === 0x00B; - } -runTestCase(testcase); + +assert.sameValue(arrObj.length, 0x00B, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-144.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-144.js index 1a2dc2f8b..be700ec76 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-144.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-144.js @@ -7,16 +7,12 @@ description: > Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing a number with leading zeros (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = []; Object.defineProperty(arrObj, "length", { value: "0002.0" }); - return arrObj.length === 2; - } -runTestCase(testcase); + +assert.sameValue(arrObj.length, 2, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-146.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-146.js index af9a768ae..565369fb7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-146.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-146.js @@ -7,11 +7,8 @@ description: > Object.defineProperty - '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 method (15.4.5.1 step 3.c) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = []; Object.defineProperty(arrObj, "length", { @@ -21,7 +18,5 @@ function testcase() { } } }); - return arrObj.length === 2; - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 2, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-147.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-147.js index 67b40a9a1..4274ebbb3 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-147.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-147.js @@ -7,11 +7,8 @@ description: > Object.defineProperty - '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 arrObj = []; Object.defineProperty(arrObj, "length", { @@ -21,7 +18,5 @@ function testcase() { } } }); - return arrObj.length === 2; - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 2, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-148.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-148.js index 24784a4d6..19cb735ae 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-148.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-148.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 arrObj = []; var toStringAccessed = false; var valueOfAccessed = false; @@ -30,7 +27,7 @@ function testcase() { } } }); - return arrObj.length === 2 && toStringAccessed && valueOfAccessed; - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 2, 'arrObj.length'); +assert(toStringAccessed, 'toStringAccessed !== true'); +assert(valueOfAccessed, 'valueOfAccessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-149.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-149.js index 86c1df18b..dbcbc3fa3 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-149.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-149.js @@ -7,11 +7,8 @@ description: > Object.defineProperty - '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 arrObj = []; var toStringAccessed = false; var valueOfAccessed = false; @@ -29,7 +26,7 @@ function testcase() { } } }); - return arrObj.length === 3 && !toStringAccessed && valueOfAccessed; - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 3, 'arrObj.length'); +assert.sameValue(toStringAccessed, false, 'toStringAccessed'); +assert(valueOfAccessed, 'valueOfAccessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-15.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-15.js index 578e94d50..115f1864e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-15.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-15.js @@ -10,10 +10,8 @@ es5id: 15.2.3.6-4-15 description: > Object.defineProperty permits changing accessor property to data property for configurable properties -includes: [runTestCase.js] ---*/ -function testcase() { var o = {}; // define an accessor property @@ -30,11 +28,7 @@ function testcase() { Object.defineProperty(o, "foo", desc); var d2 = Object.getOwnPropertyDescriptor(o, "foo"); - if (d2.value === 101 && - d2.writable === false && - d2.enumerable === false && - d2.configurable === true) { - return true; - } - } -runTestCase(testcase); +assert.sameValue(d2.value, 101, 'd2.value'); +assert.sameValue(d2.writable, false, 'd2.writable'); +assert.sameValue(d2.enumerable, false, 'd2.enumerable'); +assert.sameValue(d2.configurable, true, 'd2.configurable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-151.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-151.js index c92b6deda..4cce14207 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-151.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-151.js @@ -8,11 +8,8 @@ description: > property of 'O', and the [[Value]] field of 'desc' is an Object with an own toString method and an inherited valueOf method (15.4.5.1 step 3.c), test that the inherited valueOf method is used -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = []; var toStringAccessed = false; var valueOfAccessed = false; @@ -36,7 +33,7 @@ function testcase() { Object.defineProperty(arrObj, "length", { value: child }); - return arrObj.length === 2 && !toStringAccessed && valueOfAccessed; - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 2, 'arrObj.length'); +assert.sameValue(toStringAccessed, false, 'toStringAccessed'); +assert(valueOfAccessed, 'valueOfAccessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-154.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-154.js index 5291e5bc3..c499969dd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-154.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-154.js @@ -7,18 +7,12 @@ description: > Object.defineProperty - '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 arrObj = []; Object.defineProperty(arrObj, "length", { value: 4294967294 }); - return arrObj.length === 4294967294; - - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 4294967294, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-155.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-155.js index c47bb2078..b9bfd0689 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-155.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-155.js @@ -7,18 +7,12 @@ description: > Object.defineProperty - '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 arrObj = []; Object.defineProperty(arrObj, "length", { value: 4294967295 }); - return arrObj.length === 4294967295; - - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 4294967295, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-159.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-159.js index df937e231..06246ef3e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-159.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-159.js @@ -7,19 +7,16 @@ description: > Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', set the [[Value]] field of 'desc' to a value greater than the existing value of length (15.4.5.1 step 3.f) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = [0, , 2]; Object.defineProperty(arrObj, "length", { value: 5 }); - return arrObj.length === 5 && arrObj[0] === 0 && - !arrObj.hasOwnProperty("1") && arrObj[2] === 2 && - !arrObj.hasOwnProperty("4"); - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 5, 'arrObj.length'); +assert.sameValue(arrObj[0], 0, 'arrObj[0]'); +assert.sameValue(arrObj.hasOwnProperty("1"), false, 'arrObj.hasOwnProperty("1")'); +assert.sameValue(arrObj[2], 2, 'arrObj[2]'); +assert.sameValue(arrObj.hasOwnProperty("4"), false, 'arrObj.hasOwnProperty("4")'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-160.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-160.js index 4b301bb7c..889d911df 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-160.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-160.js @@ -7,17 +7,15 @@ description: > Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', set the [[Value]] field of 'desc' to a value equal to the existing value of length (15.4.5.1 step 3.f) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = [0, , 2]; Object.defineProperty(arrObj, "length", { value: 3 }); - return arrObj.length === 3 && arrObj[0] === 0 && !arrObj.hasOwnProperty("1") && arrObj[2] === 2; - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 3, 'arrObj.length'); +assert.sameValue(arrObj[0], 0, 'arrObj[0]'); +assert.sameValue(arrObj.hasOwnProperty("1"), false, 'arrObj.hasOwnProperty("1")'); +assert.sameValue(arrObj[2], 2, 'arrObj[2]'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-161.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-161.js index a68df7536..881a01347 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-161.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-161.js @@ -8,16 +8,13 @@ description: > property of 'O', set the [[Value]] field of 'desc' to a value lesser than the existing value of length and test that indexes beyond the new length are deleted(15.4.5.1 step 3.f) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = [0, 1]; Object.defineProperty(arrObj, "length", { value: 1 }); - return arrObj.length === 1 && !arrObj.hasOwnProperty("1"); - } -runTestCase(testcase); + +assert.sameValue(arrObj.length, 1, 'arrObj.length'); +assert.sameValue(arrObj.hasOwnProperty("1"), false, 'arrObj.hasOwnProperty("1")'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-165.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-165.js index cfc3b4c20..4a72cda65 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-165.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-165.js @@ -10,11 +10,8 @@ description: > length property is set to true 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 arrObj = [0, 1]; Object.defineProperty(arrObj, "length", { @@ -25,6 +22,5 @@ function testcase() { arrObj.length = 10; - return indexDeleted && arrObj.length === 10; - } -runTestCase(testcase); +assert(indexDeleted, 'indexDeleted !== true'); +assert.sameValue(arrObj.length, 10, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-166.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-166.js index 51d7c9acc..85c2e654d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-166.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-166.js @@ -10,11 +10,8 @@ description: > length property is set to true 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 arrObj = [0, 1]; Object.defineProperty(arrObj, "length", { @@ -26,6 +23,5 @@ function testcase() { arrObj.length = 10; - return indexDeleted && arrObj.length === 10; - } -runTestCase(testcase); +assert(indexDeleted, 'indexDeleted !== true'); +assert.sameValue(arrObj.length, 10, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-178.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-178.js index 44e9feb3d..10a208b9b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-178.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-178.js @@ -8,17 +8,12 @@ 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' is deleted (15.4.5.1 step 3.l.ii) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = [0, 1]; Object.defineProperty(arrObj, "length", { value: 1 }); - return !arrObj.hasOwnProperty("1"); - } -runTestCase(testcase); +assert.sameValue(arrObj.hasOwnProperty("1"), false, 'arrObj.hasOwnProperty("1")'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-179-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-179-1.js index 059f46325..d59c20d30 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-179-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-179-1.js @@ -8,10 +8,8 @@ description: > property of 'O', the [[Value]] field of 'desc' is greater than value of the length property, test value of the length property is same as [[Value]] (15.4.5.1 step 3.l.iii.1) -includes: [runTestCase.js] ---*/ -function testcase() { var arrObj = [0, 1, 2, 3]; Object.defineProperty(arrObj, "1", { @@ -22,6 +20,4 @@ function testcase() { value: 3 }); - return arrObj.length === 3; - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 3, 'arrObj.length'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-182.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-182.js index bf54ebd0e..9f3e38ad0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-182.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-182.js @@ -7,17 +7,12 @@ description: > Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is available String values that convert to numbers (15.4.5.1 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = []; Object.defineProperty(arrObj, "0", { value: 12 }); - return arrObj[0] === 12; - } -runTestCase(testcase); +assert.sameValue(arrObj[0], 12, 'arrObj[0]'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-183.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-183.js index 161afe732..3fa0485eb 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-183.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-183.js @@ -7,16 +7,14 @@ description: > Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is boundary value 2^32 - 2 (15.4.5.1 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var arrObj = []; Object.defineProperty(arrObj, 4294967294, { value: 100 }); - return arrObj.hasOwnProperty("4294967294") && arrObj.length === 4294967295 && arrObj[4294967294] === 100; - } -runTestCase(testcase); +assert(arrObj.hasOwnProperty("4294967294"), 'arrObj.hasOwnProperty("4294967294") !== true'); +assert.sameValue(arrObj.length, 4294967295, 'arrObj.length'); +assert.sameValue(arrObj[4294967294], 100, 'arrObj[4294967294]'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-184.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-184.js index 208c85cad..b3678ae48 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-184.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-184.js @@ -7,16 +7,14 @@ description: > Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is boundary value 2^32 - 1 (15.4.5.1 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var arrObj = []; Object.defineProperty(arrObj, 4294967295, { value: 100 }); - return arrObj.hasOwnProperty("4294967295") && arrObj.length === 0 && arrObj[4294967295] === 100; ; - } -runTestCase(testcase); +assert(arrObj.hasOwnProperty("4294967295"), 'arrObj.hasOwnProperty("4294967295") !== true'); +assert.sameValue(arrObj.length, 0, 'arrObj.length'); +assert.sameValue(arrObj[4294967295], 100, 'arrObj[4294967295]'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-185.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-185.js index 18d3c9093..c99ce7106 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-185.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-185.js @@ -6,16 +6,14 @@ es5id: 15.2.3.6-4-185 description: > Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is boundary value 2^32 (15.4.5.1 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var arrObj = []; Object.defineProperty(arrObj, 4294967296, { value: 100 }); - return arrObj.hasOwnProperty("4294967296") && arrObj.length === 0 && arrObj[4294967296] === 100; - } -runTestCase(testcase); +assert(arrObj.hasOwnProperty("4294967296"), 'arrObj.hasOwnProperty("4294967296") !== true'); +assert.sameValue(arrObj.length, 0, 'arrObj.length'); +assert.sameValue(arrObj[4294967296], 100, 'arrObj[4294967296]'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-186.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-186.js index 9ae21fb2b..0af8105b0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-186.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-186.js @@ -7,16 +7,14 @@ description: > Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is boundary value 2^32 + 1 (15.4.5.1 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var arrObj = []; Object.defineProperty(arrObj, 4294967297, { value: 100 }); - return arrObj.hasOwnProperty("4294967297") && arrObj.length === 0 && arrObj[4294967297] === 100; - } -runTestCase(testcase); +assert(arrObj.hasOwnProperty("4294967297"), 'arrObj.hasOwnProperty("4294967297") !== true'); +assert.sameValue(arrObj.length, 0, 'arrObj.length'); +assert.sameValue(arrObj[4294967297], 100, 'arrObj[4294967297]'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-19.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-19.js index 1278e03a0..a469574ec 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-19.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-19.js @@ -10,10 +10,8 @@ es5id: 15.2.3.6-4-19 description: > Object.defineProperty permits setting a setter (if absent) of non-configurable accessor properties(8.12.9 step 10.a.ii.1) -includes: [runTestCase.js] ---*/ -function testcase() { var o = {}; // create an accessor property; all other attributes default to false. @@ -29,11 +27,7 @@ function testcase() { var d2 = Object.getOwnPropertyDescriptor(o, "foo"); - if (d2.get === getter && - d2.set === undefined && - d2.configurable === false && - d2.enumerable === false) { - return true; - } - } -runTestCase(testcase); +assert.sameValue(d2.get, getter, 'd2.get'); +assert.sameValue(d2.set, undefined, 'd2.set'); +assert.sameValue(d2.configurable, false, 'd2.configurable'); +assert.sameValue(d2.enumerable, false, 'd2.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-206.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-206.js index 3ac2e464b..50a9bc2ad 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-206.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-206.js @@ -8,10 +8,8 @@ description: > named property, 'name' property doesn't exist in 'O', test [[Set]] of 'name' property in 'Attributes' is set as undefined if [[Set]] is absent in accessor descriptor 'desc' (15.4.5.1 step 4.c) -includes: [runTestCase.js] ---*/ -function testcase() { var arrObj = []; var getFunc = function () { }; @@ -23,6 +21,6 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(arrObj, "0"); - return arrObj.hasOwnProperty("0") && desc.hasOwnProperty("set") && typeof desc.set === "undefined"; - } -runTestCase(testcase); +assert(arrObj.hasOwnProperty("0"), 'arrObj.hasOwnProperty("0") !== true'); +assert(desc.hasOwnProperty("set"), 'desc.hasOwnProperty("set") !== true'); +assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-21.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-21.js index d2111326e..edde570bd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-21.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-21.js @@ -10,10 +10,8 @@ es5id: 15.2.3.6-4-21 description: > Object.defineProperty permits setting a getter (if absent) of non-configurable accessor properties(8.12.9 step 11.a.ii) -includes: [runTestCase.js] ---*/ -function testcase() { var o = {}; // create an accessor property; all other attributes default to false. @@ -30,11 +28,7 @@ function testcase() { Object.defineProperty(o, "foo", desc); var d2 = Object.getOwnPropertyDescriptor(o, "foo"); - if (d2.get === getter && - d2.set === setter && - d2.configurable === false && - d2.enumerable === false) { - return true; - } - } -runTestCase(testcase); +assert.sameValue(d2.get, getter, 'd2.get'); +assert.sameValue(d2.set, setter, 'd2.set'); +assert.sameValue(d2.configurable, false, 'd2.configurable'); +assert.sameValue(d2.enumerable, false, 'd2.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-23.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-23.js index d1f70c855..6acf72daa 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-23.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-23.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-23 description: > Object.defineProperty - 'name' is existing an inherited data property (8.12.9 step 1) -includes: [runTestCase.js] ---*/ -function testcase() { var proto = {}; Object.defineProperty(proto, "foo", { value: 11, @@ -23,6 +21,6 @@ function testcase() { Object.defineProperty(obj, "foo", { configurable: true }); - return obj.hasOwnProperty("foo") && (typeof obj.foo) === "undefined"; - } -runTestCase(testcase); + +assert(obj.hasOwnProperty("foo"), 'obj.hasOwnProperty("foo") !== true'); +assert.sameValue(typeof obj.foo, "undefined", 'typeof obj.foo'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-27.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-27.js index ce7d3e345..01f897d3b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-27.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-27.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-27 description: > Object.defineProperty - 'name' is an inherited accessor property (8.12.9 step 1) -includes: [runTestCase.js] ---*/ -function testcase() { var proto = {}; Object.defineProperty(proto, "property", { get: function () { @@ -28,6 +26,6 @@ function testcase() { }, configurable: true }); - return obj.hasOwnProperty("property") && obj.property === 12; - } -runTestCase(testcase); + +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert.sameValue(obj.property, 12, 'obj.property'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-274.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-274.js index 3c89b165c..3ffc0976a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-274.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-274.js @@ -8,11 +8,8 @@ description: > named property, test the length property of 'O' is not changed if ToUint32('name') is less than value of the length property in 'O' (15.4.5.1 step 4.e) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = []; arrObj.length = 3; // default value of length: writable: true, configurable: false, enumerable: false @@ -20,6 +17,5 @@ function testcase() { value: 14 }); - return arrObj.length === 3 && arrObj[1] === 14; - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 3, 'arrObj.length'); +assert.sameValue(arrObj[1], 14, 'arrObj[1]'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-275.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-275.js index ed9f39acc..314b3a9a6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-275.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-275.js @@ -8,11 +8,8 @@ description: > named property, test the length property of 'O' is set as ToUint32('name') + 1 if ToUint32('name') equals to value of the length property in 'O' (15.4.5.1 step 4.e.ii) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = []; arrObj.length = 3; // default value of length: writable: true, configurable: false, enumerable: false @@ -20,6 +17,5 @@ function testcase() { value: 3 }); - return arrObj.length === 4 && arrObj[3] === 3; - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 4, 'arrObj.length'); +assert.sameValue(arrObj[3], 3, 'arrObj[3]'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-276.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-276.js index efa4becea..ec26b3097 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-276.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-276.js @@ -8,17 +8,13 @@ description: > named property, test the length property of 'O' is set as ToUint32('name') + 1 if ToUint32('name') is greater than value of the length property in 'O' (15.4.5.1 step 4.e.ii) -includes: [runTestCase.js] ---*/ -function testcase() { - var arrObj = []; Object.defineProperty(arrObj, "5", { value: 3 }); - return arrObj.length === 6 && arrObj[5] === 3; - } -runTestCase(testcase); +assert.sameValue(arrObj.length, 6, 'arrObj.length'); +assert.sameValue(arrObj[5], 3, 'arrObj[5]'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-32.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-32.js index 337157906..858591bc5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-32.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-32.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-32 description: > Object.defineProperty - 'name' is an inherited accessor property without a get function (8.12.9 step 1) -includes: [runTestCase.js] ---*/ -function testcase() { var proto = {}; Object.defineProperty(proto, "foo", { set: function () { }, @@ -23,6 +21,6 @@ function testcase() { Object.defineProperty(obj, "foo", { configurable: true }); - return obj.hasOwnProperty("foo") && typeof obj.foo === "undefined"; - } -runTestCase(testcase); + +assert(obj.hasOwnProperty("foo"), 'obj.hasOwnProperty("foo") !== true'); +assert.sameValue(typeof obj.foo, "undefined", 'typeof obj.foo'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-325-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-325-1.js index 08e607bb4..e91a4651c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-325-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-325-1.js @@ -9,10 +9,8 @@ description: > [[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 argObj = (function (a, b, c) { return arguments; })(1, 2, 3); var accessed = false; @@ -23,6 +21,5 @@ function testcase() { } }); - return argObj[0] === 12 && accessed; - } -runTestCase(testcase); +assert.sameValue(argObj[0], 12, 'argObj[0]'); +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-325.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-325.js index 5c32e40cc..b0204f081 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-325.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-325.js @@ -8,10 +8,8 @@ description: > 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 argObj = (function () { return arguments; })(1, 2, 3); var accessed = false; @@ -22,6 +20,5 @@ function testcase() { } }); - return argObj[0] === 12 && accessed; - } -runTestCase(testcase); +assert.sameValue(argObj[0], 12, 'argObj[0]'); +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-326.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-326.js index 464a6ead9..4ec0121f3 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-326.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-326.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-326 description: > ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is true) is writable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -21,6 +19,5 @@ function testcase() { var propertyDefineCorrect = (obj.prop === 2010); obj.prop = 1001; - return propertyDefineCorrect && obj.prop === 1001; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(obj.prop, 1001, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-328.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-328.js index 5d8f24047..70c4b2669 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-328.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-328.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-328 description: > ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is true) is deletable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -21,6 +19,6 @@ function testcase() { var beforeDelete = obj.hasOwnProperty("prop"); delete obj.prop; var afterDelete = obj.hasOwnProperty("prop"); - return beforeDelete && !afterDelete; - } -runTestCase(testcase); + +assert(beforeDelete, 'beforeDelete !== true'); +assert.sameValue(afterDelete, false, 'afterDelete'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-329.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-329.js index f9ea888a4..b184812e7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-329.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-329.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update [[Writable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -27,6 +25,7 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc1.writable === true && obj.prop === 2010 && desc2.writable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc1.writable, true, 'desc1.writable'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc2.writable, false, 'desc2.writable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-330.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-330.js index 7d552757d..98ef3f69f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-330.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-330.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update [[enumerable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -27,6 +25,7 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc1.enumerable === true && obj.prop === 2010 && desc2.enumerable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc1.enumerable, true, 'desc1.enumerable'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc2.enumerable, false, 'desc2.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-331.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-331.js index 058e2f199..86300a83e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-331.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-331.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update [[Configurable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -27,6 +25,7 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc1.configurable === true && obj.prop === 2010 && desc2.configurable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc1.configurable, true, 'desc1.configurable'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc2.configurable, false, 'desc2.configurable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-332.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-332.js index 9cb151d78..80b01079f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-332.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-332.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update the data property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is true) to an accessor property -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -29,6 +27,5 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.hasOwnProperty("value") && desc2.get === getFunc; - } -runTestCase(testcase); +assert(desc1.hasOwnProperty("value"), 'desc1.hasOwnProperty("value") !== true'); +assert.sameValue(desc2.get, getFunc, 'desc2.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-10.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-10.js index b59c41205..226f17c35 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-10.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-10.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - indexed data property 'P' with attributes [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: false is writable using simple assignment, 'O' is an Arguments object -includes: [runTestCase.js] ---*/ -function testcase() { var obj = (function () { return arguments; }()); @@ -24,6 +22,5 @@ function testcase() { var verifyValue = (obj[0] === 2010); obj[0] = 1001; - return verifyValue && obj[0] === 1001; - } -runTestCase(testcase); +assert(verifyValue, 'verifyValue !== true'); +assert.sameValue(obj[0], 1001, 'obj[0]'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-11.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-11.js index 5d27bfcd5..e8a45d3f6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-11.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-11.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - indexed property 'P' with attributes [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: false is writable using simple assignment, 'O' is an Arguments object -includes: [runTestCase.js] ---*/ -function testcase() { var obj = (function (x) { return arguments; }(1001)); @@ -23,6 +21,4 @@ function testcase() { }); var verifyValue = (obj[0] === 2010); - return verifyValue; - } -runTestCase(testcase); +assert(verifyValue, 'verifyValue !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-4.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-4.js index bd07a4bfc..1779e740b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-4.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-4.js @@ -7,10 +7,8 @@ description: > Indexed property 'P' with attributes [[Writable]]: true, [[Enumerable]]:true, [[Configurable]]:false is writable using simple assignment, 'A' is an Array Object -includes: [runTestCase.js] ---*/ -function testcase() { var obj = []; Object.defineProperty(obj, "0", { @@ -22,6 +20,5 @@ function testcase() { var verifyValue = (obj[0] === 2010); obj[0] = 1001; - return verifyValue && obj[0] === 1001; - } -runTestCase(testcase); +assert(verifyValue, 'verifyValue !== true'); +assert.sameValue(obj[0], 1001, 'obj[0]'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-5.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-5.js index 8dbf20a18..cb4f8fa5e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-5.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-5.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - named data property 'P' with attributes [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: false is writable using simple assignment, 'O' is an Arguments object -includes: [runTestCase.js] ---*/ -function testcase() { var obj = (function () { return arguments; }()); @@ -24,6 +22,5 @@ function testcase() { var verifyValue = (obj.prop === 2010); obj.prop = 1001; - return verifyValue && obj.prop === 1001; - } -runTestCase(testcase); +assert(verifyValue, 'verifyValue !== true'); +assert.sameValue(obj.prop, 1001, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-9.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-9.js index 94a0c67d2..de964513d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-9.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-9.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - Named property 'P' with attributes [[Writable]]: true, [[Enumerable]]:true, [[Configurable]]:false is writable using simple assignment, 'A' is an Array Object -includes: [runTestCase.js] ---*/ -function testcase() { var obj = []; Object.defineProperty(obj, "prop", { @@ -22,6 +20,5 @@ function testcase() { var verifyValue = (obj.prop === 2010); obj.prop = 1001; - return verifyValue && obj.prop === 1001; - } -runTestCase(testcase); +assert(verifyValue, 'verifyValue !== true'); +assert.sameValue(obj.prop, 1001, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-333.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-333.js index 01f827eac..fc22ccde7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-333.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-333.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-333 description: > ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is false) is writable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -21,6 +19,5 @@ function testcase() { var propertyDefineCorrect = (obj.prop === 2010); obj.prop = 1001; - return propertyDefineCorrect && obj.prop === 1001; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(obj.prop, 1001, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-336.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-336.js index 7ac3e195a..61256748e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-336.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-336.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - Success to update [[Writable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is false) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -27,6 +25,7 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc1.writable === true && obj.prop === 2010 && desc2.writable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc1.writable, true, 'desc1.writable'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc2.writable, false, 'desc2.writable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-340.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-340.js index 8067fca02..d54903654 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-340.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-340.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-340 description: > ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is true) is writable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -21,6 +19,5 @@ function testcase() { var propertyDefineCorrect = (obj.prop === 2010); obj.prop = 1001; - return propertyDefineCorrect && obj.prop === 1001; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(obj.prop, 1001, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-342.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-342.js index 271ad2ed2..3ccac9871 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-342.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-342.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-342 description: > ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is true) is deletable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -21,6 +19,6 @@ function testcase() { var beforeDelete = obj.hasOwnProperty("prop"); delete obj.prop; var afterDelete = obj.hasOwnProperty("prop"); - return beforeDelete && !afterDelete; - } -runTestCase(testcase); + +assert(beforeDelete, 'beforeDelete !== true'); +assert.sameValue(afterDelete, false, 'afterDelete'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-343.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-343.js index c18a642ed..7d9169e97 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-343.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-343.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update [[Writable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -27,6 +25,7 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc1.writable === true && obj.prop === 2010 && desc2.writable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc1.writable, true, 'desc1.writable'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc2.writable, false, 'desc2.writable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-344.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-344.js index 60013370e..6e61cad2d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-344.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-344.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update [[Enumerable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -27,6 +25,7 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc1.enumerable === false && obj.prop === 2010 && desc2.enumerable === true; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc1.enumerable, false, 'desc1.enumerable'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc2.enumerable, true, 'desc2.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-345.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-345.js index 5e66b6160..8909632d9 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-345.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-345.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update [[Configurable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -27,6 +25,7 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc1.configurable === true && obj.prop === 2010 && desc2.configurable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc1.configurable, true, 'desc1.configurable'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc2.configurable, false, 'desc2.configurable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-346.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-346.js index 7f1ef0421..ecd43d652 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-346.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-346.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update the data property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is true) to an accessor property -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -29,6 +27,5 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get"); - } -runTestCase(testcase); +assert(desc1.hasOwnProperty("value"), 'desc1.hasOwnProperty("value") !== true'); +assert(desc2.hasOwnProperty("get"), 'desc2.hasOwnProperty("get") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-347.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-347.js index 339697f36..dcefdd011 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-347.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-347.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-347 description: > ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is false) is writable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -21,6 +19,5 @@ function testcase() { var propertyDefineCorrect = (obj.prop === 2010); obj.prop = 1001; - return propertyDefineCorrect && obj.prop === 1001; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(obj.prop, 1001, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-350.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-350.js index 7a80aa8c7..ad0446494 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-350.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-350.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - fail to update [[Writable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is false) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -27,6 +25,7 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc1.writable === true && obj.prop === 2010 && desc2.writable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc1.writable, true, 'desc1.writable'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc2.writable, false, 'desc2.writable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-356.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-356.js index c9d8d5b40..c31bf7e1b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-356.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-356.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-356 description: > ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is true) is deletable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -21,6 +19,6 @@ function testcase() { var beforeDelete = obj.hasOwnProperty("prop"); delete obj.prop; var afterDelete = obj.hasOwnProperty("prop"); - return beforeDelete && !afterDelete; - } -runTestCase(testcase); + +assert(beforeDelete, 'beforeDelete !== true'); +assert.sameValue(afterDelete, false, 'afterDelete'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-357.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-357.js index 2af6a6a6c..7af95b48c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-357.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-357.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update [[Writable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -27,6 +25,7 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc1.writable === false && obj.prop === 2010 && desc2.writable === true; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc1.writable, false, 'desc1.writable'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc2.writable, true, 'desc2.writable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-358.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-358.js index 2d0ba0a8e..e475c264e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-358.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-358.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update [[Enumerable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -27,6 +25,7 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc1.enumerable === true && obj.prop === 2010 && desc2.enumerable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc1.enumerable, true, 'desc1.enumerable'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc2.enumerable, false, 'desc2.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-359.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-359.js index 935276fa5..cae4f4c7f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-359.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-359.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update [[Configurable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -27,6 +25,7 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc1.configurable === true && obj.prop === 2010 && desc2.configurable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc1.configurable, true, 'desc1.configurable'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc2.configurable, false, 'desc2.configurable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-360-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-360-1.js index 40e8c8e0f..68d77e7cc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-360-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-360-1.js @@ -8,10 +8,8 @@ description: > attributes are [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true to an accessor property, 'A' is an Array object (8.12.9 - step 9.b.i) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = []; Object.defineProperty(obj, "0", { @@ -30,8 +28,10 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "0"); - return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get") && - desc2.enumerable === true && desc2.configurable === true && - obj[0] === 20 && typeof desc2.set === "undefined" && desc2.get === getFunc; - } -runTestCase(testcase); +assert(desc1.hasOwnProperty("value"), 'desc1.hasOwnProperty("value") !== true'); +assert(desc2.hasOwnProperty("get"), 'desc2.hasOwnProperty("get") !== true'); +assert.sameValue(desc2.enumerable, true, 'desc2.enumerable'); +assert.sameValue(desc2.configurable, true, 'desc2.configurable'); +assert.sameValue(obj[0], 20, 'obj[0]'); +assert.sameValue(typeof desc2.set, "undefined", 'typeof desc2.set'); +assert.sameValue(desc2.get, getFunc, 'desc2.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-360-2.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-360-2.js index 36a28a976..c7cf7e7f2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-360-2.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-360-2.js @@ -8,10 +8,8 @@ description: > [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true to an accessor property, 'O' is an Arguments object (8.12.9 - step 9.b.i) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = (function () { return arguments; }()); @@ -32,8 +30,10 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get") && - desc2.enumerable === true && desc2.configurable === true && - obj.prop === 20 && typeof desc2.set === "undefined" && desc2.get === getFunc; - } -runTestCase(testcase); +assert(desc1.hasOwnProperty("value"), 'desc1.hasOwnProperty("value") !== true'); +assert(desc2.hasOwnProperty("get"), 'desc2.hasOwnProperty("get") !== true'); +assert.sameValue(desc2.enumerable, true, 'desc2.enumerable'); +assert.sameValue(desc2.configurable, true, 'desc2.configurable'); +assert.sameValue(obj.prop, 20, 'obj.prop'); +assert.sameValue(typeof desc2.set, "undefined", 'typeof desc2.set'); +assert.sameValue(desc2.get, getFunc, 'desc2.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-360-5.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-360-5.js index ecb2a47db..29ab089dc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-360-5.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-360-5.js @@ -8,10 +8,8 @@ description: > are [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true to an accessor property, 'A' is an Array object (8.12.9 - step 9.b.i) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = []; Object.defineProperty(obj, "prop", { @@ -30,8 +28,10 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get") && - desc2.enumerable === true && desc2.configurable === true && - obj.prop === 20 && typeof desc2.set === "undefined" && desc2.get === getFunc; - } -runTestCase(testcase); +assert(desc1.hasOwnProperty("value"), 'desc1.hasOwnProperty("value") !== true'); +assert(desc2.hasOwnProperty("get"), 'desc2.hasOwnProperty("get") !== true'); +assert.sameValue(desc2.enumerable, true, 'desc2.enumerable'); +assert.sameValue(desc2.configurable, true, 'desc2.configurable'); +assert.sameValue(obj.prop, 20, 'obj.prop'); +assert.sameValue(typeof desc2.set, "undefined", 'typeof desc2.set'); +assert.sameValue(desc2.get, getFunc, 'desc2.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-360-6.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-360-6.js index 0c9d0dc16..87d14d4fb 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-360-6.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-360-6.js @@ -8,10 +8,8 @@ description: > attributes are [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true to an accessor property, 'O' is an Arguments object (8.12.9 - step 9.b.i) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = (function () { return arguments; }()); @@ -32,8 +30,10 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "0"); - return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get") && - desc2.enumerable === true && desc2.configurable === true && - obj[0] === 20 && typeof desc2.set === "undefined" && desc2.get === getFunc; - } -runTestCase(testcase); +assert(desc1.hasOwnProperty("value"), 'desc1.hasOwnProperty("value") !== true'); +assert(desc2.hasOwnProperty("get"), 'desc2.hasOwnProperty("get") !== true'); +assert.sameValue(desc2.enumerable, true, 'desc2.enumerable'); +assert.sameValue(desc2.configurable, true, 'desc2.configurable'); +assert.sameValue(obj[0], 20, 'obj[0]'); +assert.sameValue(typeof desc2.set, "undefined", 'typeof desc2.set'); +assert.sameValue(desc2.get, getFunc, 'desc2.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-360.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-360.js index 6df3b6d44..3e68d2ec7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-360.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-360.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update the data property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is true) to an accessor property -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -29,6 +27,5 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get"); - } -runTestCase(testcase); +assert(desc1.hasOwnProperty("value"), 'desc1.hasOwnProperty("value") !== true'); +assert(desc2.hasOwnProperty("get"), 'desc2.hasOwnProperty("get") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-370.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-370.js index 9c02b5004..96e8bc9e2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-370.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-370.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-370 description: > ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is true) is deletable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -21,6 +19,6 @@ function testcase() { var beforeDelete = obj.hasOwnProperty("prop"); delete obj.prop; var afterDelete = obj.hasOwnProperty("prop"); - return beforeDelete && !afterDelete; - } -runTestCase(testcase); + +assert(beforeDelete, 'beforeDelete !== true'); +assert.sameValue(afterDelete, false, 'afterDelete'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-371.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-371.js index 14aff6bd3..ce74180fd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-371.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-371.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update [[Writable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -27,6 +25,7 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc1.writable === false && obj.prop === 2010 && desc2.writable === true; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc1.writable, false, 'desc1.writable'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc2.writable, true, 'desc2.writable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-372.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-372.js index f3b3bba74..23d887263 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-372.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-372.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update [[Enumerable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -27,6 +25,7 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc1.enumerable === false && obj.prop === 2010 && desc2.enumerable === true; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc1.enumerable, false, 'desc1.enumerable'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc2.enumerable, true, 'desc2.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-373.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-373.js index 5a59c1657..7e32a7a11 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-373.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-373.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update [[Configurable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -27,6 +25,7 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc1.configurable === true && obj.prop === 2010 && desc2.configurable === false; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc1.configurable, true, 'desc1.configurable'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc2.configurable, false, 'desc2.configurable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-374.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-374.js index 85ea01fb8..90e0d9d9f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-374.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-374.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update the data property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is true) to an accessor property -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -28,6 +26,5 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.hasOwnProperty("value") && desc2.get === getFunc; - } -runTestCase(testcase); +assert(desc1.hasOwnProperty("value"), 'desc1.hasOwnProperty("value") !== true'); +assert.sameValue(desc2.get, getFunc, 'desc2.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-382.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-382.js index 811b6c54b..6a13ff503 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-382.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-382.js @@ -4,10 +4,8 @@ /*--- es5id: 15.2.3.6-4-382 description: ES5 Attributes - [[Value]] attribute of data property is a number -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -16,6 +14,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop === 1001 && desc.value === 1001; - } -runTestCase(testcase); +assert.sameValue(obj.prop, 1001, 'obj.prop'); +assert.sameValue(desc.value, 1001, 'desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-383.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-383.js index f986cb4d9..16e5e19d0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-383.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-383.js @@ -4,10 +4,8 @@ /*--- es5id: 15.2.3.6-4-383 description: ES5 Attributes - [[Value]] attribute of data property is a string -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -16,6 +14,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop === "ThisIsAString" && desc.value === "ThisIsAString"; - } -runTestCase(testcase); +assert.sameValue(obj.prop, "ThisIsAString", 'obj.prop'); +assert.sameValue(desc.value, "ThisIsAString", 'desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-384.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-384.js index b349dec25..cf51444dd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-384.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-384.js @@ -4,10 +4,8 @@ /*--- es5id: 15.2.3.6-4-384 description: ES5 Attributes - [[Value]] attribute of data property is a boolean -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -16,6 +14,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop === false && desc.value === false; - } -runTestCase(testcase); +assert.sameValue(obj.prop, false, 'obj.prop'); +assert.sameValue(desc.value, false, 'desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-385.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-385.js index 008a6de75..397487f5c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-385.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-385.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-385 description: > ES5 Attributes - [[Value]] attribute of data property is a generic object -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var tempObj = { testproperty: 100 }; @@ -19,6 +17,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop === tempObj && desc.value === tempObj; - } -runTestCase(testcase); +assert.sameValue(obj.prop, tempObj, 'obj.prop'); +assert.sameValue(desc.value, tempObj, 'desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-386.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-386.js index 9756ac528..44f100f09 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-386.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-386.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-386 description: > ES5 Attributes - [[Value]] attribute of data property is an Array object -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var arrObj = []; @@ -19,6 +17,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop === arrObj && desc.value === arrObj; - } -runTestCase(testcase); +assert.sameValue(obj.prop, arrObj, 'obj.prop'); +assert.sameValue(desc.value, arrObj, 'desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-387.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-387.js index b6d28dd29..0e8c8b77d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-387.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-387.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-387 description: > ES5 Attributes - [[Value]] attribute of data property is a String object -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var strObj = new String(); @@ -19,6 +17,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop === strObj && desc.value === strObj; - } -runTestCase(testcase); +assert.sameValue(obj.prop, strObj, 'obj.prop'); +assert.sameValue(desc.value, strObj, 'desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-388.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-388.js index aaafa8975..cef375818 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-388.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-388.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-388 description: > ES5 Attributes - [[Value]] attribute of data property is a Number object -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var numObj = new Number(); @@ -19,6 +17,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop === numObj && desc.value === numObj; - } -runTestCase(testcase); +assert.sameValue(obj.prop, numObj, 'obj.prop'); +assert.sameValue(desc.value, numObj, 'desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-389.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-389.js index 21bbd4e67..4777b4566 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-389.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-389.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-389 description: > ES5 Attributes - [[Value]] attribute of data property is a Boolean Object -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var boolObj = new Boolean(); @@ -19,6 +17,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop === boolObj && desc.value === boolObj; - } -runTestCase(testcase); +assert.sameValue(obj.prop, boolObj, 'obj.prop'); +assert.sameValue(desc.value, boolObj, 'desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-390.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-390.js index e5ec91a84..c60d8330b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-390.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-390.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-390 description: > ES5 Attributes - [[Value]] attribute of data property is a Function object -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var funObj = function () { }; @@ -19,6 +17,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop === funObj && desc.value === funObj; - } -runTestCase(testcase); +assert.sameValue(obj.prop, funObj, 'obj.prop'); +assert.sameValue(desc.value, funObj, 'desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-391.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-391.js index ca1ee5dbb..4d8b67005 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-391.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-391.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-391 description: > ES5 Attributes - [[Value]] attribute of data property is an Error object -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var errObj = new Error(); @@ -19,6 +17,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop === errObj && desc.value === errObj; - } -runTestCase(testcase); +assert.sameValue(obj.prop, errObj, 'obj.prop'); +assert.sameValue(desc.value, errObj, 'desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-392.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-392.js index c9b9f832b..dd614a623 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-392.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-392.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-392 description: > ES5 Attributes - [[Value]] attribute of data property is a Date object -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var dateObj = new Date(); @@ -19,6 +17,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop === dateObj && desc.value === dateObj; - } -runTestCase(testcase); +assert.sameValue(obj.prop, dateObj, 'obj.prop'); +assert.sameValue(desc.value, dateObj, 'desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-393.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-393.js index 3b50f25f7..2d00d4687 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-393.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-393.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-393 description: > ES5 Attributes - [[Value]] attribute of data property is a RegExp object -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var regObj = new RegExp(); @@ -19,6 +17,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop === regObj && desc.value === regObj; - } -runTestCase(testcase); +assert.sameValue(obj.prop, regObj, 'obj.prop'); +assert.sameValue(desc.value, regObj, 'desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-394.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-394.js index b17e0128d..f5e858877 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-394.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-394.js @@ -4,10 +4,8 @@ /*--- es5id: 15.2.3.6-4-394 description: ES5 Attributes - [[Value]] attribute of data property is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -16,6 +14,6 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && typeof obj.prop === "undefined" && typeof desc.value === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof obj.prop, "undefined", 'typeof obj.prop'); +assert.sameValue(typeof desc.value, "undefined", 'typeof desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-395.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-395.js index 70f59193a..de734ce6d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-395.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-395.js @@ -4,10 +4,8 @@ /*--- es5id: 15.2.3.6-4-395 description: ES5 Attributes - [[Value]] attribute of data property is null -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -16,6 +14,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop === null && desc.value === null; - } -runTestCase(testcase); +assert.sameValue(obj.prop, null, 'obj.prop'); +assert.sameValue(desc.value, null, 'desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-396.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-396.js index d9490b158..2fb0eff84 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-396.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-396.js @@ -4,10 +4,8 @@ /*--- es5id: 15.2.3.6-4-396 description: ES5 Attributes - [[Value]] attribute of data property is NaN -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -16,6 +14,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop !== obj.prop && desc.value !== desc.value; - } -runTestCase(testcase); +assert(obj.prop !== obj.prop, 'obj.prop !== obj.prop !== true'); +assert(desc.value !== desc.value, 'desc.value !== desc.value !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-397.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-397.js index 733ad03db..e368a8e9b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-397.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-397.js @@ -4,10 +4,8 @@ /*--- es5id: 15.2.3.6-4-397 description: ES5 Attributes - [[Value]] attribute of data property is Infinity -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -16,6 +14,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop === Infinity && desc.value === Infinity; - } -runTestCase(testcase); +assert.sameValue(obj.prop, Infinity, 'obj.prop'); +assert.sameValue(desc.value, Infinity, 'desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-398.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-398.js index 1e930b39f..c3aadc108 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-398.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-398.js @@ -4,10 +4,8 @@ /*--- es5id: 15.2.3.6-4-398 description: ES5 Attributes - [[Value]] attribute of data property is -Infinity -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -16,6 +14,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop === -Infinity && desc.value === -Infinity; - } -runTestCase(testcase); +assert.sameValue(obj.prop, -Infinity, 'obj.prop'); +assert.sameValue(desc.value, -Infinity, 'desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-399.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-399.js index 4a2d76e55..71b0a8e0a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-399.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-399.js @@ -6,12 +6,9 @@ es5id: 15.2.3.6-4-399 description: > ES5 Attributes - [[Value]] attribute of data property is the global object -includes: - - runTestCase.js - - fnGlobalObject.js +includes: [fnGlobalObject.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -20,6 +17,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.prop === fnGlobalObject() && desc.value === fnGlobalObject(); - } -runTestCase(testcase); +assert.sameValue(obj.prop, fnGlobalObject(), 'obj.prop'); +assert.sameValue(desc.value, fnGlobalObject(), 'desc.value'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-412.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-412.js index c1f192ad7..03459242f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-412.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-412.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-412 description: > ES5 Attributes - [[Value]] field of inherited property of [[Prototype]] internal property is correct(Object.create) -includes: [runTestCase.js] ---*/ -function testcase() { var appointment = {}; Object.defineProperty(appointment, "startTime", { @@ -39,8 +37,7 @@ function testcase() { !teamMeeting.hasOwnProperty("startTime") && !teamMeeting.hasOwnProperty('conferenceCall'); - return hasOwnProperty && teamMeeting.name === "NAME" && - teamMeeting.startTime === 1001 && - teamMeeting.conferenceCall === "In-person meeting"; - } -runTestCase(testcase); +assert(hasOwnProperty, 'hasOwnProperty !== true'); +assert.sameValue(teamMeeting.name, "NAME", 'teamMeeting.name'); +assert.sameValue(teamMeeting.startTime, 1001, 'teamMeeting.startTime'); +assert.sameValue(teamMeeting.conferenceCall, "In-person meeting", 'teamMeeting.conferenceCall'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-413.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-413.js index 981370eee..9c832eed1 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-413.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-413.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - Successfully add a property to an object when the object's prototype has a property with the same name and [[Writable]] set to true (Object.create) -includes: [runTestCase.js] ---*/ -function testcase() { var appointment = {}; Object.defineProperty(appointment, "startTime", { @@ -44,8 +42,7 @@ function testcase() { teamMeeting.hasOwnProperty("startTime") && teamMeeting.hasOwnProperty('conferenceCall'); - return hasOwnProperty && teamMeeting.name === "Team Meeting" && - teamMeeting.startTime === dateObj && - teamMeeting.conferenceCall === "4255551212"; - } -runTestCase(testcase); +assert(hasOwnProperty, 'hasOwnProperty !== true'); +assert.sameValue(teamMeeting.name, "Team Meeting", 'teamMeeting.name'); +assert.sameValue(teamMeeting.startTime, dateObj, 'teamMeeting.startTime'); +assert.sameValue(teamMeeting.conferenceCall, "4255551212", 'teamMeeting.conferenceCall'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-414.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-414.js index 92c8ed22d..d0d7f1ea4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-414.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-414.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-414 description: > ES5 Attributes - Inherited property whose [[Enumerable]] attribute is set to true is enumerable (Object.create) -includes: [runTestCase.js] ---*/ -function testcase() { var appointment = new Object(); Object.defineProperty(appointment, "startTime", { @@ -54,6 +52,7 @@ function testcase() { !teamMeeting.hasOwnProperty("startTime") && !teamMeeting.hasOwnProperty("conferenceCall"); - return hasOwnProperty && verifyTimeProp && verifyNameProp && verifyCallProp; - } -runTestCase(testcase); +assert(hasOwnProperty, 'hasOwnProperty !== true'); +assert(verifyTimeProp, 'verifyTimeProp !== true'); +assert(verifyNameProp, 'verifyNameProp !== true'); +assert(verifyCallProp, 'verifyCallProp !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-416.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-416.js index e584b6763..510662766 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-416.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-416.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-416 description: > ES5 Attributes - Inherited properties whose [[Enumerable]] attribute is set to false is non-enumerable (Object.create) -includes: [runTestCase.js] ---*/ -function testcase() { var appointment = {}; Object.defineProperty(appointment, "startTime", { @@ -54,6 +52,7 @@ function testcase() { !teamMeeting.hasOwnProperty("startTime") && !teamMeeting.hasOwnProperty("conferenceCall"); - return hasOwnProperty && !verifyTimeProp && !verifyNameProp && !verifyCallProp; - } -runTestCase(testcase); +assert(hasOwnProperty, 'hasOwnProperty !== true'); +assert.sameValue(verifyTimeProp, false, 'verifyTimeProp'); +assert.sameValue(verifyNameProp, false, 'verifyNameProp'); +assert.sameValue(verifyCallProp, false, 'verifyCallProp'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-422.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-422.js index 3c440e553..af1d66714 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-422.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-422.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -23,6 +21,5 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc.get === "undefined"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc.get, "undefined", 'typeof desc.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-423.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-423.js index 1eeb87f0c..8f3e9ae5b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-423.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-423.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -23,6 +21,5 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc.set === "undefined"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-425.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-425.js index 58fc8af08..f088516cc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-425.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-425.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) is deletable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -25,6 +23,6 @@ function testcase() { delete obj.prop; - return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.configurable, true, 'desc.configurable'); +assert.sameValue(obj.hasOwnProperty("prop"), false, 'obj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-426.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-426.js index 229688a85..645d4286b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-426.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-426.js @@ -8,10 +8,8 @@ description: > property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { return 1001; @@ -34,6 +32,7 @@ function testcase() { var result2 = obj.prop === 1001; var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return result1 && result2 && typeof desc1.get === "undefined" && desc2.get === getFunc; - } -runTestCase(testcase); +assert(result1, 'result1 !== true'); +assert(result2, 'result2 !== true'); +assert.sameValue(typeof desc1.get, "undefined", 'typeof desc1.get'); +assert.sameValue(desc2.get, getFunc, 'desc2.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-427.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-427.js index 8f1dd630f..0aad297c2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-427.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-427.js @@ -8,10 +8,8 @@ description: > property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; var setFunc = function (value) { @@ -35,6 +33,7 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc1.set === "undefined" && desc2.set === setFunc && verifySetFunc === "overrideData"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc1.set, "undefined", 'typeof desc1.set'); +assert.sameValue(desc2.set, setFunc, 'desc2.set'); +assert.sameValue(verifySetFunc, "overrideData", 'verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-428.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-428.js index ca3d2ed4c..1e52d201b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-428.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-428.js @@ -8,10 +8,8 @@ description: > accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -39,6 +37,7 @@ function testcase() { } } - return result1 && !result2 && desc1.enumerable === true && desc2.enumerable === false; - } -runTestCase(testcase); +assert(result1, 'result1 !== true'); +assert.sameValue(result2, false, 'result2'); +assert.sameValue(desc1.enumerable, true, 'desc1.enumerable'); +assert.sameValue(desc2.enumerable, false, 'desc2.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-430.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-430.js index bd232972f..315581b82 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-430.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-430.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update the accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to a data property -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -26,6 +24,5 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value"); - } -runTestCase(testcase); +assert(desc1.hasOwnProperty("get"), 'desc1.hasOwnProperty("get") !== true'); +assert(desc2.hasOwnProperty("value"), 'desc2.hasOwnProperty("value") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-431.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-431.js index 0ce9f526c..ad0e57ba9 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-431.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-431.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -23,6 +21,5 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc.get === "undefined"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc.get, "undefined", 'typeof desc.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-432.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-432.js index a39238a4c..dc57d00b1 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-432.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-432.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -23,6 +21,5 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc.set === "undefined"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-440.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-440.js index e1d09f964..cbdec5470 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-440.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-440.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -23,6 +21,5 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc.get === "undefined"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc.get, "undefined", 'typeof desc.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-441.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-441.js index 12fe8dc32..2a44e2278 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-441.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-441.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -23,6 +21,5 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc.set === "undefined"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-443.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-443.js index 69893b1b9..b20c7d664 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-443.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-443.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) is deletable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -25,6 +23,6 @@ function testcase() { delete obj.prop; - return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.configurable, true, 'desc.configurable'); +assert.sameValue(obj.hasOwnProperty("prop"), false, 'obj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-444.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-444.js index 8236e86d1..06fe5d84f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-444.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-444.js @@ -8,10 +8,8 @@ description: > property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { return 1001; @@ -34,6 +32,7 @@ function testcase() { var result2 = obj.prop === 1001; var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return result1 && result2 && typeof desc1.get === "undefined" && desc2.get === getFunc; - } -runTestCase(testcase); +assert(result1, 'result1 !== true'); +assert(result2, 'result2 !== true'); +assert.sameValue(typeof desc1.get, "undefined", 'typeof desc1.get'); +assert.sameValue(desc2.get, getFunc, 'desc2.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-445.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-445.js index f1a96669b..2e29668de 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-445.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-445.js @@ -8,10 +8,8 @@ description: > property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -36,6 +34,7 @@ function testcase() { obj.prop = "overrideData"; var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return typeof desc1.set === "undefined" && propertyDefineCorrect && desc2.set === setFunc && verifySetFunc === "overrideData"; - } -runTestCase(testcase); +assert.sameValue(typeof desc1.set, "undefined", 'typeof desc1.set'); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc2.set, setFunc, 'desc2.set'); +assert.sameValue(verifySetFunc, "overrideData", 'verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-446.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-446.js index dd61f38df..83a537a9c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-446.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-446.js @@ -8,10 +8,8 @@ description: > accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -39,6 +37,7 @@ function testcase() { } } - return !result1 && result2 && desc1.enumerable === false && desc2.enumerable === true; - } -runTestCase(testcase); +assert.sameValue(result1, false, 'result1'); +assert(result2, 'result2 !== true'); +assert.sameValue(desc1.enumerable, false, 'desc1.enumerable'); +assert.sameValue(desc2.enumerable, true, 'desc2.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-448.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-448.js index a8970332a..c86437c68 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-448.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-448.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update the accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to a data property -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -26,6 +24,5 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value"); - } -runTestCase(testcase); +assert(desc1.hasOwnProperty("get"), 'desc1.hasOwnProperty("get") !== true'); +assert(desc2.hasOwnProperty("value"), 'desc2.hasOwnProperty("value") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-449.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-449.js index 3b623861f..8454c88fe 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-449.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-449.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -23,6 +21,5 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc.get === "undefined"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc.get, "undefined", 'typeof desc.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-450.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-450.js index 44411c65b..8b3da549b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-450.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-450.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "prop", { @@ -23,6 +21,5 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc.set === "undefined"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-458.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-458.js index ed84cf553..97868514a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-458.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-458.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -28,6 +26,5 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc.get === "undefined"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc.get, "undefined", 'typeof desc.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-459.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-459.js index dd1db334d..7f5fbeb97 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-459.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-459.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) is the expected function -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -29,6 +27,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(verifySetFunc, "overrideData", 'verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-46.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-46.js index 6cc0343bd..6bb80f608 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-46.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-46.js @@ -7,10 +7,8 @@ description: > Object.defineProperty - 'name' is defined as data property if 'name' property doesn't exist in 'O' and 'desc' is generic descriptor (8.12.9 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; Object.defineProperty(obj, "property", { @@ -24,6 +22,5 @@ function testcase() { } } - return obj.hasOwnProperty("property") && isEnumerable; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true'); +assert(isEnumerable, 'isEnumerable !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-461.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-461.js index 45241ce3c..0def8453a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-461.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-461.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) is deletable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -30,6 +28,6 @@ function testcase() { delete obj.prop; - return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.configurable, true, 'desc.configurable'); +assert.sameValue(obj.hasOwnProperty("prop"), false, 'obj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-462.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-462.js index 8ae6358b9..3e1a0de3b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-462.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-462.js @@ -8,10 +8,8 @@ description: > property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -40,6 +38,7 @@ function testcase() { var result2 = obj.prop === 1001; var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return result1 && result2 && typeof desc1.get === "undefined" && desc2.get === getFunc; - } -runTestCase(testcase); +assert(result1, 'result1 !== true'); +assert(result2, 'result2 !== true'); +assert.sameValue(typeof desc1.get, "undefined", 'typeof desc1.get'); +assert.sameValue(desc2.get, getFunc, 'desc2.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-463.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-463.js index ea7144dd2..2df1dddc7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-463.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-463.js @@ -8,10 +8,8 @@ description: > property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -34,6 +32,5 @@ function testcase() { var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.set === setFunc && typeof desc2.set === "undefined"; - } -runTestCase(testcase); +assert.sameValue(desc1.set, setFunc, 'desc1.set'); +assert.sameValue(typeof desc2.set, "undefined", 'typeof desc2.set'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-464.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-464.js index 0cf890bd1..bd4d6d709 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-464.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-464.js @@ -8,10 +8,8 @@ description: > accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -45,6 +43,7 @@ function testcase() { } } - return result1 && !result2 && desc1.enumerable === true && desc2.enumerable === false; - } -runTestCase(testcase); +assert(result1, 'result1 !== true'); +assert.sameValue(result2, false, 'result2'); +assert.sameValue(desc1.enumerable, true, 'desc1.enumerable'); +assert.sameValue(desc2.enumerable, false, 'desc2.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-466.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-466.js index 0687dce43..9bbd3affe 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-466.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-466.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update the accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to a data property -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -31,6 +29,5 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value"); - } -runTestCase(testcase); +assert(desc1.hasOwnProperty("get"), 'desc1.hasOwnProperty("get") !== true'); +assert(desc2.hasOwnProperty("value"), 'desc2.hasOwnProperty("value") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-467.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-467.js index a6f0ca3d5..9bd1e448e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-467.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-467.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -28,6 +26,5 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc.get === "undefined"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc.get, "undefined", 'typeof desc.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-468.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-468.js index 998de8bf6..0ad4ce436 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-468.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-468.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) is the expected function -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -29,6 +27,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(verifySetFunc, "overrideData", 'verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-476.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-476.js index 6cd24bf84..c9203cdd7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-476.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-476.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -28,6 +26,5 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc.get === "undefined"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc.get, "undefined", 'typeof desc.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-477.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-477.js index 60f23f248..0285a1f9b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-477.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-477.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) is the expected function -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -29,6 +27,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(verifySetFunc, "overrideData", 'verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-479.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-479.js index d15251c9b..8faf0c6c1 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-479.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-479.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) is deletable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -30,6 +28,6 @@ function testcase() { delete obj.prop; - return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.configurable, true, 'desc.configurable'); +assert.sameValue(obj.hasOwnProperty("prop"), false, 'obj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-480.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-480.js index 9cd8a7bc1..d3c67c802 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-480.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-480.js @@ -8,10 +8,8 @@ description: > property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -40,6 +38,7 @@ function testcase() { var result2 = obj.prop === 1001; var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return result1 && result2 && typeof desc1.get === "undefined" && desc2.get === getFunc; - } -runTestCase(testcase); +assert(result1, 'result1 !== true'); +assert(result2, 'result2 !== true'); +assert.sameValue(typeof desc1.get, "undefined", 'typeof desc1.get'); +assert.sameValue(desc2.get, getFunc, 'desc2.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-481.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-481.js index dba549c6b..a876dad7e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-481.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-481.js @@ -8,10 +8,8 @@ description: > property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -34,6 +32,5 @@ function testcase() { var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.set === setFunc && typeof desc2.set === "undefined"; - } -runTestCase(testcase); +assert.sameValue(desc1.set, setFunc, 'desc1.set'); +assert.sameValue(typeof desc2.set, "undefined", 'typeof desc2.set'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-482.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-482.js index 3c81c784d..a0ed01131 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-482.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-482.js @@ -8,10 +8,8 @@ description: > accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -45,6 +43,7 @@ function testcase() { } } - return !result1 && result2 && desc1.enumerable === false && desc2.enumerable === true; - } -runTestCase(testcase); +assert.sameValue(result1, false, 'result1'); +assert(result2, 'result2 !== true'); +assert.sameValue(desc1.enumerable, false, 'desc1.enumerable'); +assert.sameValue(desc2.enumerable, true, 'desc2.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-484.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-484.js index 63dd56eaf..92329f3d7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-484.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-484.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update the accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to a data property -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -31,6 +29,5 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value"); - } -runTestCase(testcase); +assert(desc1.hasOwnProperty("get"), 'desc1.hasOwnProperty("get") !== true'); +assert(desc2.hasOwnProperty("value"), 'desc2.hasOwnProperty("value") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-485.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-485.js index 6dda9a64e..2a1a18a85 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-485.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-485.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -28,6 +26,5 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc.get === "undefined"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc.get, "undefined", 'typeof desc.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-486.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-486.js index d5d4a35c3..2f5f0e3b0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-486.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-486.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) is the expected function -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = "data"; @@ -29,6 +27,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(verifySetFunc, "overrideData", 'verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-494.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-494.js index 09fa65ca1..307059771 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-494.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-494.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) is the expected function -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -27,6 +25,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.get, getFunc, 'desc.get'); +assert.sameValue(obj.prop, 1001, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-495.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-495.js index b972b527f..924720e5e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-495.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-495.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -27,6 +25,5 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc.set === "undefined"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-497.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-497.js index dbdf06135..f2079be32 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-497.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-497.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) is deletable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -29,6 +27,6 @@ function testcase() { delete obj.prop; - return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.configurable, true, 'desc.configurable'); +assert.sameValue(obj.hasOwnProperty("prop"), false, 'obj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-498.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-498.js index f5ec0fd22..2289b4393 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-498.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-498.js @@ -8,10 +8,8 @@ description: > property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { return 1001; @@ -34,6 +32,7 @@ function testcase() { var result2 = typeof obj.prop === "undefined"; var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return result1 && result2 && desc1.get === getFunc && typeof desc2.get === "undefined"; - } -runTestCase(testcase); +assert(result1, 'result1 !== true'); +assert(result2, 'result2 !== true'); +assert.sameValue(desc1.get, getFunc, 'desc1.get'); +assert.sameValue(typeof desc2.get, "undefined", 'typeof desc2.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-499.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-499.js index d7f753530..d07f52810 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-499.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-499.js @@ -8,10 +8,8 @@ description: > property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -38,6 +36,7 @@ function testcase() { var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); obj.prop = "overrideData"; - return typeof desc1.set === "undefined" && desc2.set === setFunc && verifySetFunc === "overrideData"; - } -runTestCase(testcase); + +assert.sameValue(typeof desc1.set, "undefined", 'typeof desc1.set'); +assert.sameValue(desc2.set, setFunc, 'desc2.set'); +assert.sameValue(verifySetFunc, "overrideData", 'verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-5.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-5.js index ae1760003..4d519e4fa 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-5.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-5.js @@ -11,10 +11,8 @@ es5id: 15.2.3.6-4-5 description: > Object.defineProperty is no-op if current and desc are the same data desc -includes: [runTestCase.js] ---*/ -function testcase() { function sameDataDescriptorValues(d1, d2) { return (d1.value === d2.value && d1.enumerable === d2.enumerable && @@ -39,8 +37,4 @@ function testcase() { var d2 = Object.getOwnPropertyDescriptor(o, "foo"); - if (sameDataDescriptorValues(d1, d2) === true) { - return true; - } - } -runTestCase(testcase); +assert.sameValue(sameDataDescriptorValues(d1, d2), true, 'sameDataDescriptorValues(d1, d2)'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-500.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-500.js index 000de4742..ed20f1ac7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-500.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-500.js @@ -8,10 +8,8 @@ description: > accessor property ([[Get]] is Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -43,6 +41,7 @@ function testcase() { } } - return result1 && !result2 && desc1.enumerable === true && desc2.enumerable === false; - } -runTestCase(testcase); +assert(result1, 'result1 !== true'); +assert.sameValue(result2, false, 'result2'); +assert.sameValue(desc1.enumerable, true, 'desc1.enumerable'); +assert.sameValue(desc2.enumerable, false, 'desc2.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-502.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-502.js index 7318fb4b6..7a2ef9839 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-502.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-502.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update the accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to a data property -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -30,6 +28,5 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value"); - } -runTestCase(testcase); +assert(desc1.hasOwnProperty("get"), 'desc1.hasOwnProperty("get") !== true'); +assert(desc2.hasOwnProperty("value"), 'desc2.hasOwnProperty("value") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-503.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-503.js index 75b213af1..76320b704 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-503.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-503.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) is the expected function -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -27,6 +25,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.get, getFunc, 'desc.get'); +assert.sameValue(obj.prop, 1001, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-504.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-504.js index a2dae491d..f1534efb0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-504.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-504.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -27,6 +25,5 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc.set === "undefined"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-512.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-512.js index 5280b06c4..c7627d864 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-512.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-512.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) is the expected function -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -27,6 +25,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.get, getFunc, 'desc.get'); +assert.sameValue(obj.prop, 1001, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-513.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-513.js index 54d430ebf..f44cb451a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-513.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-513.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -27,6 +25,5 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc.set === "undefined"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-515.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-515.js index 815fc4b40..b87f8abd5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-515.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-515.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) is deletable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -29,6 +27,6 @@ function testcase() { delete obj.prop; - return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.configurable, true, 'desc.configurable'); +assert.sameValue(obj.hasOwnProperty("prop"), false, 'obj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-516.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-516.js index e2c1ce01a..523204109 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-516.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-516.js @@ -8,10 +8,8 @@ description: > property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { return 1001; @@ -34,6 +32,7 @@ function testcase() { var result2 = typeof obj.prop === "undefined"; var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return result1 && result2 && desc1.get === getFunc && typeof desc2.get === "undefined"; - } -runTestCase(testcase); +assert(result1, 'result1 !== true'); +assert(result2, 'result2 !== true'); +assert.sameValue(desc1.get, getFunc, 'desc1.get'); +assert.sameValue(typeof desc2.get, "undefined", 'typeof desc2.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-517.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-517.js index 2eab38ef2..d47836e41 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-517.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-517.js @@ -8,10 +8,8 @@ description: > property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -40,6 +38,7 @@ function testcase() { obj.prop = "overrideData"; var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return typeof desc1.set === "undefined" && propertyDefineCorrect && desc2.set === setFunc && verifySetFunc === "overrideData"; - } -runTestCase(testcase); +assert.sameValue(typeof desc1.set, "undefined", 'typeof desc1.set'); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc2.set, setFunc, 'desc2.set'); +assert.sameValue(verifySetFunc, "overrideData", 'verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-518.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-518.js index 322f5c331..bbf3dbf0c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-518.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-518.js @@ -8,10 +8,8 @@ description: > accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -43,6 +41,7 @@ function testcase() { } } - return !result1 && result2 && desc1.enumerable === false && desc2.enumerable === true; - } -runTestCase(testcase); +assert.sameValue(result1, false, 'result1'); +assert(result2, 'result2 !== true'); +assert.sameValue(desc1.enumerable, false, 'desc1.enumerable'); +assert.sameValue(desc2.enumerable, true, 'desc2.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-520.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-520.js index e37e0c3b1..166779005 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-520.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-520.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update the accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to a data property -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -30,6 +28,5 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value"); - } -runTestCase(testcase); +assert(desc1.hasOwnProperty("get"), 'desc1.hasOwnProperty("get") !== true'); +assert(desc2.hasOwnProperty("value"), 'desc2.hasOwnProperty("value") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-521.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-521.js index e145f2622..26ed78b25 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-521.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-521.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) is the expected function -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -27,6 +25,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.get, getFunc, 'desc.get'); +assert.sameValue(obj.prop, 1001, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-522.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-522.js index 4874b5944..7b4a2b78a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-522.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-522.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) is undefined -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -27,6 +25,5 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && typeof desc.set === "undefined"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-530.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-530.js index 735130c6d..794b0bdc7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-530.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-530.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) is the expected function -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -32,6 +30,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.get, getFunc, 'desc.get'); +assert.sameValue(obj.prop, 1001, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-15.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-15.js index 3a0153c37..eec71d694 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-15.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-15.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - Updating a named accessor property 'P' using simple assignment is successful, 'A' is an Array object (8.12.5 step 5.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = []; var verifySetFunc = "data"; @@ -32,6 +30,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.set === setFunc && obj.prop === "overrideData"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(obj.prop, "overrideData", 'obj.prop'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-16.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-16.js index 4e0b37710..18edd69ae 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-16.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-16.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-531-16 description: > ES5 Attributes - Updating an indexed accessor property 'P' using simple assignment, 'O' is an Arguments object (8.12.5 step 5.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = (function () { return arguments; }()); @@ -33,6 +31,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("0"); var desc = Object.getOwnPropertyDescriptor(obj, "0"); - return propertyDefineCorrect && desc.set === setFunc && obj[0] === "overrideData"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(obj[0], "overrideData", 'obj[0]'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-531.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-531.js index 914744482..dcb124023 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-531.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-531.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) is the expected function -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -33,6 +31,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(verifySetFunc, "overrideData", 'verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-533.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-533.js index a09d53a9c..7c26ccedb 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-533.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-533.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) is deletable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -34,6 +32,6 @@ function testcase() { delete obj.prop; - return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.configurable, true, 'desc.configurable'); +assert.sameValue(obj.hasOwnProperty("prop"), false, 'obj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-534.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-534.js index 7c226448e..c6acdc49d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-534.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-534.js @@ -8,10 +8,8 @@ description: > property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -40,6 +38,7 @@ function testcase() { var result2 = typeof obj.prop === "undefined"; var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return result1 && result2 && desc1.get === getFunc && typeof desc2.get === "undefined"; - } -runTestCase(testcase); +assert(result1, 'result1 !== true'); +assert(result2, 'result2 !== true'); +assert.sameValue(desc1.get, getFunc, 'desc1.get'); +assert.sameValue(typeof desc2.get, "undefined", 'typeof desc2.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-535.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-535.js index e07b16f2a..7235c3f78 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-535.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-535.js @@ -8,10 +8,8 @@ description: > property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -38,6 +36,5 @@ function testcase() { var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.set === setFunc && typeof desc2.set === "undefined"; - } -runTestCase(testcase); +assert.sameValue(desc1.set, setFunc, 'desc1.set'); +assert.sameValue(typeof desc2.set, "undefined", 'typeof desc2.set'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-536.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-536.js index c3bee8e3c..f3ff2e36a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-536.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-536.js @@ -8,10 +8,8 @@ description: > accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -48,6 +46,7 @@ function testcase() { } } - return result1 && !result2 && desc1.enumerable === true && desc2.enumerable === false; - } -runTestCase(testcase); +assert(result1, 'result1 !== true'); +assert.sameValue(result2, false, 'result2'); +assert.sameValue(desc1.enumerable, true, 'desc1.enumerable'); +assert.sameValue(desc2.enumerable, false, 'desc2.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-539.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-539.js index be71e2641..6d06b7a1f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-539.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-539.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) is the expected function -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -32,6 +30,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.get, getFunc, 'desc.get'); +assert.sameValue(obj.prop, 1001, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-10.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-10.js index 27890310e..42279065b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-10.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-10.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - Updating an indexed accessor property 'P' using simple assignment is successful, 'O' is an Arguments object (8.12.5 step 5.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = (function () { return arguments; }()); @@ -35,6 +33,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("0"); var desc = Object.getOwnPropertyDescriptor(obj, "0"); - return propertyDefineCorrect && desc.set === setFunc && obj.verifySetFunc === "overrideData"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(obj.verifySetFunc, "overrideData", 'obj.verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-4.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-4.js index fd639efc4..7db3da876 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-4.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-4.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - Updating an indexed accessor property 'P' using simple assignment is successful, 'A' is an Array object (8.12.5 step 5.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = []; obj.verifySetFunc = "data"; @@ -33,6 +31,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("0"); var desc = Object.getOwnPropertyDescriptor(obj, "0"); - return propertyDefineCorrect && desc.set === setFunc && obj.verifySetFunc === "overrideData"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(obj.verifySetFunc, "overrideData", 'obj.verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-5.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-5.js index 9c3ab6420..04d921614 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-5.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-5.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - Updating a named accessor property 'P' using simple assignment is successful, 'O' is an Arguments object (8.12.5 step 5.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = (function () { return arguments; }()); @@ -35,6 +33,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.set === setFunc && obj.verifySetFunc === "overrideData"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(obj.verifySetFunc, "overrideData", 'obj.verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-9.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-9.js index 664ffecda..b2354b2e1 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-9.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-9.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - Updating a named accessor property 'P' using simple assignment is successful, 'A' is an Array object (8.12.5 step 5.b) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = []; obj.verifySetFunc = "data"; @@ -33,6 +31,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.set === setFunc && obj.verifySetFunc === "overrideData"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(obj.verifySetFunc, "overrideData", 'obj.verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-540.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-540.js index 55d0186ad..141ecc9f5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-540.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-540.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) is the expected function -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -33,6 +31,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(verifySetFunc, "overrideData", 'verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-548.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-548.js index 60b2c751a..fc6d76d47 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-548.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-548.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) is the expected function -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -32,6 +30,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.get, getFunc, 'desc.get'); +assert.sameValue(obj.prop, 1001, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-549.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-549.js index a6388d439..a8cd117d9 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-549.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-549.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) is the expected function -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -33,6 +31,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(verifySetFunc, "overrideData", 'verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-551.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-551.js index aa76b6fe9..1cd7d71c7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-551.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-551.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) is deletable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -34,6 +32,6 @@ function testcase() { delete obj.prop; - return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.configurable, true, 'desc.configurable'); +assert.sameValue(obj.hasOwnProperty("prop"), false, 'obj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-552.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-552.js index df1f5c22d..34fe59a86 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-552.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-552.js @@ -8,10 +8,8 @@ description: > property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -40,6 +38,7 @@ function testcase() { var result2 = typeof obj.prop === "undefined"; var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return result1 && result2 && desc1.get === getFunc && typeof desc2.get === "undefined"; - } -runTestCase(testcase); +assert(result1, 'result1 !== true'); +assert(result2, 'result2 !== true'); +assert.sameValue(desc1.get, getFunc, 'desc1.get'); +assert.sameValue(typeof desc2.get, "undefined", 'typeof desc2.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-553.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-553.js index 17524df72..62695097d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-553.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-553.js @@ -8,10 +8,8 @@ description: > property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -38,6 +36,5 @@ function testcase() { var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.set === setFunc && typeof desc2.set === "undefined"; - } -runTestCase(testcase); +assert.sameValue(desc1.set, setFunc, 'desc1.set'); +assert.sameValue(typeof desc2.set, "undefined", 'typeof desc2.set'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-554.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-554.js index f3414191c..248611615 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-554.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-554.js @@ -8,10 +8,8 @@ description: > accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to different value -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -49,6 +47,7 @@ function testcase() { } } - return !result1 && result2 && desc1.enumerable === false && desc2.enumerable === true; - } -runTestCase(testcase); +assert.sameValue(result1, false, 'result1'); +assert(result2, 'result2 !== true'); +assert.sameValue(desc1.enumerable, false, 'desc1.enumerable'); +assert.sameValue(desc2.enumerable, true, 'desc2.enumerable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-556.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-556.js index a52cd765c..0e91ba3b5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-556.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-556.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - success to update the accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to a data property -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -36,6 +34,5 @@ function testcase() { }); var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value"); - } -runTestCase(testcase); +assert(desc1.hasOwnProperty("get"), 'desc1.hasOwnProperty("get") !== true'); +assert(desc2.hasOwnProperty("value"), 'desc2.hasOwnProperty("value") !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-557.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-557.js index 049529f7f..be2d5d46c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-557.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-557.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) is the expected function -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -32,6 +30,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.get, getFunc, 'desc.get'); +assert.sameValue(obj.prop, 1001, 'obj.prop'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-558.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-558.js index f9c0761d9..1bcd85f7c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-558.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-558.js @@ -7,10 +7,8 @@ description: > ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) is the expected function -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { @@ -33,6 +31,6 @@ function testcase() { var propertyDefineCorrect = obj.hasOwnProperty("prop"); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData"; - } -runTestCase(testcase); +assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(verifySetFunc, "overrideData", 'verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-566.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-566.js index c2e268bfc..f3deecae4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-566.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-566.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-566 description: > ES5 Attributes - [[Get]] attribute is a function which has zero argument -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function () { return 2010; @@ -21,6 +19,6 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && obj.prop === 2010 && desc.get === getFunc; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc.get, getFunc, 'desc.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-567.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-567.js index 65a039a0b..b61e13a1f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-567.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-567.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-567 description: > ES5 Attributes - [[Get]] attribute is a function which has one argument -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function (arg1) { return 2010; @@ -21,6 +19,6 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && obj.prop === 2010 && desc.get === getFunc; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc.get, getFunc, 'desc.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-568.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-568.js index a3aa983fd..9a37b39d5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-568.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-568.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-568 description: > ES5 Attributes - [[Get]] attribute is a function which has two arguments -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var getFunc = function (arg1, arg2) { return 2010; @@ -21,6 +19,6 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && obj.prop === 2010 && desc.get === getFunc; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(desc.get, getFunc, 'desc.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-569.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-569.js index b7bac598d..9c1564a68 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-569.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-569.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-569 description: > ES5 Attributes - [[Get]] attribute is a function which contains global variable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var globalVariable = 20; var getFunc = function () { @@ -22,6 +20,7 @@ function testcase() { }); var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && desc.get === getFunc && obj.prop === 2010 && globalVariable === 2010; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(desc.get, getFunc, 'desc.get'); +assert.sameValue(obj.prop, 2010, 'obj.prop'); +assert.sameValue(globalVariable, 2010, 'globalVariable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-570.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-570.js index 8bed11851..5aa6cada3 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-570.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-570.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-570 description: > ES5 Attributes - [[Get]] attribute is a function which doesn't contains return statement -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifyExecute = false; var getFunc = function () { @@ -22,6 +20,7 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && desc.get === getFunc && typeof obj.prop === "undefined" && verifyExecute; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(desc.get, getFunc, 'desc.get'); +assert.sameValue(typeof obj.prop, "undefined", 'typeof obj.prop'); +assert(verifyExecute, 'verifyExecute !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-571.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-571.js index 3b94fee9e..308b6693b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-571.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-571.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-571 description: > ES5 Attributes - [[Get]] attribute is a function which involves 'this' object into statement(s) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = { len: 2010 }; @@ -23,6 +21,6 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && obj.prop === obj && desc.get === getFunc; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(obj.prop, obj, 'obj.prop'); +assert.sameValue(desc.get, getFunc, 'desc.get'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-572.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-572.js index 4606e17c1..74d43c55a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-572.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-572.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-572 description: > ES5 Attributes - [[Set]] attribute is a function which has zero argument -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var setFunc = function () { }; @@ -20,6 +18,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && desc.set === setFunc; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-573.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-573.js index b6bf86c22..f6d79774d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-573.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-573.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-573 description: > ES5 Attributes - [[Set]] attribute is a function which has one argument -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var verifySetFunc = 20; @@ -22,6 +20,6 @@ function testcase() { obj.prop = 2010; var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && desc.set === setFunc && verifySetFunc === 2010; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(verifySetFunc, 2010, 'verifySetFunc'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-574.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-574.js index e68b6098f..0d63001c6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-574.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-574.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-574 description: > ES5 Attributes - [[Set]] attribute is a function which has two arguments -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var firstArg = 12; var secondArg = 12; @@ -24,6 +22,7 @@ function testcase() { obj.prop = 100; var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && desc.set === setFunc && firstArg === 100 && typeof secondArg === "undefined"; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(firstArg, 100, 'firstArg'); +assert.sameValue(typeof secondArg, "undefined", 'typeof secondArg'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-575.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-575.js index 886decb1c..7a0601c56 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-575.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-575.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-575 description: > ES5 Attributes - [[Set]] attribute is a function which contains global variable -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var globalVariable = 20; var setFunc = function () { @@ -22,6 +20,6 @@ function testcase() { obj.prop = 10; var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && desc.set === setFunc && globalVariable === 2010; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(globalVariable, 2010, 'globalVariable'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-576.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-576.js index 73c777777..36c181458 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-576.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-576.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-576 description: > ES5 Attributes - [[Set]] attribute is a function which contains return statement -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var setFunc = function () { @@ -22,6 +20,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && desc.set === setFunc; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-577.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-577.js index ba79be590..a7bba5a0e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-577.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-577.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-577 description: > ES5 Attributes - [[Set]] attribute is a function which involves 'this' object into statement(s) -includes: [runTestCase.js] ---*/ -function testcase() { var obj = {}; var setFunc = function (value) { @@ -23,6 +21,6 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - return obj.hasOwnProperty("prop") && desc.set === setFunc && obj.len === 2010; - } -runTestCase(testcase); +assert(obj.hasOwnProperty("prop"), 'obj.hasOwnProperty("prop") !== true'); +assert.sameValue(desc.set, setFunc, 'desc.set'); +assert.sameValue(obj.len, 2010, 'obj.len'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-588.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-588.js index 2cb8f361a..09d635b64 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-588.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-588.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-588 description: > ES5 Attributes - [[Get]] field of inherited property of [[Prototype]] internal property is correct (Object.create) -includes: [runTestCase.js] ---*/ -function testcase() { var appointment = {}; var data1 = 1001; @@ -48,8 +46,7 @@ function testcase() { !teamMeeting.hasOwnProperty("startTime") && !teamMeeting.hasOwnProperty('conferenceCall'); - return hasOwnProperty && teamMeeting.name === "NAME" && - teamMeeting.startTime === 1001 && - teamMeeting.conferenceCall === "In-person meeting"; - } -runTestCase(testcase); +assert(hasOwnProperty, 'hasOwnProperty !== true'); +assert.sameValue(teamMeeting.name, "NAME", 'teamMeeting.name'); +assert.sameValue(teamMeeting.startTime, 1001, 'teamMeeting.startTime'); +assert.sameValue(teamMeeting.conferenceCall, "In-person meeting", 'teamMeeting.conferenceCall'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-589.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-589.js index 1ef73419c..d3c303a97 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-589.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-589.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-589 description: > ES5 Attributes - Success to update value of property into of [[Proptotype]] internal property (Object.create) -includes: [runTestCase.js] ---*/ -function testcase() { var appointment = {}; var data1 = 1001; @@ -58,8 +56,7 @@ function testcase() { !teamMeeting.hasOwnProperty("startTime") && !teamMeeting.hasOwnProperty('conferenceCall'); - return hasOwnProperty && teamMeeting.name === "Team Meeting" && - teamMeeting.startTime === dateObj && - teamMeeting.conferenceCall === "4255551212"; - } -runTestCase(testcase); +assert(hasOwnProperty, 'hasOwnProperty !== true'); +assert.sameValue(teamMeeting.name, "Team Meeting", 'teamMeeting.name'); +assert.sameValue(teamMeeting.startTime, dateObj, 'teamMeeting.startTime'); +assert.sameValue(teamMeeting.conferenceCall, "4255551212", 'teamMeeting.conferenceCall'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-590.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-590.js index a58a90d00..3e326be2e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-590.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-590.js @@ -4,10 +4,8 @@ /*--- es5id: 15.2.3.6-4-590 description: ES5 Attributes - Inherited property is enumerable (Object.create) -includes: [runTestCase.js] ---*/ -function testcase() { var appointment = {}; var data1 = 1001; @@ -67,6 +65,7 @@ function testcase() { !teamMeeting.hasOwnProperty("startTime") && !teamMeeting.hasOwnProperty('conferenceCall'); - return hasOwnProperty && verifyTimeProp && verifyNameProp && verifyCallProp; - } -runTestCase(testcase); +assert(hasOwnProperty, 'hasOwnProperty !== true'); +assert(verifyTimeProp, 'verifyTimeProp !== true'); +assert(verifyNameProp, 'verifyNameProp !== true'); +assert(verifyCallProp, 'verifyCallProp !== true'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-592.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-592.js index a59653449..40784147f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-592.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-592.js @@ -6,10 +6,8 @@ es5id: 15.2.3.6-4-592 description: > ES5 Attributes - Inherited property is non-enumerable (Object.create) -includes: [runTestCase.js] ---*/ -function testcase() { var appointment = {}; var data1 = 1001; @@ -60,6 +58,7 @@ function testcase() { !teamMeeting.hasOwnProperty("startTime") && !teamMeeting.hasOwnProperty('conferenceCall'); - return hasOwnProperty && !verifyTimeProp && !verifyNameProp && !verifyCallProp; - } -runTestCase(testcase); +assert(hasOwnProperty, 'hasOwnProperty !== true'); +assert.sameValue(verifyTimeProp, false, 'verifyTimeProp'); +assert.sameValue(verifyNameProp, false, 'verifyNameProp'); +assert.sameValue(verifyCallProp, false, 'verifyCallProp'); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-6.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-6.js index 3b34efda6..aa0c45a57 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-6.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-6.js @@ -11,10 +11,8 @@ es5id: 15.2.3.6-4-6 description: > Object.defineProperty is no-op if current and desc are the same accessor desc -includes: [runTestCase.js] ---*/ -function testcase() { function sameAccessorDescriptorValues(d1, d2) { return (d1.get == d2.get && d1.enumerable == d2.enumerable && @@ -43,8 +41,4 @@ function testcase() { var d2 = Object.getOwnPropertyDescriptor(o, "foo"); - if (sameAccessorDescriptorValues(d1, d2) === true) { - return true; - } - } -runTestCase(testcase); +assert.sameValue(sameAccessorDescriptorValues(d1, d2), true, 'sameAccessorDescriptorValues(d1, d2)'); diff --git a/test/built-ins/Object/defineProperty/8.12.9-9-b-i_1.js b/test/built-ins/Object/defineProperty/8.12.9-9-b-i_1.js index 77adc834d..17e8b1667 100644 --- a/test/built-ins/Object/defineProperty/8.12.9-9-b-i_1.js +++ b/test/built-ins/Object/defineProperty/8.12.9-9-b-i_1.js @@ -6,10 +6,8 @@ es5id: 8.12.9-9-b-i_1 description: > Redefine a configurable data property to be an accessor property on a newly non-extensible object -includes: [runTestCase.js] ---*/ -function testcase() { var o = {}; Object.defineProperty(o, "foo", { value: "hello", @@ -18,6 +16,11 @@ function testcase() { Object.defineProperty(o, "foo", { get: function() { return 5;} }); var fooDescrip = Object.getOwnPropertyDescriptor(o, "foo"); - return o.foo===5 && fooDescrip.get!==undefined && fooDescrip.set===undefined && fooDescrip.value===undefined && fooDescrip.configurable===true && fooDescrip.enumerable===false && fooDescrip.writable===undefined; -} -runTestCase(testcase); + +assert.sameValue(o.foo, 5, 'o.foo'); +assert(fooDescrip.get!==undefined, 'fooDescrip.get!==undefined !== true'); +assert.sameValue(fooDescrip.set, undefined, 'fooDescrip.set'); +assert.sameValue(fooDescrip.value, undefined, 'fooDescrip.value'); +assert.sameValue(fooDescrip.configurable, true, 'fooDescrip.configurable'); +assert.sameValue(fooDescrip.enumerable, false, 'fooDescrip.enumerable'); +assert.sameValue(fooDescrip.writable, undefined, 'fooDescrip.writable'); diff --git a/test/built-ins/Object/defineProperty/8.12.9-9-b-i_2.js b/test/built-ins/Object/defineProperty/8.12.9-9-b-i_2.js index f1a11ac7a..00ab01527 100644 --- a/test/built-ins/Object/defineProperty/8.12.9-9-b-i_2.js +++ b/test/built-ins/Object/defineProperty/8.12.9-9-b-i_2.js @@ -6,10 +6,8 @@ es5id: 8.12.9-9-b-i_2 description: > Redefine a configurable data property to be an accessor property on a newly non-extensible object -includes: [runTestCase.js] ---*/ -function testcase() { var o = {}; Object.defineProperty(o, "foo", { value: "hello", @@ -20,6 +18,11 @@ function testcase() { Object.defineProperty(o, "foo", { get: function() { return 5;} }); var fooDescrip = Object.getOwnPropertyDescriptor(o, "foo"); - return o.foo===5 && fooDescrip.get!==undefined && fooDescrip.set===undefined && fooDescrip.value===undefined && fooDescrip.configurable===true && fooDescrip.enumerable===true && fooDescrip.writable===undefined; -} -runTestCase(testcase); + +assert.sameValue(o.foo, 5, 'o.foo'); +assert(fooDescrip.get!==undefined, 'fooDescrip.get!==undefined !== true'); +assert.sameValue(fooDescrip.set, undefined, 'fooDescrip.set'); +assert.sameValue(fooDescrip.value, undefined, 'fooDescrip.value'); +assert.sameValue(fooDescrip.configurable, true, 'fooDescrip.configurable'); +assert.sameValue(fooDescrip.enumerable, true, 'fooDescrip.enumerable'); +assert.sameValue(fooDescrip.writable, undefined, 'fooDescrip.writable'); diff --git a/test/built-ins/Object/defineProperty/8.12.9-9-c-i_1.js b/test/built-ins/Object/defineProperty/8.12.9-9-c-i_1.js index 8f2740672..f64da3594 100644 --- a/test/built-ins/Object/defineProperty/8.12.9-9-c-i_1.js +++ b/test/built-ins/Object/defineProperty/8.12.9-9-c-i_1.js @@ -6,10 +6,8 @@ es5id: 8.12.9-9-c-i_1 description: > Redefine a configurable accessor property to be a data property on a non-extensible object -includes: [runTestCase.js] ---*/ -function testcase() { var o = {}; Object.defineProperty(o, "foo", { get: function() { return 5;}, @@ -18,6 +16,11 @@ function testcase() { Object.defineProperty(o, "foo", { value: "hello"}); var fooDescrip = Object.getOwnPropertyDescriptor(o, "foo"); - return o.foo==="hello" && fooDescrip.get===undefined && fooDescrip.set===undefined && fooDescrip.value==="hello" && fooDescrip.configurable===true && fooDescrip.enumerable===false && fooDescrip.writable===false; -} -runTestCase(testcase); + +assert.sameValue(o.foo, "hello", 'o.foo'); +assert.sameValue(fooDescrip.get, undefined, 'fooDescrip.get'); +assert.sameValue(fooDescrip.set, undefined, 'fooDescrip.set'); +assert.sameValue(fooDescrip.value, "hello", 'fooDescrip.value'); +assert.sameValue(fooDescrip.configurable, true, 'fooDescrip.configurable'); +assert.sameValue(fooDescrip.enumerable, false, 'fooDescrip.enumerable'); +assert.sameValue(fooDescrip.writable, false, 'fooDescrip.writable'); diff --git a/test/built-ins/Object/defineProperty/8.12.9-9-c-i_2.js b/test/built-ins/Object/defineProperty/8.12.9-9-c-i_2.js index 3bda5a8ce..118ff856f 100644 --- a/test/built-ins/Object/defineProperty/8.12.9-9-c-i_2.js +++ b/test/built-ins/Object/defineProperty/8.12.9-9-c-i_2.js @@ -6,10 +6,8 @@ es5id: 8.12.9-9-c-i_2 description: > Redefine a configurable accessor property to be a data property on a non-extensible object -includes: [runTestCase.js] ---*/ -function testcase() { var o = {}; Object.defineProperty(o, "foo", { get: function() { return 5;}, @@ -20,6 +18,11 @@ function testcase() { writable: true}); var fooDescrip = Object.getOwnPropertyDescriptor(o, "foo"); - return o.foo==="hello" && fooDescrip.get===undefined && fooDescrip.set===undefined && fooDescrip.value==="hello" && fooDescrip.configurable===true && fooDescrip.enumerable===false && fooDescrip.writable===true; -} -runTestCase(testcase); + +assert.sameValue(o.foo, "hello", 'o.foo'); +assert.sameValue(fooDescrip.get, undefined, 'fooDescrip.get'); +assert.sameValue(fooDescrip.set, undefined, 'fooDescrip.set'); +assert.sameValue(fooDescrip.value, "hello", 'fooDescrip.value'); +assert.sameValue(fooDescrip.configurable, true, 'fooDescrip.configurable'); +assert.sameValue(fooDescrip.enumerable, false, 'fooDescrip.enumerable'); +assert.sameValue(fooDescrip.writable, true, 'fooDescrip.writable'); |