Add unwrap_ok macro to replace unwrap in unit tests

The unwrap error message is not very useful.  This patch adds the
unwrap_ok macro that is basically the same as unwrap but prints a more
readable error message.

1 files changed, 9 insertions, 12 deletions

diff --git a/tests/otp.rs b/tests/otp.rs
index e424673..fc0e79e 100644
--- a/tests/otp.rs
+++ b/tests/otp.rs
@@ -56,8 +56,7 @@ fn configure_hotp(admin: &ConfigureOtp, counter: u8) {
 fn check_hotp_codes(device: &GenerateOtp, offset: u8) {
     HOTP_CODES.iter().enumerate().for_each(|(i, code)| {
         if i >= offset as usize {
-            let result = device.get_hotp_code(1);
-            assert_eq!(code, &result.unwrap());
+            assert_ok!(code.to_string(), device.get_hotp_code(1));
         }
     });
 }
@@ -93,7 +92,7 @@ fn hotp_pin(device: DeviceWrapper) {
     assert_ok!((), admin.write_config(config));
 
     configure_hotp(&admin, 0);
-    let user = admin.device().authenticate_user(USER_PASSWORD).unwrap();
+    let user = unwrap_ok!(admin.device().authenticate_user(USER_PASSWORD));
     check_hotp_codes(&user, 0);
 
     assert_cmd_err!(CommandError::NotAuthorized, user.device().get_hotp_code(1));
@@ -106,10 +105,8 @@ fn hotp_slot_name(device: DeviceWrapper) {
     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_lib_err!(LibraryError::InvalidSlot, result);
+    assert_ok!("test-hotp".to_string(), device.get_hotp_slot_name(1));
+    assert_lib_err!(LibraryError::InvalidSlot, device.get_hotp_slot_name(4));
 }
 
 #[test_device]
@@ -149,7 +146,7 @@ fn hotp_erase(device: DeviceWrapper) {
     let result = device.get_hotp_code(1);
     assert_cmd_err!(CommandError::SlotNotProgrammed, result);
 
-    assert_eq!("test2", device.get_hotp_slot_name(2).unwrap());
+    assert_ok!("test2".to_string(), device.get_hotp_slot_name(2));
 }
 
 fn configure_totp(admin: &ConfigureOtp, factor: u64) {
@@ -167,7 +164,7 @@ fn check_totp_codes(device: &GenerateOtp, factor: u64, timestamp_size: TotpTimes
         }
 
         assert_ok!((), device.set_time(time, true));
-        let code = device.get_totp_code(1).unwrap();
+        let code = unwrap_ok!(device.get_totp_code(1));
         assert!(
             code.contains(&code),
             "Generated TOTP code {} for {}, but expected one of {}",
@@ -221,7 +218,7 @@ fn totp_pin(device: DeviceWrapper) {
     assert_ok!((), admin.write_config(config));
 
     configure_totp(&admin, 1);
-    let user = admin.device().authenticate_user(USER_PASSWORD).unwrap();
+    let user = unwrap_ok!(admin.device().authenticate_user(USER_PASSWORD));
     check_totp_codes(&user, 1, TotpTimestampSize::U32);
 
     assert_cmd_err!(CommandError::NotAuthorized, user.device().get_totp_code(1));
@@ -235,7 +232,7 @@ fn totp_pin_64(device: Pro) {
     assert_ok!((), admin.write_config(config));
 
     configure_totp(&admin, 1);
-    let user = admin.device().authenticate_user(USER_PASSWORD).unwrap();
+    let user = unwrap_ok!(admin.device().authenticate_user(USER_PASSWORD));
     check_totp_codes(&user, 1, TotpTimestampSize::U64);
 
     assert_cmd_err!(CommandError::NotAuthorized, user.device().get_totp_code(1));
@@ -291,5 +288,5 @@ fn totp_erase(device: DeviceWrapper) {
     let result = device.get_totp_code(1);
     assert_cmd_err!(CommandError::SlotNotProgrammed, result);
 
-    assert_eq!("test2", device.get_totp_slot_name(2).unwrap());
+    assert_ok!("test2".to_string(), device.get_totp_slot_name(2));
 }