Skip to content

Commit

Permalink
fmt: use get_matches_from() in tests
Browse files Browse the repository at this point in the history
instead of try_get_matches_from()
  • Loading branch information
cakebaker committed May 7, 2024
1 parent 0e9ce50 commit e40bd02
Showing 1 changed file with 10 additions and 26 deletions.
36 changes: 10 additions & 26 deletions src/uu/fmt/src/fmt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -470,62 +470,46 @@ pub fn uu_app() -> Command {

#[cfg(test)]
mod tests {
use std::error::Error;

use crate::uu_app;
use crate::{extract_files, extract_width};

#[test]
fn parse_negative_width() -> Result<(), Box<dyn Error>> {
let matches = uu_app().try_get_matches_from(vec!["fmt", "-3", "some-file"])?;
fn parse_negative_width() {
let matches = uu_app().get_matches_from(vec!["fmt", "-3", "some-file"]);

assert_eq!(extract_files(&matches).unwrap(), vec!["some-file"]);

assert_eq!(extract_width(&matches).ok(), Some(Some(3)));

Ok(())
}

#[test]
fn parse_width_as_arg() -> Result<(), Box<dyn Error>> {
let matches = uu_app().try_get_matches_from(vec!["fmt", "-w3", "some-file"])?;
fn parse_width_as_arg() {
let matches = uu_app().get_matches_from(vec!["fmt", "-w3", "some-file"]);

assert_eq!(extract_files(&matches).unwrap(), vec!["some-file"]);

assert_eq!(extract_width(&matches).ok(), Some(Some(3)));

Ok(())
}

#[test]
fn parse_no_args() -> Result<(), Box<dyn Error>> {
let matches = uu_app().try_get_matches_from(vec!["fmt"])?;
fn parse_no_args() {
let matches = uu_app().get_matches_from(vec!["fmt"]);

assert_eq!(extract_files(&matches).unwrap(), vec!["-"]);

assert_eq!(extract_width(&matches).ok(), Some(None));

Ok(())
}

#[test]
fn parse_just_file_name() -> Result<(), Box<dyn Error>> {
let matches = uu_app().try_get_matches_from(vec!["fmt", "some-file"])?;
fn parse_just_file_name() {
let matches = uu_app().get_matches_from(vec!["fmt", "some-file"]);

assert_eq!(extract_files(&matches).unwrap(), vec!["some-file"]);

assert_eq!(extract_width(&matches).ok(), Some(None));

Ok(())
}

#[test]
fn parse_with_both_widths_positional_first() -> Result<(), Box<dyn Error>> {
let matches = uu_app().try_get_matches_from(vec!["fmt", "-10", "-w3", "some-file"])?;
fn parse_with_both_widths_positional_first() {
let matches = uu_app().get_matches_from(vec!["fmt", "-10", "-w3", "some-file"]);

assert_eq!(extract_files(&matches).unwrap(), vec!["some-file"]);

assert_eq!(extract_width(&matches).ok(), Some(Some(3)));
Ok(())
}
}

0 comments on commit e40bd02

Please sign in to comment.