Tests are updated to use check

This commit is contained in:
Paul deGrandis 2012-03-25 23:33:00 -04:00
parent a2bd09a14c
commit 9fe63a2f90
2 changed files with 9 additions and 10 deletions

View file

@ -1,5 +1,5 @@
(ns kibit.test.control-structures
(:require [kibit.core :as kibit])
(:require [kibit.check :as kibit])
(:use [clojure.test]))
;; ==========
@ -12,10 +12,9 @@
(deftest control-structures-are
(are [expected-alt-form test-form]
(= expected-alt-form (:alt (kibit/simplify test-form)))
; These two below require a recursive simplify
;'(println "X") '(if true (println "X") nil)
;'(println "X") '(if true (println "X"))
(= expected-alt-form (:alt (kibit/check-expr test-form)))
'(println "X") '(if true (println "X") nil)
'(println "X") '(if true (println "X"))
'(when-not test else) '(if test nil else)
'(when test then) '(if test then nil)))

View file

@ -1,10 +1,10 @@
(ns kibit.test.core
(:require [kibit.core :as kibit])
(:require [kibit.check :as kibit])
(:use [clojure.test]))
(deftest simplify-alts
(are [expected-alt test-form]
(= expected-alt (:alt (kibit/simplify test-form)))
(= expected-alt (:alt (kibit/check-expr test-form)))
[1 2 3] '(do [1 2 3])
[] '(do [])
"Hello" '(do "Hello")
@ -14,15 +14,15 @@
(deftest simplify-exprs
(are [expected-expr test-expr]
(= expected-expr (:expr (kibit/simplify test-expr)))
(= expected-expr (:expr (kibit/check-expr test-expr)))
'(do [1 2 3]) '(do [1 2 3])
nil '(if (> 2 3) :one :two)))
(deftest simplify-deep
(is (= :one
(:alt (kibit/simplify '(if (= 0 0) :one nil))))))
(:alt (kibit/check-expr '(if (= 0 0) :one nil))))))
(deftest simplify-one
(is (= '(when (= 0 0) :one)
(:alt (kibit/simplify-one '(if (= 0 0) :one nil))))))
(:alt (kibit/check-expr '(if (= 0 0) :one nil) :resolution :subform)))))