From 7c488ea11aee32afd74614efaf10912e9d033b00 Mon Sep 17 00:00:00 2001 From: Ruben Ayrapetyan Date: Thu, 6 Nov 2014 17:39:24 +0300 Subject: [PATCH] Fixing tests of internal test suite. --- .../11/11.02/11.02.04/11.02.04-009.js | 2 +- .../11/11.02/11.02.04/11.02.04-010.js | 9 ++++++++- tests/jerry-test-suite/13/13-011.js | 2 +- .../15/15.02/15.02.03/15.02.03-003.js | 2 +- .../15/15.02/15.02.03/15.02.03-006.js | 2 +- .../15/15.02/15.02.03/15.02.03-010.js | 19 ++++++++++++++----- .../15/15.02/15.02.03/15.02.03-012.js | 3 ++- .../15/15.02/15.02.03/15.02.03-021.js | 2 +- .../15.02.04/15.02.04.06/15.02.04.06-001.js | 2 +- .../15.02.04/15.02.04.06/15.02.04.06-003.js | 2 +- .../15.02.04/15.02.04.06/15.02.04.06-004.js | 2 +- .../15.02.04/15.02.04.06/15.02.04.06-005.js | 2 +- .../15.02.04/15.02.04.06/15.02.04.06-006.js | 10 +++++++++- .../15.02.04/15.02.04.07/15.02.04.07-003.js | 2 +- .../15.03.02/15.03.02.01/15.03.02.01-011.js | 3 ++- .../15.03.04/15.03.04.02/15.03.04.02-001.js | 2 +- .../15.03.04/15.03.04.02/15.03.04.02-004.js | 2 +- .../15.05.04/15.05.04.05/15.05.04.05-002.js | 2 +- .../15.07.03/15.07.03.03/15.07.03.03-004.js | 2 +- .../15.07.03/15.07.03.05/15.07.03.05-007.js | 2 +- tests/jerry-test-suite/precommit_test_list | 1 - 21 files changed, 50 insertions(+), 25 deletions(-) diff --git a/tests/jerry-test-suite/11/11.02/11.02.04/11.02.04-009.js b/tests/jerry-test-suite/11/11.02/11.02.04/11.02.04-009.js index fe033c7d5..f678deff0 100644 --- a/tests/jerry-test-suite/11/11.02/11.02.04/11.02.04-009.js +++ b/tests/jerry-test-suite/11/11.02/11.02.04/11.02.04-009.js @@ -16,4 +16,4 @@ f_arg = function () { return arguments; } -assert(f_arg(1, 2, 3)[3] !== undefined); +assert(f_arg(1, 2, 3)[3] === undefined); diff --git a/tests/jerry-test-suite/11/11.02/11.02.04/11.02.04-010.js b/tests/jerry-test-suite/11/11.02/11.02.04/11.02.04-010.js index fe033c7d5..22c5beaf7 100644 --- a/tests/jerry-test-suite/11/11.02/11.02.04/11.02.04-010.js +++ b/tests/jerry-test-suite/11/11.02/11.02.04/11.02.04-010.js @@ -16,4 +16,11 @@ f_arg = function () { return arguments; } -assert(f_arg(1, 2, 3)[3] !== undefined); +var args = f_arg (1, 2, 3); + +for (var i = 0; i < 3; i++) +{ + assert(args[i] === i + 1); +} + +assert(args[3] === undefined); diff --git a/tests/jerry-test-suite/13/13-011.js b/tests/jerry-test-suite/13/13-011.js index d9be2acff..cad4b0b2a 100644 --- a/tests/jerry-test-suite/13/13-011.js +++ b/tests/jerry-test-suite/13/13-011.js @@ -16,4 +16,4 @@ function foo(param1) { return delete arguments; //arguments is non-configurable } -assert(foo("param")); +assert(!foo("param")); diff --git a/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-003.js b/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-003.js index 4e00ddd62..ae8c12ca4 100644 --- a/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-003.js +++ b/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-003.js @@ -30,4 +30,4 @@ for (prop in Object) if (delete Object.prototype) configurable = true; -assert(writable || enumerable || configurable); +assert(!writable && !enumerable && !configurable); diff --git a/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-006.js b/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-006.js index be0178418..352bbb857 100644 --- a/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-006.js +++ b/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-006.js @@ -26,4 +26,4 @@ var object2 = { Object.freeze(object1); -assert(Object.isExtensible(object1) && !Object.isExtensible(object2)); +assert(!Object.isExtensible(object1) && Object.isExtensible(object2)); diff --git a/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-010.js b/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-010.js index ac70c4803..23398b3c1 100644 --- a/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-010.js +++ b/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-010.js @@ -13,9 +13,18 @@ // limitations under the License. var a = new String("qwe"); + names = Object.getOwnPropertyNames(a); -assert(names instanceof Array && - names[0] === "0" && - names[1] === "1" && - names[2] === "2" && - names[3] === "length"); + +assert(names instanceof Array); + +var is_0 = false, is_1 = false, is_2 = false, is_length = false; +for (var i = 0; i <= 3; i++) +{ + if (names[i] === "0") { is_0 = true; } + if (names[i] === "1") { is_1 = true; } + if (names[i] === "2") { is_2 = true; } + if (names[i] === "length") { is_length = true; } +} + +assert (is_0 && is_1 && is_2 && is_length); diff --git a/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-012.js b/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-012.js index f5d089e24..a491a205d 100644 --- a/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-012.js +++ b/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-012.js @@ -23,4 +23,5 @@ veryUsefulObject.method = function () { return "asdf"; } -assert(veryUsefulObject.property && veryUsefulObject.method()); +assert(veryUsefulObject.property === undefined); +assert(veryUsefulObject.method === undefined); diff --git a/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-021.js b/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-021.js index ebe6fc6e8..f2186d325 100644 --- a/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-021.js +++ b/tests/jerry-test-suite/15/15.02/15.02.03/15.02.03-021.js @@ -49,4 +49,4 @@ for (p in emptyObject) { if (delete emptyObject.myProperty) isConfigurable = true; -assert(isWritable || isEnumerable || isConfigurable); +assert(!isWritable && !isEnumerable && !isConfigurable); diff --git a/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-001.js b/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-001.js index 15f346477..2bc890138 100644 --- a/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-001.js +++ b/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-001.js @@ -15,5 +15,5 @@ var a = new Object(); var b = 123; -assert(a.isPrototypeOf(b)); +assert(!a.isPrototypeOf(b)); diff --git a/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-003.js b/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-003.js index dd2639203..7be8fe058 100644 --- a/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-003.js +++ b/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-003.js @@ -15,4 +15,4 @@ var object = new Object(); var otherObject = new Object(); -assert(otherObject.isPrototypeOf(object)); +assert(!otherObject.isPrototypeOf(object)); diff --git a/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-004.js b/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-004.js index 0db039cb2..c51f4515c 100644 --- a/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-004.js +++ b/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-004.js @@ -13,4 +13,4 @@ // limitations under the License. var object = new Object(); -assert(object.isPrototypeOf(object)); \ No newline at end of file +assert(!object.isPrototypeOf(object)); diff --git a/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-005.js b/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-005.js index da9db7121..cf9429303 100644 --- a/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-005.js +++ b/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-005.js @@ -14,4 +14,4 @@ var object = Object.create(null); var temp = new Object(); -assert(temp.isPrototypeOf(object)); \ No newline at end of file +assert(!temp.isPrototypeOf(object)); diff --git a/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-006.js b/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-006.js index b1d0a0387..5c66a126f 100644 --- a/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-006.js +++ b/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.06/15.02.04.06-006.js @@ -12,4 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -Object.prototype.isPrototypeOf.call(undefined, {}); +try +{ + Object.prototype.isPrototypeOf.call(undefined, {}); + + assert(false); +} catch (e) +{ + assert (e instanceof TypeError); +} diff --git a/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.07/15.02.04.07-003.js b/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.07/15.02.04.07-003.js index a2d97f532..9468bb6b8 100644 --- a/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.07/15.02.04.07-003.js +++ b/tests/jerry-test-suite/15/15.02/15.02.04/15.02.04.07/15.02.04.07-003.js @@ -23,4 +23,4 @@ var propertyDescriptor = { Object.defineProperty(object, 'prop', propertyDescriptor); -assert(object.propertyIsEnumerable('prop')); +assert(!object.propertyIsEnumerable('prop')); diff --git a/tests/jerry-test-suite/15/15.03/15.03.02/15.03.02.01/15.03.02.01-011.js b/tests/jerry-test-suite/15/15.03/15.03.02/15.03.02.01/15.03.02.01-011.js index a73a774aa..2d21a769a 100644 --- a/tests/jerry-test-suite/15/15.03/15.03.02/15.03.02.01/15.03.02.01-011.js +++ b/tests/jerry-test-suite/15/15.03/15.03.02/15.03.02.01/15.03.02.01-011.js @@ -13,6 +13,7 @@ // limitations under the License. "use strict"; + var foo = new Function("baz", "baz", "baz", "return 0;"); -assert(false); \ No newline at end of file +assert(foo() === 0); diff --git a/tests/jerry-test-suite/15/15.03/15.03.04/15.03.04.02/15.03.04.02-001.js b/tests/jerry-test-suite/15/15.03/15.03.04/15.03.04.02/15.03.04.02-001.js index a9b967ae2..409e22687 100644 --- a/tests/jerry-test-suite/15/15.03/15.03.04/15.03.04.02/15.03.04.02-001.js +++ b/tests/jerry-test-suite/15/15.03/15.03.04/15.03.04.02/15.03.04.02-001.js @@ -13,5 +13,5 @@ // limitations under the License. assert(Function.prototype.toString.hasOwnProperty('length')); -assert(delete Function.prototype.toString.length); +assert(!(delete Function.prototype.toString.length)); assert(Function.prototype.toString.hasOwnProperty('length')); diff --git a/tests/jerry-test-suite/15/15.03/15.03.04/15.03.04.02/15.03.04.02-004.js b/tests/jerry-test-suite/15/15.03/15.03.04/15.03.04.02/15.03.04.02-004.js index a9b967ae2..409e22687 100644 --- a/tests/jerry-test-suite/15/15.03/15.03.04/15.03.04.02/15.03.04.02-004.js +++ b/tests/jerry-test-suite/15/15.03/15.03.04/15.03.04.02/15.03.04.02-004.js @@ -13,5 +13,5 @@ // limitations under the License. assert(Function.prototype.toString.hasOwnProperty('length')); -assert(delete Function.prototype.toString.length); +assert(!(delete Function.prototype.toString.length)); assert(Function.prototype.toString.hasOwnProperty('length')); diff --git a/tests/jerry-test-suite/15/15.05/15.05.04/15.05.04.05/15.05.04.05-002.js b/tests/jerry-test-suite/15/15.05/15.05.04/15.05.04.05/15.05.04.05-002.js index 805c77b63..27ca56870 100644 --- a/tests/jerry-test-suite/15/15.05/15.05.04/15.05.04.05/15.05.04.05-002.js +++ b/tests/jerry-test-suite/15/15.05/15.05.04/15.05.04.05/15.05.04.05-002.js @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -assert(String("abc").charCodeAt(3) === NaN ? 1 : 0); +assert(isNaN(String("abc").charCodeAt(3))); diff --git a/tests/jerry-test-suite/15/15.07/15.07.03/15.07.03.03/15.07.03.03-004.js b/tests/jerry-test-suite/15/15.07/15.07.03/15.07.03.03/15.07.03.03-004.js index 8152c8f1c..b9790f29b 100644 --- a/tests/jerry-test-suite/15/15.07/15.07.03/15.07.03.03/15.07.03.03-004.js +++ b/tests/jerry-test-suite/15/15.07/15.07.03/15.07.03.03/15.07.03.03-004.js @@ -14,4 +14,4 @@ var b = Number.MIN_VALUE Number.MIN_VALUE = 0 -assert(Number.MIN_VALUE === b);f +assert(Number.MIN_VALUE === b); diff --git a/tests/jerry-test-suite/15/15.07/15.07.03/15.07.03.05/15.07.03.05-007.js b/tests/jerry-test-suite/15/15.07/15.07.03/15.07.03.05/15.07.03.05-007.js index a58a90131..b6234c019 100644 --- a/tests/jerry-test-suite/15/15.07/15.07.03/15.07.03.05/15.07.03.05-007.js +++ b/tests/jerry-test-suite/15/15.07/15.07.03/15.07.03.05/15.07.03.05-007.js @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -assert(Number.propertyIsEnumerable('NEGATIVE_INFINITY')); +assert(!Number.propertyIsEnumerable('NEGATIVE_INFINITY')); diff --git a/tests/jerry-test-suite/precommit_test_list b/tests/jerry-test-suite/precommit_test_list index 852449313..8d9154071 100644 --- a/tests/jerry-test-suite/precommit_test_list +++ b/tests/jerry-test-suite/precommit_test_list @@ -934,7 +934,6 @@ ./tests/jerry-test-suite/13/13-007.js ./tests/jerry-test-suite/13/13-009.js ./tests/jerry-test-suite/13/13-010.js -./tests/jerry-test-suite/13/13-011.js ./tests/jerry-test-suite/13/13.01/13.01-001.js ./tests/jerry-test-suite/13/13.02/13.02-001.js ./tests/jerry-test-suite/13/13.02/13.02-003.js