From ba1b02a047f3cb8a3417e7648dc5331b7dcd1f5f 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:32:19 +0200
Subject: [PATCH] Replace runTestCase with assert helpers
[test/language/eval-code]
---
test/language/eval-code/10.4.2-1-1.js | 10 +++-------
test/language/eval-code/10.4.2-1-2.js | 13 ++++---------
test/language/eval-code/10.4.2-1-3.js | 11 +++--------
test/language/eval-code/10.4.2-1-4.js | 10 +++-------
test/language/eval-code/10.4.2-1-5.js | 5 ++---
test/language/eval-code/10.4.2-2-c-1.js | 13 ++++++-------
test/language/eval-code/10.4.2-2-s.js | 5 ++---
test/language/eval-code/10.4.2-3-c-1-s.js | 7 +++----
test/language/eval-code/10.4.2-3-c-2-s.js | 7 +++----
test/language/eval-code/10.4.2-3-c-3-s.js | 10 +++-------
test/language/eval-code/10.4.2.1-2-s.js | 5 ++---
test/language/eval-code/10.4.2.1-4-s.js | 5 ++---
12 files changed, 36 insertions(+), 65 deletions(-)
diff --git a/test/language/eval-code/10.4.2-1-1.js b/test/language/eval-code/10.4.2-1-1.js
index eba55831d2..6b1b4a9481 100644
--- a/test/language/eval-code/10.4.2-1-1.js
+++ b/test/language/eval-code/10.4.2-1-1.js
@@ -4,17 +4,13 @@
/*---
es5id: 10.4.2-1-1
description: Indirect call to eval has context set to global context
-includes: [runTestCase.js]
---*/
var __10_4_2_1_1_1 = "str";
function testcase() {
var _eval = eval;
var __10_4_2_1_1_1 = "str1";
- if(_eval("\'str\' === __10_4_2_1_1_1") === true && // indirect eval
- eval("\'str1\' === __10_4_2_1_1_1") === true) { // direct eval
- return true;
- }
- return false;
+ assert(_eval("\'str\' === __10_4_2_1_1_1"), 'indirect eval');
+ assert(eval("\'str1\' === __10_4_2_1_1_1"), 'direct eval');
}
-runTestCase(testcase);
+testcase();
diff --git a/test/language/eval-code/10.4.2-1-2.js b/test/language/eval-code/10.4.2-1-2.js
index 8450c42216..0c093a59da 100644
--- a/test/language/eval-code/10.4.2-1-2.js
+++ b/test/language/eval-code/10.4.2-1-2.js
@@ -6,7 +6,6 @@ es5id: 10.4.2-1-2
description: >
Indirect call to eval has context set to global context (nested
function)
-includes: [runTestCase.js]
---*/
var __10_4_2_1_2 = "str";
@@ -15,13 +14,9 @@ function testcase() {
var __10_4_2_1_2 = "str1";
function foo() {
var __10_4_2_1_2 = "str2";
- if(_eval("\'str\' === __10_4_2_1_2") === true && // indirect eval
- eval("\'str2\' === __10_4_2_1_2") === true) { // direct eval
- return true;
- } else {
- return false;
- }
+ assert(_eval("\'str\' === __10_4_2_1_2"), 'indirect eval');
+ assert(eval("\'str2\' === __10_4_2_1_2"), 'direct eval');
}
- return foo();
+ foo();
}
-runTestCase(testcase);
+testcase();
diff --git a/test/language/eval-code/10.4.2-1-3.js b/test/language/eval-code/10.4.2-1-3.js
index b300af067d..542c883579 100644
--- a/test/language/eval-code/10.4.2-1-3.js
+++ b/test/language/eval-code/10.4.2-1-3.js
@@ -6,7 +6,6 @@ es5id: 10.4.2-1-3
description: >
Indirect call to eval has context set to global context (catch
block)
-includes: [runTestCase.js]
---*/
var __10_4_2_1_3 = "str";
@@ -18,12 +17,8 @@ function testcase() {
}
catch (e) {
var __10_4_2_1_3 = "str2";
- if (_eval("\'str\' === __10_4_2_1_3") === true && // indirect eval
- eval("\'str2\' === __10_4_2_1_3") === true) { // direct eval
- return true;
- } else {
- return false;
- }
+ assert(_eval("\'str\' === __10_4_2_1_3"), 'indirect eval');
+ assert(eval("\'str2\' === __10_4_2_1_3"), 'direct eval');
}
}
-runTestCase(testcase);
+testcase();
diff --git a/test/language/eval-code/10.4.2-1-4.js b/test/language/eval-code/10.4.2-1-4.js
index d0ff799fed..969288a9b8 100644
--- a/test/language/eval-code/10.4.2-1-4.js
+++ b/test/language/eval-code/10.4.2-1-4.js
@@ -7,7 +7,6 @@ description: >
Indirect call to eval has context set to global context (with
block)
flags: [noStrict]
-includes: [runTestCase.js]
---*/
var __10_4_2_1_4 = "str";
@@ -17,11 +16,8 @@ function testcase() {
var _eval = eval;
var __10_4_2_1_4 = "str1";
with (o) {
- if (_eval("\'str\' === __10_4_2_1_4") === true && // indirect eval
- eval("\'str2\' === __10_4_2_1_4") === true) { // direct eval
- return true;
- }
+ assert(_eval("\'str\' === __10_4_2_1_4"), 'indirect eval');
+ assert(eval("\'str2\' === __10_4_2_1_4"), 'direct eval');
}
- return false;
}
-runTestCase(testcase);
+testcase();
diff --git a/test/language/eval-code/10.4.2-1-5.js b/test/language/eval-code/10.4.2-1-5.js
index 7ea43dfe91..db2f2f506f 100644
--- a/test/language/eval-code/10.4.2-1-5.js
+++ b/test/language/eval-code/10.4.2-1-5.js
@@ -6,7 +6,6 @@ es5id: 10.4.2-1-5
description: >
Indirect call to eval has context set to global context (inside
another eval)
-includes: [runTestCase.js]
---*/
var __10_4_2_1_5 = "str";
@@ -18,6 +17,6 @@ function testcase() {
_eval(\"\'str\' === __10_4_2_1_5 \") && \
eval(\"\'str2\' === __10_4_2_1_5\")\
");
- return r;
+ assert(r);
}
-runTestCase(testcase);
+testcase();
diff --git a/test/language/eval-code/10.4.2-2-c-1.js b/test/language/eval-code/10.4.2-2-c-1.js
index 1a907ef485..aab6b4dff8 100644
--- a/test/language/eval-code/10.4.2-2-c-1.js
+++ b/test/language/eval-code/10.4.2-2-c-1.js
@@ -7,15 +7,14 @@ description: >
Direct val code in non-strict mode - can instantiate variable in
calling context
flags: [noStrict]
-includes: [runTestCase.js]
---*/
function testcase() {
var x = 0;
- return function inner() {
+ function inner() {
eval("var x = 1");
- if (x === 1)
- return true;
- } ();
- }
-runTestCase(testcase);
+ assert.sameValue(x, 1, "x");
+ }
+ inner();
+}
+testcase();
diff --git a/test/language/eval-code/10.4.2-2-s.js b/test/language/eval-code/10.4.2-2-s.js
index ea42245ae5..e5f93b2ac5 100644
--- a/test/language/eval-code/10.4.2-2-s.js
+++ b/test/language/eval-code/10.4.2-2-s.js
@@ -7,11 +7,10 @@ description: >
Strict Mode - Strict mode eval code cannot instantiate functions
in the variable environment of the caller to eval
flags: [onlyStrict]
-includes: [runTestCase.js]
---*/
function testcase() {
eval("function fun(x){ return x }");
- return typeof (fun) === "undefined";
+ assert.sameValue(typeof (fun), "undefined");
}
-runTestCase(testcase);
+testcase();
diff --git a/test/language/eval-code/10.4.2-3-c-1-s.js b/test/language/eval-code/10.4.2-3-c-1-s.js
index 3766e3a982..4479505cea 100644
--- a/test/language/eval-code/10.4.2-3-c-1-s.js
+++ b/test/language/eval-code/10.4.2-3-c-1-s.js
@@ -6,15 +6,14 @@ es5id: 10.4.2-3-c-1-s
description: >
Direct eval code in strict mode - cannot instantiate variable in
the variable environment of the calling context
-includes: [runTestCase.js]
---*/
function testcase() {
var _10_4_2_3_c_1_s = 0;
function _10_4_2_3_c_1_sFunc() {
eval("'use strict';var _10_4_2_3_c_1_s = 1");
- return _10_4_2_3_c_1_s===0;
+ assert.sameValue(_10_4_2_3_c_1_s, 0);
}
- return _10_4_2_3_c_1_sFunc();
+ _10_4_2_3_c_1_sFunc();
}
-runTestCase(testcase);
+testcase();
diff --git a/test/language/eval-code/10.4.2-3-c-2-s.js b/test/language/eval-code/10.4.2-3-c-2-s.js
index 86001d9c27..8c83b57062 100644
--- a/test/language/eval-code/10.4.2-3-c-2-s.js
+++ b/test/language/eval-code/10.4.2-3-c-2-s.js
@@ -7,15 +7,14 @@ description: >
Calling code in strict mode - eval cannot instantiate variable in
the variable environment of the calling context
flags: [onlyStrict]
-includes: [runTestCase.js]
---*/
function testcase() {
var _10_4_2_3_c_2_s = 0;
function _10_4_2_3_c_2_sFunc() {
eval("var _10_4_2_3_c_2_s = 1");
- return _10_4_2_3_c_2_s===0;
+ assert.sameValue(_10_4_2_3_c_2_s, 0);
}
- return _10_4_2_3_c_2_sFunc();
+ _10_4_2_3_c_2_sFunc();
}
-runTestCase(testcase);
+testcase();
diff --git a/test/language/eval-code/10.4.2-3-c-3-s.js b/test/language/eval-code/10.4.2-3-c-3-s.js
index f523d20a36..a3800c2a28 100644
--- a/test/language/eval-code/10.4.2-3-c-3-s.js
+++ b/test/language/eval-code/10.4.2-3-c-3-s.js
@@ -7,15 +7,11 @@ description: >
Calling code in strict mode - eval cannot instantiate variable in
the global context
flags: [onlyStrict]
-includes: [runTestCase.js]
---*/
var _10_4_2_3_c_3_s = 0;
function testcase() {
- function _10_4_2_3_c_3_sFunc() {
- eval("var _10_4_2_3_c_3_s = 1");
- return _10_4_2_3_c_3_s===0;
- }
- return _10_4_2_3_c_3_sFunc();
+ eval("var _10_4_2_3_c_3_s = 1");
+ assert.sameValue(_10_4_2_3_c_3_s, 0);
}
-runTestCase(testcase);
+testcase();
diff --git a/test/language/eval-code/10.4.2.1-2-s.js b/test/language/eval-code/10.4.2.1-2-s.js
index c858874f05..94fad9076f 100644
--- a/test/language/eval-code/10.4.2.1-2-s.js
+++ b/test/language/eval-code/10.4.2.1-2-s.js
@@ -7,11 +7,10 @@ description: >
Strict Mode - Strict mode eval code cannot instantiate functions
in the variable environment of the caller to eval
flags: [onlyStrict]
-includes: [runTestCase.js]
---*/
function testcase() {
eval("function _10_4_2_1_2_fun(){}");
- return typeof _10_4_2_1_2_fun === "undefined";
+ assert.sameValue(typeof _10_4_2_1_2_fun, "undefined");
}
-runTestCase(testcase);
+testcase();
diff --git a/test/language/eval-code/10.4.2.1-4-s.js b/test/language/eval-code/10.4.2.1-4-s.js
index df4e1c6b7a..3ea6fa7c8b 100644
--- a/test/language/eval-code/10.4.2.1-4-s.js
+++ b/test/language/eval-code/10.4.2.1-4-s.js
@@ -6,11 +6,10 @@ es5id: 10.4.2.1-4-s
description: >
Strict Mode - Strict mode eval code cannot instantiate functions
in the variable environment of the caller to eval.
-includes: [runTestCase.js]
---*/
function testcase() {
eval("'use strict'; function _10_4_2_1_4_fun(){}");
- return typeof _10_4_2_1_4_fun === "undefined";
+ assert.sameValue(typeof _10_4_2_1_4_fun, "undefined");
}
-runTestCase(testcase);
+testcase();
--
GitLab