Add assert_cmd_err and assert_ok macros to tests

These macros allow easier comparisions using the new error type.  This
patch fixes all tests and updates nitrokey-test to 0.2.0 so that it
integrates with the new error structure.

Some tests may still fail until CommunicationError::NotConnected is
actually returned.

5 files changed, 226 insertions, 192 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 99ddd0c..cfe1579 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,4 +19,4 @@ rand_core = {version = "0.3", default-features = false}
 rand_os = {version = "0.1"}
 
 [dev-dependencies]
-nitrokey-test = {version = "0.1"}
+nitrokey-test = {version = "0.2"}
diff --git a/tests/device.rs b/tests/device.rs
index abede67..174624f 100644
--- a/tests/device.rs
+++ b/tests/device.rs
@@ -5,7 +5,7 @@ use std::process::Command;
 use std::{thread, time};
 
 use nitrokey::{
-    Authenticate, CommandError, Config, ConfigureOtp, Device, GenerateOtp, GetPasswordSafe,
+    Authenticate, CommandError, Config, ConfigureOtp, Device, Error, GenerateOtp, GetPasswordSafe,
     OtpMode, OtpSlotData, Storage, VolumeMode,
 };
 use nitrokey_test::test as test_device;
@@ -125,20 +125,20 @@ fn get_retry_count(device: DeviceWrapper) {
 fn config(device: DeviceWrapper) {
     let admin = device.authenticate_admin(ADMIN_PASSWORD).unwrap();
     let config = Config::new(None, None, None, true);
-    assert_eq!(Ok(()), admin.write_config(config));
+    assert_ok!((), admin.write_config(config));
     let get_config = admin.get_config().unwrap();
     assert_eq!(config, get_config);
 
     let config = Config::new(None, Some(9), None, true);
-    assert_eq!(Err(CommandError::InvalidSlot), admin.write_config(config));
+    assert_cmd_err!(CommandError::InvalidSlot, admin.write_config(config));
 
     let config = Config::new(Some(1), None, Some(0), false);
-    assert_eq!(Ok(()), admin.write_config(config));
+    assert_ok!((), admin.write_config(config));
     let get_config = admin.get_config().unwrap();
     assert_eq!(config, get_config);
 
     let config = Config::new(None, None, None, false);
-    assert_eq!(Ok(()), admin.write_config(config));
+    assert_ok!((), admin.write_config(config));
     let get_config = admin.get_config().unwrap();
     assert_eq!(config, get_config);
 }
@@ -159,7 +159,7 @@ fn change_user_pin(device: DeviceWrapper) {
         .device();
 
     let result = device.change_user_pin(USER_PASSWORD, USER_PASSWORD);
-    assert_eq!(Err(CommandError::WrongPassword), result);
+    assert_cmd_err!(CommandError::WrongPassword, result);
 
     assert!(device
         .change_user_pin(USER_NEW_PASSWORD, USER_PASSWORD)
@@ -184,8 +184,8 @@ fn change_admin_pin(device: DeviceWrapper) {
         .unwrap()
         .device();
 
-    assert_eq!(
-        Err(CommandError::WrongPassword),
+    assert_cmd_err!(
+        CommandError::WrongPassword,
         device.change_admin_pin(ADMIN_PASSWORD, ADMIN_PASSWORD)
     );
 
@@ -205,7 +205,10 @@ where
     let result = device.authenticate_user(password);
     assert!(result.is_err());
     let err = result.unwrap_err();
-    assert_eq!(error, err.1);
+    match err.1 {
+        Error::CommandError(err) => assert_eq!(error, err),
+        _ => assert!(false),
+    };
     err.0
 }
 
@@ -215,8 +218,8 @@ fn unlock_user_pin(device: DeviceWrapper) {
     assert!(device
         .unlock_user_pin(ADMIN_PASSWORD, USER_PASSWORD)
         .is_ok());
-    assert_eq!(
-        Err(CommandError::WrongPassword),
+    assert_cmd_err!(
+        CommandError::WrongPassword,
         device.unlock_user_pin(USER_PASSWORD, USER_PASSWORD)
     );
 
@@ -228,8 +231,8 @@ fn unlock_user_pin(device: DeviceWrapper) {
     let device = require_failed_user_login(device, USER_PASSWORD, CommandError::WrongPassword);
 
     // unblock with current PIN
-    assert_eq!(
-        Err(CommandError::WrongPassword),
+    assert_cmd_err!(
+        CommandError::WrongPassword,
         device.unlock_user_pin(USER_PASSWORD, USER_PASSWORD)
     );
     assert!(device
@@ -244,8 +247,8 @@ fn unlock_user_pin(device: DeviceWrapper) {
     let device = require_failed_user_login(device, USER_PASSWORD, CommandError::WrongPassword);
 
     // unblock with new PIN
-    assert_eq!(
-        Err(CommandError::WrongPassword),
+    assert_cmd_err!(
+        CommandError::WrongPassword,
         device.unlock_user_pin(USER_PASSWORD, USER_PASSWORD)
     );
     assert!(device
@@ -262,39 +265,33 @@ fn unlock_user_pin(device: DeviceWrapper) {
 fn factory_reset(device: DeviceWrapper) {
     let admin = device.authenticate_admin(ADMIN_PASSWORD).unwrap();
     let otp_data = OtpSlotData::new(1, "test", "0123468790", OtpMode::SixDigits);
-    assert_eq!(Ok(()), admin.write_totp_slot(otp_data, 30));
+    assert_ok!((), admin.write_totp_slot(otp_data, 30));
 
     let device = admin.device();
     let pws = device.get_password_safe(USER_PASSWORD).unwrap();
-    assert_eq!(Ok(()), pws.write_slot(0, "test", "testlogin", "testpw"));
+    assert_ok!((), pws.write_slot(0, "test", "testlogin", "testpw"));
     drop(pws);
 
-    assert_eq!(
-        Ok(()),
-        device.change_user_pin(USER_PASSWORD, USER_NEW_PASSWORD)
-    );
-    assert_eq!(
-        Ok(()),
+    assert_ok!((), device.change_user_pin(USER_PASSWORD, USER_NEW_PASSWORD));
+    assert_ok!(
+        (),
         device.change_admin_pin(ADMIN_PASSWORD, ADMIN_NEW_PASSWORD)
     );
 
-    assert_eq!(
-        Err(CommandError::WrongPassword),
+    assert_cmd_err!(
+        CommandError::WrongPassword,
         device.factory_reset(USER_NEW_PASSWORD)
     );
-    assert_eq!(
-        Err(CommandError::WrongPassword),
+    assert_cmd_err!(
+        CommandError::WrongPassword,
         device.factory_reset(ADMIN_PASSWORD)
     );
-    assert_eq!(Ok(()), device.factory_reset(ADMIN_NEW_PASSWORD));
+    assert_ok!((), device.factory_reset(ADMIN_NEW_PASSWORD));
 
     let device = device.authenticate_admin(ADMIN_PASSWORD).unwrap().device();
 
     let user = device.authenticate_user(USER_PASSWORD).unwrap();
-    assert_eq!(
-        Err(CommandError::SlotNotProgrammed),
-        user.get_totp_slot_name(1)
-    );
+    assert_cmd_err!(CommandError::SlotNotProgrammed, user.get_totp_slot_name(1));
 
     let device = user.device();
     let pws = device.get_password_safe(USER_PASSWORD).unwrap();
@@ -302,20 +299,20 @@ fn factory_reset(device: DeviceWrapper) {
     assert_ne!("testlogin".to_string(), pws.get_slot_login(0).unwrap());
     assert_ne!("testpw".to_string(), pws.get_slot_password(0).unwrap());
 
-    assert_eq!(Ok(()), device.build_aes_key(ADMIN_PASSWORD));
+    assert_ok!((), device.build_aes_key(ADMIN_PASSWORD));
 }
 
 #[test_device]
 fn build_aes_key(device: DeviceWrapper) {
     let pws = device.get_password_safe(USER_PASSWORD).unwrap();
-    assert_eq!(Ok(()), pws.write_slot(0, "test", "testlogin", "testpw"));
+    assert_ok!((), pws.write_slot(0, "test", "testlogin", "testpw"));
     drop(pws);
 
-    assert_eq!(
-        Err(CommandError::WrongPassword),
+    assert_cmd_err!(
+        CommandError::WrongPassword,
         device.build_aes_key(USER_PASSWORD)
     );
-    assert_eq!(Ok(()), device.build_aes_key(ADMIN_PASSWORD));
+    assert_ok!((), device.build_aes_key(ADMIN_PASSWORD));
 
     let device = device.authenticate_admin(ADMIN_PASSWORD).unwrap().device();
 
@@ -327,74 +324,71 @@ fn build_aes_key(device: DeviceWrapper) {
 
 #[test_device]
 fn change_update_pin(device: Storage) {
-    assert_eq!(
-        Err(CommandError::WrongPassword),
+    assert_cmd_err!(
+        CommandError::WrongPassword,
         device.change_update_pin(UPDATE_NEW_PIN, UPDATE_PIN)
     );
-    assert_eq!(Ok(()), device.change_update_pin(UPDATE_PIN, UPDATE_NEW_PIN));
-    assert_eq!(Ok(()), device.change_update_pin(UPDATE_NEW_PIN, UPDATE_PIN));
+    assert_ok!((), device.change_update_pin(UPDATE_PIN, UPDATE_NEW_PIN));
+    assert_ok!((), device.change_update_pin(UPDATE_NEW_PIN, UPDATE_PIN));
 }
 
 #[test_device]
 fn encrypted_volume(device: Storage) {
-    assert_eq!(Ok(()), device.lock());
+    assert_ok!((), device.lock());
 
     assert_eq!(1, count_nitrokey_block_devices());
-    assert_eq!(Ok(()), device.disable_encrypted_volume());
+    assert_ok!((), device.disable_encrypted_volume());
     assert_eq!(1, count_nitrokey_block_devices());
-    assert_eq!(
-        Err(CommandError::WrongPassword),
+    assert_cmd_err!(
+        CommandError::WrongPassword,
         device.enable_encrypted_volume("123")
     );
     assert_eq!(1, count_nitrokey_block_devices());
-    assert_eq!(Ok(()), device.enable_encrypted_volume(USER_PASSWORD));
+    assert_ok!((), device.enable_encrypted_volume(USER_PASSWORD));
     assert_eq!(2, count_nitrokey_block_devices());
-    assert_eq!(Ok(()), device.disable_encrypted_volume());
+    assert_ok!((), device.disable_encrypted_volume());
     assert_eq!(1, count_nitrokey_block_devices());
 }
 
 #[test_device]
 fn hidden_volume(device: Storage) {
-    assert_eq!(Ok(()), device.lock());
+    assert_ok!((), device.lock());
 
     assert_eq!(1, count_nitrokey_block_devices());
-    assert_eq!(Ok(()), device.disable_hidden_volume());
+    assert_ok!((), device.disable_hidden_volume());
     assert_eq!(1, count_nitrokey_block_devices());
 
-    assert_eq!(Ok(()), device.enable_encrypted_volume(USER_PASSWORD));
+    assert_ok!((), device.enable_encrypted_volume(USER_PASSWORD));
     assert_eq!(2, count_nitrokey_block_devices());
 
     // TODO: why this error code?
-    assert_eq!(
-        Err(CommandError::WrongPassword),
+    assert_cmd_err!(
+        CommandError::WrongPassword,
         device.create_hidden_volume(5, 0, 100, "hiddenpw")
     );
-    assert_eq!(Ok(()), device.create_hidden_volume(0, 20, 21, "hidden-pw"));
-    assert_eq!(
-        Ok(()),
-        device.create_hidden_volume(0, 20, 21, "hiddenpassword")
-    );
-    assert_eq!(Ok(()), device.create_hidden_volume(1, 0, 1, "otherpw"));
+    assert_ok!((), device.create_hidden_volume(0, 20, 21, "hidden-pw"));
+    assert_ok!((), device.create_hidden_volume(0, 20, 21, "hiddenpassword"));
+    assert_ok!((), device.create_hidden_volume(1, 0, 1, "otherpw"));
     // TODO: test invalid range (not handled by libnitrokey)
     assert_eq!(2, count_nitrokey_block_devices());
 
-    assert_eq!(
-        Err(CommandError::WrongPassword),
+    assert_cmd_err!(
+        CommandError::WrongPassword,
         device.enable_hidden_volume("blubb")
     );
-    assert_eq!(Ok(()), device.enable_hidden_volume("hiddenpassword"));
+    assert_ok!((), device.enable_hidden_volume("hiddenpassword"));
     assert_eq!(2, count_nitrokey_block_devices());
-    assert_eq!(Ok(()), device.enable_hidden_volume("otherpw"));
+    assert_ok!((), device.enable_hidden_volume("otherpw"));
     assert_eq!(2, count_nitrokey_block_devices());
 
-    assert_eq!(Ok(()), device.disable_hidden_volume());
+    assert_ok!((), device.disable_hidden_volume());
     assert_eq!(1, count_nitrokey_block_devices());
 }
 
 #[test_device]
 fn lock(device: Storage) {
-    assert_eq!(Ok(()), device.enable_encrypted_volume(USER_PASSWORD));
-    assert_eq!(Ok(()), device.lock());
+    assert_ok!((), device.enable_encrypted_volume(USER_PASSWORD));
+    assert_ok!((), device.lock());
     assert_eq!(1, count_nitrokey_block_devices());
 }
 
@@ -410,17 +404,14 @@ fn set_unencrypted_volume_mode(device: Storage) {
     }
 
     fn assert_success(device: &Storage, mode: VolumeMode) {
-        assert_eq!(
-            Ok(()),
-            device.set_unencrypted_volume_mode(ADMIN_PASSWORD, mode)
-        );
+        assert_ok!((), device.set_unencrypted_volume_mode(ADMIN_PASSWORD, mode));
         assert_mode(&device, mode);
     }
 
     assert_success(&device, VolumeMode::ReadOnly);
 
-    assert_eq!(
-        Err(CommandError::WrongPassword),
+    assert_cmd_err!(
+        CommandError::WrongPassword,
         device.set_unencrypted_volume_mode(USER_PASSWORD, VolumeMode::ReadOnly)
     );
     assert_mode(&device, VolumeMode::ReadOnly);
@@ -460,17 +451,17 @@ fn get_production_info(device: Storage) {
 
 #[test_device]
 fn clear_new_sd_card_warning(device: Storage) {
-    assert_eq!(Ok(()), device.factory_reset(ADMIN_PASSWORD));
+    assert_ok!((), device.factory_reset(ADMIN_PASSWORD));
     thread::sleep(time::Duration::from_secs(3));
-    assert_eq!(Ok(()), device.build_aes_key(ADMIN_PASSWORD));
+    assert_ok!((), device.build_aes_key(ADMIN_PASSWORD));
 
     // We have to perform an SD card operation to reset the new_sd_card_found field
-    assert_eq!(Ok(()), device.lock());
+    assert_ok!((), device.lock());
 
     let status = device.get_status().unwrap();
     assert!(status.new_sd_card_found);
 
-    assert_eq!(Ok(()), device.clear_new_sd_card_warning(ADMIN_PASSWORD));
+    assert_ok!((), device.clear_new_sd_card_warning(ADMIN_PASSWORD));
 
     let status = device.get_status().unwrap();
     assert!(!status.new_sd_card_found);
@@ -478,18 +469,18 @@ fn clear_new_sd_card_warning(device: Storage) {
 
 #[test_device]
 fn export_firmware(device: Storage) {
-    assert_eq!(
-        Err(CommandError::WrongPassword),
+    assert_cmd_err!(
+        CommandError::WrongPassword,
         device.export_firmware("someadminpn")
     );
-    assert_eq!(Ok(()), device.export_firmware(ADMIN_PASSWORD));
-    assert_eq!(
-        Ok(()),
+    assert_ok!((), device.export_firmware(ADMIN_PASSWORD));
+    assert_ok!(
+        (),
         device.set_unencrypted_volume_mode(ADMIN_PASSWORD, VolumeMode::ReadWrite)
     );
-    assert_eq!(Ok(()), device.export_firmware(ADMIN_PASSWORD));
-    assert_eq!(
-        Ok(()),
+    assert_ok!((), device.export_firmware(ADMIN_PASSWORD));
+    assert_ok!(
+        (),
         device.set_unencrypted_volume_mode(ADMIN_PASSWORD, VolumeMode::ReadOnly)
     );
 }
diff --git a/tests/otp.rs b/tests/otp.rs
index 712f7a2..d328351 100644
--- a/tests/otp.rs
+++ b/tests/otp.rs
@@ -38,7 +38,7 @@ enum TotpTimestampSize {
 fn make_admin_test_device<T>(device: T) -> Admin<T>
 where
     T: Device,
-    (T, nitrokey::CommandError): Debug,
+    (T, nitrokey::Error): Debug,
 {
     device
         .authenticate_admin(ADMIN_PASSWORD)
@@ -47,7 +47,7 @@ where
 
 fn configure_hotp(admin: &ConfigureOtp, counter: u8) {
     let slot_data = OtpSlotData::new(1, "test-hotp", HOTP_SECRET, OtpMode::SixDigits);
-    assert_eq!(Ok(()), admin.write_hotp_slot(slot_data, counter.into()));
+    assert_ok!((), admin.write_hotp_slot(slot_data, counter.into()));
 }
 
 fn check_hotp_codes(device: &GenerateOtp, offset: u8) {
@@ -61,20 +61,17 @@ fn check_hotp_codes(device: &GenerateOtp, offset: u8) {
 
 #[test_device]
 fn set_time(device: DeviceWrapper) {
-    assert_eq!(Ok(()), device.set_time(1546385382, true));
-    assert_eq!(Ok(()), device.set_time(1546385392, false));
-    assert_eq!(
-        Err(CommandError::Timestamp),
-        device.set_time(1546385292, false)
-    );
-    assert_eq!(Ok(()), device.set_time(1546385382, true));
+    assert_ok!((), device.set_time(1546385382, true));
+    assert_ok!((), device.set_time(1546385392, false));
+    assert_cmd_err!(CommandError::Timestamp, device.set_time(1546385292, false));
+    assert_ok!((), device.set_time(1546385382, true));
 }
 
 #[test_device]
 fn hotp_no_pin(device: DeviceWrapper) {
     let admin = make_admin_test_device(device);
     let config = Config::new(None, None, None, false);
-    assert_eq!(Ok(()), admin.write_config(config));
+    assert_ok!((), admin.write_config(config));
 
     configure_hotp(&admin, 0);
     check_hotp_codes(admin.deref(), 0);
@@ -90,7 +87,7 @@ fn hotp_no_pin(device: DeviceWrapper) {
 fn hotp_pin(device: DeviceWrapper) {
     let admin = make_admin_test_device(device);
     let config = Config::new(None, None, None, true);
-    assert_eq!(Ok(()), admin.write_config(config));
+    assert_ok!((), admin.write_config(config));
 
     configure_hotp(&admin, 0);
     let user = admin.device().authenticate_user(USER_PASSWORD).unwrap();
@@ -103,54 +100,51 @@ fn hotp_pin(device: DeviceWrapper) {
 fn hotp_slot_name(device: DeviceWrapper) {
     let admin = make_admin_test_device(device);
     let slot_data = OtpSlotData::new(1, "test-hotp", HOTP_SECRET, OtpMode::SixDigits);
-    assert_eq!(Ok(()), admin.write_hotp_slot(slot_data, 0));
+    assert_ok!((), admin.write_hotp_slot(slot_data, 0));
 
     let device = admin.device();
     let result = device.get_hotp_slot_name(1);
     assert_eq!("test-hotp", result.unwrap());
     let result = device.get_hotp_slot_name(4);
-    assert_eq!(CommandError::InvalidSlot, result.unwrap_err());
+    assert_cmd_err!(CommandError::InvalidSlot, result);
 }
 
 #[test_device]
 fn hotp_error(device: DeviceWrapper) {
     let admin = make_admin_test_device(device);
     let slot_data = OtpSlotData::new(1, "", HOTP_SECRET, OtpMode::SixDigits);
-    assert_eq!(
-        Err(CommandError::NoName),
-        admin.write_hotp_slot(slot_data, 0)
-    );
+    assert_cmd_err!(CommandError::NoName, admin.write_hotp_slot(slot_data, 0));
     let slot_data = OtpSlotData::new(4, "test", HOTP_SECRET, OtpMode::SixDigits);
-    assert_eq!(
-        Err(CommandError::InvalidSlot),
+    assert_cmd_err!(
+        CommandError::InvalidSlot,
         admin.write_hotp_slot(slot_data, 0)
     );
     let slot_data = OtpSlotData::new(1, "test", "foobar", OtpMode::SixDigits);
-    assert_eq!(
-        Err(CommandError::InvalidHexString),
+    assert_cmd_err!(
+        CommandError::InvalidHexString,
         admin.write_hotp_slot(slot_data, 0)
     );
     let code = admin.get_hotp_code(4);
-    assert_eq!(CommandError::InvalidSlot, code.unwrap_err());
+    assert_cmd_err!(CommandError::InvalidSlot, code);
 }
 
 #[test_device]
 fn hotp_erase(device: DeviceWrapper) {
     let admin = make_admin_test_device(device);
     let config = Config::new(None, None, None, false);
-    assert_eq!(Ok(()), admin.write_config(config));
+    assert_ok!((), admin.write_config(config));
     let slot_data = OtpSlotData::new(1, "test1", HOTP_SECRET, OtpMode::SixDigits);
-    assert_eq!(Ok(()), admin.write_hotp_slot(slot_data, 0));
+    assert_ok!((), admin.write_hotp_slot(slot_data, 0));
     let slot_data = OtpSlotData::new(2, "test2", HOTP_SECRET, OtpMode::SixDigits);
-    assert_eq!(Ok(()), admin.write_hotp_slot(slot_data, 0));
+    assert_ok!((), admin.write_hotp_slot(slot_data, 0));
 
-    assert_eq!(Ok(()), admin.erase_hotp_slot(1));
+    assert_ok!((), admin.erase_hotp_slot(1));
 
     let device = admin.device();
     let result = device.get_hotp_slot_name(1);
-    assert_eq!(CommandError::SlotNotProgrammed, result.unwrap_err());
+    assert_cmd_err!(CommandError::SlotNotProgrammed, result);
     let result = device.get_hotp_code(1);
-    assert_eq!(CommandError::SlotNotProgrammed, result.unwrap_err());
+    assert_cmd_err!(CommandError::SlotNotProgrammed, result);
 
     assert_eq!("test2", device.get_hotp_slot_name(2).unwrap());
 }
@@ -158,7 +152,7 @@ fn hotp_erase(device: DeviceWrapper) {
 fn configure_totp(admin: &ConfigureOtp, factor: u64) {
     let slot_data = OtpSlotData::new(1, "test-totp", TOTP_SECRET, OtpMode::EightDigits);
     let time_window = 30u64.checked_mul(factor).unwrap();
-    assert_eq!(Ok(()), admin.write_totp_slot(slot_data, time_window as u16));
+    assert_ok!((), admin.write_totp_slot(slot_data, time_window as u16));
 }
 
 fn check_totp_codes(device: &GenerateOtp, factor: u64, timestamp_size: TotpTimestampSize) {
@@ -169,7 +163,7 @@ fn check_totp_codes(device: &GenerateOtp, factor: u64, timestamp_size: TotpTimes
             continue;
         }
 
-        assert_eq!(Ok(()), device.set_time(time, true));
+        assert_ok!((), device.set_time(time, true));
         let result = device.get_totp_code(1);
         assert!(result.is_ok());
         let result_code = result.unwrap();
@@ -186,7 +180,7 @@ fn totp_no_pin(device: DeviceWrapper) {
     // TODO: this test may fail due to bad timing --> find solution
     let admin = make_admin_test_device(device);
     let config = Config::new(None, None, None, false);
-    assert_eq!(Ok(()), admin.write_config(config));
+    assert_ok!((), admin.write_config(config));
 
     configure_totp(&admin, 1);
     check_totp_codes(admin.deref(), 1, TotpTimestampSize::U32);
@@ -204,7 +198,7 @@ fn totp_no_pin(device: DeviceWrapper) {
 fn totp_no_pin_64(device: Pro) {
     let admin = make_admin_test_device(device);
     let config = Config::new(None, None, None, false);
-    assert_eq!(Ok(()), admin.write_config(config));
+    assert_ok!((), admin.write_config(config));
 
     configure_totp(&admin, 1);
     check_totp_codes(admin.deref(), 1, TotpTimestampSize::U64);
@@ -221,7 +215,7 @@ fn totp_pin(device: DeviceWrapper) {
     // TODO: this test may fail due to bad timing --> find solution
     let admin = make_admin_test_device(device);
     let config = Config::new(None, None, None, true);
-    assert_eq!(Ok(()), admin.write_config(config));
+    assert_ok!((), admin.write_config(config));
 
     configure_totp(&admin, 1);
     let user = admin.device().authenticate_user(USER_PASSWORD).unwrap();
@@ -235,7 +229,7 @@ fn totp_pin(device: DeviceWrapper) {
 fn totp_pin_64(device: Pro) {
     let admin = make_admin_test_device(device);
     let config = Config::new(None, None, None, true);
-    assert_eq!(Ok(()), admin.write_config(config));
+    assert_ok!((), admin.write_config(config));
 
     configure_totp(&admin, 1);
     let user = admin.device().authenticate_user(USER_PASSWORD).unwrap();
@@ -248,55 +242,52 @@ fn totp_pin_64(device: Pro) {
 fn totp_slot_name(device: DeviceWrapper) {
     let admin = make_admin_test_device(device);
     let slot_data = OtpSlotData::new(1, "test-totp", TOTP_SECRET, OtpMode::EightDigits);
-    assert_eq!(Ok(()), admin.write_totp_slot(slot_data, 0));
+    assert_ok!((), admin.write_totp_slot(slot_data, 0));
 
     let device = admin.device();
     let result = device.get_totp_slot_name(1);
     assert!(result.is_ok());
     assert_eq!("test-totp", result.unwrap());
     let result = device.get_totp_slot_name(16);
-    assert_eq!(CommandError::InvalidSlot, result.unwrap_err());
+    assert_cmd_err!(CommandError::InvalidSlot, result);
 }
 
 #[test_device]
 fn totp_error(device: DeviceWrapper) {
     let admin = make_admin_test_device(device);
     let slot_data = OtpSlotData::new(1, "", TOTP_SECRET, OtpMode::SixDigits);
-    assert_eq!(
-        Err(CommandError::NoName),
-        admin.write_totp_slot(slot_data, 0)
-    );
+    assert_cmd_err!(CommandError::NoName, admin.write_totp_slot(slot_data, 0));
     let slot_data = OtpSlotData::new(20, "test", TOTP_SECRET, OtpMode::SixDigits);
-    assert_eq!(
-        Err(CommandError::InvalidSlot),
+    assert_cmd_err!(
+        CommandError::InvalidSlot,
         admin.write_totp_slot(slot_data, 0)
     );
     let slot_data = OtpSlotData::new(4, "test", "foobar", OtpMode::SixDigits);
-    assert_eq!(
-        Err(CommandError::InvalidHexString),
+    assert_cmd_err!(
+        CommandError::InvalidHexString,
         admin.write_totp_slot(slot_data, 0)
     );
     let code = admin.get_totp_code(20);
-    assert_eq!(CommandError::InvalidSlot, code.unwrap_err());
+    assert_cmd_err!(CommandError::InvalidSlot, code);
 }
 
 #[test_device]
 fn totp_erase(device: DeviceWrapper) {
     let admin = make_admin_test_device(device);
     let config = Config::new(None, None, None, false);
-    assert_eq!(Ok(()), admin.write_config(config));
+    assert_ok!((), admin.write_config(config));
     let slot_data = OtpSlotData::new(1, "test1", TOTP_SECRET, OtpMode::SixDigits);
-    assert_eq!(Ok(()), admin.write_totp_slot(slot_data, 0));
+    assert_ok!((), admin.write_totp_slot(slot_data, 0));
     let slot_data = OtpSlotData::new(2, "test2", TOTP_SECRET, OtpMode::SixDigits);
-    assert_eq!(Ok(()), admin.write_totp_slot(slot_data, 0));
+    assert_ok!((), admin.write_totp_slot(slot_data, 0));
 
-    assert_eq!(Ok(()), admin.erase_totp_slot(1));
+    assert_ok!((), admin.erase_totp_slot(1));
 
     let device = admin.device();
     let result = device.get_totp_slot_name(1);
-    assert_eq!(CommandError::SlotNotProgrammed, result.unwrap_err());
+    assert_cmd_err!(CommandError::SlotNotProgrammed, result);
     let result = device.get_totp_code(1);
-    assert_eq!(CommandError::SlotNotProgrammed, result.unwrap_err());
+    assert_cmd_err!(CommandError::SlotNotProgrammed, result);
 
     assert_eq!("test2", device.get_totp_slot_name(2).unwrap());
 }
diff --git a/tests/pws.rs b/tests/pws.rs
index fbcc0c1..f12af48 100644
--- a/tests/pws.rs
+++ b/tests/pws.rs
@@ -3,16 +3,16 @@ mod util;
 use std::ffi::CStr;
 
 use libc::{c_int, c_void, free};
-use nitrokey::{CommandError, Device, GetPasswordSafe, PasswordSafe, SLOT_COUNT};
+use nitrokey::{CommandError, Device, Error, GetPasswordSafe, PasswordSafe, SLOT_COUNT};
 use nitrokey_sys;
 use nitrokey_test::test as test_device;
 
 use crate::util::{ADMIN_PASSWORD, USER_PASSWORD};
 
-fn get_slot_name_direct(slot: u8) -> Result<String, CommandError> {
+fn get_slot_name_direct(slot: u8) -> Result<String, Error> {
     let ptr = unsafe { nitrokey_sys::NK_get_password_safe_slot_name(slot) };
     if ptr.is_null() {
-        return Err(CommandError::Undefined);
+        return Err(CommandError::Undefined.into());
     }
     let s = unsafe { CStr::from_ptr(ptr).to_string_lossy().into_owned() };
     unsafe { free(ptr as *mut c_void) };
@@ -21,7 +21,7 @@ fn get_slot_name_direct(slot: u8) -> Result<String, CommandError> {
             let error = unsafe { nitrokey_sys::NK_get_last_command_status() } as c_int;
             match error {
                 0 => Ok(s),
-                other => Err(CommandError::from(other)),
+                other => Err(CommandError::from(other).into()),
             }
         }
         false => Ok(s),
@@ -49,35 +49,35 @@ fn enable(device: DeviceWrapper) {
 fn drop(device: DeviceWrapper) {
     {
         let pws = get_pws(&device);
-        assert_eq!(Ok(()), pws.write_slot(1, "name", "login", "password"));
+        assert_ok!((), pws.write_slot(1, "name", "login", "password"));
         assert_eq!("name", pws.get_slot_name(1).unwrap());
         let result = get_slot_name_direct(1);
-        assert_eq!(Ok(String::from("name")), result);
+        assert_ok!(String::from("name"), result);
     }
     let result = get_slot_name_direct(1);
-    assert_eq!(Ok(String::from("name")), result);
-    assert_eq!(Ok(()), device.lock());
+    assert_ok!(String::from("name"), result);
+    assert_ok!((), device.lock());
     let result = get_slot_name_direct(1);
-    assert_eq!(Err(CommandError::NotAuthorized), result);
+    assert_cmd_err!(CommandError::NotAuthorized, result);
 }
 
 #[test_device]
 fn get_status(device: DeviceWrapper) {
     let pws = get_pws(&device);
     for i in 0..SLOT_COUNT {
-        assert_eq!(Ok(()), pws.erase_slot(i), "Could not erase slot {}", i);
+        assert_ok!((), pws.erase_slot(i));
     }
     let status = pws.get_slot_status().unwrap();
     assert_eq!(status, [false; SLOT_COUNT as usize]);
 
-    assert_eq!(Ok(()), pws.write_slot(1, "name", "login", "password"));
+    assert_ok!((), pws.write_slot(1, "name", "login", "password"));
     let status = pws.get_slot_status().unwrap();
     for i in 0..SLOT_COUNT {
         assert_eq!(i == 1, status[i as usize]);
     }
 
     for i in 0..SLOT_COUNT {
-        assert_eq!(Ok(()), pws.write_slot(i, "name", "login", "password"));
+        assert_ok!((), pws.write_slot(i, "name", "login", "password"));
     }
     let status = pws.get_slot_status().unwrap();
     assert_eq!(status, [true; SLOT_COUNT as usize]);
@@ -86,76 +86,61 @@ fn get_status(device: DeviceWrapper) {
 #[test_device]
 fn get_data(device: DeviceWrapper) {
     let pws = get_pws(&device);
-    assert_eq!(Ok(()), pws.write_slot(1, "name", "login", "password"));
+    assert_ok!((), pws.write_slot(1, "name", "login", "password"));
     assert_eq!("name", pws.get_slot_name(1).unwrap());
     assert_eq!("login", pws.get_slot_login(1).unwrap());
     assert_eq!("password", pws.get_slot_password(1).unwrap());
 
-    assert_eq!(Ok(()), pws.erase_slot(1));
-    assert_eq!(Err(CommandError::SlotNotProgrammed), pws.get_slot_name(1));
-    assert_eq!(Err(CommandError::SlotNotProgrammed), pws.get_slot_login(1));
-    assert_eq!(
-        Err(CommandError::SlotNotProgrammed),
-        pws.get_slot_password(1)
-    );
+    assert_ok!((), pws.erase_slot(1));
+    assert_cmd_err!(CommandError::SlotNotProgrammed, pws.get_slot_name(1));
+    assert_cmd_err!(CommandError::SlotNotProgrammed, pws.get_slot_login(1));
+    assert_cmd_err!(CommandError::SlotNotProgrammed, pws.get_slot_password(1));
 
     let name = "with å";
     let login = "pär@test.com";
     let password = "'i3lJc[09?I:,[u7dWz9";
-    assert_eq!(Ok(()), pws.write_slot(1, name, login, password));
+    assert_ok!((), pws.write_slot(1, name, login, password));
     assert_eq!(name, pws.get_slot_name(1).unwrap());
     assert_eq!(login, pws.get_slot_login(1).unwrap());
     assert_eq!(password, pws.get_slot_password(1).unwrap());
 
-    assert_eq!(
-        Err(CommandError::InvalidSlot),
-        pws.get_slot_name(SLOT_COUNT)
-    );
-    assert_eq!(
-        Err(CommandError::InvalidSlot),
-        pws.get_slot_login(SLOT_COUNT)
-    );
-    assert_eq!(
-        Err(CommandError::InvalidSlot),
-        pws.get_slot_password(SLOT_COUNT)
-    );
+    assert_cmd_err!(CommandError::InvalidSlot, pws.get_slot_name(SLOT_COUNT));
+    assert_cmd_err!(CommandError::InvalidSlot, pws.get_slot_login(SLOT_COUNT));
+    assert_cmd_err!(CommandError::InvalidSlot, pws.get_slot_password(SLOT_COUNT));
 }
 
 #[test_device]
 fn write(device: DeviceWrapper) {
     let pws = get_pws(&device);
 
-    assert_eq!(
-        Err(CommandError::InvalidSlot),
+    assert_cmd_err!(
+        CommandError::InvalidSlot,
         pws.write_slot(SLOT_COUNT, "name", "login", "password")
     );
 
-    assert_eq!(Ok(()), pws.write_slot(0, "", "login", "password"));
-    assert_eq!(Err(CommandError::SlotNotProgrammed), pws.get_slot_name(0));
-    assert_eq!(Ok(String::from("login")), pws.get_slot_login(0));
-    assert_eq!(Ok(String::from("password")), pws.get_slot_password(0));
-
-    assert_eq!(Ok(()), pws.write_slot(0, "name", "", "password"));
-    assert_eq!(Ok(String::from("name")), pws.get_slot_name(0));
-    assert_eq!(Err(CommandError::SlotNotProgrammed), pws.get_slot_login(0));
-    assert_eq!(Ok(String::from("password")), pws.get_slot_password(0));
-
-    assert_eq!(Ok(()), pws.write_slot(0, "name", "login", ""));
-    assert_eq!(Ok(String::from("name")), pws.get_slot_name(0));
-    assert_eq!(Ok(String::from("login")), pws.get_slot_login(0));
-    assert_eq!(
-        Err(CommandError::SlotNotProgrammed),
-        pws.get_slot_password(0)
-    );
+    assert_ok!((), pws.write_slot(0, "", "login", "password"));
+    assert_cmd_err!(CommandError::SlotNotProgrammed, pws.get_slot_name(0));
+    assert_ok!(String::from("login"), pws.get_slot_login(0));
+    assert_ok!(String::from("password"), pws.get_slot_password(0));
+
+    assert_ok!((), pws.write_slot(0, "name", "", "password"));
+    assert_ok!(String::from("name"), pws.get_slot_name(0));
+    assert_cmd_err!(CommandError::SlotNotProgrammed, pws.get_slot_login(0));
+    assert_ok!(String::from("password"), pws.get_slot_password(0));
+
+    assert_ok!((), pws.write_slot(0, "name", "login", ""));
+    assert_ok!(String::from("name"), pws.get_slot_name(0));
+    assert_ok!(String::from("login"), pws.get_slot_login(0));
+    assert_cmd_err!(CommandError::SlotNotProgrammed, pws.get_slot_password(0));
 }
 
 #[test_device]
 fn erase(device: DeviceWrapper) {
     let pws = get_pws(&device);
-    assert_eq!(Err(CommandError::InvalidSlot), pws.erase_slot(SLOT_COUNT));
+    assert_cmd_err!(CommandError::InvalidSlot, pws.erase_slot(SLOT_COUNT));
 
-    assert_eq!(Ok(()), pws.write_slot(0, "name", "login", "password"));
-    assert_eq!(Ok(()), pws.erase_slot(0));
-    assert_eq!(Ok(()), pws.erase_slot(0));
-    assert_eq!(Err(CommandError::SlotNotProgrammed), pws.get_slot_name(0));
+    assert_ok!((), pws.write_slot(0, "name", "login", "password"));
+    assert_ok!((), pws.erase_slot(0));
+    assert_ok!((), pws.erase_slot(0));
+    assert_cmd_err!(CommandError::SlotNotProgrammed, pws.get_slot_name(0));
 }
diff --git a/tests/util/mod.rs b/tests/util/mod.rs
index cbf6b93..f0d0bb5 100644
--- a/tests/util/mod.rs
+++ b/tests/util/mod.rs
@@ -1,2 +1,69 @@
 pub static ADMIN_PASSWORD: &str = "12345678";
 pub static USER_PASSWORD: &str = "123456";
+
+#[macro_export]
+macro_rules! assert_ok {
+    ($left:expr, $right:expr) => {{
+        match &$right {
+            Ok(right) => match &$left {
+                left => {
+                    if !(*left == *right) {
+                        panic!(
+                            r#"assertion failed: `(left == right)`
+  left: `{:?}`,
+ right: `{:?}`"#,
+                            left, right
+                        )
+                    }
+                }
+            },
+            Err(right_err) => panic!(
+                r#"assertion failed: `(left == right)`
+  left: `Ok({:?})`,
+ right: `Err({:?})`"#,
+                $left, right_err
+            ),
+        }
+    }};
+}
+
+#[macro_export]
+macro_rules! assert_err {
+    ($err:path, $left:expr, $right:expr) => {
+        match &$right {
+            Err($err(ref right_err)) => match &$left {
+                left_err => {
+                    if !(*left_err == *right_err) {
+                        panic!(
+                            r#"assertion failed: `(left == right)`
+  left: `{:?}`,
+ right: `{:?}`"#,
+                            left_err, right_err
+                        )
+                    }
+                }
+            },
+            Err(ref right_err) => panic!(
+                r#"assertion failed: `(left == right)`
+  left: `{:?}`,
+ right: `{:?}`"#,
+                $err($left),
+                right_err
+            ),
+            Ok(right_ok) => panic!(
+                r#"assertion failed: `(left == right)`
+  left: `Err({:?})`,
+ right: `Ok({:?})`"#,
+                $err($left),
+                right_ok
+            ),
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! assert_cmd_err {
+    ($left:expr, $right:expr) => {
+        assert_err!(::nitrokey::Error::CommandError, $left, $right);
+    };
+}