Test module refactoring

Author: michaelklishin

tests/bindings_tests.rs

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 use predicates::prelude::*;
 
 mod test_helpers;
@@ -78,21 +79,21 @@ fn test_list_bindings() -> Result<(), Box<dyn std::error::Error>> {
 
     // list bindings in vhost 1
     run_succeeds(["-V", "bindings_vhost_1", "list", "bindings"]).stdout(
-        predicate::str::contains("new_queue_1")
-            .and(predicate::str::contains("routing_key_queue"))
-            .and(predicate::str::contains("routing_key_exchange")),
+        output_includes("new_queue_1")
+            .and(output_includes("routing_key_queue"))
+            .and(output_includes("routing_key_exchange")),
     );
 
     // delete the queue from vhost 1
     run_succeeds(["-V", vh1, "queues", "delete", "--name", q1]);
 
     // these bindings were deleted with the queue
     run_succeeds(["-V", "bindings_vhost_1", "list", "bindings"]).stdout(
-        predicate::str::contains("new_queue_1")
+        output_includes("new_queue_1")
             .not()
-            .and(predicate::str::contains("routing_key_queue"))
+            .and(output_includes("routing_key_queue"))
             .not()
-            .and(predicate::str::contains("routing_key_exchange")),
+            .and(output_includes("routing_key_exchange")),
     );
 
     delete_vhost(vh1).expect("failed to delete a virtual host");
@@ -163,9 +164,9 @@ fn test_bindings_list() -> Result<(), Box<dyn std::error::Error>> {
 
     // list bindings in vhost 1
     run_succeeds(["-V", vh1, "list", "bindings"]).stdout(
-        predicate::str::contains("new_queue_1")
-            .and(predicate::str::contains("routing_key_queue"))
-            .and(predicate::str::contains("routing_key_exchange")),
+        output_includes("new_queue_1")
+            .and(output_includes("routing_key_queue"))
+            .and(output_includes("routing_key_exchange")),
     );
 
     // delete a binding
@@ -187,11 +188,11 @@ fn test_bindings_list() -> Result<(), Box<dyn std::error::Error>> {
 
     // ensure that the deleted binding is no longer listed
     run_succeeds(["-V", vh1, "list", "bindings"]).stdout(
-        predicate::str::contains("new_queue_1")
+        output_includes("new_queue_1")
             .not()
-            .and(predicate::str::contains("routing_key_queue"))
+            .and(output_includes("routing_key_queue"))
             .not()
-            .and(predicate::str::contains("routing_key_exchange")),
+            .and(output_includes("routing_key_exchange")),
     );
 
     delete_vhost(vh1).expect("failed to delete a virtual host");

tests/combined_integration_tests.rs

@@ -11,11 +11,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-use predicates::prelude::*;
 use std::path;
 use std::path::PathBuf;
 
+use predicates::prelude::*;
+
 mod test_helpers;
+use crate::test_helpers::output_includes;
 use test_helpers::{run_fails, run_succeeds};
 
 #[test]
@@ -63,9 +65,8 @@ fn combined_integration_test2() -> Result<(), Box<dyn std::error::Error>> {
             vh,
         ])
         .stderr(
-            predicate::str::contains("specified configuration section (--node)").and(
-                predicate::str::contains("was not found in the configuration file"),
-            ),
+            output_includes("specified configuration section (--node)")
+                .and(output_includes("was not found in the configuration file")),
         );
 
         test_helpers::delete_vhost(vh)
@@ -90,7 +91,7 @@ fn combined_integration_test3() -> Result<(), Box<dyn std::error::Error>> {
         "--name",
         vh,
     ])
-    .stderr(predicate::str::contains("does not exist"));
+    .stderr(output_includes("does not exist"));
 
     test_helpers::delete_vhost(vh)
 }

tests/definitions_export_tests.rs

@@ -15,12 +15,12 @@
 use predicates::prelude::*;
 
 mod test_helpers;
-use crate::test_helpers::delete_vhost;
+use crate::test_helpers::{delete_vhost, output_includes};
 use test_helpers::run_succeeds;
 
 #[test]
 fn test_export_cluster_wide_definitions() -> Result<(), Box<dyn std::error::Error>> {
-    run_succeeds(["definitions", "export"]).stdout(predicate::str::contains("guest"));
+    run_succeeds(["definitions", "export"]).stdout(output_includes("guest"));
 
     Ok(())
 }
@@ -36,10 +36,9 @@ fn test_export_vhost_definitions() -> Result<(), Box<dyn std::error::Error>> {
         "-V", vh, "declare", "queue", "--name", q, "--type", "quorum",
     ]);
 
-    run_succeeds(["--vhost", vh, "definitions", "export_from_vhost"])
-        .stdout(predicate::str::contains(q));
+    run_succeeds(["--vhost", vh, "definitions", "export_from_vhost"]).stdout(output_includes(q));
     run_succeeds(["--vhost", "/", "definitions", "export_from_vhost"])
-        .stdout(predicate::str::contains(q).not());
+        .stdout(output_includes(q).not());
 
     delete_vhost(vh).expect("failed to delete a virtual host");
 
@@ -76,7 +75,7 @@ fn test_export_cluster_wide_definitions_with_transformations_case1()
         "-V", vh, "declare", "queue", "--name", q, "--type", "quorum",
     ]);
 
-    run_succeeds(["--vhost", vh, "definitions", "export"]).stdout(predicate::str::contains(p1));
+    run_succeeds(["--vhost", vh, "definitions", "export"]).stdout(output_includes(p1));
     // These two cannot be tested on 4.x: empty definitions will be rejected
     // by validation, and CMQ keys are no longer recognized as known/valid.
     // But at least we can test the code path this way.
@@ -88,7 +87,7 @@ fn test_export_cluster_wide_definitions_with_transformations_case1()
         "--transformations",
         "prepare_for_quorum_queue_migration,strip_cmq_keys_from_policies,drop_empty_policies",
     ])
-    .stdout(predicate::str::contains(p1));
+    .stdout(output_includes(p1));
 
     delete_vhost(vh).expect("failed to delete a virtual host");
 
@@ -125,8 +124,7 @@ fn test_export_vhost_definitions_with_transformations_case1()
         "-V", vh, "declare", "queue", "--name", q, "--type", "quorum",
     ]);
 
-    run_succeeds(["--vhost", vh, "definitions", "export_from_vhost"])
-        .stdout(predicate::str::contains(p1));
+    run_succeeds(["--vhost", vh, "definitions", "export_from_vhost"]).stdout(output_includes(p1));
     run_succeeds([
         "--vhost",
         vh,
@@ -135,7 +133,7 @@ fn test_export_vhost_definitions_with_transformations_case1()
         "--transformations",
         "prepare_for_quorum_queue_migration,strip_cmq_keys_from_policies,drop_empty_policies",
     ])
-    .stdout(predicate::str::contains(p1));
+    .stdout(output_includes(p1));
 
     delete_vhost(vh).expect("failed to delete a virtual host");
 

tests/deprecated_feature_tests.rs

@@ -12,21 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use predicates::prelude::*;
-
 mod test_helpers;
 use crate::test_helpers::*;
 
 #[test]
 fn test_list_all_deprecated_features() -> Result<(), Box<dyn std::error::Error>> {
-    run_succeeds(["deprecated_features", "list"]).stdout(predicate::str::contains("ram_node_type"));
+    run_succeeds(["deprecated_features", "list"]).stdout(output_includes("ram_node_type"));
 
     Ok(())
 }
 
 #[test]
 fn test_list_all_deprecated_features_via_alias() -> Result<(), Box<dyn std::error::Error>> {
-    run_succeeds(["list", "deprecated_features"]).stdout(predicate::str::contains("ram_node_type"));
+    run_succeeds(["list", "deprecated_features"]).stdout(output_includes("ram_node_type"));
 
     Ok(())
 }

tests/exchange_federation_tests.rs

@@ -16,7 +16,7 @@ use rabbitmq_http_client::commons::QueueType;
 use rabbitmq_http_client::requests::{ExchangeFederationParams, FederationUpstreamParams};
 
 mod test_helpers;
-use crate::test_helpers::{amqp_endpoint_with_vhost, delete_vhost};
+use crate::test_helpers::{amqp_endpoint_with_vhost, delete_vhost, output_includes};
 use test_helpers::{run_fails, run_succeeds};
 
 #[test]
@@ -200,9 +200,7 @@ fn test_federation_upstream_declaration_for_exchange_federation_case3()
         "--queue-type",
         &xfp.queue_type.to_string(),
     ])
-    .stderr(predicate::str::contains(
-        "required arguments were not provided",
-    ));
+    .stderr(output_includes("required arguments were not provided"));
 
     delete_vhost(vh).expect("failed to delete a virtual host");
 
@@ -290,10 +288,10 @@ fn test_federation_list_all_upstreams_with_exchange_federation()
     ]);
 
     run_succeeds(["-V", vh, "federation", "list_all_upstreams"])
-        .stdout(predicate::str::contains(name))
-        .stdout(predicate::str::contains(endpoint1.clone()))
-        .stdout(predicate::str::contains(x))
-        .stdout(predicate::str::contains(queue_type.to_string()));
+        .stdout(output_includes(name))
+        .stdout(output_includes(&endpoint1))
+        .stdout(output_includes(x))
+        .stdout(output_includes(&queue_type.to_string()));
 
     delete_vhost(vh).expect("failed to delete a virtual host");
 
@@ -339,10 +337,10 @@ fn test_federation_delete_an_upstream_with_exchange_federation_settings()
     ]);
 
     run_succeeds(["-V", vh, "federation", "list_all_upstreams"])
-        .stdout(predicate::str::contains(name))
-        .stdout(predicate::str::contains(endpoint1.clone()))
-        .stdout(predicate::str::contains(x))
-        .stdout(predicate::str::contains(queue_type.to_string()));
+        .stdout(output_includes(name))
+        .stdout(output_includes(&endpoint1))
+        .stdout(output_includes(x))
+        .stdout(output_includes(&queue_type.to_string()));
 
     run_succeeds([
         "-V",
@@ -354,7 +352,7 @@ fn test_federation_delete_an_upstream_with_exchange_federation_settings()
     ]);
 
     run_succeeds(["-V", vh, "federation", "list_all_upstreams"])
-        .stdout(predicate::str::contains(name).not());
+        .stdout(output_includes(name).not());
 
     delete_vhost(vh).expect("failed to delete a virtual host");