diff --git a/tests/test_regexp.rs b/tests/test_regexp.rs --- a/tests/test_regexp.rs +++ b/tests/test_regexp.rs @@ -1,4 +1,5 @@ use regexp::RegexpNFA; +use regexp::RegexpDFA; use regexp::ParsingError; #[test] @@ -11,7 +12,7 @@ fn test_eval_basic_nfa() { #[test] fn test_eval_basic_dfa() { - let r = RegexpNFA::new(&String::from("abc")).unwrap().determinize().reduce().normalize(); + let r = RegexpDFA::new(&String::from("abc")).unwrap(); assert!(r.eval(String::from("abc"))); assert!(!r.eval(String::from("ab"))); assert!(!r.eval(String::from("abcd"))); @@ -27,9 +28,9 @@ fn test_eval_empty_nfa() { #[test] fn test_eval_empty_dfa() { - assert!(RegexpNFA::new(&String::from("a*")).unwrap().determinize().reduce().normalize().eval(String::from(""))); - assert!(RegexpNFA::new(&String::from("")).unwrap().determinize().reduce().normalize().eval(String::from(""))); - assert!(!RegexpNFA::new(&String::from("")).unwrap().determinize().reduce().normalize().eval(String::from("a"))); + assert!(RegexpDFA::new(&String::from("a*")).unwrap().eval(String::from(""))); + assert!(RegexpDFA::new(&String::from("")).unwrap().eval(String::from(""))); + assert!(!RegexpDFA::new(&String::from("")).unwrap().eval(String::from("a"))); } #[test] @@ -43,7 +44,7 @@ fn test_eval_asterisk_nfa() { #[test] fn test_eval_asterisk_dfa() { - let r = RegexpNFA::new(&String::from("a*b*")).unwrap().determinize().normalize().reduce(); + let r = RegexpDFA::new(&String::from("a*b*")).unwrap(); assert!(r.eval(String::from("a"))); assert!(r.eval(String::from("ab"))); assert!(r.eval(String::from("aabb"))); @@ -62,7 +63,7 @@ fn test_eval_alternative_nfa() { #[test] fn test_eval_alternative_dfa() { - let r = RegexpNFA::new(&String::from("a|b|c")).unwrap().determinize().reduce().normalize(); + let r = RegexpDFA::new(&String::from("a|b|c")).unwrap(); assert!(r.eval(String::from("a"))); assert!(r.eval(String::from("b"))); assert!(r.eval(String::from("c"))); @@ -85,12 +86,12 @@ fn test_eval_lambda_nfa() { #[test] fn test_eval_lambda_dfa() { - let r = RegexpNFA::new(&String::from("a_")).unwrap().determinize().reduce().normalize(); + let r = RegexpDFA::new(&String::from("a_")).unwrap(); assert!(r.eval(String::from("a"))); assert!(!r.eval(String::from(""))); assert!(!r.eval(String::from("ab"))); - let r = RegexpNFA::new(&String::from("a|_")).unwrap().determinize().reduce().normalize(); + let r = RegexpDFA::new(&String::from("a|_")).unwrap(); assert!(r.eval(String::from("a"))); assert!(r.eval(String::from(""))); assert!(!r.eval(String::from("b"))); @@ -100,34 +101,46 @@ fn test_eval_lambda_dfa() { fn test_invalid_asterisk() { let x = RegexpNFA::new(&String::from("*")); assert!(matches!(x, Err(ParsingError::Asterisk{s: _, pos: 0}))); + let x = RegexpDFA::new(&String::from("*")); + assert!(matches!(x, Err(ParsingError::Asterisk{s: _, pos: 0}))); } #[test] fn test_invalid_closing_parenthesis() { let x = RegexpNFA::new(&String::from("(a")); assert!(matches!(x, Err(ParsingError::ClosingParenthesis{s: _, pos: 0}))); + let x = RegexpDFA::new(&String::from("(a")); + assert!(matches!(x, Err(ParsingError::ClosingParenthesis{s: _, pos: 0}))); } #[test] fn test_invalid_opening_parenthesis() { let x = RegexpNFA::new(&String::from("a)")); assert!(matches!(x, Err(ParsingError::OpeningParenthesis{s: _, pos: 1}))); + let x = RegexpDFA::new(&String::from("a)")); + assert!(matches!(x, Err(ParsingError::OpeningParenthesis{s: _, pos: 1}))); } #[test] fn test_invalid_empty_variant_start() { let x = RegexpNFA::new(&String::from("a(|b)")); assert!(matches!(x, Err(ParsingError::EmptyAlternativeVariant))); + let x = RegexpDFA::new(&String::from("a(|b)")); + assert!(matches!(x, Err(ParsingError::EmptyAlternativeVariant))); } #[test] fn test_invalid_empty_variant_end() { let x = RegexpNFA::new(&String::from("a|")); assert!(matches!(x, Err(ParsingError::EmptyAlternativeVariant))); + let x = RegexpDFA::new(&String::from("a|")); + assert!(matches!(x, Err(ParsingError::EmptyAlternativeVariant))); } #[test] fn test_invalid_empty_variant_middle() { let x = RegexpNFA::new(&String::from("a||b")); assert!(matches!(x, Err(ParsingError::EmptyAlternativeVariant))); + let x = RegexpDFA::new(&String::from("a||b")); + assert!(matches!(x, Err(ParsingError::EmptyAlternativeVariant))); }