From 7a05cd33ceac3b0540423a4988e1de76d65bd4c3 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Mon, 20 Jun 2016 10:46:38 +0200
Subject: [PATCH] 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: https://github.com/nodejs/node/pull/6734
Backport-PR-URL: https://github.com/nodejs/node/pull/16550
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 test/addons/buffer-free-callback/binding.cc  | 5 +++--
 test/addons/make-callback-recurse/binding.cc | 6 +++---
 test/addons/make-callback/binding.cc         | 9 ++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/addons/buffer-free-callback/binding.cc b/test/addons/buffer-free-callback/binding.cc
index e5298a0063e5fa..82ad1b68efd162 100644
--- a/test/addons/buffer-free-callback/binding.cc
+++ b/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>
+
 static int alive;
 static char buf[1024];
 
@@ -25,7 +26,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);
 }
 
 void init(v8::Local<v8::Object> target) {
diff --git a/test/addons/make-callback-recurse/binding.cc b/test/addons/make-callback-recurse/binding.cc
index 1195dbe2ff7e4c..3e3a1464930477 100644
--- a/test/addons/make-callback-recurse/binding.cc
+++ b/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 {
 
 void MakeCallback(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>();
diff --git a/test/addons/make-callback/binding.cc b/test/addons/make-callback/binding.cc
index a1adb997bbf9b9..8970e9fb1af76c 100644
--- a/test/addons/make-callback/binding.cc
+++ b/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 {
 
 void MakeCallback(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);
 }