From 5e20a29b4fdc8a2d442d1093681b396dcb4b816b Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Tue, 7 Jan 2020 11:18:04 +0000 Subject: Add structopt dependency in version 0.3.7 This patch series replaces argparse with structopt in the argument handling code. As a first step, we need structopt as a dependency. Import subrepo structopt/:structopt at efbdda4753592e27bc430fb01f7b9650b2f3174d Import subrepo bitflags/:bitflags at 30668016aca6bd3b02c766e8347e0b4080d4c296 Import subrepo clap/:clap at 784524f7eb193e35f81082cc69454c8c21b948f7 Import subrepo heck/:heck at 093d56fbf001e1506e56dbfa38631d99b1066df1 Import subrepo proc-macro-error/:proc-macro-error at 6c4cfe79a622c5de8ae68557993542be46eacae2 Import subrepo proc-macro2/:proc-macro2 at d5d48eddca4566e5438e8a2cbed4a74e049544de Import subrepo quote/:quote at 727436c6c137b20f0f34dde5d8fda2679b9747ad Import subrepo rustversion/:rustversion at 0c5663313516263059ce9059ef81fc7a1cf655ca Import subrepo syn-mid/:syn-mid at 5d3d85414a9e6674e1857ec22a87b96e04a6851a Import subrepo syn/:syn at e87c27e87f6f4ef8919d0372bdb056d53ef0d8f3 Import subrepo textwrap/:textwrap at abcd618beae3f74841032aa5b53c1086b0a57ca2 Import subrepo unicode-segmentation/:unicode-segmentation at 637c9874c4fe0c205ff27787faf150a40295c6c3 Import subrepo unicode-width/:unicode-width at 3033826f8bf05e82724140a981d5941e48fce393 Import subrepo unicode-xid/:unicode-xid at 4baae9fffb156ba229665b972a9cd5991787ceb7 --- clap/tests/positionals.rs | 274 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 274 insertions(+) create mode 100644 clap/tests/positionals.rs (limited to 'clap/tests/positionals.rs') diff --git a/clap/tests/positionals.rs b/clap/tests/positionals.rs new file mode 100644 index 0000000..bf0f79f --- /dev/null +++ b/clap/tests/positionals.rs @@ -0,0 +1,274 @@ +extern crate clap; + +use clap::{App, Arg, ErrorKind}; + +#[test] +fn only_pos_follow() { + let r = App::new("onlypos") + .args(&[Arg::from_usage("-f [flag] 'some opt'"), + Arg::from_usage("[arg] 'some arg'")]) + .get_matches_from_safe(vec!["", "--", "-f"]); + assert!(r.is_ok()); + let m = r.unwrap(); + assert!(m.is_present("arg")); + assert!(!m.is_present("f")); + assert_eq!(m.value_of("arg").unwrap(), "-f"); +} + +#[test] +fn issue_946() { + let r = App::new("compiletest") + .setting(clap::AppSettings::AllowLeadingHyphen) + .args_from_usage("--exact 'filters match exactly'") + .arg(clap::Arg::with_name("filter") + .index(1) + .takes_value(true) + .help("filters to apply to output")) + .get_matches_from_safe(vec!["compiletest", "--exact"]); + assert!(r.is_ok(), "{:#?}", r); + let matches = r.unwrap(); + + assert!(matches.is_present("exact")); + assert!(matches.value_of("filter").is_none()); +} + +#[test] +fn positional() { + let r = App::new("positional") + .args(&[ + Arg::from_usage("-f, --flag 'some flag'"), + Arg::with_name("positional") + .index(1) + ]) + .get_matches_from_safe(vec!["", "-f", "test"]); + assert!(r.is_ok(), "{:#?}", r); + let m = r.unwrap(); + assert!(m.is_present("positional")); + assert!(m.is_present("flag")); + assert_eq!(m.value_of("positional").unwrap(), "test"); + + let m = App::new("positional") + .args(&[ + Arg::from_usage("-f, --flag 'some flag'"), + Arg::with_name("positional") + .index(1) + ]) + .get_matches_from(vec!["", "test", "--flag"]); + assert!(m.is_present("positional")); + assert!(m.is_present("flag")); + assert_eq!(m.value_of("positional").unwrap(), "test"); +} + +#[test] +fn lots_o_vals() { + let r = App::new("opts") + .arg( + Arg::from_usage("[opt]... 'some pos'"), + ) + .get_matches_from_safe(vec!["", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", "some", + ]); + assert!(r.is_ok()); + let m = r.unwrap(); + assert!(m.is_present("opt")); + assert_eq!(m.values_of("opt").unwrap().collect::>().len(), 297); // i.e. more than u8 +} + +#[test] +fn positional_multiple() { + let r = App::new("positional_multiple") + .args(&[ + Arg::from_usage("-f, --flag 'some flag'"), + Arg::with_name("positional") + .index(1) + .multiple(true) + ]) + .get_matches_from_safe(vec!["", "-f", "test1", "test2", "test3"]); + assert!(r.is_ok(), "{:#?}", r); + let m = r.unwrap(); + assert!(m.is_present("positional")); + assert!(m.is_present("flag")); + assert_eq!(&*m.values_of("positional").unwrap().collect::>(), &["test1", "test2", "test3"]); +} + +#[test] +fn positional_multiple_3() { + let r = App::new("positional_multiple") + .args(&[ + Arg::from_usage("-f, --flag 'some flag'"), + Arg::with_name("positional") + .index(1) + .multiple(true) + ]) + .get_matches_from_safe(vec!["", "test1", "test2", "test3", "--flag"]); + assert!(r.is_ok(), "{:#?}", r); + let m = r.unwrap(); + assert!(m.is_present("positional")); + assert!(m.is_present("flag")); + assert_eq!(&*m.values_of("positional").unwrap().collect::>(), &["test1", "test2", "test3"]); +} + +#[test] +fn positional_multiple_2() { + let result = App::new("positional_multiple") + .args(&[ + Arg::from_usage("-f, --flag 'some flag'"), + Arg::with_name("positional") + .index(1) + ]) + .get_matches_from_safe(vec!["", "-f", "test1", "test2", "test3"]); + assert!(result.is_err()); + let err = result.err().unwrap(); + assert_eq!(err.kind, ErrorKind::UnknownArgument); +} + +#[test] +fn positional_possible_values() { + let r = App::new("positional_possible_values") + .args(&[ + Arg::from_usage("-f, --flag 'some flag'"), + Arg::with_name("positional") + .index(1) + .possible_value("test123") + ]) + .get_matches_from_safe(vec!["", "-f", "test123"]); + assert!(r.is_ok(), "{:#?}", r); + let m = r.unwrap(); + assert!(m.is_present("positional")); + assert!(m.is_present("flag")); + assert_eq!(&*m.values_of("positional").unwrap().collect::>(), &["test123"]); +} + +#[test] +fn create_positional() { + let _ = App::new("test") + .arg(Arg::with_name("test") + .index(1) + .help("testing testing")) + .get_matches_from(vec![""]); +} + +#[test] +fn positional_hyphen_does_not_panic() { + let _ = App::new("test") + .arg(Arg::with_name("dummy")) + .get_matches_from(vec!["test", "-"]); +} + +#[test] +fn single_positional_usage_string() { + let m = App::new("test").arg_from_usage("[FILE] 'some file'").get_matches_from(vec!["test"]); + assert_eq!(m.usage(), "USAGE:\n test [FILE]"); +} + +#[test] +fn single_positional_multiple_usage_string() { + let m = App::new("test").arg_from_usage("[FILE]... 'some file'").get_matches_from(vec!["test"]); + assert_eq!(m.usage(), "USAGE:\n test [FILE]..."); +} + +#[test] +fn multiple_positional_usage_string() { + let m = App::new("test") + .arg_from_usage("[FILE] 'some file'") + .arg_from_usage("[FILES]... 'some file'") + .get_matches_from(vec!["test"]); + assert_eq!(m.usage(), "USAGE:\n test [ARGS]"); +} + +#[test] +fn multiple_positional_one_required_usage_string() { + let m = App::new("test") + .arg_from_usage(" 'some file'") + .arg_from_usage("[FILES]... 'some file'") + .get_matches_from(vec!["test", "file"]); + assert_eq!(m.usage(), "USAGE:\n test [FILES]..."); +} + +#[test] +fn single_positional_required_usage_string() { + let m = App::new("test") + .arg_from_usage(" 'some file'") + .get_matches_from(vec!["test", "file"]); + assert_eq!(m.usage(), "USAGE:\n test "); +} + +#[test] +#[should_panic] +fn missing_required() { + let r = App::new("test") + .arg_from_usage("[FILE1] 'some file'") + .arg_from_usage(" 'some file'") + .get_matches_from_safe(vec!["test", "file"]); + assert!(r.is_err()); + assert_eq!(r.unwrap_err().kind, ErrorKind::MissingRequiredArgument); +} + +#[test] +fn missing_required_2() { + let r = App::new("test") + .arg_from_usage(" 'some file'") + .arg_from_usage(" 'some file'") + .get_matches_from_safe(vec!["test", "file"]); + assert!(r.is_err()); + assert_eq!(r.unwrap_err().kind, ErrorKind::MissingRequiredArgument); +} + +#[test] +fn last_positional() { + let r = App::new("test") + .arg_from_usage(" 'some target'") + .arg_from_usage("[CORPUS] 'some corpus'") + .arg(Arg::from_usage("[ARGS]... 'some file'").last(true)) + .get_matches_from_safe(vec!["test", "tgt", "--", "arg"]); + assert!(r.is_ok()); + let m = r.unwrap(); + assert_eq!(m.values_of("ARGS").unwrap().collect::>(), &["arg"]); +} + +#[test] +fn last_positional_no_double_dash() { + let r = App::new("test") + .arg_from_usage(" 'some target'") + .arg_from_usage("[CORPUS] 'some corpus'") + .arg(Arg::from_usage("[ARGS]... 'some file'").last(true)) + .get_matches_from_safe(vec!["test", "tgt", "crp", "arg"]); + assert!(r.is_err()); + assert_eq!(r.unwrap_err().kind, ErrorKind::UnknownArgument); +} + +#[test] +fn last_positional_second_to_last_mult() { + let r = App::new("test") + .arg_from_usage(" 'some target'") + .arg_from_usage("[CORPUS]... 'some corpus'") + .arg(Arg::from_usage("[ARGS]... 'some file'").last(true)) + .get_matches_from_safe(vec!["test", "tgt", "crp1", "crp2", "--", "arg"]); + assert!(r.is_ok(), "{:?}", r.unwrap_err().kind); +} -- cgit v1.2.1