Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-15 15:52:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Completes transition to clap

Browse source 
- fixes build issues in parser tests.
This commit is contained in:
Tyler 2021-07-02 11:31:06 -07:00
parent 4d76cb45de
commit 951d9c0822
2 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/uu/dd/src/parseargs.rs
View file

@ -1,16 +1,7 @@
#[cfg(test)] #[cfg(test)]
mod unit_tests; mod unit_tests;
use crate::conversion_tables::*; use super::*;
use crate::{
CountType,
IConvFlags, OConvFlags,
StatusLevel,
};
use crate::{
IFlags, OFlags,
};
use std::error::Error; use std::error::Error;
pub type Matches = clap::ArgMatches<'static>; pub type Matches = clap::ArgMatches<'static>;

35
src/uu/dd/src/parseargs/unit_tests.rs
View file

@ -1,8 +1,7 @@
use super::*; use super::*;
use crate::{ use crate::{
build_app, build_dd_app,
SYNTAX, SUMMARY, LONG_HELP,
IConvFlags, OConvFlags, IConvFlags, OConvFlags,
StatusLevel, StatusLevel,
}; };
@ -16,7 +15,7 @@ fn test_status_level_absent()
String::from("--of=bar.file"), String::from("--of=bar.file"),
]; ];
let matches = build_app!().parse(args); let matches = build_dd_app!().get_matches_from_safe(args).unwrap();
let st = parse_status_level(&matches).unwrap(); let st = parse_status_level(&matches).unwrap();
assert_eq!(st, None); assert_eq!(st, None);
@ -32,7 +31,7 @@ fn test_status_level_none()
String::from("--of=bar.file"), String::from("--of=bar.file"),
]; ];
let matches = build_app!().parse(args); let matches = build_dd_app!().get_matches_from_safe(args).unwrap();
let st = parse_status_level(&matches).unwrap().unwrap(); let st = parse_status_level(&matches).unwrap().unwrap();
assert_eq!(st, StatusLevel::None); assert_eq!(st, StatusLevel::None);
@ -48,7 +47,7 @@ fn test_status_level_progress()
String::from("--status=progress"), String::from("--status=progress"),
]; ];
let matches = build_app!().parse(args); let matches = build_dd_app!().get_matches_from_safe(args).unwrap();
let st = parse_status_level(&matches).unwrap().unwrap(); let st = parse_status_level(&matches).unwrap().unwrap();
assert_eq!(st, StatusLevel::Progress); assert_eq!(st, StatusLevel::Progress);
@ -64,7 +63,7 @@ fn test_status_level_noxfer()
String::from("--of=bar.file"), String::from("--of=bar.file"),
]; ];
let matches = build_app!().parse(args); let matches = build_dd_app!().get_matches_from_safe(args).unwrap();
let st = parse_status_level(&matches).unwrap().unwrap(); let st = parse_status_level(&matches).unwrap().unwrap();
assert_eq!(st, StatusLevel::Noxfer); assert_eq!(st, StatusLevel::Noxfer);
@ -81,7 +80,7 @@ fn icf_ctable_error()
String::from("--conv=ascii,ebcdic,ibm"), String::from("--conv=ascii,ebcdic,ibm"),
]; ];
let matches = build_app!().parse(args); let matches = build_dd_app!().get_matches_from_safe(args).unwrap();
let icf_parsed = parse_conv_flag_input(&matches).unwrap(); let icf_parsed = parse_conv_flag_input(&matches).unwrap();
} }
@ -95,7 +94,7 @@ fn icf_case_error()
String::from("--conv=ucase,lcase"), String::from("--conv=ucase,lcase"),
]; ];
let matches = build_app!().parse(args); let matches = build_dd_app!().get_matches_from_safe(args).unwrap();
let icf_parsed = parse_conv_flag_input(&matches).unwrap(); let icf_parsed = parse_conv_flag_input(&matches).unwrap();
} }
@ -109,7 +108,7 @@ fn icf_block_error()
String::from("--conv=block,unblock"), String::from("--conv=block,unblock"),
]; ];
let matches = build_app!().parse(args); let matches = build_dd_app!().get_matches_from_safe(args).unwrap();
let icf_parsed = parse_conv_flag_input(&matches).unwrap(); let icf_parsed = parse_conv_flag_input(&matches).unwrap();
} }
@ -123,7 +122,7 @@ fn icf_creat_error()
String::from("--conv=excl,nocreat"), String::from("--conv=excl,nocreat"),
]; ];
let matches = build_app!().parse(args); let matches = build_dd_app!().get_matches_from_safe(args).unwrap();
let icf_parsed = parse_conv_flag_output(&matches).unwrap(); let icf_parsed = parse_conv_flag_output(&matches).unwrap();
} }
@ -139,7 +138,7 @@ fn parse_icf_token_ibm()
String::from("dd"), String::from("dd"),
String::from("--conv=ibm"), String::from("--conv=ibm"),
]; ];
let matches = build_app!().parse(args); let matches = build_dd_app!().get_matches_from_safe(args).unwrap();
let act = parse_flag_list::<ConvFlag>("conv", &matches).unwrap(); let act = parse_flag_list::<ConvFlag>("conv", &matches).unwrap();
@ -163,7 +162,7 @@ fn parse_icf_tokens_elu()
String::from("dd"), String::from("dd"),
String::from("--conv=ebcdic,lcase,unblock"), String::from("--conv=ebcdic,lcase,unblock"),
]; ];
let matches = build_app!().parse(args); let matches = build_dd_app!().get_matches_from_safe(args).unwrap();
let act = parse_flag_list::<ConvFlag>("conv", &matches).unwrap(); let act = parse_flag_list::<ConvFlag>("conv", &matches).unwrap();
assert_eq!(exp.len(), act.len()); assert_eq!(exp.len(), act.len());
@ -196,7 +195,7 @@ fn parse_icf_tokens_remaining()
String::from("dd"), String::from("dd"),
String::from("--conv=ascii,ucase,block,sparse,swab,sync,noerror,excl,nocreat,notrunc,noerror,fdatasync,fsync"), String::from("--conv=ascii,ucase,block,sparse,swab,sync,noerror,excl,nocreat,notrunc,noerror,fdatasync,fsync"),
]; ];
let matches = build_app!().parse(args); let matches = build_dd_app!().get_matches_from_safe(args).unwrap();
let act = parse_flag_list::<ConvFlag>("conv", &matches).unwrap(); let act = parse_flag_list::<ConvFlag>("conv", &matches).unwrap();
@ -215,8 +214,8 @@ macro_rules! test_byte_parser (
#[test] #[test]
fn $test_name() fn $test_name()
{ {
let bs_str = String::from($bs_str); // let bs_str = String::from($bs_str);
assert_eq!($bs, parse_bytes_with_opt_multiplier(bs_str).unwrap()) assert_eq!($bs, parse_bytes_with_opt_multiplier($bs_str).unwrap())
} }
} }
); );
@ -346,7 +345,7 @@ test_byte_parser!(
fn test_KB_multiplier_error() fn test_KB_multiplier_error()
{ {
// KB is not valid (kB, K, and KiB are) // KB is not valid (kB, K, and KiB are)
let bs_str = String::from("2000KB"); let bs_str = "2000KB";
parse_bytes_with_opt_multiplier(bs_str).unwrap(); parse_bytes_with_opt_multiplier(bs_str).unwrap();
} }
@ -357,7 +356,7 @@ fn test_overflow_panic()
{ {
let bs_str = format!("{}KiB", usize::MAX); let bs_str = format!("{}KiB", usize::MAX);
parse_bytes_with_opt_multiplier(bs_str).unwrap(); parse_bytes_with_opt_multiplier(&bs_str).unwrap();
} }
#[test] #[test]
@ -366,5 +365,5 @@ fn test_neg_panic()
{ {
let bs_str = format!("{}KiB", -1); let bs_str = format!("{}KiB", -1);
parse_bytes_with_opt_multiplier(bs_str).unwrap(); parse_bytes_with_opt_multiplier(&bs_str).unwrap();
} }