[#422] Convert tests to buttercup.

Author: anthonygalea

Makefile

@@ -29,7 +29,7 @@ clean:
 	rm -f $(OBJS)
 
 test: $(PKGDIR)
-	$(CASK) exec buttercup -L .
+	$(CASK) exec buttercup -L . -L ./test/
 
 test-checks:
 	$(CASK) exec $(EMACS) --no-site-file --no-site-lisp --batch \

test/clojure-mode-convert-collection-test.el

@@ -26,49 +26,56 @@
 ;;; Code:
 
 (require 'clojure-mode)
-(require 'ert)
-
-(def-refactor-test test-convert-collection-list-map
-  "(:a 1 :b 2)"
-  "{:a 1 :b 2}"
-  (backward-sexp)
-  (down-list)
-  (clojure-convert-collection-to-map))
-
-(def-refactor-test test-convert-collection-map-vector
-  "{:a 1 :b 2}"
-  "[:a 1 :b 2]"
-  (backward-sexp)
-  (down-list)
-  (clojure-convert-collection-to-vector))
-
-(def-refactor-test test-convert-collection-vector-set
-  "[1 2 3]"
-  "#{1 2 3}"
-  (backward-sexp)
-  (down-list)
-  (clojure-convert-collection-to-set))
-
-(def-refactor-test test-convert-collection-set-list
-  "#{1 2 3}"
-  "(1 2 3)"
-  (backward-sexp)
-  (down-list)
-  (clojure-convert-collection-to-list))
-
-(def-refactor-test test-convert-collection-set-quoted-list
-  "#{1 2 3}"
-  "'(1 2 3)"
-  (backward-sexp)
-  (down-list)
-  (clojure-convert-collection-to-quoted-list))
-
-(def-refactor-test test-convert-collection-quoted-list-set
-  "'(1 2 3)"
-  "#{1 2 3}"
-  (backward-sexp)
-  (down-list)
-  (clojure-convert-collection-to-set))
+(require 'test-helper)
+(require 'buttercup)
+
+(describe "clojure-convert-collection-to-map"
+  (when-refactoring-it "should convert a list to a map"
+    "(:a 1 :b 2)"
+    "{:a 1 :b 2}"
+    (backward-sexp)
+    (down-list)
+    (clojure-convert-collection-to-map)))
+
+(describe "clojure-convert-collection-to-vector"
+  (when-refactoring-it "should convert a map to a vector"
+    "{:a 1 :b 2}"
+    "[:a 1 :b 2]"
+    (backward-sexp)
+    (down-list)
+    (clojure-convert-collection-to-vector)))
+
+(describe "clojure-convert-collection-to-set"
+  (when-refactoring-it "should convert a vector to a set"
+    "[1 2 3]"
+    "#{1 2 3}"
+    (backward-sexp)
+    (down-list)
+    (clojure-convert-collection-to-set)))
+
+(describe "clojure-convert-collection-to-list"
+  (when-refactoring-it "should convert a set to a list"
+    "#{1 2 3}"
+    "(1 2 3)"
+    (backward-sexp)
+    (down-list)
+    (clojure-convert-collection-to-list)))
+
+(describe "clojure-convert-collection-to-quoted-list"
+  (when-refactoring-it "should convert a set to a quoted list"
+    "#{1 2 3}"
+    "'(1 2 3)"
+    (backward-sexp)
+    (down-list)
+    (clojure-convert-collection-to-quoted-list)))
+
+(describe "clojure-convert-collection-to-set"
+  (when-refactoring-it "should convert a quoted list to a set"
+    "'(1 2 3)"
+    "#{1 2 3}"
+    (backward-sexp)
+    (down-list)
+    (clojure-convert-collection-to-set)))
 
 (provide 'clojure-mode-convert-collection-test)
 

test/clojure-mode-cycling-test.el

@@ -25,137 +25,170 @@
 ;;; Code:
 
 (require 'clojure-mode)
-(require 'ert)
+(require 'test-helper)
+(require 'buttercup)
 
-(def-refactor-test test-cycle-privacy-public-defn-private-defn
-  "(defn add [a b]
+(describe "clojure-cycle-privacy"
+
+  (when-refactoring-it "should turn a public defn into a private defn"
+    "(defn add [a b]
   (+ a b))"
-  "(defn- add [a b]
+
+    "(defn- add [a b]
   (+ a b))"
-  (clojure-cycle-privacy))
 
-(def-refactor-test test-cycle-privacy-from-sexp-beg
-  "(defn- add [a b]
+    (clojure-cycle-privacy))
+
+  (when-refactoring-it "should also work from the beginning of a sexp"
+     "(defn- add [a b]
   (+ a b))"
-  "(defn add [a b]
+
+     "(defn add [a b]
   (+ a b))"
-  (backward-sexp)
-  (clojure-cycle-privacy))
 
-(def-refactor-test test-cycle-privacy-public-defn-private-defn-metadata
-  "(defn add [a b]
+     (backward-sexp)
+     (clojure-cycle-privacy))
+
+  (when-refactoring-it "should use metadata when clojure-use-metadata-for-privacy is set to true"
+    "(defn add [a b]
   (+ a b))"
-  "(defn ^:private add [a b]
+
+    "(defn ^:private add [a b]
   (+ a b))"
-  (let ((clojure-use-metadata-for-privacy t))
+
+    (let ((clojure-use-metadata-for-privacy t))
       (clojure-cycle-privacy)))
 
-(def-refactor-test test-cycle-privacy-private-defn-public-defn
-  "(defn- add [a b]
+  (when-refactoring-it "should turn a private defn into a public defn"
+    "(defn- add [a b]
   (+ a b))"
-  "(defn add [a b]
+
+    "(defn add [a b]
   (+ a b))"
-  (clojure-cycle-privacy))
 
-(def-refactor-test test-cycle-privacy-private-defn-public-defn-metadata
-  "(defn ^:private add [a b]
+    (clojure-cycle-privacy))
+
+  (when-refactoring-it "should turn a private defn with metadata into a public defn"
+    "(defn ^:private add [a b]
   (+ a b))"
-  "(defn add [a b]
+
+    "(defn add [a b]
   (+ a b))"
-  (let ((clojure-use-metadata-for-privacy t))
-    (clojure-cycle-privacy)))
 
-(def-refactor-test test-cycle-privacy-public-def-private-def
-  "(def ^:dynamic config
+    (let ((clojure-use-metadata-for-privacy t))
+      (clojure-cycle-privacy)))
+
+  (when-refactoring-it "should also work with pre-existing metadata"
+    "(def ^:dynamic config
   \"docs\"
   {:env \"staging\"})"
-  "(def ^:private ^:dynamic config
+
+    "(def ^:private ^:dynamic config
   \"docs\"
   {:env \"staging\"})"
-  (clojure-cycle-privacy))
 
-(def-refactor-test test-cycle-privacy-private-def-public-def
-  "(def ^:private config
+    (clojure-cycle-privacy))
+
+  (when-refactoring-it "should turn a private def with metadata into a public def"
+    "(def ^:private config
   \"docs\"
   {:env \"staging\"})"
-  "(def config
+
+    "(def config
   \"docs\"
   {:env \"staging\"})"
-  (clojure-cycle-privacy))
 
-(def-refactor-test test-cycle-if-inner-if
-  "(if this
+    (clojure-cycle-privacy)))
+
+(describe "clojure-cycle-if"
+
+  (when-refactoring-it "should cycle inner if"
+    "(if this
   (if that
     (then AAA)
     (else BBB))
   (otherwise CCC))"
-  "(if this
+
+    "(if this
   (if-not that
     (else BBB)
     (then AAA))
   (otherwise CCC))"
-  (beginning-of-buffer)
-  (search-forward "BBB)")
-  (clojure-cycle-if))
 
-(def-refactor-test test-cycle-if-outer-if
-  "(if-not this
+    (beginning-of-buffer)
+    (search-forward "BBB)")
+    (clojure-cycle-if))
+
+  (when-refactoring-it "should cycle outer if"
+    "(if-not this
   (if that
     (then AAA)
     (else BBB))
   (otherwise CCC))"
-  "(if this
+
+    "(if this
   (otherwise CCC)
   (if that
     (then AAA)
     (else BBB)))"
-  (beginning-of-buffer)
-  (search-forward "BBB))")
-  (clojure-cycle-if))
 
-(def-refactor-test test-cycle-when-inner-when
-  "(when this
+    (beginning-of-buffer)
+    (search-forward "BBB))")
+    (clojure-cycle-if)))
+
+(describe "clojure-cycle-when"
+
+  (when-refactoring-it "should cycle inner when"
+    "(when this
   (when that
     (aaa)
     (bbb))
   (ccc))"
-  "(when this
+
+    "(when this
   (when-not that
     (aaa)
     (bbb))
   (ccc))"
-  (beginning-of-buffer)
-  (search-forward "bbb)")
-  (clojure-cycle-when))
 
-(def-refactor-test test-cycle-when-outer-when
-  "(when-not this
+    (beginning-of-buffer)
+    (search-forward "bbb)")
+    (clojure-cycle-when))
+
+  (when-refactoring-it "should cycle outer when"
+    "(when-not this
   (when that
     (aaa)
     (bbb))
   (ccc))"
-  "(when this
+
+    "(when this
   (when that
     (aaa)
     (bbb))
   (ccc))"
-  (beginning-of-buffer)
-  (search-forward "bbb))")
-  (clojure-cycle-when))
-
-(def-refactor-test test-cycle-not-add
-  "(ala bala portokala)"
-  "(not (ala bala portokala))"
-  (beginning-of-buffer)
-  (search-forward "bala")
-  (clojure-cycle-not))
-
-(def-refactor-test test-cycle-not-remove
-  "(not (ala bala portokala))"
-  "(ala bala portokala)"
-  (beginning-of-buffer)
-  (search-forward "bala")
-  (clojure-cycle-not))
+
+    (beginning-of-buffer)
+    (search-forward "bbb))")
+    (clojure-cycle-when)))
+
+(describe "clojure-cycle-not"
+
+  (when-refactoring-it "should add a not when missing"
+    "(ala bala portokala)"
+    "(not (ala bala portokala))"
+
+    (beginning-of-buffer)
+    (search-forward "bala")
+    (clojure-cycle-not))
+
+  (when-refactoring-it "should remove a not when present"
+    "(not (ala bala portokala))"
+    "(ala bala portokala)"
+
+    (beginning-of-buffer)
+    (search-forward "bala")
+    (clojure-cycle-not)))
 
 (provide 'clojure-mode-cycling-test)