Add tests for non-zero termianted string input

nodejs · sampsongao · Sep 11, 2017 · Sep 11, 2017 · Sep 11, 2017 · Sep 11, 2017
commit c0b202c5a18ac594f1ca2e2b2f981ad676da7bb0
diff --git a/test/addons-napi/test_constructor/binding.gyp b/test/addons-napi/test_constructor/binding.gyp
@@ -3,6 +3,10 @@
     {
       "target_name": "test_constructor",
       "sources": [ "test_constructor.c" ]
+    },
+    {
+      "target_name": "test_constructor_name",
+      "sources": [ "test_constructor_name.c" ]
     }
   ]
 }
diff --git a/test/addons-napi/test_constructor/test2.js b/test/addons-napi/test_constructor/test2.js
@@ -0,0 +1,8 @@
+'use strict';
+const common = require('../../common');
+const assert = require('assert');
+
+// Testing api calls for a constructor that defines properties
+const TestConstructor =
+    require(`./build/${common.buildType}/test_constructor_name`);
+assert.equal(TestConstructor.name, 'MyObject');
diff --git a/test/addons-napi/test_constructor/test_constructor_name.c b/test/addons-napi/test_constructor/test_constructor_name.c
@@ -0,0 +1,25 @@
+#include <node_api.h>
+#include "../common.h"
+
+napi_ref constructor_;
+
+napi_value New(napi_env env, napi_callback_info info) {
+  napi_value _this;
+  NAPI_CALL(env, napi_get_cb_info(env, info, NULL, NULL, &_this, NULL));
+
+  return _this;
+}
+
+void Init(napi_env env, napi_value exports, napi_value module, void* priv) {
+  napi_value cons;
+  NAPI_CALL_RETURN_VOID(env, napi_define_class(env, "MyObject_Extra", 8, New,
+    NULL, 0, NULL, &cons));
+
+  NAPI_CALL_RETURN_VOID(env,
+    napi_set_named_property(env, module, "exports", cons));
+
+  NAPI_CALL_RETURN_VOID(env,
+    napi_create_reference(env, cons, 1, &constructor_));
+}
+
+NAPI_MODULE(addon, Init)
diff --git a/test/addons-napi/test_fatal/test2.js b/test/addons-napi/test_fatal/test2.js
@@ -0,0 +1,18 @@
+'use strict';
+const common = require('../../common');
+const assert = require('assert');
+const child_process = require('child_process');
+const test_fatal = require(`./build/${common.buildType}/test_fatal`);
+
+// Test in a child process because the test code will trigger a fatal error
+// that crashes the process.
+if (process.argv[2] === 'child') {
+  test_fatal.TestStringLength();
+  return;
+}
+
+const p = child_process.spawnSync(
+  process.execPath, [ '--napi-modules', __filename, 'child' ]);
+assert.ifError(p.error);
+assert.ok(p.stderr.toString().includes(
+  'FATAL ERROR: test_fatal::Test fatal message'));
diff --git a/test/addons-napi/test_fatal/test_fatal.c b/test/addons-napi/test_fatal/test_fatal.c
@@ -6,9 +6,15 @@ napi_value Test(napi_env env, napi_callback_info info) {
   return NULL;
 }
 
+napi_value TestStringLength(napi_env env, napi_callback_info info) {
+  napi_fatal_error("test_fatal::TestStringLength", 16, "fatal message", 13);
+  return NULL;
+}
+
 napi_value Init(napi_env env, napi_value exports) {
   napi_property_descriptor properties[] = {
     DECLARE_NAPI_PROPERTY("Test", Test),
+    DECLARE_NAPI_PROPERTY("TestStringLength", TestStringLength),
   };
 
   NAPI_CALL(env, napi_define_properties(

diff --git a/test/addons-napi/test_function/test.js b/test/addons-napi/test_function/test.js
@@ -9,20 +9,22 @@ const test_function = require(`./build/${common.buildType}/test_function`);
 function func1() {
   return 1;
 }
-assert.strictEqual(test_function.Test(func1), 1);
+assert.strictEqual(test_function.TestCall(func1), 1);
 
 function func2() {
   console.log('hello world!');
   return null;
 }
-assert.strictEqual(test_function.Test(func2), null);
+assert.strictEqual(test_function.TestCall(func2), null);
 
 function func3(input) {
   return input + 1;
 }
-assert.strictEqual(test_function.Test(func3, 1), 2);
+assert.strictEqual(test_function.TestCall(func3, 1), 2);
 
 function func4(input) {
   return func3(input);
 }
-assert.strictEqual(test_function.Test(func4, 1), 2);
+assert.strictEqual(test_function.TestCall(func4, 1), 2);
+assert.strictEqual(test_function.TestName.name, 'Name');
+assert.strictEqual(test_function.TestNameShort.name, 'Name_');
diff --git a/test/addons-napi/test_function/test_function.c b/test/addons-napi/test_function/test_function.c
@@ -1,7 +1,7 @@
 #include <node_api.h>
 #include "../common.h"
 
-napi_value Test(napi_env env, napi_callback_info info) {
+napi_value TestCallFunction(napi_env env, napi_callback_info info) {
   size_t argc = 10;
   napi_value args[10];
   NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -26,11 +26,24 @@ napi_value Test(napi_env env, napi_callback_info info) {
   return result;
 }
 
-napi_value Init(napi_env env, napi_value exports) {
-  napi_value fn;
-  NAPI_CALL(env, napi_create_function(env, NULL, -1, Test, NULL, &fn));
-  NAPI_CALL(env, napi_set_named_property(env, exports, "Test", fn));
->>>>>>> test: update test for additional string length parameter
+void TestFunctionName(napi_env env, napi_callback_info info) {}
+
+void Init(napi_env env, napi_value exports, napi_value module, void* priv) {
+  napi_value fn1;
+  NAPI_CALL(env, napi_create_function(
+      env, NULL, -1, TestCallFunction, NULL, &fn1));
+
+  napi_value fn2;
+  NAPI_CALL(env, napi_create_function(
+      env, "Name", -1, TestFunctionName, NULL, &fn2));
+
+  napi_value fn3;
+  NAPI_CALL(env, napi_create_function(
+      env, "Name_extra", 5, TestFunctionName, NULL, &fn3));
+
+  NAPI_CALL(env, napi_set_named_property(env, exports, "TestCall", fn1));
+  NAPI_CALL(env, napi_set_named_property(env, exports, "TestName", fn2));
+  NAPI_CALL(env, napi_set_named_property(env, exports, "TestNameShort", fn3));
 }
 
 NAPI_MODULE(NODE_GYP_MODULE_NAME, Init)