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.3