diff options
author | Robin Krahl <robin.krahl@ireas.org> | 2019-01-28 19:45:40 +0000 |
---|---|---|
committer | Robin Krahl <robin.krahl@ireas.org> | 2019-01-28 19:48:33 +0000 |
commit | d1262390573b758ac4aa610eff96a1b5dcb9f3d6 (patch) | |
tree | 445a3251f134c1794aabf587a7ef1ced01b960ea /tests/device.rs | |
parent | 52df93249f27ae803bada0451d7380bc3d596007 (diff) | |
download | nitrokey-rs-d1262390573b758ac4aa610eff96a1b5dcb9f3d6.tar.gz nitrokey-rs-d1262390573b758ac4aa610eff96a1b5dcb9f3d6.tar.bz2 |
Add assert_any_ok macro to unit tests
Sometimes we cannot use assert_ok! as we can’t compare the Ok value (or
do not want to). For these cases, this patch adds the new assert_any_ok
macro to use instead of assert!(x.is_ok()). The advantage is that the
error information is not discarded but printed in a helpful error
message.
Diffstat (limited to 'tests/device.rs')
-rw-r--r-- | tests/device.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/device.rs b/tests/device.rs index 67c2713..306b33f 100644 --- a/tests/device.rs +++ b/tests/device.rs @@ -55,9 +55,9 @@ fn connect_pro(device: Pro) { assert_eq!(device.get_model(), nitrokey::Model::Pro); drop(device); - assert!(nitrokey::connect().is_ok()); - assert!(nitrokey::connect_model(nitrokey::Model::Pro).is_ok()); - assert!(nitrokey::Pro::connect().is_ok()); + assert_any_ok!(nitrokey::connect()); + assert_any_ok!(nitrokey::connect_model(nitrokey::Model::Pro)); + assert_any_ok!(nitrokey::Pro::connect()); } #[test_device] @@ -65,9 +65,9 @@ fn connect_storage(device: Storage) { assert_eq!(device.get_model(), nitrokey::Model::Storage); drop(device); - assert!(nitrokey::connect().is_ok()); - assert!(nitrokey::connect_model(nitrokey::Model::Storage).is_ok()); - assert!(nitrokey::Storage::connect().is_ok()); + assert_any_ok!(nitrokey::connect()); + assert_any_ok!(nitrokey::connect_model(nitrokey::Model::Storage)); + assert_any_ok!(nitrokey::Storage::connect()); } fn assert_empty_serial_number() { |