From 684b60e9e32085c253b89ccd71259d4d1db94aa2 Mon Sep 17 00:00:00 2001
From: Tim Bruijnzeels <tim@nlnetlabs.nl>
Date: Wed, 26 Sep 2018 14:50:18 +0200
Subject: [PATCH] Extended test for adding publisher, and fixed issue.

---
 src/provisioning/publisher_list.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/provisioning/publisher_list.rs b/src/provisioning/publisher_list.rs
index 342c8973..03dc17b4 100644
--- a/src/provisioning/publisher_list.rs
+++ b/src/provisioning/publisher_list.rs
@@ -8,7 +8,7 @@ use rpki::uri;
 //------------ Publisher -----------------------------------------------------
 
 /// This type defines Publisher CAs that are allowed to publish.
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct Publisher {
     name:       String,
     base_uri:   uri::Rsync,
@@ -145,7 +145,6 @@ impl PublisherList {
         }
 
         let mut base_uri = self.base_uri.to_string();
-        base_uri.push_str("/");
         base_uri.push_str(name.as_ref());
         let base_uri = uri::Rsync::from_string(base_uri)?;
 
@@ -224,12 +223,20 @@ mod tests {
         let pr = PublisherRequest::new(
             Some("test"),
             "test",
-            id_cert);
+            id_cert.clone());
 
         let cmd = VersionedPublisherListCommand::publisher_request(0, pr);
         cl.apply_command(cmd).unwrap();
 
         assert_eq!(1, cl.publishers.len());
+        let publisher = cl.publishers.get(0).unwrap();
+        let expected_publisher = Publisher {
+            name: "test".to_string(),
+            base_uri: rsync_uri("rsync://host/module/test"),
+            id_cert
+        };
+
+        assert_eq!(publisher, &expected_publisher);
     }
 
     #[test]