refactor(napi): Cleanup tests (#17347)

1 files changed, 21 insertions, 23 deletions

diff --git a/test_napi/src/promise.rs b/test_napi/src/promise.rs
index 02ea2f237..d6da684ba 100644
--- a/test_napi/src/promise.rs
+++ b/test_napi/src/promise.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;
 
@@ -11,10 +13,7 @@ extern "C" fn test_promise_new(
   _info: napi_callback_info,
 ) -> napi_value {
   let mut value: napi_value = ptr::null_mut();
-  assert!(
-    unsafe { napi_create_promise(env, &mut CURRENT_DEFERRED, &mut value) }
-      == napi_ok
-  );
+  assert_napi_ok!(napi_create_promise(env, &mut CURRENT_DEFERRED, &mut value));
   value
 }
 
@@ -22,12 +21,10 @@ extern "C" fn test_promise_resolve(
   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);
 
-  assert!(
-    unsafe { napi_resolve_deferred(env, CURRENT_DEFERRED, args[0]) } == napi_ok
-  );
+  assert_napi_ok!(napi_resolve_deferred(env, CURRENT_DEFERRED, args[0]));
   unsafe { CURRENT_DEFERRED = ptr::null_mut() };
   ptr::null_mut()
 }
@@ -36,12 +33,10 @@ extern "C" fn test_promise_reject(
   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);
 
-  assert!(
-    unsafe { napi_reject_deferred(env, CURRENT_DEFERRED, args[0]) } == napi_ok
-  );
+  assert_napi_ok!(napi_reject_deferred(env, CURRENT_DEFERRED, args[0]));
   unsafe { CURRENT_DEFERRED = ptr::null_mut() };
   ptr::null_mut()
 }
@@ -50,27 +45,30 @@ extern "C" fn test_promise_is(
   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 is_promise: bool = false;
-  assert!(unsafe { napi_is_promise(env, args[0], &mut is_promise) } == napi_ok);
+  assert_napi_ok!(napi_is_promise(env, args[0], &mut is_promise));
 
   let mut result: napi_value = ptr::null_mut();
-  assert!(unsafe { napi_get_boolean(env, is_promise, &mut result) } == napi_ok);
+  assert_napi_ok!(napi_get_boolean(env, is_promise, &mut result));
 
   result
 }
 
 pub fn init(env: napi_env, exports: napi_value) {
   let properties = &[
-    crate::new_property!(env, "test_promise_new\0", test_promise_new),
-    crate::new_property!(env, "test_promise_resolve\0", test_promise_resolve),
-    crate::new_property!(env, "test_promise_reject\0", test_promise_reject),
-    crate::new_property!(env, "test_promise_is\0", test_promise_is),
+    napi_new_property!(env, "test_promise_new", test_promise_new),
+    napi_new_property!(env, "test_promise_resolve", test_promise_resolve),
+    napi_new_property!(env, "test_promise_reject", test_promise_reject),
+    napi_new_property!(env, "test_promise_is", test_promise_is),
   ];
 
-  unsafe {
-    napi_define_properties(env, exports, properties.len(), properties.as_ptr())
-  };
+  assert_napi_ok!(napi_define_properties(
+    env,
+    exports,
+    properties.len(),
+    properties.as_ptr()
+  ));
 }