1 files changed, 11 insertions, 21 deletions
diff --git a/test/addons-napi/test_error/test_error.cc b/test/addons-napi/test_error/test_error.cc
index 1395cb5c4e..eb616cac37 100644
--- a/test/addons-napi/test_error/test_error.cc
+++ b/test/addons-napi/test_error/test_error.cc
@@ -1,37 +1,27 @@
 #include <node_api.h>
+#include "../common.h"
 
-void checkError(napi_env e, napi_callback_info info) {
-  napi_status status;
-  napi_value jsError;
-
-  status = napi_get_cb_args(e, info, &jsError, 1);
-  if (status != napi_ok) return;
+napi_value checkError(napi_env env, napi_callback_info info) {
+  size_t argc = 1;
+  napi_value args[1];
+  NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, nullptr, nullptr));
 
   bool r;
-  status = napi_is_error(e, jsError, &r);
-  if (status != napi_ok) return;
+  NAPI_CALL(env, napi_is_error(env, args[0], &r));
 
   napi_value result;
-  status = napi_get_boolean(e, r, &result);
-  if (status != napi_ok) return;
+  NAPI_CALL(env, napi_get_boolean(env, r, &result));
 
-  status = napi_set_return_value(e, info, result);
-  if (status != napi_ok) return;
+  return result;
 }
 
-#define DECLARE_NAPI_METHOD(name, func)                          \
-  { name, func, 0, 0, 0, napi_default, 0 }
-
 void Init(napi_env env, napi_value exports, napi_value module, void* priv) {
-  napi_status status;
-
   napi_property_descriptor descriptors[] = {
-      DECLARE_NAPI_METHOD("checkError", checkError),
+    DECLARE_NAPI_PROPERTY("checkError", checkError),
   };
 
-  status = napi_define_properties(
-    env, exports, sizeof(descriptors) / sizeof(*descriptors), descriptors);
-  if (status != napi_ok) return;
+  NAPI_CALL_RETURN_VOID(env, napi_define_properties(
+    env, exports, sizeof(descriptors) / sizeof(*descriptors), descriptors));
 }
 
 NAPI_MODULE(addon, Init)