From 789224fbaad70e9d26899f479eaee4fe55cc8c54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bargull?= <andre.bargull@gmail.com>
Date: Thu, 13 Aug 2015 17:34:40 +0200
Subject: [PATCH] Replace runTestCase with assert helpers
[test/language/function-code]
---
test/language/function-code/10.4.3-1-101-s.js | 10 +++-------
test/language/function-code/10.4.3-1-102-s.js | 9 +++------
test/language/function-code/10.4.3-1-103.js | 9 ++-------
test/language/function-code/10.4.3-1-104.js | 7 +------
test/language/function-code/10.4.3-1-105.js | 9 ++-------
test/language/function-code/10.4.3-1-106.js | 7 +------
test/language/function-code/10.4.3-1-11-s.js | 8 ++------
test/language/function-code/10.4.3-1-12-s.js | 8 ++------
test/language/function-code/10.4.3-1-17-s.js | 9 ++++-----
test/language/function-code/10.4.3-1-19-s.js | 8 +++-----
test/language/function-code/10.4.3-1-20-s.js | 8 +++-----
test/language/function-code/10.4.3-1-33-s.js | 9 +++------
test/language/function-code/10.4.3-1-34-s.js | 9 +++------
test/language/function-code/10.4.3-1-35-s.js | 11 ++++-------
test/language/function-code/10.4.3-1-42-s.js | 9 +++------
test/language/function-code/10.4.3-1-43-s.js | 9 +++------
test/language/function-code/10.4.3-1-44-s.js | 11 ++++-------
test/language/function-code/10.4.3-1-51-s.js | 12 ++++--------
test/language/function-code/10.4.3-1-52-s.js | 12 ++++--------
test/language/function-code/10.4.3-1-53-s.js | 14 +++++---------
test/language/function-code/10.4.3-1-63-s.js | 6 +-----
test/language/function-code/10.4.3-1-64-s.js | 9 ++-------
test/language/function-code/10.4.3-1-65-s.js | 9 ++-------
test/language/function-code/10.4.3-1-82-s.js | 6 +-----
test/language/function-code/10.4.3-1-83-s.js | 9 ++-------
test/language/function-code/10.4.3-1-84-s.js | 9 ++-------
test/language/function-code/10.4.3-1-85-s.js | 6 +-----
test/language/function-code/10.4.3-1-86-s.js | 9 ++-------
test/language/function-code/10.4.3-1-87-s.js | 9 ++-------
test/language/function-code/10.4.3-1-88-s.js | 6 +-----
test/language/function-code/10.4.3-1-89-s.js | 9 ++-------
test/language/function-code/10.4.3-1-90-s.js | 9 ++-------
test/language/function-code/10.4.3-1-91-s.js | 9 ++-------
test/language/function-code/10.4.3-1-92-s.js | 9 ++-------
test/language/function-code/10.4.3-1-93-s.js | 6 +-----
test/language/function-code/10.4.3-1-94-s.js | 9 ++-------
test/language/function-code/10.4.3-1-95-s.js | 9 ++-------
test/language/function-code/10.4.3-1-96-s.js | 9 ++-------
test/language/function-code/10.4.3-1-97-s.js | 9 ++-------
test/language/function-code/10.4.3-1-98-s.js | 6 +-----
test/language/function-code/10.4.3-1-99-s.js | 9 ++-------
41 files changed, 95 insertions(+), 264 deletions(-)
diff --git a/test/language/function-code/10.4.3-1-101-s.js b/test/language/function-code/10.4.3-1-101-s.js
index 129163c943..442a00d351 100644
--- a/test/language/function-code/10.4.3-1-101-s.js
+++ b/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');
diff --git a/test/language/function-code/10.4.3-1-102-s.js b/test/language/function-code/10.4.3-1-102-s.js
index 53d6c781a5..a1dbfaea34 100644
--- a/test/language/function-code/10.4.3-1-102-s.js
+++ b/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');
diff --git a/test/language/function-code/10.4.3-1-103.js b/test/language/function-code/10.4.3-1-103.js
index 655ec7f18a..608b144cb9 100644
--- a/test/language/function-code/10.4.3-1-103.js
+++ b/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');
diff --git a/test/language/function-code/10.4.3-1-104.js b/test/language/function-code/10.4.3-1-104.js
index 70851570a9..5275e225c7 100644
--- a/test/language/function-code/10.4.3-1-104.js
+++ b/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');
diff --git a/test/language/function-code/10.4.3-1-105.js b/test/language/function-code/10.4.3-1-105.js
index 7613ecf674..28b3674ab8 100644
--- a/test/language/function-code/10.4.3-1-105.js
+++ b/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');
diff --git a/test/language/function-code/10.4.3-1-106.js b/test/language/function-code/10.4.3-1-106.js
index 4e2456fdeb..481f05259e 100644
--- a/test/language/function-code/10.4.3-1-106.js
+++ b/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');
diff --git a/test/language/function-code/10.4.3-1-11-s.js b/test/language/function-code/10.4.3-1-11-s.js
index 8f246eb963..d22deb841d 100644
--- a/test/language/function-code/10.4.3-1-11-s.js
+++ b/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");
diff --git a/test/language/function-code/10.4.3-1-12-s.js b/test/language/function-code/10.4.3-1-12-s.js
index 523e15cef2..c67b8c96fa 100644
--- a/test/language/function-code/10.4.3-1-12-s.js
+++ b/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");
diff --git a/test/language/function-code/10.4.3-1-17-s.js b/test/language/function-code/10.4.3-1-17-s.js
index 029f2d247f..055382c126 100644
--- a/test/language/function-code/10.4.3-1-17-s.js
+++ b/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();
diff --git a/test/language/function-code/10.4.3-1-19-s.js b/test/language/function-code/10.4.3-1-19-s.js
index b6146fb517..5aff016b91 100644
--- a/test/language/function-code/10.4.3-1-19-s.js
+++ b/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();
diff --git a/test/language/function-code/10.4.3-1-20-s.js b/test/language/function-code/10.4.3-1-20-s.js
index 7394c8350a..24c27b3014 100644
--- a/test/language/function-code/10.4.3-1-20-s.js
+++ b/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();
diff --git a/test/language/function-code/10.4.3-1-33-s.js b/test/language/function-code/10.4.3-1-33-s.js
index 106eeb65a0..1e74d0d581 100644
--- a/test/language/function-code/10.4.3-1-33-s.js
+++ b/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);
diff --git a/test/language/function-code/10.4.3-1-34-s.js b/test/language/function-code/10.4.3-1-34-s.js
index bcc169a6fc..d5f47fb004 100644
--- a/test/language/function-code/10.4.3-1-34-s.js
+++ b/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);
diff --git a/test/language/function-code/10.4.3-1-35-s.js b/test/language/function-code/10.4.3-1-35-s.js
index 5b500c5624..ec009b0d9a 100644
--- a/test/language/function-code/10.4.3-1-35-s.js
+++ b/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);
diff --git a/test/language/function-code/10.4.3-1-42-s.js b/test/language/function-code/10.4.3-1-42-s.js
index cd6f0337c5..d6e975bd62 100644
--- a/test/language/function-code/10.4.3-1-42-s.js
+++ b/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);
diff --git a/test/language/function-code/10.4.3-1-43-s.js b/test/language/function-code/10.4.3-1-43-s.js
index 91dbb74f71..85882b9e47 100644
--- a/test/language/function-code/10.4.3-1-43-s.js
+++ b/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);
diff --git a/test/language/function-code/10.4.3-1-44-s.js b/test/language/function-code/10.4.3-1-44-s.js
index cf75229638..db6bea2542 100644
--- a/test/language/function-code/10.4.3-1-44-s.js
+++ b/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);
diff --git a/test/language/function-code/10.4.3-1-51-s.js b/test/language/function-code/10.4.3-1-51-s.js
index 70f9147410..399451d4e9 100644
--- a/test/language/function-code/10.4.3-1-51-s.js
+++ b/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);
diff --git a/test/language/function-code/10.4.3-1-52-s.js b/test/language/function-code/10.4.3-1-52-s.js
index 17a707a109..6ec647b5d1 100644
--- a/test/language/function-code/10.4.3-1-52-s.js
+++ b/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);
diff --git a/test/language/function-code/10.4.3-1-53-s.js b/test/language/function-code/10.4.3-1-53-s.js
index 69792c8d71..598bdbe559 100644
--- a/test/language/function-code/10.4.3-1-53-s.js
+++ b/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);
diff --git a/test/language/function-code/10.4.3-1-63-s.js b/test/language/function-code/10.4.3-1-63-s.js
index 5b2f958c72..620beee2ab 100644
--- a/test/language/function-code/10.4.3-1-63-s.js
+++ b/test/language/function-code/10.4.3-1-63-s.js
@@ -5,11 +5,7 @@
es5id: 10.4.3-1-63-s
description: >
checking 'this' (strict function declaration called by non-strict eval)
-includes: [runTestCase.js]
---*/
-function testcase() {
function f() { "use strict"; return this===undefined;};
-return eval("f();");
-}
-runTestCase(testcase);
+assert(eval("f();"));
diff --git a/test/language/function-code/10.4.3-1-64-s.js b/test/language/function-code/10.4.3-1-64-s.js
index 49a20b2779..2c756125dc 100644
--- a/test/language/function-code/10.4.3-1-64-s.js
+++ b/test/language/function-code/10.4.3-1-64-s.js
@@ -6,13 +6,8 @@ es5id: 10.4.3-1-64-s
description: >
checking 'this' (strict function declaration called by non-strict Function
constructor)
-includes:
- - runTestCase.js
- - fnGlobalObject.js
+includes: [fnGlobalObject.js]
---*/
-function testcase() {
fnGlobalObject().f = function() { "use strict"; return this===undefined;};
-return Function("return f();")();
-}
-runTestCase(testcase);
+assert(Function("return f();")());
diff --git a/test/language/function-code/10.4.3-1-65-s.js b/test/language/function-code/10.4.3-1-65-s.js
index 0725e797d2..f3d1180763 100644
--- a/test/language/function-code/10.4.3-1-65-s.js
+++ b/test/language/function-code/10.4.3-1-65-s.js
@@ -6,13 +6,8 @@ es5id: 10.4.3-1-65-s
description: >
checking 'this' (strict function declaration called by non-strict new'ed
Function constructor)
-includes:
- - runTestCase.js
- - fnGlobalObject.js
+includes: [fnGlobalObject.js]
---*/
-function testcase() {
fnGlobalObject().f = function() { "use strict"; return this===undefined;};
-return (new Function("return f();"))();
-}
-runTestCase(testcase);
+assert((new Function("return f();"))());
diff --git a/test/language/function-code/10.4.3-1-82-s.js b/test/language/function-code/10.4.3-1-82-s.js
index 146160f37f..617dd2e0cb 100644
--- a/test/language/function-code/10.4.3-1-82-s.js
+++ b/test/language/function-code/10.4.3-1-82-s.js
@@ -7,11 +7,7 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict eval)
flags: [noStrict]
-includes: [runTestCase.js]
---*/
-function testcase() {
function f() { return this!==undefined;};
-return (function () {"use strict"; return eval("f();");})();
-}
-runTestCase(testcase);
+assert((function () {"use strict"; return eval("f();");})());
diff --git a/test/language/function-code/10.4.3-1-83-s.js b/test/language/function-code/10.4.3-1-83-s.js
index 4b6331ddf8..d7d4583ae8 100644
--- a/test/language/function-code/10.4.3-1-83-s.js
+++ b/test/language/function-code/10.4.3-1-83-s.js
@@ -7,13 +7,8 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict Function constructor)
flags: [noStrict]
-includes:
- - runTestCase.js
- - fnGlobalObject.js
+includes: [fnGlobalObject.js]
---*/
-function testcase() {
fnGlobalObject().f = function() {return this!==undefined;};
-return (function () {return Function("\"use strict\";return f();")();})();
-}
-runTestCase(testcase);
+assert((function () {return Function("\"use strict\";return f();")();})());
diff --git a/test/language/function-code/10.4.3-1-84-s.js b/test/language/function-code/10.4.3-1-84-s.js
index f9807b800e..467a323e55 100644
--- a/test/language/function-code/10.4.3-1-84-s.js
+++ b/test/language/function-code/10.4.3-1-84-s.js
@@ -7,13 +7,8 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict new'ed Function constructor)
flags: [noStrict]
-includes:
- - runTestCase.js
- - fnGlobalObject.js
+includes: [fnGlobalObject.js]
---*/
-function testcase() {
fnGlobalObject().f = function() { return this!==undefined;};
-return (function () {return new Function("\"use strict\";return f();")();})();
-}
-runTestCase(testcase);
+assert((function () {return new Function("\"use strict\";return f();")();})());
diff --git a/test/language/function-code/10.4.3-1-85-s.js b/test/language/function-code/10.4.3-1-85-s.js
index d292baf487..ae4af0410e 100644
--- a/test/language/function-code/10.4.3-1-85-s.js
+++ b/test/language/function-code/10.4.3-1-85-s.js
@@ -7,11 +7,7 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict Function.prototype.apply())
flags: [noStrict]
-includes: [runTestCase.js]
---*/
-function testcase() {
function f() { return this!==undefined;};
-return (function () {"use strict"; return f.apply();})();
-}
-runTestCase(testcase);
+assert((function () {"use strict"; return f.apply();})());
diff --git a/test/language/function-code/10.4.3-1-86-s.js b/test/language/function-code/10.4.3-1-86-s.js
index 1cf7a495d3..824d5d36b2 100644
--- a/test/language/function-code/10.4.3-1-86-s.js
+++ b/test/language/function-code/10.4.3-1-86-s.js
@@ -7,13 +7,8 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict Function.prototype.apply(null))
flags: [noStrict]
-includes:
- - runTestCase.js
- - fnGlobalObject.js
+includes: [fnGlobalObject.js]
---*/
-function testcase() {
function f() { return this===fnGlobalObject();};
-return (function () {"use strict"; return f.apply(null);})();
-}
-runTestCase(testcase);
+assert((function () {"use strict"; return f.apply(null);})());
diff --git a/test/language/function-code/10.4.3-1-87-s.js b/test/language/function-code/10.4.3-1-87-s.js
index 92a9ef332b..f4a1313fea 100644
--- a/test/language/function-code/10.4.3-1-87-s.js
+++ b/test/language/function-code/10.4.3-1-87-s.js
@@ -7,13 +7,8 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict Function.prototype.apply(undefined))
flags: [noStrict]
-includes:
- - runTestCase.js
- - fnGlobalObject.js
+includes: [fnGlobalObject.js]
---*/
-function testcase() {
function f() { return this===fnGlobalObject()};
-return (function () {"use strict"; return f.apply(undefined);})();
-}
-runTestCase(testcase);
+assert((function () {"use strict"; return f.apply(undefined);})());
diff --git a/test/language/function-code/10.4.3-1-88-s.js b/test/language/function-code/10.4.3-1-88-s.js
index 54ecbd3409..a388bbca5f 100644
--- a/test/language/function-code/10.4.3-1-88-s.js
+++ b/test/language/function-code/10.4.3-1-88-s.js
@@ -7,12 +7,8 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict Function.prototype.apply(someObject))
flags: [noStrict]
-includes: [runTestCase.js]
---*/
-function testcase() {
var o = {};
function f() { return this===o;};
-return (function () {"use strict"; return f.apply(o);})();
-}
-runTestCase(testcase);
+assert((function () {"use strict"; return f.apply(o);})());
diff --git a/test/language/function-code/10.4.3-1-89-s.js b/test/language/function-code/10.4.3-1-89-s.js
index 73e193b3f5..799cb85f3f 100644
--- a/test/language/function-code/10.4.3-1-89-s.js
+++ b/test/language/function-code/10.4.3-1-89-s.js
@@ -7,13 +7,8 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict Function.prototype.apply(globalObject))
flags: [noStrict]
-includes:
- - runTestCase.js
- - fnGlobalObject.js
+includes: [fnGlobalObject.js]
---*/
-function testcase() {
function f() { return this;};
-return (function () {"use strict"; return f.apply(fnGlobalObject()); })() === fnGlobalObject();
-}
-runTestCase(testcase);
+assert.sameValue((function () {"use strict"; return f.apply(fnGlobalObject()); })(), fnGlobalObject());
diff --git a/test/language/function-code/10.4.3-1-90-s.js b/test/language/function-code/10.4.3-1-90-s.js
index 65063ddd16..60005ca836 100644
--- a/test/language/function-code/10.4.3-1-90-s.js
+++ b/test/language/function-code/10.4.3-1-90-s.js
@@ -7,13 +7,8 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict Function.prototype.call())
flags: [noStrict]
-includes:
- - runTestCase.js
- - fnGlobalObject.js
+includes: [fnGlobalObject.js]
---*/
-function testcase() {
function f() { return this===fnGlobalObject();};
-return (function () {"use strict"; return f.call(); })();
-}
-runTestCase(testcase);
+assert((function () {"use strict"; return f.call(); })());
diff --git a/test/language/function-code/10.4.3-1-91-s.js b/test/language/function-code/10.4.3-1-91-s.js
index e1d0dd932a..3bb35a53cf 100644
--- a/test/language/function-code/10.4.3-1-91-s.js
+++ b/test/language/function-code/10.4.3-1-91-s.js
@@ -7,13 +7,8 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict Function.prototype.call(null))
flags: [noStrict]
-includes:
- - runTestCase.js
- - fnGlobalObject.js
+includes: [fnGlobalObject.js]
---*/
-function testcase() {
function f() { return this===fnGlobalObject();};
-return (function () {"use strict"; return f.call(null); })();
-}
-runTestCase(testcase);
+assert((function () {"use strict"; return f.call(null); })());
diff --git a/test/language/function-code/10.4.3-1-92-s.js b/test/language/function-code/10.4.3-1-92-s.js
index c058527cdc..0f0993db96 100644
--- a/test/language/function-code/10.4.3-1-92-s.js
+++ b/test/language/function-code/10.4.3-1-92-s.js
@@ -7,13 +7,8 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict Function.prototype.call(undefined))
flags: [noStrict]
-includes:
- - runTestCase.js
- - fnGlobalObject.js
+includes: [fnGlobalObject.js]
---*/
-function testcase() {
function f() { return this===fnGlobalObject();};
-return (function () {"use strict"; return f.call(undefined);})();
-}
-runTestCase(testcase);
+assert((function () {"use strict"; return f.call(undefined);})());
diff --git a/test/language/function-code/10.4.3-1-93-s.js b/test/language/function-code/10.4.3-1-93-s.js
index ecda8c11f9..3a7299e7bc 100644
--- a/test/language/function-code/10.4.3-1-93-s.js
+++ b/test/language/function-code/10.4.3-1-93-s.js
@@ -7,12 +7,8 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict Function.prototype.call(someObject))
flags: [noStrict]
-includes: [runTestCase.js]
---*/
-function testcase() {
var o = {};
function f() { return this===o;};
-return (function () {"use strict"; return f.call(o); })();
-}
-runTestCase(testcase);
+assert((function () {"use strict"; return f.call(o); })());
diff --git a/test/language/function-code/10.4.3-1-94-s.js b/test/language/function-code/10.4.3-1-94-s.js
index ee4817c543..cee5d05553 100644
--- a/test/language/function-code/10.4.3-1-94-s.js
+++ b/test/language/function-code/10.4.3-1-94-s.js
@@ -7,13 +7,8 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict Function.prototype.call(globalObject))
flags: [noStrict]
-includes:
- - runTestCase.js
- - fnGlobalObject.js
+includes: [fnGlobalObject.js]
---*/
-function testcase() {
function f() { return this===fnGlobalObject();};
-return (function () {"use strict"; return f.call(fnGlobalObject());})();
-}
-runTestCase(testcase);
+assert((function () {"use strict"; return f.call(fnGlobalObject());})());
diff --git a/test/language/function-code/10.4.3-1-95-s.js b/test/language/function-code/10.4.3-1-95-s.js
index c7306f1015..4148fd9a4c 100644
--- a/test/language/function-code/10.4.3-1-95-s.js
+++ b/test/language/function-code/10.4.3-1-95-s.js
@@ -7,13 +7,8 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict Function.prototype.bind()())
flags: [noStrict]
-includes:
- - runTestCase.js
- - fnGlobalObject.js
+includes: [fnGlobalObject.js]
---*/
-function testcase() {
function f() { return this===fnGlobalObject();};
-return (function () {"use strict"; return f.bind()(); })();
-}
-runTestCase(testcase);
+assert((function () {"use strict"; return f.bind()(); })());
diff --git a/test/language/function-code/10.4.3-1-96-s.js b/test/language/function-code/10.4.3-1-96-s.js
index 4da2545f9e..8e5a67919a 100644
--- a/test/language/function-code/10.4.3-1-96-s.js
+++ b/test/language/function-code/10.4.3-1-96-s.js
@@ -7,13 +7,8 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict Function.prototype.bind(null)())
flags: [noStrict]
-includes:
- - runTestCase.js
- - fnGlobalObject.js
+includes: [fnGlobalObject.js]
---*/
-function testcase() {
function f() { return this===fnGlobalObject();};
-return (function () {"use strict"; return f.bind(null)(); })();
-}
-runTestCase(testcase);
+assert((function () {"use strict"; return f.bind(null)(); })());
diff --git a/test/language/function-code/10.4.3-1-97-s.js b/test/language/function-code/10.4.3-1-97-s.js
index 1f569b3619..1eded33e68 100644
--- a/test/language/function-code/10.4.3-1-97-s.js
+++ b/test/language/function-code/10.4.3-1-97-s.js
@@ -7,13 +7,8 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict Function.prototype.bind(undefined)())
flags: [noStrict]
-includes:
- - runTestCase.js
- - fnGlobalObject.js
+includes: [fnGlobalObject.js]
---*/
-function testcase() {
function f() { return this===fnGlobalObject();};
-return (function () {"use strict"; return f.bind(undefined)();})();
-}
-runTestCase(testcase);
+assert((function () {"use strict"; return f.bind(undefined)();})());
diff --git a/test/language/function-code/10.4.3-1-98-s.js b/test/language/function-code/10.4.3-1-98-s.js
index 36360dffa4..232b2e7455 100644
--- a/test/language/function-code/10.4.3-1-98-s.js
+++ b/test/language/function-code/10.4.3-1-98-s.js
@@ -7,12 +7,8 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict Function.prototype.bind(someObject)())
flags: [noStrict]
-includes: [runTestCase.js]
---*/
-function testcase() {
var o = {};
function f() { return this===o;};
-return (function () {"use strict"; return f.bind(o)();})();
-}
-runTestCase(testcase);
+assert((function () {"use strict"; return f.bind(o)();})());
diff --git a/test/language/function-code/10.4.3-1-99-s.js b/test/language/function-code/10.4.3-1-99-s.js
index 8f0f2f6f3a..081abf47b5 100644
--- a/test/language/function-code/10.4.3-1-99-s.js
+++ b/test/language/function-code/10.4.3-1-99-s.js
@@ -7,13 +7,8 @@ description: >
Strict Mode - checking 'this' (non-strict function declaration
called by strict Function.prototype.bind(globalObject)())
flags: [noStrict]
-includes:
- - runTestCase.js
- - fnGlobalObject.js
+includes: [fnGlobalObject.js]
---*/
-function testcase() {
function f() { return this===fnGlobalObject();};
-return (function () {"use strict"; return f.bind(fnGlobalObject())();})();
-}
-runTestCase(testcase);
+assert((function () {"use strict"; return f.bind(fnGlobalObject())();})());
--
GitLab