Replace runTestCase with assert helpers, rest [test/built-ins]

test/built-ins/Array/from/S22.1.2.1_T1.js

@@ -5,16 +5,9 @@
 es6id: 22.1.2.1_T1
 description: Testing Array.from when passed a String
 author: Hank Yates (hankyates@gmail.com)
-includes: [runTestCase.js]
 ---*/
 
-runTestCase(function () {
   var arrLikeSource = 'testValue',
       testArr = Array.from(arrLikeSource);
 
-  if (testArr.length != 9) {
-    return false;
-  }
-
-  return true;
-});
+assert.sameValue(testArr.length, 9);

test/built-ins/Array/from/S22.1.2.1_T2.js

@@ -5,10 +5,8 @@
 es6id: 22.1.2.1_T2
 description: Testing Array.from when passed an Object is passed
 author: Hank Yates (hankyates@gmail.com)
-includes: [runTestCase.js]
 ---*/
 
-runTestCase(function () {
   var testArr = Array.from({
     'a': 1,
     'b': '2',
@@ -16,10 +14,4 @@ runTestCase(function () {
     'length': '3'
   });
 
-  if (testArr.length != 3) {
-    return false;
-  }
-
-  return true;
-
-});
+assert.sameValue(testArr.length, 3);

test/built-ins/Array/from/S22.1.2.1_T3.js

@@ -5,16 +5,8 @@
 es6id: 22.1.2.1_T3
 description: Testing Array.from when passed an undefined
 author: Hank Yates (hankyates@gmail.com)
-includes: [runTestCase.js]
 ---*/
 
-runTestCase(function () {
-  try {
+assert.throws(TypeError, function() {
     Array.from(undefined);
-  } catch (e) {
-    return e instanceof TypeError;
-  }
-
-  return false;
-
 });

test/built-ins/Array/prototype/every/15.4.4.16-4-10.js

@@ -6,25 +6,17 @@ es5id: 15.4.4.16-4-10
 description: >
     Array.prototype.every - the exception is not thrown if exception
     was thrown by step 2
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var obj = { 0: 11, 1: 12 };
 
         Object.defineProperty(obj, "length", {
             get: function () {
-                throw new SyntaxError();
+                throw new Test262Error();
             },
             configurable: true
         });
 
-        try {
+assert.throws(Test262Error, function() {
             Array.prototype.every.call(obj, undefined);
-            return false;
-        } catch (ex) {
-            return !(ex instanceof TypeError);
-        }
-    }
-runTestCase(testcase);
+});

test/built-ins/Array/prototype/every/15.4.4.16-4-11.js

@@ -6,29 +6,21 @@ es5id: 15.4.4.16-4-11
 description: >
     Array.prototype.every - the exception is not thrown if exception
     was thrown by step 3
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var obj = { 0: 11, 1: 12 };
 
         Object.defineProperty(obj, "length", {
             get: function () {
                 return {
                     toString: function () {
-                        throw new SyntaxError();
+                        throw new Test262Error();
                     }
                 };
             },
             configurable: true
         });
 
-        try {
+assert.throws(Test262Error, function() {
             Array.prototype.every.call(obj, undefined);
-            return false;
-        } catch (ex) {
-            return !(ex instanceof TypeError);
-        }
-    }
-runTestCase(testcase);
+});

test/built-ins/Array/prototype/every/15.4.4.16-7-c-ii-7.js

@@ -6,28 +6,22 @@ es5id: 15.4.4.16-7-c-ii-7
 description: >
     Array.prototype.every - unhandled exceptions happened in
     callbackfn terminate iteration
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var called = 0;
 
         function callbackfn(val, idx, obj) {
             called++;
             if (called === 1) {
-                throw new Error("Exception occurred in callbackfn");
+                throw new Test262Error("Exception occurred in callbackfn");
             }
             return true;
         }
 
         var obj = { 0: 11, 4: 10, 10: 8, length: 20 };
 
-        try {
+assert.throws(Test262Error, function() {
             Array.prototype.every.call(obj, callbackfn);
-            return false;
-        } catch (ex) {
-            return 1 === called;
-        }
-    }
-runTestCase(testcase);
+});
+
+assert.sameValue(called, 1, 'called');

test/built-ins/Array/prototype/filter/15.4.4.20-4-10.js

@@ -6,25 +6,17 @@ es5id: 15.4.4.20-4-10
 description: >
     Array.prototype.filter - the exception is not thrown if exception
     was thrown by step 2
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var obj = { 0: 11, 1: 12 };
 
         Object.defineProperty(obj, "length", {
             get: function () {
-                throw new SyntaxError();
+                throw new Test262Error();
             },
             configurable: true
         });
 
-        try {
+assert.throws(Test262Error, function() {
             Array.prototype.filter.call(obj, undefined);
-            return false;
-        } catch (ex) {
-            return !(ex instanceof TypeError);
-        }
-    }
-runTestCase(testcase);
+});

test/built-ins/Array/prototype/filter/15.4.4.20-4-11.js

@@ -6,29 +6,21 @@ es5id: 15.4.4.20-4-11
 description: >
     Array.prototype.filter - the exception is not thrown if exception
     was thrown by step 3
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var obj = { 0: 11, 1: 12 };
 
         Object.defineProperty(obj, "length", {
             get: function () {
                 return {
                     toString: function () {
-                        throw new SyntaxError();
+                        throw new Test262Error();
                     }
                 };
             },
             configurable: true
         });
 
-        try {
+assert.throws(Test262Error, function() {
             Array.prototype.filter.call(obj, undefined);
-            return false;
-        } catch (ex) {
-            return !(ex instanceof TypeError);
-        }
-    }
-runTestCase(testcase);
+});

test/built-ins/Array/prototype/filter/15.4.4.20-5-1.js

@@ -5,10 +5,9 @@
 es5id: 15.4.4.20-5-1
 description: Array.prototype.filter - thisArg is passed
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
+(function() {
         this._15_4_4_20_5_1 = false;
         var _15_4_4_20_5_1 = true;
 
@@ -17,6 +16,6 @@ function testcase() {
         }
         var srcArr = [1];
         var resArr = srcArr.filter(callbackfn);
-        return resArr.length === 0;
-    }
-runTestCase(testcase);
+
+assert.sameValue(resArr.length, 0, 'resArr.length');
+})();

test/built-ins/Array/prototype/filter/15.4.4.20-9-3.js

@@ -6,11 +6,8 @@ es5id: 15.4.4.20-9-3
 description: >
     Array.prototype.filter doesn't visit deleted elements in array
     after the call
-includes: [runTestCase.js]
 ---*/
 
-function testcase() { 
- 
   function callbackfn(val, idx, obj)
   {
     delete srcArr[2];
@@ -23,8 +20,8 @@ function testcase() {
 
   var srcArr = [1,2,3,4,5];
   var resArr = srcArr.filter(callbackfn);
-  if(resArr.length === 3 && resArr[0] === 1 && resArr[2] === 4 )    // two elements deleted
-      return true;  
-  
- }
-runTestCase(testcase);
+
+// two elements deleted
+assert.sameValue(resArr.length, 3, 'resArr.length');
+assert.sameValue(resArr[0], 1, 'resArr[0]');
+assert.sameValue(resArr[2], 4, 'resArr[2]');

test/built-ins/Array/prototype/filter/15.4.4.20-9-6.js

@@ -6,11 +6,8 @@ es5id: 15.4.4.20-9-6
 description: >
     Array.prototype.filter visits deleted element in array after the
     call when same index is also present in prototype
-includes: [runTestCase.js]
 ---*/
 
-function testcase() { 
- 
   function callbackfn(val, idx, obj)
   {
     delete srcArr[2];
@@ -25,8 +22,8 @@ function testcase() {
   var srcArr = [1,2,3,4,5];
   var resArr = srcArr.filter(callbackfn);
   delete Array.prototype[4];
-  if(resArr.length === 4 && resArr[0] === 1 && resArr[3] == 5)    // only one element deleted
-      return true;  
-  
- }
-runTestCase(testcase);
+
+// only one element deleted
+assert.sameValue(resArr.length, 4, 'resArr.length');
+assert.sameValue(resArr[0], 1, 'resArr[0]');
+assert.sameValue(resArr[3], 5, 'resArr[3]');

test/built-ins/Array/prototype/filter/15.4.4.20-9-c-iii-1-2.js

@@ -6,11 +6,8 @@ es5id: 15.4.4.20-9-c-iii-1-2
 description: >
     Array.prototype.filter - value of returned array element can be
     overwritten
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         function callbackfn(val, idx, obj) {
             return true;
         }
@@ -18,12 +15,7 @@ function testcase() {
         var obj = { 0: 11, 1: 9, length: 2 };
         var newArr = Array.prototype.filter.call(obj, callbackfn);
 
-        try {
             var tempVal = newArr[1];
             newArr[1] += 1;
-            return newArr[1] !== tempVal;
-        } catch (ex) {
-            return false;
-        }
-    }
-runTestCase(testcase);
+
+assert.notSameValue(newArr[1], tempVal, 'newArr[1]');

test/built-ins/Array/prototype/filter/15.4.4.20-9-c-iii-1-4.js

@@ -6,11 +6,8 @@ es5id: 15.4.4.20-9-c-iii-1-4
 description: >
     Array.prototype.filter - value of returned array element can be
     changed or deleted
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         function callbackfn(val, idx, obj) {
             return true;
         }
@@ -18,12 +15,8 @@ function testcase() {
         var obj = { 0: 11, 1: 9, length: 2 };
         var newArr = Array.prototype.filter.call(obj, callbackfn);
 
-        try {
             var tempVal = newArr[1];
             delete newArr[1];
-            return tempVal !== undefined && newArr[1] === undefined;
-        } catch (ex) {
-            return false;
-        }
-    }
-runTestCase(testcase);
+
+assert.notSameValue(tempVal, undefined, 'tempVal');
+assert.sameValue(newArr[1], undefined, 'newArr[1]');

test/built-ins/Array/prototype/filter/15.4.4.20-9-c-iii-1.js

@@ -6,11 +6,8 @@ es5id: 15.4.4.20-9-c-iii-1
 description: >
     Array.prototype.filter - getOwnPropertyDescriptor(all true) of
     returned array element
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  
   function callbackfn(val, idx, obj){
     if(val % 2)
       return true; 
@@ -19,14 +16,12 @@ function testcase() {
   }
   var srcArr = [0,1,2,3,4];
   var resArr = srcArr.filter(callbackfn);
-  if (resArr.length > 0){
-     var desc = Object.getOwnPropertyDescriptor(resArr, 1) 
-     if(desc.value === 3 &&        //srcArr[1] = true
-       desc.writable === true &&
-       desc.enumerable === true &&
-       desc.configurable === true){
-         return true;
-    }
-  }
- }
-runTestCase(testcase);
+
+assert(resArr.length > 0, 'resArr.length > 0');
+
+var desc = Object.getOwnPropertyDescriptor(resArr, 1);
+
+assert.sameValue(desc.value, 3, 'desc.value'); //srcArr[1] = true
+assert.sameValue(desc.writable, true, 'desc.writable');
+assert.sameValue(desc.enumerable, true, 'desc.enumerable');
+assert.sameValue(desc.configurable, true, 'desc.configurable');

test/built-ins/Array/prototype/forEach/15.4.4.18-4-10.js

@@ -6,25 +6,17 @@ es5id: 15.4.4.18-4-10
 description: >
     Array.prototype.forEach - the exception is not thrown if exception
     was thrown by step 2
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var obj = { 0: 11, 1: 12 };
 
         Object.defineProperty(obj, "length", {
             get: function () {
-                throw new SyntaxError();
+                throw new Test262Error();
             },
             configurable: true
         });
 
-        try {
+assert.throws(Test262Error, function() {
             Array.prototype.forEach.call(obj, undefined);
-            return false;
-        } catch (ex) {
-            return !(ex instanceof TypeError);
-        }
-    }
-runTestCase(testcase);
+});

test/built-ins/Array/prototype/forEach/15.4.4.18-4-11.js

@@ -6,29 +6,21 @@ es5id: 15.4.4.18-4-11
 description: >
     Array.prototype.forEach - the exception is not thrown if exception
     was thrown by step 3
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var obj = { 0: 11, 1: 12 };
 
         Object.defineProperty(obj, "length", {
             get: function () {
                 return {
                     toString: function () {
-                        throw new SyntaxError();
+                        throw new Test262Error();
                     }
                 };
             },
             configurable: true
         });
 
-        try {
+assert.throws(Test262Error, function() {
             Array.prototype.forEach.call(obj, undefined);
-            return false;
-        } catch (ex) {
-            return !(ex instanceof TypeError);
-        }
-    }
-runTestCase(testcase);
+});

test/built-ins/Array/prototype/forEach/15.4.4.18-5-1.js

@@ -5,10 +5,9 @@
 es5id: 15.4.4.18-5-1
 description: Array.prototype.forEach - thisArg is passed
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
+(function() {
         this._15_4_4_18_5_1 = false;
         var _15_4_4_18_5_1 = true;
         var result;
@@ -17,6 +16,6 @@ function testcase() {
         }
         var arr = [1];
         arr.forEach(callbackfn)
-        return !result;
-    }
-runTestCase(testcase);
+
+assert.sameValue(result, false, 'result');
+})();

test/built-ins/Array/prototype/indexOf/15.4.4.14-10-1.js

@@ -6,10 +6,8 @@ es5id: 15.4.4.14-10-1
 description: >
     Array.prototype.indexOf returns -1 for elements not present in
     array
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   var a = new Array();
   a[100] = 1;
   a[99999] = "";  
@@ -17,21 +15,15 @@ function testcase() {
   a[5555] = 5.5;
   a[123456] = "str";
   a[5] = 1E+309;
-  if (a.indexOf(1) !== 100 || 
-      a.indexOf("") !== 99999 ||
-      a.indexOf("str") !== 123456 ||
-      a.indexOf(1E+309) !== 5 ||   //Infinity
-      a.indexOf(5.5) !== 5555 )
-  {
-    return false;
-  }
-  if (a.indexOf(true) === -1 && 
-      a.indexOf(5) === -1 &&
-      a.indexOf("str1") === -1 &&
-      a.indexOf(null) === -1 &&
-      a.indexOf(new Object()) === -1) 
-  {
-    return true;
-  }
- }
-runTestCase(testcase);
+
+assert.sameValue(a.indexOf(1), 100, 'a.indexOf(1)');
+assert.sameValue(a.indexOf(""), 99999, 'a.indexOf("")');
+assert.sameValue(a.indexOf("str"), 123456, 'a.indexOf("str")');
+assert.sameValue(a.indexOf(1E+309), 5, 'a.indexOf(1E+309)'); //Infinity
+assert.sameValue(a.indexOf(5.5), 5555, 'a.indexOf(5.5)');
+
+assert.sameValue(a.indexOf(true), -1, 'a.indexOf(true)');
+assert.sameValue(a.indexOf(5), -1, 'a.indexOf(5)');
+assert.sameValue(a.indexOf("str1"), -1, 'a.indexOf("str1")');
+assert.sameValue(a.indexOf(null), -1, 'a.indexOf(null)');
+assert.sameValue(a.indexOf(new Object()), -1, 'a.indexOf(new Object())');

test/built-ins/Array/prototype/indexOf/15.4.4.14-2-15.js

@@ -4,30 +4,19 @@
 /*---
 es5id: 15.4.4.14-2-15
 description: Array.prototype.indexOf - 'length' is property of the global object
-includes:
-    - runTestCase.js
-    - fnGlobalObject.js
+includes: [fnGlobalObject.js]
 ---*/
 
-function testcase() {
         var targetObj = {};
-        try {
+
             var oldLen = fnGlobalObject().length;
             fnGlobalObject().length = 2;
 
             fnGlobalObject()[1] = targetObj;
-            if (Array.prototype.indexOf.call(fnGlobalObject(), targetObj) !== 1) {
-                return false;
-            }
+
+assert.sameValue(Array.prototype.indexOf.call(fnGlobalObject(), targetObj), 1, 'Array.prototype.indexOf.call(fnGlobalObject(), targetObj)');
 
             fnGlobalObject()[1] = {};
             fnGlobalObject()[2] = targetObj;
 
-            return Array.prototype.indexOf.call(fnGlobalObject(), targetObj) === -1;
-        } finally {
-            delete fnGlobalObject()[1];
-            delete fnGlobalObject()[2];
-            fnGlobalObject().length = oldLen;
-        }
-    }
-runTestCase(testcase);
+assert.sameValue(Array.prototype.indexOf.call(fnGlobalObject(), targetObj), -1, 'Array.prototype.indexOf.call(fnGlobalObject(), targetObj)');

test/built-ins/Array/prototype/indexOf/15.4.4.14-3-22.js

@@ -7,11 +7,8 @@ description: >
     Array.prototype.indexOf throws TypeError exception when 'length'
     is an object with toString and valueOf methods that don�t return
     primitive values
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var toStringAccessed = false;
         var valueOfAccessed = false;
 
@@ -29,11 +26,9 @@ function testcase() {
             }
         };
 
-        try {
+assert.throws(TypeError, function() {
             Array.prototype.indexOf.call(obj);
-            return false;
-        } catch (e) {
-            return toStringAccessed && valueOfAccessed;
-        }
-    }
-runTestCase(testcase);
+});
+
+assert(toStringAccessed, 'toStringAccessed');
+assert(valueOfAccessed, 'valueOfAccessed');