More test refactoring

Author: michaelklishin

src/cli.rs

@@ -803,7 +803,7 @@ fn delete_subcommands() -> [Command; 11] {
                     .required(true),
             ),
         Command::new("user_limit")
-            .about("delete a user limit")
+            .about("clears a user limit")
             .arg(
                 Arg::new("user")
                     .long("user")

tests/list_user_limits_tests.rs

@@ -11,47 +11,48 @@
 // 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 assert_cmd::Command;
 use predicates::prelude::*;
 
+mod test_helpers;
+use crate::test_helpers::*;
+
 #[test]
 fn test_user_limits() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::cargo_bin("rabbitmqadmin")?;
-
-    cmd.args([
+    let limit_name = "max-connections";
+    let username = "guest";
+    run_succeeds([
         "declare",
         "user_limit",
         "--user",
-        "guest",
+        username,
         "--name",
-        "max-connections",
+        limit_name,
         "--value",
         "1234",
     ]);
-    cmd.assert().success();
 
-    let mut cmd = Command::cargo_bin("rabbitmqadmin")?;
-    cmd.args(["list", "user_limits"]);
-    cmd.assert()
-        .success()
-        .stdout(predicate::str::contains("max-connections").and(predicate::str::contains("1234")));
+    run_succeeds(["list", "user_limits"])
+        .stdout(predicate::str::contains(limit_name).and(predicate::str::contains("1234")));
 
-    let mut cmd = Command::cargo_bin("rabbitmqadmin")?;
-    cmd.args([
+    run_succeeds([
         "delete",
         "user_limit",
         "--user",
-        "guest",
+        username,
         "--name",
-        "max-connections",
+        limit_name,
     ]);
-    cmd.assert().success();
 
-    let mut cmd = Command::cargo_bin("rabbitmqadmin")?;
-    cmd.args(["list", "user_limits"]);
-    cmd.assert()
-        .success()
-        .stdout(predicate::str::contains("max-connections").not());
+    run_succeeds(["list", "user_limits"]).stdout(predicate::str::contains(limit_name).not());
+
+    run_succeeds([
+        "delete",
+        "user_limit",
+        "--user",
+        username,
+        "--name",
+        limit_name,
+    ]);
 
     Ok(())
 }

tests/list_users_tests.rs

@@ -1,4 +1,3 @@
-use std::process::Command;
 // Copyright (C) 2023-2024 RabbitMQ Core Team ([email protected])
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,37 +11,29 @@ use std::process::Command;
 // 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 assert_cmd::prelude::*;
+
 use predicates::prelude::*;
 
+mod test_helpers;
+use crate::test_helpers::*;
+
 #[test]
 fn test_list_users() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::cargo_bin("rabbitmqadmin")?;
-    cmd.args([
+    let username = "new_user";
+    let password = "pa$$w0rd";
+    run_succeeds([
         "declare",
         "user",
         "--name",
-        "new_user",
+        username,
         "--password",
-        "pa$$w0rd",
+        password,
     ]);
-    cmd.assert().success();
-
-    let mut cmd = Command::cargo_bin("rabbitmqadmin")?;
-    cmd.args(["list", "users"]);
-    cmd.assert()
-        .success()
-        .stdout(predicate::str::contains("new_user"));
 
-    let mut cmd = Command::cargo_bin("rabbitmqadmin")?;
-    cmd.args(["delete", "user", "--name", "new_user"]);
-    cmd.assert().success();
+    run_succeeds(["list", "users"]).stdout(predicate::str::contains(username));
+    run_succeeds(["delete", "user", "--name", username]);
 
-    let mut cmd = Command::cargo_bin("rabbitmqadmin")?;
-    cmd.args(["list", "users"]);
-    cmd.assert()
-        .success()
-        .stdout(predicate::str::contains("new_user").not());
+    run_succeeds(["list", "users"]).stdout(predicate::str::contains(username).not());
 
     Ok(())
 }