1 files changed, 27 insertions, 31 deletions

diff --git a/test_napi/src/properties.rs b/test_napi/src/properties.rs
index dafa9ef96..9d90d0b7f 100644
--- a/test_napi/src/properties.rs
+++ b/test_napi/src/properties.rs
@@ -1,49 +1,42 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
+use crate::assert_napi_ok;
 use napi_sys::PropertyAttributes::*;
-use napi_sys::Status::napi_ok;
 use napi_sys::*;
 use std::os::raw::c_char;
 use std::ptr;
 
 pub fn init(env: napi_env, exports: napi_value) {
   let mut number: napi_value = ptr::null_mut();
-  assert!(unsafe { napi_create_double(env, 1.0, &mut number) } == napi_ok);
+  assert_napi_ok!(napi_create_double(env, 1.0, &mut number));
 
   // Key name as napi_value representing `v8::String`
   let mut name_value: napi_value = ptr::null_mut();
-  assert!(
-    unsafe {
-      napi_create_string_utf8(
-        env,
-        "key_v8_string".as_ptr() as *const c_char,
-        usize::MAX,
-        &mut name_value,
-      )
-    } == napi_ok
-  );
+  assert_napi_ok!(napi_create_string_utf8(
+    env,
+    "key_v8_string".as_ptr() as *const c_char,
+    usize::MAX,
+    &mut name_value,
+  ));
 
   // Key symbol
   let mut symbol_description: napi_value = ptr::null_mut();
   let mut name_symbol: napi_value = ptr::null_mut();
-  assert!(
-    unsafe {
-      napi_create_string_utf8(
-        env,
-        "key_v8_symbol".as_ptr() as *const c_char,
-        usize::MAX,
-        &mut symbol_description,
-      )
-    } == napi_ok
-  );
-  assert!(
-    unsafe { napi_create_symbol(env, symbol_description, &mut name_symbol) }
-      == napi_ok
-  );
+  assert_napi_ok!(napi_create_string_utf8(
+    env,
+    "key_v8_symbol".as_ptr() as *const c_char,
+    usize::MAX,
+    &mut symbol_description,
+  ));
+  assert_napi_ok!(napi_create_symbol(
+    env,
+    symbol_description,
+    &mut name_symbol
+  ));
 
   let properties = &[
     napi_property_descriptor {
-      utf8name: "test_property_rw\0".as_ptr() as *const c_char,
+      utf8name: "test_property_rw".as_ptr() as *const c_char,
       name: ptr::null_mut(),
       method: None,
       getter: None,
@@ -53,7 +46,7 @@ pub fn init(env: napi_env, exports: napi_value) {
       value: number,
     },
     napi_property_descriptor {
-      utf8name: "test_property_r\0".as_ptr() as *const c_char,
+      utf8name: "test_property_r".as_ptr() as *const c_char,
       name: ptr::null_mut(),
       method: None,
       getter: None,
@@ -84,7 +77,10 @@ pub fn init(env: napi_env, exports: napi_value) {
     },
   ];
 
-  unsafe {
-    napi_define_properties(env, exports, properties.len(), properties.as_ptr())
-  };
+  assert_napi_ok!(napi_define_properties(
+    env,
+    exports,
+    properties.len(),
+    properties.as_ptr()
+  ));
 }