Add not overwrite testcase for cargo add --public

Author: linyihai

tests/testsuite/cargo_add/mod.rs

@@ -65,14 +65,11 @@ mod namever;
 mod no_args;
 mod no_default_features;
 mod no_optional;
+mod no_public;
 mod offline_empty_cache;
 mod optional;
 mod overwrite_default_features;
 mod overwrite_default_features_with_no_default_features;
-mod overwrite_no_public;
-mod overwrite_no_public_with_public;
-mod overwrite_public;
-mod overwrite_public_with_no_public;
 mod overwrite_features;
 mod overwrite_git_with_path;
 mod overwrite_inherit_features_noop;
@@ -85,11 +82,15 @@ mod overwrite_no_default_features;
 mod overwrite_no_default_features_with_default_features;
 mod overwrite_no_optional;
 mod overwrite_no_optional_with_optional;
+mod overwrite_no_public;
+mod overwrite_no_public_with_public;
 mod overwrite_optional;
 mod overwrite_optional_with_no_optional;
 mod overwrite_path_noop;
 mod overwrite_path_with_version;
 mod overwrite_preserves_inline_table;
+mod overwrite_public;
+mod overwrite_public_with_no_public;
 mod overwrite_rename_with_no_rename;
 mod overwrite_rename_with_rename;
 mod overwrite_rename_with_rename_noop;
@@ -107,6 +108,7 @@ mod preserve_dep_std_table;
 mod preserve_features_table;
 mod preserve_sorted;
 mod preserve_unsorted;
+mod public;
 mod quiet;
 mod registry;
 mod rename;

tests/testsuite/cargo_add/no_public/in/Cargo.toml

@@ -0,0 +1,6 @@
+cargo-features = ["public-dependency"]
+[workspace]
+
+[package]
+name = "cargo-list-test-fixture"
+version = "0.0.0"

tests/testsuite/cargo_add/no_public/in/src/lib.rs

@@ -0,0 +1,39 @@
+use cargo_test_support::compare::assert_ui;
+use cargo_test_support::prelude::*;
+use cargo_test_support::Project;
+
+use cargo_test_support::curr_dir;
+
+#[cargo_test]
+fn case() {
+    cargo_test_support::registry::init();
+    for name in ["my-package1", "my-package2"] {
+        for ver in [
+            "0.1.1+my-package",
+            "0.2.0+my-package",
+            "0.2.3+my-package",
+            "0.4.1+my-package",
+            "20.0.0+my-package",
+            "99999.0.0+my-package",
+            "99999.0.0-alpha.1+my-package",
+        ] {
+            cargo_test_support::registry::Package::new(name, ver).publish();
+        }
+    }
+
+    let project = Project::from_template(curr_dir!().join("in"));
+    let project_root = project.root();
+    let cwd = &project_root;
+
+    snapbox::cmd::Command::cargo_ui()
+        .arg("add")
+        .arg_line("my-package1 my-package2@0.4.1 --no-public")
+        .current_dir(cwd)
+        .masquerade_as_nightly_cargo(&["public-dependency"])
+        .assert()
+        .success()
+        .stdout_matches_path(curr_dir!().join("stdout.log"))
+        .stderr_matches_path(curr_dir!().join("stderr.log"));
+
+    assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
+}

tests/testsuite/cargo_add/no_public/mod.rs

@@ -0,0 +1,10 @@
+cargo-features = ["public-dependency"]
+[workspace]
+
+[package]
+name = "cargo-list-test-fixture"
+version = "0.0.0"
+
+[dependencies]
+my-package1 = "99999.0.0"
+my-package2 = "0.4.1"

tests/testsuite/cargo_add/no_public/out/Cargo.toml

@@ -0,0 +1,3 @@
+    Updating `dummy-registry` index
+      Adding my-package1 v99999.0.0 to dependencies.
+      Adding my-package2 v0.4.1 to dependencies.

tests/testsuite/cargo_add/no_public/stderr.log

@@ -0,0 +1 @@
+../add-basic.in

tests/testsuite/cargo_add/no_public/stdout.log

@@ -0,0 +1,39 @@
+use cargo_test_support::compare::assert_ui;
+use cargo_test_support::prelude::*;
+use cargo_test_support::Project;
+
+use cargo_test_support::curr_dir;
+
+#[cargo_test]
+fn case() {
+    cargo_test_support::registry::init();
+    for name in ["my-package1", "my-package2"] {
+        for ver in [
+            "0.1.1+my-package",
+            "0.2.0+my-package",
+            "0.2.3+my-package",
+            "0.4.1+my-package",
+            "20.0.0+my-package",
+            "99999.0.0+my-package",
+            "99999.0.0-alpha.1+my-package",
+        ] {
+            cargo_test_support::registry::Package::new(name, ver).publish();
+        }
+    }
+
+    let project = Project::from_template(curr_dir!().join("in"));
+    let project_root = project.root();
+    let cwd = &project_root;
+
+    snapbox::cmd::Command::cargo_ui()
+        .arg("add")
+        .arg_line("my-package1 my-package2@0.4.1 --public")
+        .current_dir(cwd)
+        .masquerade_as_nightly_cargo(&["public-dependency"])
+        .assert()
+        .success()
+        .stdout_matches_path(curr_dir!().join("stdout.log"))
+        .stderr_matches_path(curr_dir!().join("stderr.log"));
+
+    assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
+}

tests/testsuite/cargo_add/public/in

@@ -0,0 +1,10 @@
+cargo-features = ["public-dependency"]
+[workspace]
+
+[package]
+name = "cargo-list-test-fixture"
+version = "0.0.0"
+
+[dependencies]
+my-package1 = { version = "99999.0.0", public = true }
+my-package2 = { version = "0.4.1", public = true }