merge tests

Author: vmoroz

test/node-api/test_reference_all_types/binding.gyp

@@ -0,0 +1,14 @@
+{
+  "targets": [
+    {
+      "target_name": "test_reference_all_types",
+      "sources": [ "test_reference_by_node_api_version.c" ],
+      "defines": [ "NAPI_EXPERIMENTAL" ],
+    },
+    {
+      "target_name": "test_reference_obj_only",
+      "sources": [ "test_reference_by_node_api_version.c" ],
+      "defines": [ "NAPI_VERSION=8" ],
+    }
+  ]
+}

test/node-api/test_reference_all_types/test.js

@@ -1,16 +1,18 @@
 'use strict';
 // Flags: --expose-gc
 //
-// Testing API calls for references to only object, function, and symbol types.
-// This is the reference behavior without the napi_feature_reference_all_types
-// feature enabled.
-// This test uses NAPI_MODULE_INIT macro to initialize module.
+// Testing API calls for Node-API references.
+// We compare their behavior between Node-API version 8 and later.
+// In version 8 references can be created only for object, function,
+// and symbol types. While in newer versions they can be created for
+// any value type.
 //
 const { gcUntil, buildType } = require('../../common');
 const assert = require('assert');
-const addon = require(`./build/${buildType}/test_reference_obj_only`);
+const addon_v8 = require(`./build/${buildType}/test_reference_obj_only`);
+const addon_new = require(`./build/${buildType}/test_reference_all_types`);
 
-async function runTests() {
+async function runTests(addon, isVersion8) {
   let allEntries = [];
 
   (() => {
@@ -27,22 +29,22 @@ async function runTests() {
     const bigintValue = 9007199254740991n;
 
     allEntries = [
-      { value: undefinedValue, canBeWeak: false, canBeRef: false },
-      { value: nullValue, canBeWeak: false, canBeRef: false },
-      { value: booleanValue, canBeWeak: false, canBeRef: false },
-      { value: numberValue, canBeWeak: false, canBeRef: false },
-      { value: stringValue, canBeWeak: false, canBeRef: false },
-      { value: symbolValue, canBeWeak: false, canBeRef: true },
-      { value: objectValue, canBeWeak: true, canBeRef: true },
-      { value: functionValue, canBeWeak: true, canBeRef: true },
-      { value: externalValue, canBeWeak: true, canBeRef: true },
-      { value: bigintValue, canBeWeak: false, canBeRef: false },
+      { value: undefinedValue, canBeWeak: false, canBeRefV8: false },
+      { value: nullValue, canBeWeak: false, canBeRefV8: false },
+      { value: booleanValue, canBeWeak: false, canBeRefV8: false },
+      { value: numberValue, canBeWeak: false, canBeRefV8: false },
+      { value: stringValue, canBeWeak: false, canBeRefV8: false },
+      { value: symbolValue, canBeWeak: false, canBeRefV8: true },
+      { value: objectValue, canBeWeak: true, canBeRefV8: true },
+      { value: functionValue, canBeWeak: true, canBeRefV8: true },
+      { value: externalValue, canBeWeak: true, canBeRefV8: true },
+      { value: bigintValue, canBeWeak: false, canBeRefV8: false },
     ];
 
     // Go over all values of different types, create strong ref values for
     // them, read the stored values, and check how the ref count works.
     for (const entry of allEntries) {
-      if (entry.canBeRef) {
+      if (!isVersion8 || entry.canBeRefV8) {
         const index = addon.createRef(entry.value);
         const refValue = addon.getRefValue(index);
         assert.strictEqual(entry.value, refValue);
@@ -59,12 +61,10 @@ async function runTests() {
     }
 
     // The references become weak pointers when the ref count is 0.
-    // The old reference were supported for objects, external objects,
-    // functions, and symbols.
     // Here we know that the GC is not run yet because the values are
     // still in the allEntries array.
     allEntries.forEach((entry, index) => {
-      if (entry.canBeRef) {
+      if (!isVersion8 || entry.canBeRefV8) {
         assert.strictEqual(addon.getRefValue(index), entry.value);
       }
       // Set to undefined to allow GC collect the value.
@@ -93,7 +93,7 @@ async function runTests() {
   // It also includes the value at index 0 because it is the undefined value.
   // Other value types are not collected by GC.
   allEntries.forEach((entry, index) => {
-    if (entry.canBeRef) {
+    if (!isVersion8 || entry.canBeRefV8) {
       if (entry.canBeWeak || index === 0) {
         assert.strictEqual(addon.getRefValue(index), undefined);
       } else {
@@ -103,4 +103,6 @@ async function runTests() {
     }
   });
 }
-runTests();
+
+runTests(addon_v8, /* isVersion8 */ true);
+runTests(addon_new, /* isVersion8 */ false);