Fix a --queue-type CLI type bug; more tests

Author: michaelklishin

src/commands.rs

@@ -425,8 +425,8 @@ pub fn declare_federation_upstream(
         .get_one::<String>("exchange_name")
         .map(|s| s.as_str());
     let queue_type = command_args
-        .get_one::<QueueType>("queue_type")
-        .cloned()
+        .get_one::<String>("queue_type")
+        .map(|s| Into::<QueueType>::into(s.as_str()))
         .unwrap_or_default();
     let max_hops = command_args.get_one::<u8>("max_hops").copied();
     let resource_cleanup_mode = command_args

tests/exchange_federation_tests.rs

@@ -51,13 +51,13 @@ fn test_federation_upstream_declaration_for_exchange_federation_case0()
 }
 
 #[test]
-fn test_federation_upstream_declaration_for_exchange_federation_case1()
+fn test_federation_upstream_declaration_for_exchange_federation_case1a()
 -> Result<(), Box<dyn std::error::Error>> {
-    let vh = "rust.federation.1";
-    let name = "up.for_exchange_federation.1";
+    let vh = "rust.federation.1a";
+    let name = "up.for_exchange_federation.1a";
 
     let amqp_endpoint = amqp_endpoint_with_vhost(vh);
-    let x = "federation.x.1";
+    let x = "federation.x.1a";
     let queue_type = QueueType::Quorum;
     let xfp = ExchangeFederationParams::new(queue_type);
     let endpoint1 = amqp_endpoint.clone();
@@ -87,6 +87,46 @@ fn test_federation_upstream_declaration_for_exchange_federation_case1()
     Ok(())
 }
 
+#[test]
+fn test_federation_upstream_declaration_for_exchange_federation_case1b()
+    -> Result<(), Box<dyn std::error::Error>> {
+    let vh = "rust.federation.1b";
+    let name = "up.for_exchange_federation.1b";
+
+    let amqp_endpoint = amqp_endpoint_with_vhost(vh);
+    let x = "federation.x.1b";
+    let queue_type = QueueType::Quorum;
+    let xfp = ExchangeFederationParams::new(queue_type);
+    let endpoint1 = amqp_endpoint.clone();
+    let upstream =
+        FederationUpstreamParams::new_exchange_federation_upstream(vh, name, &endpoint1, xfp);
+
+    run_succeeds(["declare", "vhost", "--name", vh]);
+    let xfp = upstream.exchange_federation.unwrap();
+
+    run_succeeds([
+        "-V",
+        vh,
+        "federation",
+        "declare_upstream",
+        "--name",
+        &upstream.name,
+        "--uri",
+        &upstream.uri,
+        "--exchange-name",
+        &x,
+        "--queue-type",
+        &xfp.queue_type.to_string(),
+        // queue federation
+        "--queue-name",
+        "overridden.queue.name"
+    ]);
+
+    delete_vhost(vh).expect("failed to delete a virtual host");
+
+    Ok(())
+}
+
 #[test]
 fn test_federation_upstream_declaration_for_exchange_federation_case2()
 -> Result<(), Box<dyn std::error::Error>> {

tests/queue_federation_tests.rs

@@ -56,14 +56,14 @@ fn test_federation_upstream_declaration_for_queue_federation_case0()
 }
 
 #[test]
-fn test_federation_upstream_declaration_for_queue_federation_case1()
+fn test_federation_upstream_declaration_for_queue_federation_case1a()
 -> Result<(), Box<dyn std::error::Error>> {
-    let vh = "rust.federation.1";
-    let name = "up.for_queue_federation";
+    let vh = "rust.federation.1a";
+    let name = "up.for_queue_federation.a";
 
     let amqp_endpoint = amqp_endpoint_with_vhost(vh);
-    let q = "federation.cq.1";
-    let ctag = "federation.custom-consumer-tag";
+    let q = "federation.cq.1a";
+    let ctag = "federation.custom-consumer-tag.a";
     let qfp = QueueFederationParams::new_with_consumer_tag(q, ctag);
     let endpoint1 = amqp_endpoint.clone();
     let upstream =
@@ -94,6 +94,48 @@ fn test_federation_upstream_declaration_for_queue_federation_case1()
     Ok(())
 }
 
+#[test]
+fn test_federation_upstream_declaration_for_queue_federation_case1b()
+    -> Result<(), Box<dyn std::error::Error>> {
+    let vh = "rust.federation.1b";
+    let name = "up.for_queue_federation.b";
+
+    let amqp_endpoint = amqp_endpoint_with_vhost(vh);
+    let q = "federation.cq.1b";
+    let ctag = "federation.custom-consumer-tag.b";
+    let qfp = QueueFederationParams::new_with_consumer_tag(q, ctag);
+    let endpoint1 = amqp_endpoint.clone();
+    let upstream =
+        FederationUpstreamParams::new_queue_federation_upstream(vh, name, &endpoint1, qfp);
+
+    run_succeeds(["declare", "vhost", "--name", vh]);
+    let qfp = upstream.queue_federation.unwrap();
+
+    run_succeeds([
+        "-V",
+        vh,
+        "federation",
+        "declare_upstream",
+        "--name",
+        &upstream.name,
+        "--uri",
+        &upstream.uri,
+        "--ack-mode",
+        "on-confirm",
+        "--queue-name",
+        &q,
+        "--consumer-tag",
+        &qfp.consumer_tag.unwrap(),
+        // exchange federation
+        "--queue-type",
+        "quorum"
+    ]);
+
+    delete_vhost(vh).expect("failed to delete a virtual host");
+
+    Ok(())
+}
+
 #[test]
 fn test_federation_upstream_declaration_for_queue_federation_case2()
 -> Result<(), Box<dyn std::error::Error>> {