1 files changed, 19 insertions, 14 deletions
diff --git a/test_napi/src/numbers.rs b/test_napi/src/numbers.rs
index 8808659f9..829dd24c5 100644
--- a/test_napi/src/numbers.rs
+++ b/test_napi/src/numbers.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_number;
 use napi_sys::*;
 use std::ptr;
@@ -9,18 +11,18 @@ extern "C" fn test_int32(
   env: napi_env,
   info: napi_callback_info,
 ) -> napi_value {
-  let (args, argc, _) = crate::get_callback_info!(env, info, 1);
+  let (args, argc, _) = napi_get_callback_info!(env, info, 1);
   assert_eq!(argc, 1);
 
   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_number);
 
   let mut int32 = -1;
-  assert!(unsafe { napi_get_value_int32(env, args[0], &mut int32) } == napi_ok);
+  assert_napi_ok!(napi_get_value_int32(env, args[0], &mut int32));
 
   let mut value: napi_value = ptr::null_mut();
-  assert!(unsafe { napi_create_int32(env, int32, &mut value) } == napi_ok);
+  assert_napi_ok!(napi_create_int32(env, int32, &mut value));
   value
 }
 
@@ -28,28 +30,31 @@ extern "C" fn test_int64(
   env: napi_env,
   info: napi_callback_info,
 ) -> napi_value {
-  let (args, argc, _) = crate::get_callback_info!(env, info, 1);
+  let (args, argc, _) = napi_get_callback_info!(env, info, 1);
   assert_eq!(argc, 1);
 
   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_number);
 
   let mut int64 = -1;
-  assert!(unsafe { napi_get_value_int64(env, args[0], &mut int64) } == napi_ok);
+  assert_napi_ok!(napi_get_value_int64(env, args[0], &mut int64));
 
   let mut value: napi_value = ptr::null_mut();
-  assert!(unsafe { napi_create_int64(env, int64, &mut value) } == napi_ok);
+  assert_napi_ok!(napi_create_int64(env, int64, &mut value));
   value
 }
 
 pub fn init(env: napi_env, exports: napi_value) {
   let properties = &[
-    crate::new_property!(env, "test_int32\0", test_int32),
-    crate::new_property!(env, "test_int64\0", test_int64),
+    napi_new_property!(env, "test_int32", test_int32),
+    napi_new_property!(env, "test_int64", test_int64),
   ];
 
-  unsafe {
-    napi_define_properties(env, exports, properties.len(), properties.as_ptr())
-  };
+  assert_napi_ok!(napi_define_properties(
+    env,
+    exports,
+    properties.len(),
+    properties.as_ptr()
+  ));
 }