From d133f7a23aa758c7ecd65c9e32c711e8475d0e06 Mon Sep 17 00:00:00 2001
From: Kevin J Hoerr <kjhoerr@submelon.tech>
Date: Wed, 30 Oct 2019 10:20:12 -0400
Subject: Simplify unit testing on messages using Clone

---
 src/messages/callback.rs       | 12 +++---------
 src/messages/mod.rs            |  2 +-
 src/messages/not_understood.rs |  5 +++--
 3 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'src/messages')

diff --git a/src/messages/callback.rs b/src/messages/callback.rs
index d98ac15..fe3ef30 100644
--- a/src/messages/callback.rs
+++ b/src/messages/callback.rs
@@ -1,7 +1,7 @@
 use messages::Message;
 use std::collections::HashMap;
 
-#[derive(Debug, Serialize)]
+#[derive(Clone, Debug, Serialize)]
 pub struct Callback {
     pub path: Vec<String>,
     pub request: String,
@@ -49,19 +49,13 @@ mod tests {
             request: String::from("GET"),
             content: HashMap::new(),
         };
+        let message_ref = message.clone();
 
         // Act
         let outgoing = message.as_outgoing();
 
         // Assert
         assert_eq!(outgoing.result_type, "CALLBACK");
-        assert_eq!(
-            outgoing.content,
-            Callback {
-                path: vec![],
-                request: String::from("GET"),
-                content: HashMap::new(),
-            }
-        );
+        assert_eq!(outgoing.content, message_ref);
     }
 }
diff --git a/src/messages/mod.rs b/src/messages/mod.rs
index ca74078..ef326a0 100644
--- a/src/messages/mod.rs
+++ b/src/messages/mod.rs
@@ -7,7 +7,7 @@ pub use self::callback::Callback;
 pub use self::not_understood::NotUnderstood;
 
 #[derive(Serialize)]
-pub struct OutgoingMsg<T> {
+pub struct OutgoingMsg<T: Message> {
     pub result_type: String,
     pub content: T,
 }
diff --git a/src/messages/not_understood.rs b/src/messages/not_understood.rs
index 6c2c3ae..b567676 100644
--- a/src/messages/not_understood.rs
+++ b/src/messages/not_understood.rs
@@ -1,6 +1,6 @@
 use messages::Message;
 
-#[derive(Debug, Serialize)]
+#[derive(Clone, Debug, Serialize)]
 pub struct NotUnderstood {
     pub path: Vec<String>,
 }
@@ -37,12 +37,13 @@ mod tests {
     fn test_asoutgoing() {
         // Arrange
         let message = NotUnderstood { path: vec![] };
+        let message_ref = message.clone();
 
         // Act
         let outgoing = message.as_outgoing();
 
         // Assert
         assert_eq!(outgoing.result_type, "NOT_UNDERSTOOD");
-        assert_eq!(outgoing.content, NotUnderstood { path: vec![] });
+        assert_eq!(outgoing.content, message_ref);
     }
 }
-- 
cgit