From c43b63b70ee32f9fa8e980d89eff5383931f5c39 Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin.krahl@ireas.org>
Date: Thu, 17 Jan 2019 03:49:13 +0000
Subject: 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.
---
 tests/util/mod.rs | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

(limited to 'tests/util')

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);
+    };
+}
-- 
cgit v1.2.1


From 5e258d26b55af6bed7c316b1c7ac12e20946702d Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin.krahl@ireas.org>
Date: Thu, 17 Jan 2019 12:47:52 +0000
Subject: Refactor library errors into LibraryError enum

Previously, library errors were part of the CommandError enum.  As
command errors and library errors are two different error types, they
should be split into two enums.
---
 tests/util/mod.rs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'tests/util')

diff --git a/tests/util/mod.rs b/tests/util/mod.rs
index f0d0bb5..b1d3ea3 100644
--- a/tests/util/mod.rs
+++ b/tests/util/mod.rs
@@ -67,3 +67,10 @@ macro_rules! assert_cmd_err {
         assert_err!(::nitrokey::Error::CommandError, $left, $right);
     };
 }
+
+#[macro_export]
+macro_rules! assert_lib_err {
+    ($left:expr, $right:expr) => {
+        assert_err!(::nitrokey::Error::LibraryError, $left, $right);
+    };
+}
-- 
cgit v1.2.1


From d87859975dc158919ecd5bf11a1111a2da5fcb30 Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin.krahl@ireas.org>
Date: Thu, 17 Jan 2019 14:21:44 +0000
Subject: Check specific error codes in the tests

If possible, check specific error codes instead of `is_err()`.  This
makes the code more readable and catches bugs resulting in the wrong
error code.  Also, using the assert_*_err and assert_ok macros yields
error messages containing the expected and the actual value.

To be able to use these macros with the `get_password_safe` method, we
also have to implement `Debug` for `PasswordSafe` and `Device`.
---
 tests/util/mod.rs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'tests/util')

diff --git a/tests/util/mod.rs b/tests/util/mod.rs
index b1d3ea3..4a00a66 100644
--- a/tests/util/mod.rs
+++ b/tests/util/mod.rs
@@ -68,6 +68,13 @@ macro_rules! assert_cmd_err {
     };
 }
 
+#[macro_export]
+macro_rules! assert_cmu_err {
+    ($left:expr, $right:expr) => {
+        assert_err!(::nitrokey::Error::CommunicationError, $left, $right);
+    };
+}
+
 #[macro_export]
 macro_rules! assert_lib_err {
     ($left:expr, $right:expr) => {
-- 
cgit v1.2.1