Prepare for automatic transformation to clojure.test

Author: Yannick Scherer

test/rewrite_clj/examples/cljx_test.clj

@@ -19,8 +19,8 @@
 (tabular
   (fact "about cljx macro detection."
         (let [loc (z/of-string ?data)]
-          (cljx-macro? loc) => ?result))
-  ?data                 ?result
+          (cljx-macro? loc) => ?pred))
+  ?data                 ?pred
   "#+clj 123"           truthy
   "#-clj 123"           truthy
   "#clj  123"           falsey

test/rewrite_clj/node/coerce_test.clj

@@ -8,7 +8,7 @@
 (tabular
   (fact "about sexpr -> node -> sexpr roundtrip."
         (let [n (coerce ?sexpr)]
-          n => #(satisfies? node/Node %)
+          (satisfies? node/Node n) => true
           (node/string n) => string?
           (node/sexpr n) => ?sexpr
           (class (node/sexpr n)) => (class ?sexpr)))
@@ -31,7 +31,6 @@
   :namespace/keyword
   ""
   "hello, over there!"
-  #"abc"
 
   ;; seqs
   []
@@ -48,14 +47,22 @@
   (hash-map)
   (hash-map :a 0, :b 1))
 
+(fact "about sexpr -> node -> sexpr roundtrip for regex"
+      (let [sexpr #"abc"
+            n (coerce sexpr)]
+        (satisfies? node/Node n) => true
+        (node/string n) => string?
+        (str (node/sexpr n)) => (str sexpr)
+        (class (node/sexpr n)) => (class sexpr)))
+
 (fact "about vars."
       (let [n (coerce #'identity)]
-        n => #(satisfies? node/Node %)
+        (satisfies? node/Node n) => true
         (node/sexpr n) => '(var clojure.core/identity)))
 
 (fact "about nil."
       (let [n (coerce nil)]
-        n => #(satisfies? node/Node %)
+        (satisfies? node/Node n) => true
         (node/sexpr n) => nil
         (p/parse-string "nil") => n))
 
@@ -64,6 +71,6 @@
 (fact "about records."
       (let [v (Foo-Bar. 0)
             n (coerce v)]
-        n => #(satisfies? node/Node %)
+        (satisfies? node/Node n) => true
         (node/tag n) => :reader-macro
         (node/string n) => (pr-str v)))

test/rewrite_clj/parser_test.clj

@@ -32,10 +32,11 @@
 
 (tabular
   (fact "about parsing simple data"
-        (let [n (p/parse-string ?s)]
-          (node/tag n)    => :token
-          (node/string n) => ?s
-          (node/sexpr n)  => ?r))
+        (binding [*ns* (find-ns 'rewrite-clj.parser-test)]
+          (let [n (p/parse-string ?s)]
+            (node/tag n)    => :token
+            (node/string n) => ?s
+            (node/sexpr n)  => ?r)))
   ?s                           ?r
   "0"                          0
   "0.1"                        0.1

test/rewrite_clj/zip/base_test.clj

@@ -23,37 +23,36 @@
 
 (let [f (java.io.File/createTempFile "rewrite" ".clj")
       s "   [[1 2] 3]"]
-  (with-state-changes [(before :facts (spit f s))
-                       (after :facts (.delete f))]
-    (tabular
-      (fact "about zipper creation (with movement to first non-ws node)."
-            (let [loc ?loc
-                  [_ a b c d] (iterate z/next loc)]
-              (base/tag loc) => :vector
-              (base/sexpr loc) => [[1 2] 3]
-              (base/tag a) => :vector
-              (base/tag b) => :token
-              (base/tag c) => :whitespace
-              (base/tag d) => :token
-              (base/string loc) => "[[1 2] 3]"
-              (base/string a) => "[1 2]"
-              (map base/root-string [loc a b c d]) => (has every? #{s})
-              (with-out-str (base/print loc)) => "[[1 2] 3]"
-              (with-out-str (base/print-root loc)) => "   [[1 2] 3]"
-              (with-open [w (java.io.StringWriter.)]
-                (base/print loc w)
-                (str w)) => "[[1 2] 3]"
-              (with-open [w (java.io.StringWriter.)]
-                (base/print-root loc w)
-                (str w)) => "   [[1 2] 3]"))
-      ?loc
-      (base/edn
-        (node/forms-node
-          [(node/spaces 3)
-           (node/coerce [[1 2] 3])]))
-      (base/of-string s)
-      (base/of-file f)
-      (base/of-file (.getPath f)))))
+  (spit f s)
+  (tabular
+    (fact "about zipper creation (with movement to first non-ws node)."
+          (let [loc ?loc
+                [_ a b c d] (iterate z/next loc)]
+            (base/tag loc) => :vector
+            (base/sexpr loc) => [[1 2] 3]
+            (base/tag a) => :vector
+            (base/tag b) => :token
+            (base/tag c) => :whitespace
+            (base/tag d) => :token
+            (base/string loc) => "[[1 2] 3]"
+            (base/string a) => "[1 2]"
+            (map base/root-string [loc a b c d]) => (has every? #{s})
+            (with-out-str (base/print loc)) => "[[1 2] 3]"
+            (with-out-str (base/print-root loc)) => "   [[1 2] 3]"
+            (with-open [w (java.io.StringWriter.)]
+              (base/print loc w)
+              (str w)) => "[[1 2] 3]"
+            (with-open [w (java.io.StringWriter.)]
+              (base/print-root loc w)
+              (str w)) => "   [[1 2] 3]"))
+    ?loc
+    (base/edn
+      (node/forms-node
+        [(node/spaces 3)
+         (node/coerce [[1 2] 3])]))
+    (base/of-string s)
+    (base/of-file f)
+    (base/of-file (.getPath f))))
 
 (tabular
   (fact "about zipper creation for whitespace-only nodes."