diff options
Diffstat (limited to 'test_napi/src/strings.rs')
| -rw-r--r-- | test_napi/src/strings.rs | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/test_napi/src/strings.rs b/test_napi/src/strings.rs index af6f84189..70faa640d 100644 --- a/test_napi/src/strings.rs +++ b/test_napi/src/strings.rs @@ -1,15 +1,17 @@ // 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_string; use napi_sys::*; extern "C" fn test_utf8(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_string); args[0] @@ -19,11 +21,11 @@ extern "C" fn test_utf16( 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_string); args[0] @@ -32,13 +34,16 @@ extern "C" fn test_utf16( pub fn init(env: napi_env, exports: napi_value) { let properties = &[ // utf8 - crate::new_property!(env, "test_utf8\0", test_utf8), + napi_new_property!(env, "test_utf8", test_utf8), // utf16 - crate::new_property!(env, "test_utf16\0", test_utf16), + napi_new_property!(env, "test_utf16", test_utf16), // latin1 ]; - unsafe { - napi_define_properties(env, exports, properties.len(), properties.as_ptr()) - }; + assert_napi_ok!(napi_define_properties( + env, + exports, + properties.len(), + properties.as_ptr() + )); } |