sweeping the floor

Author: tjennings

notes

@@ -2,7 +2,7 @@
 
 (it "finds the tests in the runner_tests folder"
   (expect (find-tests "./runner_tests")
-   to (be_empty) <<<<<<<< ??????
+   to (be :empty) <<<<<<<< ??????
    to (equal '("suite_one.clj")))))
 
-- Assertion failures should report the line number they're failing on
+- Assertion failures should report the line number they're failing on

probe.jar

@@ -3,31 +3,14 @@
 (use 'probe.runner)
 (use 'clojure.contrib.seq-utils)
 
-(defmulti pending-for-type :type)
-
-(defmethod pending-for-type :context [context]
-  (let [tests (:tests context)]
-    (if (empty? tests)
-      true
-      (find-first pending-for-type tests))))
-
-(defmethod pending-for-type :test [test]
-  (empty? (:tests test)))
-
-(defmethod pending-for-type :expects [test]
-  (empty? (:tests test)))
-
-(defn is-pending [coll]
-  (let [result (find-first pending-for-type (flatten [coll]))]
-    (not (or (nil? result) (empty? result)))))
+;; The two default data structures are defined below
+;; Everything is stored as either a context or a test.
 
 (defstruct context-info
   :type
   :doc
   :tests)
 
-;; TODO: There has to be a reasonable way to do this
-;; in clojure
 (def default-context
   (struct-map context-info
     :type :context
@@ -40,6 +23,26 @@
     :doc ""
     :tests []))
 
+(defmulti pending-for-type :type)
+
+(defmethod pending-for-type :context [context]
+  (let [tests (:tests context)]
+    (if (empty? tests)
+      true
+      (find-first pending-for-type tests))))
+
+(defmethod pending-for-type :test [test]
+  (empty? (:tests test)))
+
+(defmethod pending-for-type :expects [test]
+  (empty? (:tests test)))
+
+(defn is-pending [coll]
+  (let [result (find-first pending-for-type (flatten [coll]))]
+    (not (or (nil? result)
+             (empty? result)))))
+
+
 (defn context
   ([doc] (assoc default-context :doc doc))
   ([doc & children]