Replace runTestCase with assert helpers [test/language/function-code]

test/language/function-code/10.4.3-1-101-s.js

@@ -7,12 +7,9 @@ description: >
     Strict Mode - checking 'this' (non-strict function passed as arg
     to String.prototype.replace from strict context)
 flags: [noStrict]
-includes:
-    - runTestCase.js
-    - fnGlobalObject.js
+includes: [fnGlobalObject.js]
 ---*/
 
-function testcase() {
 var x = 3;
 
 function f() {
@@ -20,6 +17,5 @@ function f() {
     return "a";
 }
 
-return (function() {"use strict"; return "ab".replace("b", f)==="aa";}()) && (x===fnGlobalObject());
-}
-runTestCase(testcase);
+assert.sameValue(function() {"use strict"; return "ab".replace("b", f);}(), "aa");
+assert.sameValue(x, fnGlobalObject(), 'x');

test/language/function-code/10.4.3-1-102-s.js

@@ -6,18 +6,15 @@ es5id: 10.4.3-1-102-s
 description: >
     Strict Mode - checking 'this' (strict anonymous function passed as
     arg to String.prototype.replace)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 var x = 3;
 
-return ("ab".replace("b", (function () { 
+assert.sameValue("ab".replace("b", (function () {
                                 "use strict";
                                 return function () {
                                     x = this;
                                     return "a";
                                 }
-                           })())==="aa") && (x===undefined);
-}
-runTestCase(testcase);
+                           })()), "aa");
+assert.sameValue(x, undefined, 'x');

test/language/function-code/10.4.3-1-103.js

@@ -6,14 +6,9 @@ es5id: 10.4.3-1-103
 description: >
     Non strict mode should ToObject thisArg if not an object.
     Abstract equality operator should succeed.
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){
   Object.defineProperty(Object.prototype, "x", { get: function () { return this; } }); 
-  if((5).x == 0) return false;
-  if(!((5).x == 5)) return false;
-  return true;
-}
 
-runTestCase(testcase);
+assert.sameValue((5).x == 0, false, '(5).x == 0');
+assert((5).x == 5, '(5).x == 5');

test/language/function-code/10.4.3-1-104.js

@@ -7,13 +7,8 @@ description: >
     Strict mode should not ToObject thisArg if not an object.  Strict
     equality operator should succeed.
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){
   Object.defineProperty(Object.prototype, "x", { get: function () { return this; } }); 
-  if(!((5).x === 5)) return false;
-  return true;
-}
 
-runTestCase(testcase);
+assert((5).x === 5, '(5).x === 5');

test/language/function-code/10.4.3-1-105.js

@@ -10,14 +10,9 @@ description: >
     Non strict mode should ToObject thisArg if not an object.  Return
     type should be object and strict equality should fail.
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){
   Object.defineProperty(Object.prototype, "x", { get: function () { return this; } }); 
-  if((5).x === 5) return false;
-  if(!(typeof (5).x === "object")) return false;
-  return true;
-}
 
-runTestCase(testcase);
+assert.sameValue((5).x === 5, false, '(5).x === 5');
+assert.sameValue(typeof (5).x, "object", 'typeof (5).x');

test/language/function-code/10.4.3-1-106.js

@@ -10,13 +10,8 @@ description: >
     Strict mode should not ToObject thisArg if not an object.  Return
     type should be 'number'.
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){
   Object.defineProperty(Object.prototype, "x", { get: function () { return this; } }); 
-  if(!(typeof (5).x === "number")) return false;
-  return true;
-}
 
-runTestCase(testcase);
+assert.sameValue(typeof (5).x, "number", 'typeof (5).x');

test/language/function-code/10.4.3-1-11-s.js

@@ -7,12 +7,8 @@ description: >
     Strict Mode - checking 'this' (Anonymous FunctionExpression
     defined within strict mode)
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-return (function () {
+assert.sameValue((function () {
     return typeof this;
-})() === "undefined";
-}
-runTestCase(testcase);
+})(), "undefined");

test/language/function-code/10.4.3-1-12-s.js

@@ -7,13 +7,9 @@ description: >
     Strict Mode - checking 'this' (Anonymous FunctionExpression
     includes strict directive prologue)
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-return (function () {
+assert.sameValue((function () {
     "use strict";
     return typeof this;
-})() === "undefined";
-}
-runTestCase(testcase);
+})(), "undefined");

test/language/function-code/10.4.3-1-17-s.js

@@ -5,12 +5,11 @@
 es5id: 10.4.3-1-17-s
 description: Strict Mode - checking 'this' (eval used within strict mode)
 flags: [onlyStrict]
-includes:
-    - runTestCase.js
-    - fnGlobalObject.js
+includes: [fnGlobalObject.js]
 ---*/
 
 function testcase() {
-return (eval("typeof this") === "undefined") && (eval("this") !== fnGlobalObject());
+  assert.sameValue(eval("typeof this"), "undefined", 'eval("typeof this")');
+  assert.notSameValue(eval("this"), fnGlobalObject(), 'eval("this")');
 }
-runTestCase(testcase);
+testcase();

test/language/function-code/10.4.3-1-19-s.js

@@ -7,13 +7,11 @@ description: >
     Strict Mode - checking 'this' (indirect eval used within strict
     mode)
 flags: [onlyStrict]
-includes:
-    - runTestCase.js
-    - fnGlobalObject.js
+includes: [fnGlobalObject.js]
 ---*/
 
 function testcase() {
 var my_eval = eval;
-return my_eval("this") === fnGlobalObject();
+assert.sameValue(my_eval("this"), fnGlobalObject(), 'my_eval("this")');
 }
-runTestCase(testcase);
+testcase();

test/language/function-code/10.4.3-1-20-s.js

@@ -7,13 +7,11 @@ description: >
     Strict Mode - checking 'this' (indirect eval includes strict
     directive prologue)
 flags: [noStrict]
-includes:
-    - runTestCase.js
-    - fnGlobalObject.js
+includes: [fnGlobalObject.js]
 ---*/
 
 function testcase() {
 var my_eval = eval;
-return my_eval("\"use strict\";\nthis") === fnGlobalObject();
+assert.sameValue(my_eval("\"use strict\";\nthis"), fnGlobalObject());
 }
-runTestCase(testcase);
+testcase();

test/language/function-code/10.4.3-1-33-s.js

@@ -7,15 +7,12 @@ description: >
     Strict Mode - checking 'this' (FunctionDeclaration defined within
     an Anonymous FunctionExpression inside strict mode)
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-return (function () {
+(function () {
     function f() {
         return typeof this;
     }
-    return (f()==="undefined") && ((typeof this)==="undefined");
+    assert.sameValue(f(), "undefined", 'f()');
+    assert.sameValue(typeof this, "undefined", 'typeof this');
 })();
-}
-runTestCase(testcase);

test/language/function-code/10.4.3-1-34-s.js

@@ -7,15 +7,12 @@ description: >
     Strict Mode - checking 'this' (FunctionExpression defined within
     an Anonymous FunctionExpression inside strict mode)
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-return (function () {
+(function () {
     var f = function () {
         return typeof this;
     }
-    return (f()==="undefined") && ((typeof this)==="undefined");
+    assert.sameValue(f(), "undefined", 'f()');
+    assert.sameValue(typeof this, "undefined", 'typeof this');
 })();
-}
-runTestCase(testcase);

test/language/function-code/10.4.3-1-35-s.js

@@ -7,14 +7,11 @@ description: >
     Strict Mode - checking 'this' (Anonymous FunctionExpression
     defined within an Anonymous FunctionExpression inside strict mode)
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-return (function () {
-    return ((function () {
+(function () {
+    assert.sameValue((function () {
         return typeof this;
-    })()==="undefined") && ((typeof this)==="undefined");
+    })(), "undefined");
+    assert.sameValue(typeof this, "undefined", 'typeof this');
 })();
-}
-runTestCase(testcase);

test/language/function-code/10.4.3-1-42-s.js

@@ -7,16 +7,13 @@ description: >
     Strict Mode - checking 'this' (FunctionDeclaration defined within
     an Anonymous FunctionExpression with a strict directive prologue)
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-return (function () {
+(function () {
     "use strict";
     function f() {
         return typeof this;
     }
-    return (f()==="undefined") && ((typeof this)==="undefined");
+    assert.sameValue(f(), "undefined", 'f()');
+    assert.sameValue(typeof this, "undefined", 'typeof this');
 })();
-}
-runTestCase(testcase);

test/language/function-code/10.4.3-1-43-s.js

@@ -7,16 +7,13 @@ description: >
     Strict Mode - checking 'this' (FunctionExpression defined within
     an Anonymous FunctionExpression with a strict directive prologue)
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-return (function () {
+(function () {
     "use strict";
     var f = function () {
         return typeof this;
     }
-    return (f()==="undefined") && ((typeof this)==="undefined");
+    assert.sameValue(f(), "undefined", 'f()');
+    assert.sameValue(typeof this, "undefined", 'typeof this');
 })();
-}
-runTestCase(testcase);

test/language/function-code/10.4.3-1-44-s.js

@@ -8,15 +8,12 @@ description: >
     defined within an Anonymous FunctionExpression with a strict
     directive prologue)
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-return (function () {
+(function () {
     "use strict";
-    return ((function () {
+    assert.sameValue((function () {
         return typeof this;
-    })()==="undefined") && ((typeof this)==="undefined");
+    })(), "undefined");
+    assert.sameValue(typeof this, "undefined", 'typeof this');
 })();
-}
-runTestCase(testcase);

test/language/function-code/10.4.3-1-51-s.js

@@ -7,18 +7,14 @@ description: >
     Strict Mode - checking 'this' (FunctionDeclaration with a strict
     directive prologue defined within an Anonymous FunctionExpression)
 flags: [noStrict]
-includes:
-    - runTestCase.js
-    - fnGlobalObject.js
+includes: [fnGlobalObject.js]
 ---*/
 
-function testcase() {
-return (function () {
+(function () {
     function f() {
         "use strict";
         return typeof this;
     }
-    return (f()==="undefined") && (this===fnGlobalObject());
+    assert.sameValue(f(), "undefined", 'f()');
+    assert.sameValue(this, fnGlobalObject(), 'this');
 })();
-}
-runTestCase(testcase);

test/language/function-code/10.4.3-1-52-s.js

@@ -7,18 +7,14 @@ description: >
     Strict Mode - checking 'this' (FunctionExpression with a strict
     directive prologue defined within an Anonymous FunctionExpression)
 flags: [noStrict]
-includes:
-    - runTestCase.js
-    - fnGlobalObject.js
+includes: [fnGlobalObject.js]
 ---*/
 
-function testcase() {
-return (function () {
+(function () {
     var f = function () {
         "use strict";
         return typeof this;
     }
-    return (f()==="undefined") && (this===fnGlobalObject());
+    assert.sameValue(f(), "undefined", 'f()');
+    assert.sameValue(this, fnGlobalObject(), 'this');
 })();
-}
-runTestCase(testcase);

test/language/function-code/10.4.3-1-53-s.js

@@ -8,17 +8,13 @@ description: >
     strict directive prologue defined within an Anonymous
     FunctionExpression)
 flags: [noStrict]
-includes:
-    - runTestCase.js
-    - fnGlobalObject.js
+includes: [fnGlobalObject.js]
 ---*/
 
-function testcase() {
-return (function () {
-    return ((function () {
+(function () {
+    assert.sameValue((function () {
         "use strict";
         return typeof this;
-    })()==="undefined") && (this===fnGlobalObject());
+    })(), "undefined");
+    assert.sameValue(this, fnGlobalObject(), 'this');
 })();
-}
-runTestCase(testcase);