Change 'assert' handle to pass only upon exactly 1 argument is received, and the argument is boolean true; update internal test suite correspondingly.

JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan [email protected]

Author: ruben-ayrapetyan

main-linux.cpp

@@ -113,7 +113,7 @@ read_sources (const char *script_file_names[],
 /**
  * Provide the 'assert' implementation for the engine.
  *
- * @return true - if the argument was not a boolean value or it was boolean true.
+ * @return true - if only one argument was passed and the argument is a boolean true.
  */
 static bool
 assert_handler (const jerry_api_object_t *function_obj_p __attr_unused___, /** < function object */
@@ -122,18 +122,19 @@ assert_handler (const jerry_api_object_t *function_obj_p __attr_unused___, /** <
                 const jerry_api_value_t args_p[], /** < function arguments */
                 const jerry_api_length_t args_cnt) /** < number of function arguments */
 {
-  if (args_cnt > 0
+  if (args_cnt == 1
       && args_p[0].type == JERRY_API_DATA_TYPE_BOOLEAN
-      && args_p[0].v_bool != true)
+      && args_p[0].v_bool == true)
+  {
+    return true;
+  }
+  else
   {
     JERRY_ERROR_MSG ("Script assertion failed\n");
     exit (JERRY_STANDALONE_EXIT_CODE_FAIL);
   }
-
-  return true;
 } /* assert_handler */
 
-
 int
 main (int argc,
       char **argv)

tests/jerry-test-suite/08/08.01/08.01-010.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Samsung Electronics Co., Ltd.
+// Copyright 2014-2015 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-assert(test());
+assert (test ());
 
-function test(arg)
+function test (arg)
 {
   if (typeof (arg) === "undefined")
-    return 1;
+    return true;
   else
-    return 0;
+    return false;
 }

tests/jerry-test-suite/08/08.01/08.01-011.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Samsung Electronics Co., Ltd.
+// Copyright 2014-2015 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-assert(test());
+assert (test ());
 
-function test(arg)
+function test (arg)
 {
   if (typeof (arg) === "undefined")
-    return 1;
+    return true;
   else
-    return 0;
+    return false;
 }

tests/jerry-test-suite/11/11.11/11.11-009.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Samsung Electronics Co., Ltd.
+// Copyright 2014-2015 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,5 +13,5 @@
 // limitations under the License.
 
 var a = NaN;
-var b = new Object();
-assert((!a && b))
+var b = new Object ();
+assert ((!a && b) === b);

tests/jerry-test-suite/11/11.13/11.13.02/11.13.02-012.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Samsung Electronics Co., Ltd.
+// Copyright 2014-2015 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,4 +15,4 @@
 var a = 0xffffffff;
 var _a = a;
 var b = 4;
-assert(a >>= b === _a >> b)
+assert ((a >>= b) === (_a >> b));

tests/jerry-test-suite/11/11.13/11.13.02/11.13.02-013.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Samsung Electronics Co., Ltd.
+// Copyright 2014-2015 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,4 +15,4 @@
 var a = 0xffffffff;
 var _a = a;
 var b = 4;
-assert(a <<= b === _a << b)
+assert ((a <<= b) === (_a << b));

tests/jerry-test-suite/11/11.13/11.13.02/11.13.02-014.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Samsung Electronics Co., Ltd.
+// Copyright 2014-2015 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,4 +15,4 @@
 var a = 0xffffffff;
 var _a = a;
 var b = 4;
-assert(a >>>= b === _a >>> b)
+assert ((a >>>= b) === (_a >>> b));

tests/jerry-test-suite/12/12.01/12.01-002.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Samsung Electronics Co., Ltd.
+// Copyright 2014-2015 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-function test()
+function test ()
 {
   {
-    return 1;
+    return true;
   }
-  return 0;
+  return false;
 }
 
-assert(test());
+assert (test ());

tests/jerry-test-suite/12/12.11/12.11-002.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Samsung Electronics Co., Ltd.
+// Copyright 2014-2015 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -29,4 +29,4 @@ switch ("key") {
     break;
 }
 
-assert(matchesCount === 1 ? 1 : 0);
+assert (matchesCount === 1);

tests/jerry-test-suite/12/12.11/12.11-004.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Samsung Electronics Co., Ltd.
+// Copyright 2014-2015 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,4 +25,4 @@ switch ("key") {
     ++counter;
 }
 
-assert(counter == 4 ? 1 : 0);
+assert (counter == 4);