test: don't use internal headers in add-on tests

There is no real need and it causes endless grief on Windows with some of the upcoming changes. PR-URL: #6734 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

Author: bnoordhuis

test/addons/buffer-free-callback/binding.cc

@@ -1,8 +1,9 @@
 #include<node.h>
 #include<node_buffer.h>
-#include<util.h>
 #include<v8.h>
 
+#include<assert.h>
+
 staticint alive;
 staticchar buf[1024];
 
@@ -32,7 +33,7 @@ void Check(const v8::FunctionCallbackInfo<v8::Value>& args){
  v8::Isolate* isolate = args.GetIsolate();
  isolate->RequestGarbageCollectionForTesting(
  v8::Isolate::kFullGarbageCollection);
-CHECK_GT(alive,0);
+assert(alive >0);
 }
 
 voidinit(v8::Local<v8::Object> target){

test/addons/buffer-free-callback/binding.gyp

@@ -2,10 +2,7 @@
 'targets': [
 {
 'target_name': 'binding',
-'defines': [
-'NODE_WANT_INTERNALS=1',
-'V8_DEPRECATION_WARNINGS=1',
- ],
+'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
 'sources': [ 'binding.cc' ]
  }
  ]

test/addons/make-callback-recurse/binding.cc

@@ -1,7 +1,7 @@
 #include"node.h"
 #include"v8.h"
 
-#include"../../../src/util.h"
+#include<assert.h>
 
 using v8::Function;
 using v8::FunctionCallbackInfo;
@@ -13,8 +13,8 @@ using v8::Value;
 namespace{
 
 voidMakeCallback(const FunctionCallbackInfo<Value>& args){
-CHECK(args[0]->IsObject());
-CHECK(args[1]->IsFunction());
+assert(args[0]->IsObject());
+assert(args[1]->IsFunction());
  Isolate* isolate = args.GetIsolate();
  Local<Object> recv = args[0].As<Object>();
  Local<Function> method = args[1].As<Function>();

test/addons/make-callback-recurse/binding.gyp

@@ -2,10 +2,7 @@
 'targets': [
 {
 'target_name': 'binding',
-'defines': [
-'NODE_WANT_INTERNALS=1',
-'V8_DEPRECATION_WARNINGS=1',
- ],
+'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
 'sources': [ 'binding.cc' ]
  }
  ]

test/addons/make-callback/binding.cc

@@ -1,15 +1,14 @@
 #include"node.h"
 #include"v8.h"
 
-#include"../../../src/util.h"
-
+#include<assert.h>
 #include<vector>
 
 namespace{
 
 voidMakeCallback(const v8::FunctionCallbackInfo<v8::Value>& args){
-CHECK(args[0]->IsObject());
-CHECK(args[1]->IsFunction() || args[1]->IsString());
+assert(args[0]->IsObject());
+assert(args[1]->IsFunction() || args[1]->IsString());
 auto isolate = args.GetIsolate();
 auto recv = args[0].As<v8::Object>();
  std::vector<v8::Local<v8::Value>> argv;
@@ -26,7 +25,7 @@ void MakeCallback(const v8::FunctionCallbackInfo<v8::Value>& args){
  result =
 node::MakeCallback(isolate, recv, method, argv.size(), argv.data());
  } else{
-UNREACHABLE();
+assert(0 && "unreachable");
  }
  args.GetReturnValue().Set(result);
 }

test/addons/make-callback/binding.gyp

@@ -2,10 +2,7 @@
 'targets': [
 {
 'target_name': 'binding',
-'defines': [
-'NODE_WANT_INTERNALS=1',
-'V8_DEPRECATION_WARNINGS=1',
- ],
+'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
 'sources': [ 'binding.cc' ]
  }
  ]

test/addons/null-buffer-neuter/binding.cc

@@ -1,12 +1,13 @@
 #include<node.h>
 #include<node_buffer.h>
-#include<util.h>
 #include<v8.h>
 
+#include<assert.h>
+
 staticint alive;
 
 staticvoidFreeCallback(char* data, void* hint){
-CHECK_EQ(data,nullptr);
+assert(data ==nullptr);
  alive--;
 }
 
@@ -24,13 +25,13 @@ void Run(const v8::FunctionCallbackInfo<v8::Value>& args){
 nullptr).ToLocalChecked();
 
 char* data = node::Buffer::Data(buf);
-CHECK_EQ(data,nullptr);
+assert(data ==nullptr);
  }
 
  isolate->RequestGarbageCollectionForTesting(
  v8::Isolate::kFullGarbageCollection);
 
-CHECK_EQ(alive,0);
+assert(alive ==0);
 }
 
 voidinit(v8::Local<v8::Object> target){

test/addons/null-buffer-neuter/binding.gyp

@@ -2,10 +2,7 @@
 'targets': [
 {
 'target_name': 'binding',
-'defines': [
-'NODE_WANT_INTERNALS=1',
-'V8_DEPRECATION_WARNINGS=1',
- ],
+'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
 'sources': [ 'binding.cc' ]
  }
  ]