diff --git a/src/parser/regex.rs b/src/parser/regex.rs index 3a5a86f..fd38948 100644 --- a/src/parser/regex.rs +++ b/src/parser/regex.rs @@ -225,7 +225,7 @@ mod test { let regex_processor = RegexProcessor::new(&command_line_args).unwrap(); - assert_eq!(regex_processor.regex_mode(), false); + assert!(!regex_processor.regex_mode()); let arguments = vec!["{0}".to_string()]; assert_eq!( @@ -243,7 +243,7 @@ mod test { let regex_processor = RegexProcessor::new(&command_line_args).unwrap(); - assert_eq!(regex_processor.regex_mode(), true); + assert!(regex_processor.regex_mode()); let arguments = vec!["{1} {2}".to_string()]; assert_eq!( @@ -264,7 +264,7 @@ mod test { let regex_processor = RegexProcessor::new(&command_line_args).unwrap(); - assert_eq!(regex_processor.regex_mode(), true); + assert!(regex_processor.regex_mode()); let arguments = vec!["{arg1} {arg2}".to_string()]; assert_eq!( @@ -285,7 +285,7 @@ mod test { let regex_processor = RegexProcessor::new(&command_line_args).unwrap(); - assert_eq!(regex_processor.regex_mode(), true); + assert!(regex_processor.regex_mode()); let arguments = vec![r#"{"id": 123, "$zero": "{0}", "one": "{1}", "two": "{2}"}"#.to_string()]; @@ -310,7 +310,7 @@ mod test { let regex_processor = RegexProcessor::new(&command_line_args).unwrap(); - assert_eq!(regex_processor.regex_mode(), true); + assert!(regex_processor.regex_mode()); let arguments = vec![r#"{"id": 123, "$zero": "{}", "one": "{1}", "two": "{2}"}"#.to_string()]; @@ -335,7 +335,7 @@ mod test { let regex_processor = RegexProcessor::new(&command_line_args).unwrap(); - assert_eq!(regex_processor.regex_mode(), true); + assert!(regex_processor.regex_mode()); let arguments = vec![r#"{"id": 123, "$zero": "{0}", "one": "{arg1}", "two": "{arg2}"}"#.to_string()]; @@ -360,7 +360,7 @@ mod test { let regex_processor = RegexProcessor::new(&command_line_args).unwrap(); - assert_eq!(regex_processor.regex_mode(), true); + assert!(regex_processor.regex_mode()); let arguments = vec![r#"{"id": 123, "$zero": "{}", "one": "{arg1}", "two": "{arg2}"}"#.to_string()]; @@ -385,7 +385,7 @@ mod test { let regex_processor = RegexProcessor::new(&command_line_args).unwrap(); - assert_eq!(regex_processor.regex_mode(), true); + assert!(regex_processor.regex_mode()); let arguments = vec![r#"{arg2}${FOO}{arg1}$BAR${BAR}{arg2}"#.to_string()]; assert_eq!( @@ -406,7 +406,7 @@ mod test { let regex_processor = RegexProcessor::new(&command_line_args).unwrap(); - assert_eq!(regex_processor.regex_mode(), true); + assert!(regex_processor.regex_mode()); let arguments = vec!["{arg2},{arg1}".to_string()]; assert_eq!( diff --git a/src/progress/style.rs b/src/progress/style.rs index 1a6a321..2312af8 100644 --- a/src/progress/style.rs +++ b/src/progress/style.rs @@ -69,10 +69,10 @@ mod test { }; let result = choose_progress_style(&command_line_args); - assert_eq!(result.is_err(), false); + assert!(result.is_ok()); let result = result.unwrap(); assert_eq!(result._style_name, LIGHT_BG_PROGRESS_STYLE); - assert_eq!(result.enable_steady_tick, true); + assert!(result.enable_steady_tick); } #[test] @@ -83,10 +83,10 @@ mod test { }; let result = choose_progress_style(&command_line_args); - assert_eq!(result.is_err(), false); + assert!(result.is_ok()); let result = result.unwrap(); assert_eq!(result._style_name, LIGHT_BG_PROGRESS_STYLE); - assert_eq!(result.enable_steady_tick, true); + assert!(result.enable_steady_tick); } #[test] @@ -97,10 +97,10 @@ mod test { }; let result = choose_progress_style(&command_line_args); - assert_eq!(result.is_err(), false); + assert!(result.is_ok()); let result = result.unwrap(); assert_eq!(result._style_name, LIGHT_BG_PROGRESS_STYLE); - assert_eq!(result.enable_steady_tick, true); + assert!(result.enable_steady_tick); } #[test] @@ -111,10 +111,10 @@ mod test { }; let result = choose_progress_style(&command_line_args); - assert_eq!(result.is_err(), false); + assert!(result.is_ok()); let result = result.unwrap(); assert_eq!(result._style_name, DARK_BG_PROGRESS_STYLE); - assert_eq!(result.enable_steady_tick, true); + assert!(result.enable_steady_tick); } #[test] @@ -125,10 +125,10 @@ mod test { }; let result = choose_progress_style(&command_line_args); - assert_eq!(result.is_err(), false); + assert!(result.is_ok()); let result = result.unwrap(); assert_eq!(result._style_name, SIMPLE_PROGRESS_STYLE); - assert_eq!(result.enable_steady_tick, false); + assert!(!result.enable_steady_tick); } #[test] @@ -139,6 +139,6 @@ mod test { }; let result = choose_progress_style(&command_line_args); - assert_eq!(result.is_err(), true); + assert!(result.is_err()); } }