diff options
| -rw-r--r-- | tests/pws.rs | 44 | ||||
| -rw-r--r-- | tests/util/mod.rs | 6 |
2 files changed, 18 insertions, 32 deletions
diff --git a/tests/pws.rs b/tests/pws.rs index 5061298..4a2ca4f 100644 --- a/tests/pws.rs +++ b/tests/pws.rs @@ -5,8 +5,9 @@ use std::ffi::CStr; use libc::{c_int, c_void, free}; use nitrokey::{CommandError, Device, GetPasswordSafe, PasswordSafe, SLOT_COUNT}; use nitrokey_sys; +use nitrokey_test::test as test_device; -use crate::util::{Target, ADMIN_PASSWORD, USER_PASSWORD}; +use crate::util::{ADMIN_PASSWORD, USER_PASSWORD}; fn get_slot_name_direct(slot: u8) -> Result<String, CommandError> { let ptr = unsafe { nitrokey_sys::NK_get_password_safe_slot_name(slot) }; @@ -27,14 +28,15 @@ fn get_slot_name_direct(slot: u8) -> Result<String, CommandError> { } } -fn get_pws(device: &Target) -> PasswordSafe { +fn get_pws<T>(device: &T) -> PasswordSafe +where + T: Device, +{ device.get_password_safe(USER_PASSWORD).unwrap() } -#[test] -#[cfg_attr(not(any(feature = "test-pro", feature = "test-storage")), ignore)] -fn enable() { - let device = Target::connect().unwrap(); +#[test_device] +fn enable(device: DeviceWrapper) { assert!(device .get_password_safe(&(USER_PASSWORD.to_owned() + "123")) .is_err()); @@ -43,10 +45,8 @@ fn enable() { assert!(device.get_password_safe(USER_PASSWORD).is_ok()); } -#[test] -#[cfg_attr(not(any(feature = "test-pro", feature = "test-storage")), ignore)] -fn drop() { - let device = Target::connect().unwrap(); +#[test_device] +fn drop(device: DeviceWrapper) { { let pws = get_pws(&device); assert!(pws.write_slot(1, "name", "login", "password").is_ok()); @@ -61,10 +61,8 @@ fn drop() { assert_eq!(Err(CommandError::NotAuthorized), result); } -#[test] -#[cfg_attr(not(any(feature = "test-pro", feature = "test-storage")), ignore)] -fn get_status() { - let device = Target::connect().unwrap(); +#[test_device] +fn get_status(device: DeviceWrapper) { let pws = get_pws(&device); for i in 0..SLOT_COUNT { assert!(pws.erase_slot(i).is_ok(), "Could not erase slot {}", i); @@ -85,10 +83,8 @@ fn get_status() { assert_eq!(status, [true; SLOT_COUNT as usize]); } -#[test] -#[cfg_attr(not(any(feature = "test-pro", feature = "test-storage")), ignore)] -fn get_data() { - let device = Target::connect().unwrap(); +#[test_device] +fn get_data(device: DeviceWrapper) { let pws = get_pws(&device); assert!(pws.write_slot(1, "name", "login", "password").is_ok()); assert_eq!("name", pws.get_slot_name(1).unwrap()); @@ -123,10 +119,8 @@ fn get_data() { ); } -#[test] -#[cfg_attr(not(any(feature = "test-pro", feature = "test-storage")), ignore)] -fn write() { - let device = Target::connect().unwrap(); +#[test_device] +fn write(device: DeviceWrapper) { let pws = get_pws(&device); assert_eq!( @@ -150,10 +144,8 @@ fn write() { assert_eq!(Err(CommandError::Undefined), pws.get_slot_password(0)); } -#[test] -#[cfg_attr(not(any(feature = "test-pro", feature = "test-storage")), ignore)] -fn erase() { - let device = Target::connect().unwrap(); +#[test_device] +fn erase(device: DeviceWrapper) { let pws = get_pws(&device); assert_eq!(Err(CommandError::InvalidSlot), pws.erase_slot(SLOT_COUNT)); diff --git a/tests/util/mod.rs b/tests/util/mod.rs index 5e495d8..1e522fd 100644 --- a/tests/util/mod.rs +++ b/tests/util/mod.rs @@ -1,9 +1,3 @@ pub static ADMIN_PASSWORD: &str = "12345678"; pub static UPDATE_PIN: &str = "12345678"; pub static USER_PASSWORD: &str = "123456"; - -#[cfg(not(feature = "test-storage"))] -pub type Target = nitrokey::Pro; - -#[cfg(feature = "test-storage")] -pub type Target = nitrokey::Storage; |