1 files changed, 39 insertions, 46 deletions

diff --git a/test_napi/src/callback.rs b/test_napi/src/callback.rs
index 4b97f1c0b..c863eb7a6 100644
--- a/test_napi/src/callback.rs
+++ b/test_napi/src/callback.rs
@@ -1,6 +1,8 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
-use napi_sys::Status::napi_ok;
+use crate::assert_napi_ok;
+use crate::napi_get_callback_info;
+use crate::napi_new_property;
 use napi_sys::ValueType::napi_function;
 use napi_sys::ValueType::napi_object;
 use napi_sys::*;
@@ -11,44 +13,38 @@ extern "C" fn test_callback_run(
   env: napi_env,
   info: napi_callback_info,
 ) -> napi_value {
-  let (args, argc, _) = crate::get_callback_info!(env, info, 2);
+  let (args, argc, _) = napi_get_callback_info!(env, info, 2);
   assert_eq!(argc, 2);
 
   let mut ty = -1;
-  assert!(unsafe { napi_typeof(env, args[0], &mut ty) } == napi_ok);
+  assert_napi_ok!(napi_typeof(env, args[0], &mut ty));
   assert_eq!(ty, napi_function);
 
   let mut ty = -1;
-  assert!(unsafe { napi_typeof(env, args[1], &mut ty) } == napi_ok);
+  assert_napi_ok!(napi_typeof(env, args[1], &mut ty));
   assert_eq!(ty, napi_object);
 
   let mut len = 0;
-  assert!(unsafe { napi_get_array_length(env, args[1], &mut len) } == napi_ok);
+  assert_napi_ok!(napi_get_array_length(env, args[1], &mut len));
 
   let mut argv = Vec::with_capacity(len as usize);
   for index in 0..len {
     let mut value: napi_value = ptr::null_mut();
-    assert!(
-      unsafe { napi_get_element(env, args[1], index, &mut value) } == napi_ok
-    );
+    assert_napi_ok!(napi_get_element(env, args[1], index, &mut value));
     argv.push(value);
   }
   let mut global: napi_value = ptr::null_mut();
-  assert!(unsafe { napi_get_global(env, &mut global) } == napi_ok);
+  assert_napi_ok!(napi_get_global(env, &mut global));
 
   let mut result: napi_value = ptr::null_mut();
-  assert!(
-    unsafe {
-      napi_call_function(
-        env,
-        global,
-        args[0],
-        argv.len(),
-        argv.as_mut_ptr(),
-        &mut result,
-      )
-    } == napi_ok
-  );
+  assert_napi_ok!(napi_call_function(
+    env,
+    global,
+    args[0],
+    argv.len(),
+    argv.as_mut_ptr(),
+    &mut result,
+  ));
 
   result
 }
@@ -57,57 +53,54 @@ extern "C" fn test_callback_run_with_recv(
   env: napi_env,
   info: napi_callback_info,
 ) -> napi_value {
-  let (args, argc, _) = crate::get_callback_info!(env, info, 3);
+  let (args, argc, _) = napi_get_callback_info!(env, info, 3);
   assert_eq!(argc, 3);
 
   let mut ty = -1;
-  assert!(unsafe { napi_typeof(env, args[0], &mut ty) } == napi_ok);
+  assert_napi_ok!(napi_typeof(env, args[0], &mut ty));
   assert_eq!(ty, napi_function);
 
   let mut ty = -1;
-  assert!(unsafe { napi_typeof(env, args[1], &mut ty) } == napi_ok);
+  assert_napi_ok!(napi_typeof(env, args[1], &mut ty));
   assert_eq!(ty, napi_object);
 
   let mut len = 0;
-  assert!(unsafe { napi_get_array_length(env, args[1], &mut len) } == napi_ok);
+  assert_napi_ok!(napi_get_array_length(env, args[1], &mut len));
 
   let mut argv = Vec::with_capacity(len as usize);
   for index in 0..len {
     let mut value: napi_value = ptr::null_mut();
-    assert!(
-      unsafe { napi_get_element(env, args[1], index, &mut value) } == napi_ok
-    );
+    assert_napi_ok!(napi_get_element(env, args[1], index, &mut value));
     argv.push(value);
   }
 
   let mut result: napi_value = ptr::null_mut();
-  assert!(
-    unsafe {
-      napi_call_function(
-        env,
-        args[2], // recv
-        args[0], // cb
-        argv.len(),
-        argv.as_mut_ptr(),
-        &mut result,
-      )
-    } == napi_ok
-  );
+  assert_napi_ok!(napi_call_function(
+    env,
+    args[2], // recv
+    args[0], // cb
+    argv.len(),
+    argv.as_mut_ptr(),
+    &mut result,
+  ));
 
   result
 }
 
 pub fn init(env: napi_env, exports: napi_value) {
   let properties = &[
-    crate::new_property!(env, "test_callback_run\0", test_callback_run),
-    crate::new_property!(
+    napi_new_property!(env, "test_callback_run", test_callback_run),
+    napi_new_property!(
       env,
-      "test_callback_run_with_recv\0",
+      "test_callback_run_with_recv",
       test_callback_run_with_recv
     ),
   ];
 
-  unsafe {
-    napi_define_properties(env, exports, properties.len(), properties.as_ptr())
-  };
+  assert_napi_ok!(napi_define_properties(
+    env,
+    exports,
+    properties.len(),
+    properties.as_ptr()
+  ));
 }