diff --git a/harness/$PRINT.js b/harness/$PRINT.js deleted file mode 100644 index b9a3015037cbadd117983a2e038ea08447d31455..0000000000000000000000000000000000000000 --- a/harness/$PRINT.js +++ /dev/null @@ -1,4 +0,0 @@ -//adaptors for Test262 framework -function $PRINT(message) { - -} diff --git a/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A7.js b/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A7.js index a6480454eb196d67618eb7ba44c92fad7f7513ed..8b99b376a5b993eb25ec469e7eee2713bf9b879c 100644 --- a/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A7.js +++ b/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A7.js @@ -5,8 +5,6 @@ info: Object.prototype.hasOwnProperty can't be used as a constructor es5id: 15.2.4.5_A7 description: Checking if creating "new Object.prototype.hasOwnProperty" fails -includes: - - $PRINT.js ---*/ var FACTORY = Object.prototype.hasOwnProperty; diff --git a/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A1.js b/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A1.js index 65a3bb3acd6bc6e5cee80d6c9fc6daa78983ea2f..5198596fe4b00cdd286af64611938472bee841c9 100644 --- a/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A1.js +++ b/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A1.js @@ -7,7 +7,6 @@ info: > V refer to the same object or to objects joined to each other, return true es5id: 15.2.4.6_A1 description: Creating two objects with the same prototype -includes: [$PRINT.js] ---*/ function USER_FACTORY( name ) { @@ -29,20 +28,22 @@ FORCEDUSER_FACTORY.prototype = proto; var luke = new FORCEDUSER_FACTORY("Luke Skywalker", 12); ////// // CHECK#1 -if(proto.isPrototypeOf(luke)){ - $PRINT('#1: Native ECMAScript objects have an internal property called [[Prototype]].'); -} else { - $ERROR('#1: native ECMAScript objects have an internal property called [[Prototype]].'); -} +assert.sameValue( + proto.isPrototypeOf(luke), + true, + '#1: native ECMAScript objects have an internal property called [[Prototype]].' +); + // ///////// ////// // CHECK#2 -if(USER_FACTORY.prototype.isPrototypeOf(luke)){ - $PRINT('#2: Native ECMAScript objects have an internal property called [[Prototype]].'); -} else { - $ERROR('#2: native ECMAScript objects have an internal property called [[Prototype]].'); -} +assert.sameValue( + USER_FACTORY.prototype.isPrototypeOf(luke), + true, + '#2: native ECMAScript objects have an internal property called [[Prototype]].' +); + // ///////// ////// diff --git a/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A7.js b/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A7.js index 44490329c7d924d52e2e3af9a7819512c5f2aa17..2a6eb9c405b74f967cb3a3ce1a3e5e0c518ba1f1 100644 --- a/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A7.js +++ b/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A7.js @@ -5,8 +5,6 @@ info: Object.prototype.valueOf can't be used as a constructor es5id: 15.2.4.4_A7 description: Checking if creating "new Object.prototype.valueOf" fails -includes: - - $PRINT.js ---*/ var FACTORY = Object.prototype.valueOf; diff --git a/test/built-ins/String/prototype/indexOf/S15.5.4.7_A7.js b/test/built-ins/String/prototype/indexOf/S15.5.4.7_A7.js index cc46ccd0c7fb6c8e794ac4036aa62a0e6ac9fe39..b1bdd51e0a5fb8a40feba06b3424990253c0bdd6 100644 --- a/test/built-ins/String/prototype/indexOf/S15.5.4.7_A7.js +++ b/test/built-ins/String/prototype/indexOf/S15.5.4.7_A7.js @@ -5,8 +5,6 @@ info: String.prototype.indexOf can't be used as constructor es5id: 15.5.4.7_A7 description: Checking if creating the String.prototype.indexOf object fails -includes: - - $PRINT.js ---*/ var __FACTORY = String.prototype.indexOf; @@ -18,5 +16,4 @@ try { if ((e instanceof TypeError) !== true) { $ERROR('#1.2: var __FACTORY = String.prototype.indexOf; "__instance = new __FACTORY" throw a TypeError. Actual: ' + (e)); } - $PRINT(e); } diff --git a/test/built-ins/String/prototype/search/S15.5.4.12_A7.js b/test/built-ins/String/prototype/search/S15.5.4.12_A7.js index 08e2f8ef63a0fbd311ca6584a7730caff5d972b8..e34449aac3556412d03c153c951c17c1465ba4e3 100644 --- a/test/built-ins/String/prototype/search/S15.5.4.12_A7.js +++ b/test/built-ins/String/prototype/search/S15.5.4.12_A7.js @@ -5,8 +5,6 @@ info: String.prototype.search can't be used as constructor es5id: 15.5.4.12_A7 description: Checking if creating the String.prototype.search object fails -includes: - - $PRINT.js ---*/ var __FACTORY = String.prototype.search; @@ -18,5 +16,4 @@ try { if ((e instanceof TypeError) !== true) { $ERROR('#1.1: __FACTORY = String.prototype.search; "__instance = new __FACTORY" throw a TypeError. Actual: ' + (e)); } - $PRINT(e); } diff --git a/test/built-ins/String/prototype/substring/S15.5.4.15_A7.js b/test/built-ins/String/prototype/substring/S15.5.4.15_A7.js index e9a8f6bf247ebd1c1749712f016b3f10ed5b0071..14440737f971d97819e2b7ed7beac408b9184c37 100644 --- a/test/built-ins/String/prototype/substring/S15.5.4.15_A7.js +++ b/test/built-ins/String/prototype/substring/S15.5.4.15_A7.js @@ -5,8 +5,6 @@ info: String.prototype.substring can't be used as constructor es5id: 15.5.4.15_A7 description: Checking if creating the String.prototype.substring object fails -includes: - - $PRINT.js ---*/ var __FACTORY = String.prototype.substring; @@ -18,5 +16,4 @@ try { if ((e instanceof TypeError) !== true) { $ERROR('#1.2: undefined = 1 throw a TypeError. Actual: ' + (e)); } - $PRINT(e); } diff --git a/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A7.js b/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A7.js index e48f67321e29402003aaeb1efcaf9d16d87dee63..03faefe863f4acf574c071b33f99df35cbbeeaeb 100644 --- a/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A7.js +++ b/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A7.js @@ -7,8 +7,6 @@ es5id: 15.5.4.17_A7 description: > Checking if creating the String.prototype.toLocaleLowerCase object fails -includes: - - $PRINT.js ---*/ var __FACTORY = String.prototype.toLocaleLowerCase; @@ -20,5 +18,4 @@ try { if ((e instanceof TypeError) !== true) { $ERROR('#1.1: var __FACTORY = String.prototype.toLocaleLowerCase; "var __instance = new __FACTORY" throw a TypeError. Actual: ' + (e)); } - $PRINT(e); } diff --git a/test/language/function-code/S10.2.1_A4_T2.js b/test/language/function-code/S10.2.1_A4_T2.js index 6733dec451a3d29c487427d29496ffaae0eb410d..c788a5985a8bfa3416b128ea6de787427ebaf856 100644 --- a/test/language/function-code/S10.2.1_A4_T2.js +++ b/test/language/function-code/S10.2.1_A4_T2.js @@ -9,7 +9,6 @@ info: > FormalParameterList properties es5id: 10.2.1_A4_T2 description: Checking existence of a function with declared variable -includes: [$PRINT.js] ---*/ //CHECK#1 @@ -22,9 +21,8 @@ function f1(){ return 7; } } -if(!(f1().constructor.prototype === Function.prototype)){ - $PRINT('#1: f1() returns function'); -} + +assert.sameValue(f1().constructor.prototype, Function.prototype); //CHECK#2 function f2(){ @@ -36,6 +34,5 @@ function f2(){ return 7; } } -if(!(f2() === "function")){ - $PRINT('#2: f2() === "function"'); -} + +assert.sameValue(f2(), "function"); diff --git a/test/language/function-code/S10.2.1_A5.1_T1.js b/test/language/function-code/S10.2.1_A5.1_T1.js index c68a53d9c10647eb41ccacd690f33f02ea572466..a1ef1a3bdfd35d8442628030059f767e675e64fd 100644 --- a/test/language/function-code/S10.2.1_A5.1_T1.js +++ b/test/language/function-code/S10.2.1_A5.1_T1.js @@ -9,7 +9,6 @@ info: > undefined and whose attributes are determined by the type of code es5id: 10.2.1_A5.1_T1 description: Checking variable existence only -includes: [$PRINT.js] ---*/ //CHECK#1 @@ -19,9 +18,7 @@ function f1(){ return typeof x; } -if(!(f1() === "undefined")){ - $PRINT('#1: f1() === "undefined"'); -} +assert.sameValue(f1(), "undefined"); //CHECK#2 function f2(){ @@ -30,6 +27,4 @@ function f2(){ return x; } -if(!(f2() === undefined)){ - $PRINT('#1: f2() === undefined'); -} +assert.sameValue(f2(), undefined); diff --git a/test/language/function-code/S10.2.1_A5.1_T2.js b/test/language/function-code/S10.2.1_A5.1_T2.js index 63295f9568c7124a12ab629b65b8862ac3b4a568..53bbee9b18dfb0837f2e0008d39f9f8ff1cbf789 100644 --- a/test/language/function-code/S10.2.1_A5.1_T2.js +++ b/test/language/function-code/S10.2.1_A5.1_T2.js @@ -11,7 +11,6 @@ es5id: 10.2.1_A5.1_T2 description: > Checking existence of the variable object property with formal parameter -includes: [$PRINT.js] ---*/ //CHECK#1 @@ -21,9 +20,7 @@ function f1(x){ return typeof x; } -if(!(f1() === "undefined")){ - $PRINT('#1: f1(1) === "undefined"'); -} +assert.sameValue(f1(), "undefined"); //CHECK#2 function f2(x){ @@ -32,6 +29,4 @@ function f2(x){ return x; } -if(!(f2() === undefined)){ - $PRINT('#1: f2(1) === undefined'); -} +assert.sameValue(f2(), undefined); diff --git a/test/language/function-code/S10.2.1_A5.2_T1.js b/test/language/function-code/S10.2.1_A5.2_T1.js index faae57d53360bacde399c265f0c81b1771dd73b1..78f5665477a79d88abf3cf197bc1639df091f2a8 100644 --- a/test/language/function-code/S10.2.1_A5.2_T1.js +++ b/test/language/function-code/S10.2.1_A5.2_T1.js @@ -10,7 +10,6 @@ es5id: 10.2.1_A5.2_T1 description: > Checking existence of the variable object property with formal parameter -includes: [$PRINT.js] ---*/ //CHECK#1 @@ -20,9 +19,7 @@ function f1(x){ return typeof x; } -if(!(f1(1) === "number")){ - $PRINT('#1: f1(1) === "number"'); -} +assert.sameValue(f1(1), "number"); //CHECK#2 function f2(x){ @@ -31,6 +28,4 @@ function f2(x){ return x; } -if(!(f2(1) === 1)){ - $PRINT('#1: f2(1) === 1'); -} +assert.sameValue(f2(1), 1); diff --git a/test/language/statements/block/S12.1_A2.js b/test/language/statements/block/S12.1_A2.js index 7b3cf0d3969789fb23d4cd8032a8e678b98c3760..edbdbca96008c2a4f3fccbfabdc6519f213196e0 100644 --- a/test/language/statements/block/S12.1_A2.js +++ b/test/language/statements/block/S12.1_A2.js @@ -8,7 +8,6 @@ info: > 2. If an exception was thrown, return (throw, V, empty) where V is the exception es5id: 12.1_A2 description: Throwing exception within a Block -includes: [$PRINT.js] ---*/ ////////////////////////////////////////////////////////////////////////////// diff --git a/test/language/types/number/S8.5_A5.js b/test/language/types/number/S8.5_A5.js index 1ce6f77e43261a3a10eb90395a218a5785700e74..1aed53ff22e12c617fe5f65794f35435c73eed2a 100644 --- a/test/language/types/number/S8.5_A5.js +++ b/test/language/types/number/S8.5_A5.js @@ -5,7 +5,6 @@ info: NaN not greater or equal zero es5id: 8.5_A5 description: Compare NaN with zero -includes: [$PRINT.js] ---*/ var x = NaN; @@ -19,8 +18,6 @@ var x_geq_0_ADD_leq_0=(x >= 0.0) + (x <= 0.0); // CHECK#1 if (x_geq_0){ $ERROR('#1: NaN not greater or equal zero'); -} else { - $PRINT('#1: NaN not greater or equal zero'); } // /////////////////////////////////////////////////// @@ -29,8 +26,6 @@ if (x_geq_0){ // CHECK#2 if (x_leq_0){ $ERROR('#2: NaN not less or equal zero'); -} else { - $PRINT('#2: NaN not less or equal zero'); } // /////////////////////////////////////////////////// @@ -39,8 +34,6 @@ if (x_leq_0){ // CHECK#3 if (x_leq_0_OR_geq_0){ $ERROR('#3: NaN not less or equal zero OR greater or equal zero'); -} else { - $PRINT('#3: NaN not less or equal zero OR greater or equal zero'); } // /////////////////////////////////////////////////// @@ -49,8 +42,6 @@ if (x_leq_0_OR_geq_0){ // CHECK#4 if (x_geq_0_ADD_leq_0){ $ERROR('#4: NaN not less or equal zero ADD greater or equal zero'); -} else { - $PRINT('#4: NaN not less or equal zero ADD greater or equal zero'); } // ///////////////////////////////////////////////////