refactor(napi): Cleanup tests (#17347)

1 files changed, 21 insertions, 22 deletions

diff --git a/test_napi/src/coerce.rs b/test_napi/src/coerce.rs
index edce7f767..80ee5aea1 100644
--- a/test_napi/src/coerce.rs
+++ b/test_napi/src/coerce.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::*;
 use std::ptr;
 
@@ -8,11 +10,11 @@ extern "C" fn test_coerce_bool(
   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 value: napi_value = ptr::null_mut();
-  assert!(unsafe { napi_coerce_to_bool(env, args[0], &mut value) } == napi_ok);
+  assert_napi_ok!(napi_coerce_to_bool(env, args[0], &mut value));
   value
 }
 
@@ -20,13 +22,11 @@ extern "C" fn test_coerce_number(
   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 value: napi_value = ptr::null_mut();
-  assert!(
-    unsafe { napi_coerce_to_number(env, args[0], &mut value) } == napi_ok
-  );
+  assert_napi_ok!(napi_coerce_to_number(env, args[0], &mut value));
   value
 }
 
@@ -34,13 +34,11 @@ extern "C" fn test_coerce_object(
   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 value: napi_value = ptr::null_mut();
-  assert!(
-    unsafe { napi_coerce_to_object(env, args[0], &mut value) } == napi_ok
-  );
+  assert_napi_ok!(napi_coerce_to_object(env, args[0], &mut value));
   value
 }
 
@@ -48,24 +46,25 @@ extern "C" fn test_coerce_string(
   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 value: napi_value = ptr::null_mut();
-  assert!(
-    unsafe { napi_coerce_to_string(env, args[0], &mut value) } == napi_ok
-  );
+  assert_napi_ok!(napi_coerce_to_string(env, args[0], &mut value));
   value
 }
 pub fn init(env: napi_env, exports: napi_value) {
   let properties = &[
-    crate::new_property!(env, "test_coerce_bool\0", test_coerce_bool),
-    crate::new_property!(env, "test_coerce_number\0", test_coerce_number),
-    crate::new_property!(env, "test_coerce_object\0", test_coerce_object),
-    crate::new_property!(env, "test_coerce_string\0", test_coerce_string),
+    napi_new_property!(env, "test_coerce_bool", test_coerce_bool),
+    napi_new_property!(env, "test_coerce_number", test_coerce_number),
+    napi_new_property!(env, "test_coerce_object", test_coerce_object),
+    napi_new_property!(env, "test_coerce_string", test_coerce_string),
   ];
 
-  unsafe {
-    napi_define_properties(env, exports, properties.len(), properties.as_ptr())
-  };
+  assert_napi_ok!(napi_define_properties(
+    env,
+    exports,
+    properties.len(),
+    properties.as_ptr()
+  ));
 }