test: wip with tsfnex tests

Author: KevinEady

test/binding.cc

@@ -48,10 +48,8 @@ Object InitThreadSafeFunctionPtr(Env env);
 Object InitThreadSafeFunctionSum(Env env);
 Object InitThreadSafeFunctionUnref(Env env);
 Object InitThreadSafeFunction(Env env);
-Object InitThreadSafeFunctionExCall(Env env);
-Object InitThreadSafeFunctionExContext(Env env);
+Object InitThreadSafeFunctionExBasic(Env env);
 Object InitThreadSafeFunctionExExample(Env env);
-Object InitThreadSafeFunctionExSimple(Env env);
 Object InitThreadSafeFunctionExThreadSafe(Env env);
 #endif
 Object InitTypedArray(Env env);
@@ -110,10 +108,8 @@ Object Init(Env env, Object exports) {
   exports.Set("threadsafe_function_sum", InitThreadSafeFunctionSum(env));
   exports.Set("threadsafe_function_unref", InitThreadSafeFunctionUnref(env));
   exports.Set("threadsafe_function", InitThreadSafeFunction(env));
-  exports.Set("threadsafe_function_ex_call", InitThreadSafeFunctionExCall(env));
-  exports.Set("threadsafe_function_ex_context", InitThreadSafeFunctionExContext(env));
+  exports.Set("threadsafe_function_ex_basic", InitThreadSafeFunctionExBasic(env));
   exports.Set("threadsafe_function_ex_example", InitThreadSafeFunctionExExample(env));
-  exports.Set("threadsafe_function_ex_simple", InitThreadSafeFunctionExSimple(env));
   exports.Set("threadsafe_function_ex_threadsafe", InitThreadSafeFunctionExThreadSafe(env));
 #endif
   exports.Set("typedarray", InitTypedArray(env));

test/binding.gyp

@@ -35,10 +35,8 @@
         'object/set_property.cc',
         'promise.cc',
         'run_script.cc',
-        'threadsafe_function_ex/call.cc',
-        'threadsafe_function_ex/context.cc',
+        'threadsafe_function_ex/basic.cc',
         'threadsafe_function_ex/example.cc',
-        'threadsafe_function_ex/simple.cc',
         'threadsafe_function_ex/threadsafe.cc',
         'threadsafe_function/threadsafe_function_ctx.cc',
         'threadsafe_function/threadsafe_function_existing_tsfn.cc',

test/index.js

@@ -42,11 +42,7 @@ let testModules = [
   'object/set_property',
   'promise',
   'run_script',
-  'threadsafe_function_ex/call',
-  'threadsafe_function_ex/context',
-  'threadsafe_function_ex/example',
-  'threadsafe_function_ex/simple',
-  'threadsafe_function_ex/threadsafe',
+  'threadsafe_function_ex',
   'threadsafe_function/threadsafe_function_ctx',
   'threadsafe_function/threadsafe_function_existing_tsfn',
   'threadsafe_function/threadsafe_function_ptr',
@@ -79,10 +75,8 @@ if (napiVersion < 4) {
   testModules.splice(testModules.indexOf('threadsafe_function/threadsafe_function_sum'), 1);
   testModules.splice(testModules.indexOf('threadsafe_function/threadsafe_function_unref'), 1);
   testModules.splice(testModules.indexOf('threadsafe_function/threadsafe_function'), 1);
-  testModules.splice(testModules.indexOf('threadsafe_function_ex/call'), 1);
-  testModules.splice(testModules.indexOf('threadsafe_function_ex/context'), 1);
+  testModules.splice(testModules.indexOf('threadsafe_function_ex/basic'), 1);
   testModules.splice(testModules.indexOf('threadsafe_function_ex/example'), 1);
-  testModules.splice(testModules.indexOf('threadsafe_function_ex/simple'), 1);
   testModules.splice(testModules.indexOf('threadsafe_function_ex/threadsafe'), 1);
 }
 
@@ -96,35 +90,41 @@ if (napiVersion < 6) {
   testModules.splice(testModules.indexOf('addon_data'), 1);
 }
 
-if (typeof global.gc === 'function') {
-  console.log(`Testing with N-API Version '${napiVersion}'.`);
+async function run() {
+  if (typeof global.gc === 'function') {
+    console.log(`Testing with N-API Version '${napiVersion}'.`);
 
-  console.log('Starting test suite\n');
+    console.log('Starting test suite\n');
 
-  // Requiring each module runs tests in the module.
-  testModules.forEach(name => {
-    console.log(`Running test '${name}'`);
-    require('./' + name);
-  });
+    // Requiring each module runs tests in the module.
+    testModules.forEach(name => {
+      console.log(`Running test '${name}'`);
+      require('./' + name);
+    });
 
-  console.log('\nAll tests passed!');
-} else {
-  // Construct the correct (version-dependent) command-line args.
-  let args = ['--expose-gc', '--no-concurrent-array-buffer-freeing'];
-  if (majorNodeVersion >= 14) {
-    args.push('--no-concurrent-array-buffer-sweeping');
-  }
-  args.push(__filename);
+    console.log('\nAll tests passed!');
+  } else {
+    // Construct the correct (version-dependent) command-line args.
+    let args = ['--expose-gc', '--no-concurrent-array-buffer-freeing'];
+    if (majorNodeVersion >= 14) {
+      args.push('--no-concurrent-array-buffer-sweeping');
+    }
+    args.push(__filename);
 
-  const child = require('./napi_child').spawnSync(process.argv[0], args, {
-    stdio: 'inherit',
-  });
+    const child = require('./napi_child').spawnSync(process.argv[0], args, {
+      stdio: 'inherit',
+    });
 
-  if (child.signal) {
-    console.error(`Tests aborted with ${child.signal}`);
-    process.exitCode = 1;
-  } else {
-    process.exitCode = child.status;
+    if (child.signal) {
+      console.error(`Tests aborted with ${child.signal}`);
+      process.exitCode = 1;
+    } else {
+      process.exitCode = child.status;
+    }
+    process.exit(process.exitCode);
   }
-  process.exit(process.exitCode);
 }
+
+run()
+  .catch(e => (console.error(e), process.exit(1)));
+

test/threadsafe_function_ex/README.md

@@ -0,0 +1,5 @@
+# Napi::ThreadSafeFunctionEx tests
+
+|Spec|Test|Native|Node|Description|
+|----|---|---|---|---|
+|call