Skip to content

Commit 5348279

Browse files
committed
Fix some test regexes
1 parent be3ff0d commit 5348279

File tree

1 file changed

+38
-48
lines changed

1 file changed

+38
-48
lines changed

src/reader.rs

Lines changed: 38 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -845,61 +845,51 @@ mod tests {
845845
fn try_read_bool_false_test() {
846846
assert_eq!(Value::Boolean(false), try_read("false ").ok().unwrap().1)
847847
}
848+
}
849+
mod regex_tests {
850+
use crate::reader::try_read;
851+
use crate::value::Value;
848852

849-
mod regex_tests {
850-
use crate::reader::try_read;
851-
use crate::value::Value;
852-
853-
#[test]
854-
fn try_read_simple_regex_pattern_test() {
855-
assert_eq!(
856-
Value::Pattern(regex::Regex::new("a").unwrap()),
857-
try_read(r##"#"a" "##).ok().unwrap().1
858-
);
859-
}
860-
861-
#[test]
862-
fn try_read_simple_with_escaped_quote_regex_pattern_test() {
863-
assert_eq!(
864-
Value::Pattern(regex::Regex::new("a").unwrap()),
865-
try_read(r###"#"a\"" "###).ok().unwrap().1
866-
);
867-
}
853+
#[test]
854+
fn try_read_simple_regex_pattern_test() {
855+
assert_eq!(
856+
Value::Pattern(regex::Regex::new("a").unwrap()),
857+
try_read(r###"#"a" "###).ok().unwrap().1
858+
);
859+
}
868860

869-
#[test]
870-
fn try_read_regex_pattern_test() {
871-
assert_eq!(
872-
Value::Pattern(regex::Regex::new("hello").unwrap()),
873-
try_read("#\"hello\" ").ok().unwrap().1
874-
);
875-
}
861+
#[test]
862+
fn try_read_regex_pattern_test() {
863+
assert_eq!(
864+
Value::Pattern(regex::Regex::new("hello").unwrap()),
865+
try_read("#\"hello\" ").ok().unwrap().1
866+
);
867+
}
876868

877-
#[test]
878-
fn try_read_regex_pattern_escaped_quote_test() {
879-
assert_eq!(
880-
Value::Pattern(regex::Regex::new("h\"e\"l\"l\"o").unwrap()),
881-
try_read(r#"#"h\"e\"l\"l\"o\"" something"#).ok().unwrap().1
882-
);
883-
}
869+
#[test]
870+
fn try_read_regex_pattern_escaped_quote_test() {
871+
assert_eq!(
872+
Value::Pattern(regex::Regex::new("h\"e\"l\"l\"o\"").unwrap()),
873+
try_read(r#"#"h\"e\"l\"l\"o\"" something"#).ok().unwrap().1
874+
);
875+
}
884876

885-
#[test]
886-
fn try_read_regex_pattern_escaped_quote_prefixed_by_whitespace_test() {
887-
assert_eq!(
888-
Value::Pattern(regex::Regex::new("h\"e\"l\"l \"o").unwrap()),
889-
try_read("#\"h\"e\"l\"l \"o\" something").ok().unwrap().1
890-
);
891-
}
877+
#[test]
878+
fn try_read_regex_pattern_escaped_quote_prefixed_by_whitespace_test() {
879+
assert_eq!(
880+
Value::Pattern(regex::Regex::new("h\"e\"l\"l \"o").unwrap()),
881+
try_read(r#"#"h\"e\"l\"l \"o""#).ok().unwrap().1
882+
);
883+
}
892884

893-
#[test]
894-
fn try_read_regex_pattern_escaped_quote_suffixed_by_whitespace_test() {
895-
assert_eq!(
896-
Value::Pattern(regex::Regex::new("h\"e\"l\" l \"o").unwrap()),
897-
try_read("#\"h\"e\"l\" l \"o\" something").ok().unwrap().1
898-
);
899-
}
885+
#[test]
886+
fn try_read_regex_pattern_escaped_quote_suffixed_by_whitespace_test() {
887+
assert_eq!(
888+
Value::Pattern(regex::Regex::new("h\"e\"l\" l \"o").unwrap()),
889+
try_read(r#"#"h\"e\"l\" l \"o" something"#).ok().unwrap().1
890+
);
900891
}
901892
}
902-
903893
mod consume_clojure_whitespaces_tests {
904894
use crate::reader::consume_clojure_whitespaces_parser;
905895
#[test]

0 commit comments

Comments
 (0)