Skip to content

simplify assertions #13756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oech3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

simplify assertions #13756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/uu/env/src/env.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,23 +1298,20 @@ mod tests {

// Test EnvBackslashCNotAllowedInDoubleQuotes
let result = parse_args_from_str(&NCvt::convert(r#"sh -c "echo \c""#));
assert!(result.is_err());
assert_eq!(
result.unwrap_err().to_string(),
"'\\c' must not appear in double-quoted -S string at position 13"
);

// Test EnvInvalidBackslashAtEndOfStringInMinusS
let result = parse_args_from_str(&NCvt::convert(r#"sh -c "echo \"#));
assert!(result.is_err());
assert_eq!(
result.unwrap_err().to_string(),
"no terminating quote in -S string at position 13 for quote '\"'"
);

// Test EnvInvalidSequenceBackslashXInMinusS
let result = parse_args_from_str(&NCvt::convert(r#"sh -c "echo \x""#));
assert!(result.is_err());
assert!(
result
.unwrap_err()
Expand All @@ -1324,15 +1321,13 @@ mod tests {

// Test EnvMissingClosingQuote
let result = parse_args_from_str(&NCvt::convert(r#"sh -c "echo "#));
assert!(result.is_err());
assert_eq!(
result.unwrap_err().to_string(),
"no terminating quote in -S string at position 12 for quote '\"'"
);

// Test variable-related errors
let result = parse_args_from_str(&NCvt::convert(r"echo ${FOO"));
assert!(result.is_err());
assert!(
result
.unwrap_err()
Expand All @@ -1341,7 +1336,6 @@ mod tests {
);

let result = parse_args_from_str(&NCvt::convert(r"echo ${FOO:-value}"));
assert!(result.is_err());
assert!(
result
.unwrap_err()
Expand All @@ -1350,15 +1344,13 @@ mod tests {
);

let result = parse_args_from_str(&NCvt::convert(r"echo $FOO"));
assert!(result.is_err());
assert!(
result
.unwrap_err()
.to_string()
.contains("only ${VARNAME} expansion is supported")
);
let result = parse_args_from_str(&NCvt::convert(r"echo ${1FOO}"));
assert!(result.is_err());
assert!(
result
.unwrap_err()
Expand All @@ -1367,7 +1359,6 @@ mod tests {
);

let result = parse_args_from_str(&NCvt::convert(r"echo ${FOO?}"));
assert!(result.is_err());
assert!(
result
.unwrap_err()
Expand Down
8 changes: 4 additions & 4 deletions src/uu/head/src/head.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,8 +596,8 @@ mod tests {

#[test]
fn test_options_errors() {
assert!(options("-n IsThisTheRealLife?").is_err());
assert!(options("-c IsThisJustFantasy").is_err());
options("-n IsThisTheRealLife?").unwrap_err();
options("-c IsThisJustFantasy").unwrap_err();
}

#[test]
Expand Down Expand Up @@ -642,9 +642,9 @@ mod tests {
Ok("head -q -z -c 123".to_owned())
);
//test that bad obsoletes are an error
assert!(arg_outputs("head -123FooBar").is_err());
arg_outputs("head -123FooBar").unwrap_err();
//test overflow
assert!(arg_outputs("head -100000000000000000000000000000000000000000").is_ok());
arg_outputs("head -100000000000000000000000000000000000000000").unwrap();
//test that empty args remain unchanged
assert_eq!(arg_outputs("head"), Ok("head".to_owned()));
}
Expand Down
4 changes: 2 additions & 2 deletions src/uu/kill/src/kill.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,8 @@ mod tests {

// Things that look like a signal but aren't must error, not fall
// through to be read as a negative PID and signalled with SIGTERM.
assert!(handle_obsolete(&mut args(&["kill", "-65", "123"])).is_err());
assert!(handle_obsolete(&mut args(&["kill", "-NOPESIG", "123"])).is_err());
handle_obsolete(&mut args(&["kill", "-65", "123"])).unwrap_err();
handle_obsolete(&mut args(&["kill", "-NOPESIG", "123"])).unwrap_err();

// A lowercase leading char is never an obsolete signal; leave args as-is.
let mut a = args(&["kill", "-foo", "123"]);
Expand Down
14 changes: 7 additions & 7 deletions src/uu/numfmt/src/numfmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ mod tests {
let mut options = get_valid_options();
options.invalid = InvalidModes::Abort;
let result = handle_buffer(BufReader::new(&input_value[..]), &options);
assert!(result.is_err(), "did not return err for invalid input");
result.expect_err("did not return err for invalid input");
}

#[test]
Expand Down Expand Up @@ -720,11 +720,11 @@ mod tests {
fn test_parse_unit_size() {
assert_eq!(1, parse_unit_size("1").unwrap());
assert_eq!(1, parse_unit_size("01").unwrap());
assert!(parse_unit_size("1.1").is_err());
assert!(parse_unit_size("0").is_err());
assert!(parse_unit_size("-1").is_err());
assert!(parse_unit_size("A").is_err());
assert!(parse_unit_size("18446744073709551616").is_err());
parse_unit_size("1.1").unwrap_err();
parse_unit_size("0").unwrap_err();
parse_unit_size("-1").unwrap_err();
parse_unit_size("A").unwrap_err();
parse_unit_size("18446744073709551616").unwrap_err();
}

#[test]
Expand All @@ -733,7 +733,7 @@ mod tests {
assert_eq!(1024, parse_unit_size("Ki").unwrap());
assert_eq!(2000, parse_unit_size("2K").unwrap());
assert_eq!(2048, parse_unit_size("2Ki").unwrap());
assert!(parse_unit_size("0K").is_err());
parse_unit_size("0K").unwrap_err();
}

#[test]
Expand Down
34 changes: 19 additions & 15 deletions src/uu/numfmt/src/options.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,20 +276,24 @@ mod tests {
#[test]
#[allow(clippy::cognitive_complexity)]
fn test_parse_format_with_invalid_formats() {
assert!("".parse::<FormatOptions>().is_err());
assert!("hello".parse::<FormatOptions>().is_err());
assert!("hello%".parse::<FormatOptions>().is_err());
assert!("%-f".parse::<FormatOptions>().is_err());
assert!("%d".parse::<FormatOptions>().is_err());
assert!("%4 f".parse::<FormatOptions>().is_err());
assert!("%f%".parse::<FormatOptions>().is_err());
assert!("%f%%%".parse::<FormatOptions>().is_err());
assert!("%%f".parse::<FormatOptions>().is_err());
assert!("%%%%f".parse::<FormatOptions>().is_err());
assert!("%.-1f".parse::<FormatOptions>().is_err());
assert!("%. 1f".parse::<FormatOptions>().is_err());
assert!("%18446744073709551616f".parse::<FormatOptions>().is_err());
assert!("%.18446744073709551616f".parse::<FormatOptions>().is_err());
"".parse::<FormatOptions>().unwrap_err();
"hello".parse::<FormatOptions>().unwrap_err();
"hello%".parse::<FormatOptions>().unwrap_err();
"%-f".parse::<FormatOptions>().unwrap_err();
"%d".parse::<FormatOptions>().unwrap_err();
"%4 f".parse::<FormatOptions>().unwrap_err();
"%f%".parse::<FormatOptions>().unwrap_err();
"%f%%%".parse::<FormatOptions>().unwrap_err();
"%%f".parse::<FormatOptions>().unwrap_err();
"%%%%f".parse::<FormatOptions>().unwrap_err();
"%.-1f".parse::<FormatOptions>().unwrap_err();
"%. 1f".parse::<FormatOptions>().unwrap_err();
"%18446744073709551616f"
.parse::<FormatOptions>()
.unwrap_err();
"%.18446744073709551616f"
.parse::<FormatOptions>()
.unwrap_err();
}

#[test]
Expand Down Expand Up @@ -388,6 +392,6 @@ mod tests {
assert_eq!(Ok(InvalidModes::Warn), InvalidModes::from_str("warn"));
assert_eq!(Ok(InvalidModes::Warn), InvalidModes::from_str("WARN"));

assert!(InvalidModes::from_str("something unknown").is_err());
InvalidModes::from_str("something unknown").unwrap_err();
}
}
16 changes: 8 additions & 8 deletions src/uu/stty/src/stty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1371,9 +1371,9 @@ mod tests {

#[test]
fn test_string_to_control_char_overflow() {
assert!(string_to_control_char("256").is_err());
assert!(string_to_control_char("0x100").is_err());
assert!(string_to_control_char("0400").is_err());
string_to_control_char("256").unwrap_err();
string_to_control_char("0x100").unwrap_err();
string_to_control_char("0400").unwrap_err();
}

// Control character formatting tests
Expand Down Expand Up @@ -1610,8 +1610,8 @@ mod tests {
"Expected overflow error, got: {err}"
);

assert!(parse_u8_or_err("1000").is_err());
assert!(parse_u8_or_err("65536").is_err());
parse_u8_or_err("1000").unwrap_err();
parse_u8_or_err("65536").unwrap_err();
}

#[test]
Expand All @@ -1627,8 +1627,8 @@ mod tests {
"Expected invalid argument error, got: {err}"
);

assert!(parse_u8_or_err("abc").is_err());
assert!(parse_u8_or_err("").is_err());
assert!(parse_u8_or_err("12.5").is_err());
parse_u8_or_err("abc").unwrap_err();
parse_u8_or_err("").unwrap_err();
parse_u8_or_err("12.5").unwrap_err();
}
}
8 changes: 3 additions & 5 deletions src/uucore/src/lib/features/mode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,13 +314,11 @@ mod tests {
#[test]
fn test_parse_invalid_modes() {
// Invalid numeric mode (too large)
assert!(parse("10000", false, 0).is_err());

parse("10000", false, 0).unwrap_err();
// Invalid operator
assert!(parse("u*rw", false, 0).is_err());

parse("u*rw", false, 0).unwrap_err();
// Invalid symbolic mode
assert!(parse("invalid", false, 0).is_err());
parse("invalid", false, 0).unwrap_err();
}

#[test]
Expand Down
10 changes: 5 additions & 5 deletions src/uucore/src/lib/features/ranges.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ impl FromStr for Range {
/// assert_eq!(Range::from_str("4-"), Ok(Range { low: 4, high: usize::MAX - 1 }));
/// assert_eq!(Range::from_str("-4"), Ok(Range { low: 1, high: 4 }));
/// assert_eq!(Range::from_str("2-4"), Ok(Range { low: 2, high: 4 }));
/// assert!(Range::from_str("0-4").is_err());
/// assert!(Range::from_str("4-2").is_err());
/// assert!(Range::from_str("-").is_err());
/// assert!(Range::from_str("a").is_err());
/// assert!(Range::from_str("a-b").is_err());
/// Range::from_str("0-4").unwrap_err();
/// Range::from_str("4-2").unwrap_err();
/// Range::from_str("-").unwrap_err();
/// Range::from_str("a").unwrap_err();
/// Range::from_str("a-b").unwrap_err();
/// ```
fn from_str(s: &str) -> Result<Self, &'static str> {
fn parse(s: &str) -> Result<usize, &'static str> {
Expand Down
Loading