1 files changed, 9 insertions, 13 deletions
diff --git a/test/addons-napi/1_hello_world/binding.c b/test/addons-napi/1_hello_world/binding.c
index 882508b9548..57bac37fa0b 100644
--- a/test/addons-napi/1_hello_world/binding.c
+++ b/test/addons-napi/1_hello_world/binding.c
@@ -1,22 +1,18 @@
 #include <node_api.h>
+#include "../common.h"
+#include <string.h>
 
-void Method(napi_env env, napi_callback_info info) {
-  napi_status status;
+napi_value Method(napi_env env, napi_callback_info info) {
   napi_value world;
-  status = napi_create_string_utf8(env, "world", -1, &world);
-  if (status != napi_ok) return;
-  status = napi_set_return_value(env, info, world);
-  if (status != napi_ok) return;
+  const char* str = "world";
+  size_t str_len = strlen(str);
+  NAPI_CALL(env, napi_create_string_utf8(env, str, str_len, &world));
+  return world;
 }
 
-#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 desc = DECLARE_NAPI_METHOD("hello", Method);
-  status = napi_define_properties(env, exports, 1, &desc);
-  if (status != napi_ok) return;
+  napi_property_descriptor desc = DECLARE_NAPI_PROPERTY("hello", Method);
+  NAPI_CALL_RETURN_VOID(env, napi_define_properties(env, exports, 1, &desc));
 }
 
 NAPI_MODULE(addon, Init)