diff --git a/tests/test_regexp.rs b/tests/test_regexp.rs --- a/tests/test_regexp.rs +++ b/tests/test_regexp.rs @@ -11,7 +11,7 @@ fn test_eval_basic_nfa() { #[test] fn test_eval_basic_dfa() { - let r = Regexp::new(&String::from("abc")).unwrap().determinize().reduce(); + let r = Regexp::new(&String::from("abc")).unwrap().determinize().reduce().normalize(); assert!(r.eval(String::from("abc"))); assert!(!r.eval(String::from("ab"))); assert!(!r.eval(String::from("abcd"))); @@ -27,9 +27,9 @@ fn test_eval_empty_nfa() { #[test] fn test_eval_empty_dfa() { - assert!(Regexp::new(&String::from("a*")).unwrap().determinize().reduce().eval(String::from(""))); - assert!(Regexp::new(&String::from("")).unwrap().determinize().reduce().eval(String::from(""))); - assert!(!Regexp::new(&String::from("")).unwrap().determinize().reduce().eval(String::from("a"))); + assert!(Regexp::new(&String::from("a*")).unwrap().determinize().reduce().normalize().eval(String::from(""))); + assert!(Regexp::new(&String::from("")).unwrap().determinize().reduce().normalize().eval(String::from(""))); + assert!(!Regexp::new(&String::from("")).unwrap().determinize().reduce().normalize().eval(String::from("a"))); } #[test] @@ -43,7 +43,7 @@ fn test_eval_asterisk_nfa() { #[test] fn test_eval_asterisk_dfa() { - let r = Regexp::new(&String::from("a*b*")).unwrap().determinize().reduce(); + let r = Regexp::new(&String::from("a*b*")).unwrap().determinize().normalize().reduce(); assert!(r.eval(String::from("a"))); assert!(r.eval(String::from("ab"))); assert!(r.eval(String::from("aabb"))); @@ -62,7 +62,7 @@ fn test_eval_alternative_nfa() { #[test] fn test_eval_alternative_dfa() { - let r = Regexp::new(&String::from("a|b|c")).unwrap().determinize().reduce(); + let r = Regexp::new(&String::from("a|b|c")).unwrap().determinize().reduce().normalize(); assert!(r.eval(String::from("a"))); assert!(r.eval(String::from("b"))); assert!(r.eval(String::from("c"))); @@ -85,12 +85,12 @@ fn test_eval_lambda_nfa() { #[test] fn test_eval_lambda_dfa() { - let r = Regexp::new(&String::from("a_")).unwrap().determinize().reduce(); + let r = Regexp::new(&String::from("a_")).unwrap().determinize().reduce().normalize(); assert!(r.eval(String::from("a"))); assert!(!r.eval(String::from(""))); assert!(!r.eval(String::from("ab"))); - let r = Regexp::new(&String::from("a|_")).unwrap().determinize().reduce(); + let r = Regexp::new(&String::from("a|_")).unwrap().determinize().reduce().normalize(); assert!(r.eval(String::from("a"))); assert!(r.eval(String::from(""))); assert!(!r.eval(String::from("b")));