test cleanup

src/tests/types/expect.rs

@@ -61,16 +61,25 @@ impl ExpectBlock {
     // Placeholder regex: {{type:name}} or {{type}}
     let ph_rx = Regex::new(r"\{\{([a-z]+)(?:[:]([^}]+))?\}\}").unwrap();
 
+    let clean_str = |s: &str| -> String {
+      let mut s = ws_re.replace_all(s, " ").into_owned();
+      for token in ["(", ")", ",", "{", "}", "\"", "=", "'"] {
+        s = s.replace(&format!(" {}", token), token);
+        s = s.replace(&format!("{} ", token), token);
+      }
+      s.trim().to_string()
+    };
+
     for (i, pattern_expect) in patterns.iter().enumerate() {
       let aline_raw = &actual[i];
-      let aline = ws_re.replace_all(aline_raw, " ").trim().to_string();
+      let aline = clean_str(aline_raw);
 
       let pattern_str_raw = match pattern_expect {
         SqlExpectation::Single(s) => s.clone(),
         SqlExpectation::Multi(m) => m.join(" "),
       };
 
-      let pattern_str = ws_re.replace_all(&pattern_str_raw, " ").trim().to_string();
+      let pattern_str = clean_str(&pattern_str_raw);
 
       let mut pp = regex::escape(&pattern_str);
       pp = pp.replace(r"\{\{", "{{").replace(r"\}\}", "}}");