Merge pull request #5954 from epage/tests

test(complete): Minor test cleanup

Author: epage

clap_complete/tests/testsuite/engine.rs

@@ -680,15 +680,10 @@ baz
 #[test]
 fn suggest_multi_positional() {
     let mut cmd = Command::new("dynamic")
-        .arg(
-            clap::Arg::new("positional-1")
-                .value_parser(["pos_1"])
-                .index(1),
-        )
+        .arg(clap::Arg::new("positional-1").value_parser(["pos_1_a", "pos_1_b", "pos_1_c"]))
         .arg(
             clap::Arg::new("positional-2")
                 .value_parser(["pos_2_a", "pos_2_b", "pos_2_c"])
-                .index(2)
                 .num_args(3),
         )
         .arg(
@@ -699,7 +694,7 @@ fn suggest_multi_positional() {
         );
 
     assert_data_eq!(
-        complete!(cmd, "pos_1 pos_a [TAB]"),
+        complete!(cmd, "pos_1_a pos_2_a [TAB]"),
         snapbox::str![[r#"
 pos_2_a
 pos_2_b
@@ -708,7 +703,7 @@ pos_2_c
     );
 
     assert_data_eq!(
-        complete!(cmd, "pos_1 pos_a pos_b [TAB]"),
+        complete!(cmd, "pos_1_a pos_2_a pos_2_b [TAB]"),
         snapbox::str![[r#"
 pos_2_a
 pos_2_b
@@ -717,7 +712,7 @@ pos_2_c
     );
 
     assert_data_eq!(
-        complete!(cmd, "--format json pos_1 [TAB]"),
+        complete!(cmd, "--format json pos_1_a [TAB]"),
         snapbox::str![[r#"
 pos_2_a
 pos_2_b
@@ -728,7 +723,7 @@ pos_2_c
     );
 
     assert_data_eq!(
-        complete!(cmd, "--format json pos_1 pos_a [TAB]"),
+        complete!(cmd, "--format json pos_1_a pos_2_a [TAB]"),
         snapbox::str![[r#"
 pos_2_a
 pos_2_b
@@ -737,15 +732,15 @@ pos_2_c
     );
 
     assert_data_eq!(
-        complete!(cmd, "--format json pos_1 pos_a pos_b pos_c [TAB]"),
+        complete!(cmd, "--format json pos_1_a pos_2_a pos_2_b pos_2_c [TAB]"),
         snapbox::str![[r#"
 --format
 --help	Print help
 "#]]
     );
 
     assert_data_eq!(
-        complete!(cmd, "--format json -- pos_1 pos_a [TAB]"),
+        complete!(cmd, "--format json -- pos_1_a pos_2_a [TAB]"),
         snapbox::str![[r#"
 pos_2_a
 pos_2_b
@@ -754,7 +749,7 @@ pos_2_c
     );
 
     assert_data_eq!(
-        complete!(cmd, "--format json -- pos_1 pos_a pos_b [TAB]"),
+        complete!(cmd, "--format json -- pos_1_a pos_2_a pos_2_b [TAB]"),
         snapbox::str![[r#"
 pos_2_a
 pos_2_b
@@ -763,7 +758,10 @@ pos_2_c
     );
 
     assert_data_eq!(
-        complete!(cmd, "--format json -- pos_1 pos_a pos_b pos_c [TAB]"),
+        complete!(
+            cmd,
+            "--format json -- pos_1_a pos_2_a pos_2_b pos_2_c [TAB]"
+        ),
         snapbox::str![]
     );
 }
@@ -772,9 +770,8 @@ pos_2_c
 fn suggest_multi_positional_unbounded() {
     let mut cmd = Command::new("dynamic")
         .arg(
-            clap::Arg::new("positional")
-                .value_parser(["pos_1", "pos_2"])
-                .index(1)
+            clap::Arg::new("positional-1")
+                .value_parser(["pos_1_a", "pos_1_b", "pos_1_c"])
                 .num_args(2..),
         )
         .arg(
@@ -785,17 +782,16 @@ fn suggest_multi_positional_unbounded() {
         );
 
     assert_data_eq!(
-        complete!(cmd, "pos_1 [TAB]"),
+        complete!(cmd, "pos_1_a [TAB]"),
         snapbox::str![[r#"
-pos_1
-pos_2
+pos_1_a
+pos_1_b
+pos_1_c
 "#]]
     );
-
-    assert_data_eq!(complete!(cmd, "pos_1 --[TAB]"), snapbox::str![""]);
-
+    assert_data_eq!(complete!(cmd, "pos_1_a --[TAB]"), snapbox::str![""]);
     assert_data_eq!(
-        complete!(cmd, "pos_1 --format [TAB]"),
+        complete!(cmd, "pos_1_a --format [TAB]"),
         snapbox::str![[r#"
 json
 yaml
@@ -804,27 +800,48 @@ toml
     );
 
     assert_data_eq!(
-        complete!(cmd, "pos_1 --format json [TAB]"),
+        complete!(cmd, "pos_1_a --format json [TAB]"),
         snapbox::str![[r#"
-pos_1
-pos_2
+pos_1_a
+pos_1_b
+pos_1_c
 --format
 --help	Print help
 "#]]
     );
 
     assert_data_eq!(
-        complete!(cmd, "pos_1 pos_2 --[TAB]"),
+        complete!(cmd, "pos_1_a pos_1_b [TAB]"),
+        snapbox::str![[r#"
+pos_1_a
+pos_1_b
+pos_1_c
+--format
+--help	Print help
+"#]]
+    );
+    assert_data_eq!(
+        complete!(cmd, "pos_1_a pos_1_b --[TAB]"),
         snapbox::str![[r#"
 --format
 --help	Print help
 "#]]
     );
     assert_data_eq!(
-        complete!(cmd, "pos_1 pos_2 --format json [TAB]"),
+        complete!(cmd, "pos_1_a pos_1_b --format [TAB]"),
         snapbox::str![[r#"
-pos_1
-pos_2
+json
+yaml
+toml
+"#]]
+    );
+
+    assert_data_eq!(
+        complete!(cmd, "pos_1_a pos_1_b --format json [TAB]"),
+        snapbox::str![[r#"
+pos_1_a
+pos_1_b
+pos_1_c
 --format
 --help	Print help
 "#]]
@@ -847,7 +864,6 @@ fn suggest_delimiter_values() {
         )
         .arg(
             clap::Arg::new("pos")
-                .index(1)
                 .value_parser(["a_pos", "b_pos", "c_pos"])
                 .value_delimiter(','),
         );
@@ -1046,14 +1062,9 @@ fn suggest_positional_long_allow_hyphen() {
         .arg(
             clap::Arg::new("positional_a")
                 .value_parser(["--pos_a"])
-                .index(1)
                 .allow_hyphen_values(true),
         )
-        .arg(
-            clap::Arg::new("positional_b")
-                .index(2)
-                .value_parser(["pos_b"]),
-        );
+        .arg(clap::Arg::new("positional_b").value_parser(["pos_b"]));
 
     assert_data_eq!(
         complete!(cmd, "--format --json --pos[TAB]"),
@@ -1104,14 +1115,9 @@ fn suggest_positional_short_allow_hyphen() {
         .arg(
             clap::Arg::new("positional_a")
                 .value_parser(["-a"])
-                .index(1)
                 .allow_hyphen_values(true),
         )
-        .arg(
-            clap::Arg::new("positional_b")
-                .index(2)
-                .value_parser(["pos_b"]),
-        );
+        .arg(clap::Arg::new("positional_b").value_parser(["pos_b"]));
 
     assert_data_eq!(
         complete!(cmd, "--format --json -a [TAB]"),