From 145ab1ed79d3fc1e8618040c3495f9cfd400f64c Mon Sep 17 00:00:00 2001
From: Akos Kiss <akiss@inf.u-szeged.hu>
Date: Sat, 19 May 2018 00:07:21 +0200
Subject: [PATCH] Simplify run-time feature checks in unit tests (#2339)

JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu
---
 tests/unit-core/test-arraybuffer.c | 23 +++--------------------
 tests/unit-core/test-promise.c     | 23 +++--------------------
 tests/unit-core/test-typedarray.c  | 23 +++--------------------
 3 files changed, 9 insertions(+), 60 deletions(-)

diff --git a/tests/unit-core/test-arraybuffer.c b/tests/unit-core/test-arraybuffer.c
index 3bfa0b316..4317eb6d2 100644
--- a/tests/unit-core/test-arraybuffer.c
+++ b/tests/unit-core/test-arraybuffer.c
@@ -68,25 +68,6 @@ assert_handler (const jerry_value_t func_obj_val, /**< function object */
   TEST_ASSERT (false);
 } /* assert_handler */
 
-/**
- * Checks whether global object has arraybuffer.
- */
-static bool
-arraybuffer_is_available (void)
-{
-  jerry_value_t global_obj_val = jerry_get_global_object ();
-  jerry_value_t prop_name = jerry_create_string ((const jerry_char_t *) "ArrayBuffer");
-
-  jerry_value_t prop_value = jerry_has_property (global_obj_val, prop_name);
-  bool has_prop = jerry_get_boolean_value (prop_value);
-
-  jerry_release_value (global_obj_val);
-  jerry_release_value (prop_name);
-  jerry_release_value (prop_value);
-
-  return has_prop;
-} /* arraybuffer_is_available */
-
 /**
  * Test ArrayBuffer 'read' api call with various offset values.
  */
@@ -182,7 +163,7 @@ main (void)
 {
   jerry_init (JERRY_INIT_EMPTY);
 
-  if (!arraybuffer_is_available ())
+  if (!jerry_is_feature_enabled (JERRY_FEATURE_TYPEDARRAY))
   {
     jerry_port_log (JERRY_LOG_LEVEL_ERROR, "ArrayBuffer is disabled!\n");
     jerry_cleanup ();
@@ -373,4 +354,6 @@ main (void)
   jerry_cleanup ();
 
   TEST_ASSERT (callback_called == true);
+
+  return 0;
 } /* main */
diff --git a/tests/unit-core/test-promise.c b/tests/unit-core/test-promise.c
index 78990e4fa..4716a82f5 100644
--- a/tests/unit-core/test-promise.c
+++ b/tests/unit-core/test-promise.c
@@ -113,31 +113,12 @@ register_js_function (const char *name_p, /**< name of the function */
   jerry_release_value (result_val);
 } /* register_js_function */
 
-/**
- * Checks whether global object has promise.
- */
-static bool
-promise_is_available (void)
-{
-  jerry_value_t global_obj_val = jerry_get_global_object ();
-  jerry_value_t prop_name = jerry_create_string ((const jerry_char_t *) "Promise");
-
-  jerry_value_t prop_value = jerry_has_property (global_obj_val, prop_name);
-  bool has_prop = jerry_get_boolean_value (prop_value);
-
-  jerry_release_value (global_obj_val);
-  jerry_release_value (prop_name);
-  jerry_release_value (prop_value);
-
-  return has_prop;
-} /* promise_is_available */
-
 int
 main (void)
 {
   jerry_init (JERRY_INIT_EMPTY);
 
-  if (!promise_is_available ())
+  if (!jerry_is_feature_enabled (JERRY_FEATURE_PROMISE))
   {
     jerry_port_log (JERRY_LOG_LEVEL_ERROR, "Promise is disabled!\n");
     jerry_cleanup ();
@@ -190,4 +171,6 @@ main (void)
   jerry_release_value (str_reject);
 
   jerry_cleanup ();
+
+  return 0;
 } /* main */
diff --git a/tests/unit-core/test-typedarray.c b/tests/unit-core/test-typedarray.c
index d8ae4fba6..0eeba8047 100644
--- a/tests/unit-core/test-typedarray.c
+++ b/tests/unit-core/test-typedarray.c
@@ -80,25 +80,6 @@ assert_handler (const jerry_value_t func_obj_val, /**< function object */
   }
 } /* assert_handler */
 
-/**
- * Checks whether global object has typedarray.
- */
-static bool
-typedarray_is_available (void)
-{
-  jerry_value_t global_obj_val = jerry_get_global_object ();
-  jerry_value_t prop_name = jerry_create_string ((const jerry_char_t *) "Int8Array");
-
-  jerry_value_t prop_value = jerry_has_property (global_obj_val, prop_name);
-  bool has_prop = jerry_get_boolean_value (prop_value);
-
-  jerry_release_value (global_obj_val);
-  jerry_release_value (prop_name);
-  jerry_release_value (prop_value);
-
-  return has_prop;
-} /* typedarray_is_available */
-
 /**
  * Do simple TypedArray property validation.
  */
@@ -423,7 +404,7 @@ main (void)
 {
   jerry_init (JERRY_INIT_EMPTY);
 
-  if (!typedarray_is_available ())
+  if (!jerry_is_feature_enabled (JERRY_FEATURE_TYPEDARRAY))
   {
     jerry_port_log (JERRY_LOG_LEVEL_ERROR, "TypedArray is disabled!\n");
     jerry_cleanup ();
@@ -589,4 +570,6 @@ main (void)
   }
 
   jerry_cleanup ();
+
+  return 0;
 } /* main */