Allow user to specify own escape-chars

[frak.git] / test / frak_test.clj

diff --git a/test/frak_test.clj b/test/frak_test.clj
index 4f7b36543f901b03e8907b9ec1dcecd977dbfce1..23a0f4116dca78bc1a4a1c09a4cb977fd47edbd9 100644 (file)
--- a/test/frak_test.clj
+++ b/test/frak_test.clj
@@ -6,51 +6,68 @@
 (def build-trie #'frak/build-trie)
 
 (deftest trie-test  
-  (is (= (-> (trie-put "a")
-             (trie-put "b"))
-         ^{:terminals '(\b \a)
-           :visitors '(\b \a)}
-         {\a nil
-          \b nil}))
-
-  (is (= (-> (trie-put "aaa")
-             (trie-put "ab"))
-         ^{:visitors '(\a\a)}
-         {\a
-          ^{:terminals '(\b)
-            :visitors '(\a \b)}
-          {\a
-           ^{:terminals '(\a)
-             :visitors '(\a)}
-           {\a nil}
-           \b nil}}))
-
-  (is (= (-> (trie-put "ab")
-             (trie-put "aaa"))
-         ^{:visitors '(\a\a)}
-         {\a
-          ^{:terminals '(\b)
-            :visitors '(\a \b)}
-          {\a
-           ^{:terminals '(\a)
-             :visitors '(\a)}
-           {\a nil}
-           \b nil}})))
+  (is (= (build-trie ["a" "b"]) 
+         {:char nil
+          :terminal? false
+          :children #{{:char \a
+                       :terminal? true
+                       :children #{}}
+                      {:char \b
+                       :terminal? true
+                       :children #{}}}}))
+
+  (is (= (build-trie ["aaa" "ab"])
+         (build-trie ["ab" "aaa"])
+         {:char nil
+          :terminal? false
+          :children #{{:char \a
+                       :terminal? false
+                       :children #{{:char \a
+                                    :terminal? false
+                                    :children #{{:char \a
+                                                 :terminal? true
+                                                 :children #{}}}}
+                                   {:char \b
+                                    :terminal? true
+                                    :children #{}}}}}})))
 
 (deftest pattern-test
   (let [strs1 ["foo" "bar" "baz"]
         strs2 ["baz" "bar" "foo"]
-        pat1 (pattern strs1)
-        pat2 (pattern strs2)]
-    (is (every? #(re-matches pat1 %) strs1))
+        match1 (partial re-matches (pattern strs1))
+        match2 (partial re-matches (pattern strs2))]
+    (is (every? match1 strs1))
+
+    (is (every? match2 strs1))
+
+    (is (every? match1 strs2))
+
+    (is (every? match2 strs2))
+
+    (is (not (or (match1 "f")
+                 (match1 "b")
+                 (match1 "ba")
+                 (match1 "fo")))))
+
+  (is (= (string-pattern ["foo" "foot"] nil)
+         (string-pattern ["foo" "" "foot"] nil)))
+
+  (is (= (re-matches
+          #"ba\[[trz]{3}\]"
+          (string-pattern ["bat" "bar" "baz"] nil))))
+
+  (is (= "b(?:i[pt]|at)"
+         (string-pattern ["bat" "bip" "bit"] nil)))
 
-    (is (every? #(re-matches pat2 %) strs1))
+  (is (= "foo\\??"
+         (string-pattern ["foo" "foo?"])))
 
-    (is (every? #(re-matches pat1 %) strs2))
+  (is (= "\\!\\\"\\#\\%\\&\\'\\,\\-\\/\\:\\;\\<\\=\\>\\@\\`\\~"
+         (string-pattern ["!\"#%&',-/:;<=>@`~"] {:escape-chars :vim})))
 
-    (is (every? #(re-matches pat2 %) strs2))
+  (is (= "foo\\★?"
+         (string-pattern ["foo" "foo★"] {:escape-chars #{\★}})))
 
-    (is (not (or (re-matches pat1 "f")
-                 (re-matches pat1 "b")
-                 (re-matches pat1 "ba")
-                 (re-matches pat1 "fo"))))))
+  (are [words] (every? #(re-matches (pattern words) %) words)
+    ["achy" "achylia" "achylous" "achymia" "achymous"]
+    ["aching" "achingly"]))