4883

pending completion

Build # 4883

Build Type

push

travis-ci

Committed by

web-flow

Commit Message

<a href="https://github.com/clap-rs/clap/commit/<a class=hub.com/clap-rs/clap/commit/5d2876163028b71c5b170d290c730bf472de7b97">5d2876163<a href="https://github.com/clap-rs/clap/commit/5d2876163028b71c5b170d290c730bf472de7b97">&quot;&gt;Merge #1667

1667: Several things r=CreepySkeleton a=pksunkara

* Updated `Cargo.toml` for both crates to be consistent with each other
  * Removed `exclude` key since it is exclusive with `include`
  * Remove things from profiles when they are using default values anyway
* Used `workspace.default-members`
* Cherry pick [this](https://github.com/clap-rs/clap/commit/</a><a class="double-link" href="https://github.com/clap-rs/clap/commit/<a class="double-link" href="https://github.com/clap-rs/clap/commit/a525b57cb5a9e12df068c703dd6739f93774cba5">a525b57cb</a>">a525b57cb</a><a href="https://github.com/clap-rs/clap/commit/5d2876163028b71c5b170d290c730bf472de7b97">) commit from 2.x branch which does not exist in master
* Put the test helper into `tests` folder.

  &gt; The old tests used the include!() macro, which is quite hacky, and hurts compile times

Co-authored-by: Pavan Kumar Sunkara &lt;pavan.sss1991@gmail.com>
Co-authored-by: rleungx <rleungx@gmail.com>

Run Details

244 of 244 new or added lines in 18 files covered. (100.0%)

9040 of 11276 relevant lines covered (80.17%)

6.2 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

97.5

/tests/utils.rs

#![allow(unused_imports, dead_code)]

use std::io::{Cursor, Write};
use std::str;

use regex::Regex;

use clap::{App, Arg, ArgGroup};

fn compare<S, S2>(l: S, r: S2) -> bool
where
    S: AsRef<str>,
    S2: AsRef<str>,
{
    let re = Regex::new("\x1b[^m]*m").unwrap();
    // Strip out any mismatching \r character on windows that might sneak in on either side
    let ls = l.as_ref().trim().replace("\r", "");
    let rs = r.as_ref().trim().replace("\r", "");
    let left = re.replace_all(&*ls, "");
    let right = re.replace_all(&*rs, "");
    let b = left == right;
    if !b {
        println!();
        println!("--> left");
        println!("{}", left);
        println!("--> right");
        println!("{}", right);
        println!("--")
    }
    b
}

pub fn compare_output(l: App, args: &str, right: &str, stderr: bool) -> bool {
    let mut buf = Cursor::new(Vec::with_capacity(50));
    let res = l.try_get_matches_from(args.split(' ').collect::<Vec<_>>());
    let err = res.unwrap_err();
    err.write_to(&mut buf).unwrap();
    let content = buf.into_inner();
    let left = String::from_utf8(content).unwrap();
    assert_eq!(
        stderr,
        err.use_stderr(),
        "Should Use STDERR failed. Should be {} but is {}",
        stderr,
        err.use_stderr()
    );
    compare(left, right)
}

pub fn compare_output2(l: App, args: &str, right1: &str, right2: &str, stderr: bool) -> bool {
    let mut buf = Cursor::new(Vec::with_capacity(50));
    let res = l.try_get_matches_from(args.split(' ').collect::<Vec<_>>());
    let err = res.unwrap_err();
    err.write_to(&mut buf).unwrap();
    let content = buf.into_inner();
    let left = String::from_utf8(content).unwrap();
    assert_eq!(stderr, err.use_stderr());
    compare(&*left, right1) || compare(&*left, right2)
}

// Legacy tests from the pyhton script days

pub fn complex_app() -> App<'static> {
    let opt3_vals = ["fast", "slow"];
    let pos3_vals = ["vi", "emacs"];

    App::new("clap-test")
        .version("v1.4.8")
        .about("tests clap library")
        .author("Kevin K. <kbknapp@gmail.com>")
        .arg("-o --option=[opt]... 'tests options'")
        .arg("[positional] 'tests positionals'")
        .arg(Arg::from("-f --flag... 'tests flags'").global(true))
        .args(&[
            Arg::from("[flag2] -F 'tests flags with exclusions'")
                .conflicts_with("flag")
                .requires("long-option-2"),
            Arg::from("--long-option-2 [option2] 'tests long options with exclusions'")
                .conflicts_with("option")
                .requires("positional2"),
            Arg::from("[positional2] 'tests positionals with exclusions'"),
            Arg::from("-O --Option [option3] 'specific vals'").possible_values(&opt3_vals),
            Arg::from("[positional3]... 'tests specific values'").possible_values(&pos3_vals),
            Arg::from("--multvals [one] [two] 'Tests mutliple values, not mult occs'"),
            Arg::from("--multvalsmo... [one] [two] 'Tests mutliple values, and mult occs'"),
            Arg::from("--minvals2 [minvals]... 'Tests 2 min vals'").min_values(2),
            Arg::from("--maxvals3 [maxvals]... 'Tests 3 max vals'").max_values(3),
        ])
        .subcommand(
            App::new("subcmd")
                .about("tests subcommands")
                .version("0.1")
                .author("Kevin K. <kbknapp@gmail.com>")
                .arg("-o --option [scoption]... 'tests options'")
                .arg("-s --subcmdarg [subcmdarg] 'tests other args'")
                .arg("[scpositional] 'tests positionals'"),
        )
}

1	#![allow(unused_imports, dead_code)]
2
3	use std::io::{Cursor, Write};
4	use std::str;
5
6	use regex::Regex;
7
8	use clap::{App, Arg, ArgGroup};
9
10	fn compare<S, S2>(l: S, r: S2) -> bool	14✔
11	where
12	S: AsRef<str>,
13	S2: AsRef<str>,
14	{
15	let re = Regex::new("\x1b[^m]*m").unwrap();	14✔
16	// Strip out any mismatching \r character on windows that might sneak in on either side
17	let ls = l.as_ref().trim().replace("\r", "");	14✔
18	let rs = r.as_ref().trim().replace("\r", "");	14✔
19	let left = re.replace_all(&*ls, "");	14✔
20	let right = re.replace_all(&*rs, "");	14✔
21	let b = left == right;	14✔
22	if !b {	14✔
23	println!();	1✔
24	println!("--> left");	1✔
25	println!("{}", left);	1✔
26	println!("--> right");	1✔
27	println!("{}", right);	1✔
28	println!("--")	1✔
29	}
30	b	14✔
31	}
32
33	pub fn compare_output(l: App, args: &str, right: &str, stderr: bool) -> bool {	12✔
34	let mut buf = Cursor::new(Vec::with_capacity(50));	12✔
35	let res = l.try_get_matches_from(args.split(' ').collect::<Vec<_>>());	12✔
36	let err = res.unwrap_err();	13✔
37	err.write_to(&mut buf).unwrap();	13✔
38	let content = buf.into_inner();	13✔
39	let left = String::from_utf8(content).unwrap();	13✔
40	assert_eq!(	13✔
41	stderr,
42	err.use_stderr(),	13✔
43	"Should Use STDERR failed. Should be {} but is {}",
44	stderr,
45	err.use_stderr()	×
46	);
47	compare(left, right)	13✔
48	}
49
50	pub fn compare_output2(l: App, args: &str, right1: &str, right2: &str, stderr: bool) -> bool {	1✔
51	let mut buf = Cursor::new(Vec::with_capacity(50));	1✔
52	let res = l.try_get_matches_from(args.split(' ').collect::<Vec<_>>());	1✔
53	let err = res.unwrap_err();	1✔
54	err.write_to(&mut buf).unwrap();	1✔
55	let content = buf.into_inner();	1✔
56	let left = String::from_utf8(content).unwrap();	1✔
57	assert_eq!(stderr, err.use_stderr());	1✔
58	compare(&left, right1) \|\| compare(&left, right2)	1✔
59	}
60
61	// Legacy tests from the pyhton script days
62
63	pub fn complex_app() -> App<'static> {	6✔
64	let opt3_vals = ["fast", "slow"];	6✔
65	let pos3_vals = ["vi", "emacs"];	6✔
66
67	App::new("clap-test")	6✔
68	.version("v1.4.8")
69	.about("tests clap library")
70	.author("Kevin K. <kbknapp@gmail.com>")
71	.arg("-o --option=[opt]... 'tests options'")
72	.arg("[positional] 'tests positionals'")
73	.arg(Arg::from("-f --flag... 'tests flags'").global(true))
74	.args(&[
75	Arg::from("[flag2] -F 'tests flags with exclusions'")
76	.conflicts_with("flag")
77	.requires("long-option-2"),
78	Arg::from("--long-option-2 [option2] 'tests long options with exclusions'")
79	.conflicts_with("option")
80	.requires("positional2"),
81	Arg::from("[positional2] 'tests positionals with exclusions'"),
82	Arg::from("-O --Option [option3] 'specific vals'").possible_values(&opt3_vals),
83	Arg::from("[positional3]... 'tests specific values'").possible_values(&pos3_vals),
84	Arg::from("--multvals [one] [two] 'Tests mutliple values, not mult occs'"),
85	Arg::from("--multvalsmo... [one] [two] 'Tests mutliple values, and mult occs'"),
86	Arg::from("--minvals2 [minvals]... 'Tests 2 min vals'").min_values(2),
87	Arg::from("--maxvals3 [maxvals]... 'Tests 3 max vals'").max_values(3),
88	])
89	.subcommand(
90	App::new("subcmd")	6✔
91	.about("tests subcommands")
92	.version("0.1")
93	.author("Kevin K. <kbknapp@gmail.com>")
94	.arg("-o --option [scoption]... 'tests options'")
95	.arg("-s --subcmdarg [subcmdarg] 'tests other args'")
96	.arg("[scpositional] 'tests positionals'"),
97	)
98	}

clap-rs / clap / 4883

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous