add test helper

Author: psteinroe

crates/pg_statement_splitter/src/lib.rs

@@ -20,35 +20,49 @@ mod tests {
 
     use super::*;
 
+    struct Tester {
+        input: String,
+        parse: Parse,
+    }
+
+    impl From<&str> for Tester {
+        fn from(input: &str) -> Self {
+            Tester {
+                parse: split(input),
+                input: input.to_string(),
+            }
+        }
+    }
+
+    impl Tester {
+        fn expect_statements(&self, expected: Vec<&str>) {
+            assert_eq!(self.parse.ranges.len(), expected.len());
+
+            for (range, expected) in self.parse.ranges.iter().zip(expected.iter()) {
+                assert_eq!(*expected, self.input[*range].to_string());
+            }
+        }
+    }
+
     #[test]
     #[timeout(1000)]
     fn basic() {
-        let input = "select 1 from contact; select 1;";
-
-        let res = split(input);
-        assert_eq!(res.ranges.len(), 2);
-        assert_eq!("select 1 from contact;", input[res.ranges[0]].to_string());
-        assert_eq!("select 1;", input[res.ranges[1]].to_string());
+        Tester::from("select 1 from contact; select 1;")
+            .expect_statements(vec!["select 1 from contact;", "select 1;"]);
     }
 
     #[test]
     fn no_semicolons() {
-        let input = "select 1 from contact\nselect 1";
-
-        let res = split(input);
-        assert_eq!(res.ranges.len(), 2);
-        assert_eq!("select 1 from contact", input[res.ranges[0]].to_string());
-        assert_eq!("select 1", input[res.ranges[1]].to_string());
+        Tester::from("select 1 from contact\nselect 1")
+            .expect_statements(vec!["select 1 from contact", "select 1"]);
     }
 
     #[test]
     fn double_newlines() {
-        let input = "select 1 from contact\n\nselect 1\n\nselect 3";
-
-        let res = split(input);
-        assert_eq!(res.ranges.len(), 3);
-        assert_eq!("select 1 from contact", input[res.ranges[0]].to_string());
-        assert_eq!("select 1", input[res.ranges[1]].to_string());
-        assert_eq!("select 3", input[res.ranges[2]].to_string());
+        Tester::from("select 1 from contact\n\nselect 1\n\nselect 3").expect_statements(vec![
+            "select 1 from contact",
+            "select 1",
+            "select 3",
+        ]);
     }
 }

crates/pg_statement_splitter/src/parser.rs

@@ -84,7 +84,6 @@ impl Parser {
                 .ranges
                 .iter()
                 .map(|(start, end)| {
-                    println!("{} {}", start, end);
                     let from = self.tokens.get(*start);
                     let to = self.tokens.get(*end).unwrap_or(&self.eof_token);