test: consolidate n-api test addons - part2

It takes time to build each of the addons used to test n-api. Consolidate a few of the smaller ones to save build time. Get rid of one more small addon. Backport-PR-URL: #19447 PR-URL: #13380 Reviewed-By: Jason Ginchereau <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
nodejs · Apr 16, 2018 · 9d70b43 · 9d70b43
1 parent 06cf948
commit 9d70b43
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 54 deletions.
diff --git a/test/addons-napi/test_napi_status/test.js → ...ddons-napi/test_general/testNapiStatus.js b/test/addons-napi/test_napi_status/test.js → ...ddons-napi/test_general/testNapiStatus.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const common = require('../../common');
-const addon = require(`./build/${common.buildType}/test_napi_status`);
+const addon = require(`./build/${common.buildType}/test_general`);
 const assert = require('assert');
 
 addon.createNapiError();

diff --git a/test/addons-napi/test_general/test_general.c b/test/addons-napi/test_general/test_general.c
@@ -59,6 +59,37 @@ napi_value getUndefined(napi_env env, napi_callback_info info) {
   return result;
 }
 
+napi_value createNapiError(napi_env env, napi_callback_info info) {
+  napi_value value;
+  NAPI_CALL(env, napi_create_string_utf8(env, "xyz", 3, &value));
+
+  double double_value;
+  napi_status status = napi_get_value_double(env, value, &double_value);
+
+  NAPI_ASSERT(env, status != napi_ok, "Failed to produce error condition");
+
+  const napi_extended_error_info *error_info = 0;
+  NAPI_CALL(env, napi_get_last_error_info(env, &error_info));
+
+  NAPI_ASSERT(env, error_info->error_code == status,
+    "Last error info code should match last status");
+  NAPI_ASSERT(env, error_info->error_message,
+    "Last error info message should not be null");
+
+  return NULL;
+}
+
+napi_value testNapiErrorCleanup(napi_env env, napi_callback_info info) {
+  const napi_extended_error_info *error_info = 0;
+  NAPI_CALL(env, napi_get_last_error_info(env, &error_info));
+
+  napi_value result;
+  bool is_ok = error_info->error_code == napi_ok;
+  NAPI_CALL(env, napi_get_boolean(env, is_ok, &result));
+
+  return result;
+}
+
 void Init(napi_env env, napi_value exports, napi_value module, void* priv) {
   napi_property_descriptor descriptors[] = {
     DECLARE_NAPI_PROPERTY("testStrictEquals", testStrictEquals),
@@ -67,6 +98,8 @@ void Init(napi_env env, napi_value exports, napi_value module, void* priv) {
     DECLARE_NAPI_PROPERTY("doInstanceOf", doInstanceOf),
     DECLARE_NAPI_PROPERTY("getUndefined", getUndefined),
     DECLARE_NAPI_PROPERTY("getNull", getNull),
+    DECLARE_NAPI_PROPERTY("createNapiError", createNapiError),
+    DECLARE_NAPI_PROPERTY("testNapiErrorCleanup", testNapiErrorCleanup),
   };
 
   NAPI_CALL_RETURN_VOID(env, napi_define_properties(

diff --git a/test/addons-napi/test_napi_status/binding.gyp b/test/addons-napi/test_napi_status/binding.gyp
diff --git a/test/addons-napi/test_napi_status/test_napi_status.cc b/test/addons-napi/test_napi_status/test_napi_status.cc