Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-11-26 22:06:26 +00:00
Code Issues Projects Releases Wiki Activity

Make option parsing unit-testable

Browse Source
This commit is contained in:
Benjamin Sago 2015-01-12 22:47:05 +01:00
parent 1ec4451016
commit 3d59a48efe
2 changed files with 58 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/exa.rs
View File

@ -88,7 +88,7 @@ fn exa(options: &Options) {
fn main() {
let args: Vec<String> = args();
match Options::getopts(args) {
match Options::getopts(args.tail()) {
Ok(options) => exa(&options),
Err(Help(text)) => {
println!("{}", text);

69
src/options.rs
View File

@ -35,20 +35,21 @@ fn no_sort_field(field: &str) -> Error {
pub struct Options {
pub list_dirs: bool,
path_strs: Vec<String>,
pub path_strs: Vec<String>,
reverse: bool,
show_invisibles: bool,
sort_field: SortField,
pub view: View,
}
#[derive(Show)]
pub enum Error {
InvalidOptions(getopts::Fail),
Help(String),
}
impl Options {
pub fn getopts(args: Vec<String>) -> Result<Options, Error> {
pub fn getopts(args: &[String]) -> Result<Options, Error> {
let opts = &[
getopts::optflag("1", "oneline", "display one entry per line"),
getopts::optflag("a", "all", "show dot-files"),
@ -67,7 +68,7 @@ impl Options {
getopts::optflag("?", "help", "show list of command-line options"),
];
let matches = match getopts::getopts(args.tail(), opts) {
let matches = match getopts::getopts(args, opts) {
Ok(m) => m,
Err(e) => return Err(Error::InvalidOptions(e)),
};
@ -123,15 +124,15 @@ impl Options {
columns.push(HardLinks);
}
if matches.opt_present("binary") {
columns.push(FileSize(SizeFormat::BinaryBytes))
}
else if matches.opt_present("bytes") {
columns.push(FileSize(SizeFormat::JustBytes))
}
else {
columns.push(FileSize(SizeFormat::DecimalBytes))
}
if matches.opt_present("binary") {
columns.push(FileSize(SizeFormat::BinaryBytes))
}
else if matches.opt_present("bytes") {
columns.push(FileSize(SizeFormat::JustBytes))
}
else {
columns.push(FileSize(SizeFormat::DecimalBytes))
}
if matches.opt_present("blocks") {
columns.push(Blocks);
@ -180,3 +181,47 @@ impl Options {
files
}
}
#[cfg(test)]
mod test {
use super::Options;
use super::Error;
use super::Error::*;
fn is_helpful(error: Result<Options, Error>) -> bool {
match error {
Err(Help(_)) => true,
_ => false,
}
}
#[test]
fn help() {
let opts = Options::getopts(&[ "--help".to_string() ]);
assert!(is_helpful(opts))
}
#[test]
fn help_with_file() {
let opts = Options::getopts(&[ "--help".to_string(), "me".to_string() ]);
assert!(is_helpful(opts))
}
#[test]
fn files() {
let opts = Options::getopts(&[ "this file".to_string(), "that file".to_string() ]);
assert_eq!(opts.unwrap().path_strs, vec![ "this file".to_string(), "that file".to_string() ])
}
#[test]
fn no_args() {
let opts = Options::getopts(&[]);
assert_eq!(opts.unwrap().path_strs, vec![ ".".to_string() ])
}
#[test]
fn view() {
let opts = Options::getopts(&[ "this file".to_string(), "that file".to_string() ]);
assert_eq!(opts.unwrap().path_strs, vec![ "this file".to_string(), "that file".to_string() ])
}
}