diff --git a/test/built-ins/Array/15.4.5-1.js b/test/built-ins/Array/15.4.5-1.js
index 16c499e9c7921dacaf2e4c331ed522250b43d5f2..d8a00abd4a5423efddaa10e6ef388ea7f5cca963 100644
--- a/test/built-ins/Array/15.4.5-1.js
+++ b/test/built-ins/Array/15.4.5-1.js
@@ -4,14 +4,9 @@
/*---
es5id: 15.4.5-1
description: Array instances have [[Class]] set to 'Array'
-includes: [runTestCase.js]
---*/
-function testcase() {
var a = [];
var s = Object.prototype.toString.call(a);
- if (s === '[object Array]') {
- return true;
- }
- }
-runTestCase(testcase);
+
+assert.sameValue(s, '[object Array]', 's');
diff --git a/test/built-ins/Array/15.4.5.1-3.d-3.js b/test/built-ins/Array/15.4.5.1-3.d-3.js
index 61e4d9b61b492c3a1e15193c0289c9f53e6a3871..7367a8a0fc8163a5637b1475cfdd4d703dbb8b42 100644
--- a/test/built-ins/Array/15.4.5.1-3.d-3.js
+++ b/test/built-ins/Array/15.4.5.1-3.d-3.js
@@ -4,12 +4,9 @@
/*---
es5id: 15.4.5.1-3.d-3
description: Set array length property to max value 4294967295 (2**32-1,)
-includes: [runTestCase.js]
---*/
-function testcase() {
var a =[];
a.length = 4294967295 ;
- return a.length===4294967295 ;
- }
-runTestCase(testcase);
+
+assert.sameValue(a.length, 4294967295, 'a.length');
diff --git a/test/built-ins/Array/15.4.5.1-5-1.js b/test/built-ins/Array/15.4.5.1-5-1.js
index 00bcc54f2d26c9795d4ff61efd4e0441d3d29db9..945bf9ae4ed9d30d07c2ed460ddd57453d45ec49 100644
--- a/test/built-ins/Array/15.4.5.1-5-1.js
+++ b/test/built-ins/Array/15.4.5.1-5-1.js
@@ -6,12 +6,9 @@ es5id: 15.4.5.1-5-1
description: >
Defining a property named 4294967295 (2**32-1)(not an array
element)
-includes: [runTestCase.js]
---*/
-function testcase() {
var a =[];
a[4294967295] = "not an array element" ;
- return a[4294967295] === "not an array element";
- }
-runTestCase(testcase);
+
+assert.sameValue(a[4294967295], "not an array element", 'a[4294967295]');
diff --git a/test/built-ins/Array/15.4.5.1-5-2.js b/test/built-ins/Array/15.4.5.1-5-2.js
index b7d365dd2f0980a2ad920baf86d8d8ab2e3f7f98..924c48f47933089dfb2c2a53b1e9773cf3189c42 100644
--- a/test/built-ins/Array/15.4.5.1-5-2.js
+++ b/test/built-ins/Array/15.4.5.1-5-2.js
@@ -6,12 +6,9 @@ es5id: 15.4.5.1-5-2
description: >
Defining a property named 4294967295 (2**32-1) doesn't change
length of the array
-includes: [runTestCase.js]
---*/
-function testcase() {
var a =[0,1,2];
a[4294967295] = "not an array element" ;
- return a.length===3;
- }
-runTestCase(testcase);
+
+assert.sameValue(a.length, 3, 'a.length');
diff --git a/test/built-ins/Array/isArray/15.4.3.2-0-1.js b/test/built-ins/Array/isArray/15.4.3.2-0-1.js
index 8ac307382f3afd547c29ed7b7627d7319ec52506..a7153724ac7ebd33f37e85b9ba8631f4d6db7976 100644
--- a/test/built-ins/Array/isArray/15.4.3.2-0-1.js
+++ b/test/built-ins/Array/isArray/15.4.3.2-0-1.js
@@ -4,13 +4,8 @@
/*---
es5id: 15.4.3.2-0-1
description: Array.isArray must exist as a function
-includes: [runTestCase.js]
---*/
-function testcase() {
var f = Array.isArray;
- if (typeof(f) === "function") {
- return true;
- }
- }
-runTestCase(testcase);
+
+assert.sameValue(typeof(f), "function", 'typeof(f)');
diff --git a/test/built-ins/Array/isArray/15.4.3.2-0-2.js b/test/built-ins/Array/isArray/15.4.3.2-0-2.js
index 07bb3368de7cd9d3076780d2fd44531ccd45e475..ba95a7ad4a384e2f3e2d14ef3faadd7f7eb83d4a 100644
--- a/test/built-ins/Array/isArray/15.4.3.2-0-2.js
+++ b/test/built-ins/Array/isArray/15.4.3.2-0-2.js
@@ -4,12 +4,6 @@
/*---
es5id: 15.4.3.2-0-2
description: Array.isArray must exist as a function taking 1 parameter
-includes: [runTestCase.js]
---*/
-function testcase() {
- if (Array.isArray.length === 1) {
- return true;
- }
- }
-runTestCase(testcase);
+assert.sameValue(Array.isArray.length, 1, 'Array.isArray.length');
diff --git a/test/built-ins/Array/isArray/15.4.3.2-0-3.js b/test/built-ins/Array/isArray/15.4.3.2-0-3.js
index 62dd2a7007e4f62aafc3be0aa5a6c4fe0e7200eb..4b8141dc7ffbd4071fd33fbdf2e80e5de9aa4d55 100644
--- a/test/built-ins/Array/isArray/15.4.3.2-0-3.js
+++ b/test/built-ins/Array/isArray/15.4.3.2-0-3.js
@@ -4,14 +4,9 @@
/*---
es5id: 15.4.3.2-0-3
description: Array.isArray return true if its argument is an Array
-includes: [runTestCase.js]
---*/
-function testcase() {
var a = [];
var b = Array.isArray(a);
- if (b === true) {
- return true;
- }
- }
-runTestCase(testcase);
+
+assert.sameValue(b, true, 'b');
diff --git a/test/built-ins/Array/isArray/15.4.3.2-0-4.js b/test/built-ins/Array/isArray/15.4.3.2-0-4.js
index 4d70abfa10e623be68de487b2f6a4de7a588e652..652430d8ad6afa6a8643912aab8ece07ef2bfa9f 100644
--- a/test/built-ins/Array/isArray/15.4.3.2-0-4.js
+++ b/test/built-ins/Array/isArray/15.4.3.2-0-4.js
@@ -4,10 +4,8 @@
/*---
es5id: 15.4.3.2-0-4
description: Array.isArray return false if its argument is not an Array
-includes: [runTestCase.js]
---*/
-function testcase() {
var b_num = Array.isArray(42);
var b_undef = Array.isArray(undefined);
var b_bool = Array.isArray(true);
@@ -15,13 +13,10 @@ function testcase() {
var b_obj = Array.isArray({});
var b_null = Array.isArray(null);
- if (b_num === false &&
- b_undef === false &&
- b_bool === false &&
- b_str === false &&
- b_obj === false &&
- b_null === false) {
- return true;
- }
- }
-runTestCase(testcase);
+
+assert.sameValue(b_num, false, 'b_num');
+assert.sameValue(b_undef, false, 'b_undef');
+assert.sameValue(b_bool, false, 'b_bool');
+assert.sameValue(b_str, false, 'b_str');
+assert.sameValue(b_obj, false, 'b_obj');
+assert.sameValue(b_null, false, 'b_null');
diff --git a/test/built-ins/Array/isArray/15.4.3.2-0-5.js b/test/built-ins/Array/isArray/15.4.3.2-0-5.js
index 91c356f96b322f0cd53b523a04a2206c02d34ba1..70cd14fc4830d5a2f139b4f89b7791f03de072fc 100644
--- a/test/built-ins/Array/isArray/15.4.3.2-0-5.js
+++ b/test/built-ins/Array/isArray/15.4.3.2-0-5.js
@@ -6,13 +6,8 @@ es5id: 15.4.3.2-0-5
description: >
Array.isArray return true if its argument is an Array
(Array.prototype)
-includes: [runTestCase.js]
---*/
-function testcase() {
var b = Array.isArray(Array.prototype);
- if (b === true) {
- return true;
- }
- }
-runTestCase(testcase);
+
+assert.sameValue(b, true, 'b');
diff --git a/test/built-ins/Array/isArray/15.4.3.2-0-6.js b/test/built-ins/Array/isArray/15.4.3.2-0-6.js
index d10e943e8bfab78ad3146c09d736faab439b7fdd..0a3144adc245bbce7f58ead7317a352d9da0d6ff 100644
--- a/test/built-ins/Array/isArray/15.4.3.2-0-6.js
+++ b/test/built-ins/Array/isArray/15.4.3.2-0-6.js
@@ -4,14 +4,9 @@
/*---
es5id: 15.4.3.2-0-6
description: Array.isArray return true if its argument is an Array (new Array())
-includes: [runTestCase.js]
---*/
-function testcase() {
var a = new Array(10);
var b = Array.isArray(a);
- if (b === true) {
- return true;
- }
- }
-runTestCase(testcase);
+
+assert.sameValue(b, true, 'b');
diff --git a/test/built-ins/Array/isArray/15.4.3.2-0-7.js b/test/built-ins/Array/isArray/15.4.3.2-0-7.js
index 1a593e89930143013a126953ec3d07a4f5d8110a..9292b2de71b7542b59ba5870e6a61580e54b6ee3 100644
--- a/test/built-ins/Array/isArray/15.4.3.2-0-7.js
+++ b/test/built-ins/Array/isArray/15.4.3.2-0-7.js
@@ -4,15 +4,10 @@
/*---
es5id: 15.4.3.2-0-7
description: Array.isArray returns false if its argument is not an Array
-includes: [runTestCase.js]
---*/
-function testcase() {
var o = new Object();
o[12] = 13;
var b = Array.isArray(o);
- if (b === false) {
- return true;
- }
- }
-runTestCase(testcase);
+
+assert.sameValue(b, false, 'b');
diff --git a/test/built-ins/Array/isArray/15.4.3.2-1-13.js b/test/built-ins/Array/isArray/15.4.3.2-1-13.js
index bb8a0cbea24f6689e29a39ca2b05f4f505b8974c..8d233f114c9037cbe717d1e2d5004ad1117adf0d 100644
--- a/test/built-ins/Array/isArray/15.4.3.2-1-13.js
+++ b/test/built-ins/Array/isArray/15.4.3.2-1-13.js
@@ -4,17 +4,12 @@
/*---
es5id: 15.4.3.2-1-13
description: Array.isArray applied to Arguments object
-includes: [runTestCase.js]
---*/
-function testcase() {
-
var arg;
(function fun() {
arg = arguments;
}(1, 2, 3));
- return !Array.isArray(arg);
- }
-runTestCase(testcase);
+assert.sameValue(Array.isArray(arg), false, 'Array.isArray(arg)');
diff --git a/test/built-ins/Array/isArray/15.4.3.2-2-1.js b/test/built-ins/Array/isArray/15.4.3.2-2-1.js
index 6e6ff90f4ab68041d5b775e9a807d52b7f8d004e..55ea40277a8d0fa26a16bb58e36f1720621e5b01 100644
--- a/test/built-ins/Array/isArray/15.4.3.2-2-1.js
+++ b/test/built-ins/Array/isArray/15.4.3.2-2-1.js
@@ -4,16 +4,12 @@
/*---
es5id: 15.4.3.2-2-1
description: Array.isArray applied to an object with an array as the prototype
-includes: [runTestCase.js]
---*/
-function testcase() {
-
var proto = [];
var Con = function () { };
Con.prototype = proto;
var child = new Con();
- return !Array.isArray(child);
- }
-runTestCase(testcase);
+
+assert.sameValue(Array.isArray(child), false, 'Array.isArray(child)');
diff --git a/test/built-ins/Array/isArray/15.4.3.2-2-2.js b/test/built-ins/Array/isArray/15.4.3.2-2-2.js
index 2453dda4e7adc408f7dc7d565bbb879a9dfc88c6..1c37dee8fba84ec65a3f9e09671f9b50d46c00eb 100644
--- a/test/built-ins/Array/isArray/15.4.3.2-2-2.js
+++ b/test/built-ins/Array/isArray/15.4.3.2-2-2.js
@@ -6,17 +6,12 @@ es5id: 15.4.3.2-2-2
description: >
Array.isArray applied to an object with Array.prototype as the
prototype
-includes: [runTestCase.js]
---*/
-function testcase() {
-
var proto = Array.prototype;
var Con = function () { };
Con.prototype = proto;
var child = new Con();
- return !Array.isArray(child);
- }
-runTestCase(testcase);
+assert.sameValue(Array.isArray(child), false, 'Array.isArray(child)');
diff --git a/test/built-ins/Array/prototype/splice/15.4.4.12-9-a-1.js b/test/built-ins/Array/prototype/splice/15.4.4.12-9-a-1.js
index 02c31166931b6945802554c671a6f93cc5c2bd14..ce423f3e347c45e6e0d39b0d60ea3baad9d61fb5 100644
--- a/test/built-ins/Array/prototype/splice/15.4.4.12-9-a-1.js
+++ b/test/built-ins/Array/prototype/splice/15.4.4.12-9-a-1.js
@@ -6,12 +6,10 @@ es5id: 15.4.4.12-9-a-1
description: >
Array.prototype.splice - 'from' is the result of
ToString(actualStart+k) in an Array
-includes: [runTestCase.js]
---*/
-function testcase() {
var arrObj = [1, 2, 3];
var newArrObj = arrObj.splice(-2, 1);
- return newArrObj.length === 1 && newArrObj[0] === 2;
- }
-runTestCase(testcase);
+
+assert.sameValue(newArrObj.length, 1, 'newArrObj.length');
+assert.sameValue(newArrObj[0], 2, 'newArrObj[0]');