Move test macros to utils file

Author: yuhan0

test/clojure-mode-refactor-add-arity-test.el

@@ -25,31 +25,6 @@
 (require 'clojure-mode)
 (require 'buttercup)
 
-(defmacro when-refactoring-with-point-it (description before after &rest body)
-  "Return a buttercup spec.
-
-Like when-refactor-it but also checks whether point is moved to the expected
-position.
-
-BEFORE is the buffer string before refactoring, where a pipe (|) represents
-point.
-
-AFTER is the expected buffer string after refactoring, where a pipe (|)
-represents the expected position of point.
-
-DESCRIPTION is a string with the description of the spec."
-  `(it ,description
-    (let* ((after ,after)
-           (expected-cursor-pos (1+ (s-index-of "|" after)))
-           (expected-state (delete ?| after)))
-      (with-clojure-buffer ,before
-        (goto-char (point-min))
-        (search-forward "|")
-        (delete-char -1)
-        ,@body
-        (expect (buffer-string) :to-equal expected-state)
-        (expect (point) :to-equal expected-cursor-pos)))))
-
 (describe "clojure-add-arity"
 
   (when-refactoring-with-point-it "should add an arity to a single-arity defn with args on same line"

test/clojure-mode-sexp-test.el

@@ -22,19 +22,6 @@
 (require 'clojure-mode)
 (require 'buttercup)
 
-(defmacro with-clojure-buffer-point (text &rest body)
-  "Run BODY in a temporary clojure buffer with TEXT.
-
-TEXT is a string with a | indicating where point is.  The | will be erased
-and point left there."
-  (declare (indent 2))
-  `(progn
-     (with-clojure-buffer ,text
-       (goto-char (point-min))
-       (re-search-forward "|")
-       (delete-char -1)
-       ,@body)))
-
 (describe "clojure-top-level-form-p"
   (it "should return true when passed the correct form"
     (with-clojure-buffer-point

test/utils/test-helper.el

@@ -41,6 +41,19 @@
      (clojure-mode)
      ,@body))
 
+(defmacro with-clojure-buffer-point (text &rest body)
+  "Run BODY in a temporary clojure buffer with TEXT.
+
+TEXT is a string with a | indicating where point is.  The | will be erased
+and point left there."
+  (declare (indent 2))
+  `(progn
+     (with-clojure-buffer ,text
+       (goto-char (point-min))
+       (re-search-forward "|")
+       (delete-char -1)
+       ,@body)))
+
 (defmacro when-refactoring-it (description before after &rest body)
   "Return a buttercup spec.
 
@@ -56,4 +69,29 @@ DESCRIPTION is the description of the spec."
        ,@body
        (expect (buffer-string) :to-equal ,after))))
 
+(defmacro when-refactoring-with-point-it (description before after &rest body)
+  "Return a buttercup spec.
+
+Like when-refactor-it but also checks whether point is moved to the expected
+position.
+
+BEFORE is the buffer string before refactoring, where a pipe (|) represents
+point.
+
+AFTER is the expected buffer string after refactoring, where a pipe (|)
+represents the expected position of point.
+
+DESCRIPTION is a string with the description of the spec."
+  `(it ,description
+     (let* ((after ,after)
+            (expected-cursor-pos (1+ (s-index-of "|" after)))
+            (expected-state (delete ?| after)))
+       (with-clojure-buffer ,before
+         (goto-char (point-min))
+         (search-forward "|")
+         (delete-char -1)
+         ,@body
+         (expect (buffer-string) :to-equal expected-state)
+         (expect (point) :to-equal expected-cursor-pos)))))
+
 ;;; test-helper.el ends here