fix: test deprecation warnings

Author: marc0der

tests/current.rs

@@ -33,7 +33,7 @@ fn should_show_current_version_for_specific_candidate() -> Result<(), Box<dyn st
     let expected_output = format!("Current default {} version {}", name, current_version);
     let contains_expected = predicate::str::contains(expected_output);
 
-    Command::cargo_bin("current")?
+    Command::new(assert_cmd::cargo::cargo_bin!("current"))
         .arg(name)
         .assert()
         .success()
@@ -83,7 +83,7 @@ fn should_show_current_versions_for_all_candidates() -> Result<(), Box<dyn std::
     let contains_java_output = predicate::str::contains(expected_java_output);
     let contains_kotlin_output = predicate::str::contains(expected_kotlin_output);
 
-    Command::cargo_bin("current")?
+    Command::new(assert_cmd::cargo::cargo_bin!("current"))
         .assert()
         .success()
         .stdout(contains_java_output.and(contains_kotlin_output))
@@ -118,7 +118,7 @@ fn should_show_error_for_non_existent_candidate() -> Result<(), Box<dyn std::err
 
     let contains_error = predicate::str::contains(invalid_name);
 
-    Command::cargo_bin("current")?
+    Command::new(assert_cmd::cargo::cargo_bin!("current"))
         .arg(invalid_name)
         .assert()
         .failure()
@@ -153,7 +153,7 @@ fn should_show_error_for_candidate_with_no_current_version(
 
     let contains_error = predicate::str::contains("No current version of");
 
-    Command::cargo_bin("current")?
+    Command::new(assert_cmd::cargo::cargo_bin!("current"))
         .arg(candidate_name)
         .assert()
         .failure()
@@ -184,7 +184,7 @@ fn should_show_message_when_no_candidates_in_use() -> Result<(), Box<dyn std::er
 
     let contains_message = predicate::str::contains("No candidates are in use");
 
-    Command::cargo_bin("current")?
+    Command::new(assert_cmd::cargo::cargo_bin!("current"))
         .assert()
         .stderr(contains_message)
         .code(0);

tests/default.rs

@@ -25,7 +25,7 @@ fn should_set_an_installed_version_as_default() -> Result<(), Box<dyn std::error
 
     env::set_var("SDKMAN_DIR", dir_string);
     let expected_output = "setting scala 0.0.2 as the default version for all shells";
-    Command::cargo_bin("default")?
+    Command::new(assert_cmd::cargo::cargo_bin!("default"))
         .arg("scala")
         .arg("0.0.2")
         .assert()
@@ -64,7 +64,7 @@ fn should_reset_the_current_default_version_as_default() -> Result<(), Box<dyn s
 
     env::set_var("SDKMAN_DIR", dir_string);
     let expected_output = "setting scala 0.0.1 as the default version for all shells";
-    Command::cargo_bin("default")?
+    Command::new(assert_cmd::cargo::cargo_bin!("default"))
         .arg("scala")
         .arg("0.0.1")
         .assert()
@@ -103,7 +103,7 @@ fn should_not_set_an_uninstalled_version_as_default() -> Result<(), Box<dyn std:
 
     env::set_var("SDKMAN_DIR", dir_string);
     let expected_output = "scala 0.0.2 is not installed on your system";
-    Command::cargo_bin("default")?
+    Command::new(assert_cmd::cargo::cargo_bin!("default"))
         .arg("scala")
         .arg("0.0.2")
         .assert()

tests/help.rs

@@ -7,7 +7,7 @@ use predicates::prelude::*;
 #[test]
 fn should_render_base_help() -> Result<(), Box<dyn std::error::Error>> {
     let header = "\nNAME\n    sdk - The command line interface (CLI) for SDKMAN!";
-    Command::cargo_bin("help")?
+    Command::new(assert_cmd::cargo::cargo_bin!("help"))
         .assert()
         .success()
         .stdout(predicate::str::starts_with(header))
@@ -37,7 +37,7 @@ fn should_render_help_for_all_subcommands() -> Result<(), Box<dyn std::error::Er
 
     for arg in &args {
         let header = format!("\n{} {} - ", "NAME\n    sdk", &arg);
-        Command::cargo_bin("help")?
+        Command::new(assert_cmd::cargo::cargo_bin!("help"))
             .arg(arg)
             .assert()
             .success()

tests/helpers.rs

@@ -20,7 +20,7 @@ fn should_fail_if_candidate_is_unknown() -> Result<(), Box<dyn std::error::Error
     };
 
     let sdkman_dir = support::virtual_env(env);
-    let candidates = known_candidates(sdkman_dir.into_path());
+    let candidates = known_candidates(sdkman_dir.keep());
     let expected_candidate = vec!["scala"];
 
     assert_eq!(candidates, expected_candidate);
@@ -33,5 +33,5 @@ fn should_fail_if_candidate_is_unknown() -> Result<(), Box<dyn std::error::Error
 #[should_panic]
 fn should_fail_if_candidate_file_is_missing() {
     let sdkman_dir = prepare_sdkman_dir();
-    known_candidates(sdkman_dir.into_path());
+    known_candidates(sdkman_dir.keep());
 }

tests/home.rs

@@ -25,7 +25,7 @@ fn should_successfully_display_current_candidate_home() -> Result<(), Box<dyn st
 
     env::set_var("SDKMAN_DIR", dir_string);
     let expected_output = format!("{}/candidates/scala/0.0.1", dir_string);
-    Command::cargo_bin("home")?
+    Command::new(assert_cmd::cargo::cargo_bin!("home"))
         .arg("scala")
         .arg("0.0.1")
         .assert()
@@ -54,7 +54,7 @@ fn should_fail_if_candidate_home_is_not_found() -> Result<(), Box<dyn std::error
 
     env::set_var("SDKMAN_DIR", dir_string);
     let expected_output = format!("{} {} is not installed on your system", "scala", "0.0.2");
-    Command::cargo_bin("home")?
+    Command::new(assert_cmd::cargo::cargo_bin!("home"))
         .arg("scala")
         .arg("0.0.2")
         .assert()

tests/uninstall.rs

@@ -25,7 +25,7 @@ fn should_successfully_remove_unused_candidate_version() -> Result<(), Box<dyn s
 
     env::set_var("SDKMAN_DIR", dir_string);
     let expected_output = "removed scala 0.0.1";
-    Command::cargo_bin("uninstall")?
+    Command::new(assert_cmd::cargo::cargo_bin!("uninstall"))
         .arg("scala")
         .arg("0.0.1")
         .assert()
@@ -63,7 +63,7 @@ fn should_successfully_remove_current_candidate_version_when_forced(
 
     env::set_var("SDKMAN_DIR", dir_string);
     let expected_output = "removed scala 0.0.2";
-    Command::cargo_bin("uninstall")?
+    Command::new(assert_cmd::cargo::cargo_bin!("uninstall"))
         .arg("scala")
         .arg("0.0.2")
         .arg("--force")
@@ -102,7 +102,7 @@ fn should_fail_if_candidate_version_is_current_when_not_forced(
 
     env::set_var("SDKMAN_DIR", dir_string);
     let expected_output = format!("scala 0.0.2 is the current version and should not be removed.");
-    Command::cargo_bin("uninstall")?
+    Command::new(assert_cmd::cargo::cargo_bin!("uninstall"))
         .arg("scala")
         .arg("0.0.2")
         .assert()
@@ -130,7 +130,7 @@ fn should_fail_if_candidate_is_invalid() -> Result<(), Box<dyn std::error::Error
 
     env::set_var("SDKMAN_DIR", dir_string);
     let expected_output = "zcala is not a valid candidate";
-    Command::cargo_bin("uninstall")?
+    Command::new(assert_cmd::cargo::cargo_bin!("uninstall"))
         .arg("zcala")
         .arg("0.0.2")
         .assert()
@@ -158,7 +158,7 @@ fn should_fail_if_candidate_version_is_not_found() -> Result<(), Box<dyn std::er
 
     env::set_var("SDKMAN_DIR", dir_string);
     let expected_output = format!("{} {} is not installed on your system", "scala", "0.0.2");
-    Command::cargo_bin("uninstall")?
+    Command::new(assert_cmd::cargo::cargo_bin!("uninstall"))
         .arg("scala")
         .arg("0.0.2")
         .assert()

tests/version.rs

@@ -31,7 +31,7 @@ fn should_successfully_render_version() -> Result<(), Box<dyn std::error::Error>
     let contains_version = predicate::str::contains(format!("script: {}", cli_version));
     let contains_native_version = predicate::str::contains(format!("native: {}", native_version));
 
-    Command::cargo_bin("version")?
+    Command::new(assert_cmd::cargo::cargo_bin!("version"))
         .assert()
         .success()
         .stdout(contains_header.and(contains_version.and(contains_native_version)))
@@ -47,7 +47,7 @@ fn should_panic_if_version_file_not_present() -> Result<(), Box<dyn std::error::
 
     env::set_var("SDKMAN_DIR", sdkman_dir.path().as_os_str());
 
-    Command::cargo_bin("version")?.assert().failure().code(101);
+    Command::new(assert_cmd::cargo::cargo_bin!("version")).assert().failure().code(101);
     Ok(())
 }
 
@@ -68,7 +68,7 @@ fn should_panic_if_version_file_empty() -> Result<(), Box<dyn std::error::Error>
 
     env::set_var("SDKMAN_DIR", sdkman_dir.path().as_os_str());
 
-    Command::cargo_bin("version")?.assert().failure().code(101);
+    Command::new(assert_cmd::cargo::cargo_bin!("version")).assert().failure().code(101);
     Ok(())
 }
 
@@ -94,7 +94,7 @@ fn should_include_os_and_arch_info() -> Result<(), Box<dyn std::error::Error>> {
     let contains_os = predicate::str::contains(format!("{}", os));
     let contains_arch = predicate::str::contains(format!("{}", arch));
 
-    Command::cargo_bin("version")?
+    Command::new(assert_cmd::cargo::cargo_bin!("version"))
         .assert()
         .success()
         .stdout(contains_os.and(contains_arch))