From d11eae7451b71693a27f263754ffa6ca24d2ad71 Mon Sep 17 00:00:00 2001
From: abscondment <brendan.ribera@gmail.com>
Date: Sun, 7 Mar 2010 23:12:33 -0800
Subject: [PATCH] Separate version check from form generator; add an optional
 test-package argument to the from generator.

---
 src/leiningen/test.clj | 59 ++++++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/src/leiningen/test.clj b/src/leiningen/test.clj
index b1352164..0b6498cd 100644
--- a/src/leiningen/test.clj
+++ b/src/leiningen/test.clj
@@ -5,39 +5,48 @@
         [clojure.contrib.find-namespaces :only [find-namespaces-in-dir]]
         [leiningen.compile :only [eval-in-project]]))
 
+(defn- with-version-guard
+  "Compatibility test to prevent use of clojure.test with Clojure 1.0."
+  [form]
+  `(if (and (= 1 (:major *clojure-version*))
+            (= 0 (:minor *clojure-version*)))
+     (println "\"lein test\" is not compatible with Clojure 1.0 projects.
+Please consider upgrading to a newer version of Clojure or using"
+              "the lein-test-is plugin.")
+     ~form))
+
 (defn form-for-testing-namespaces
   "Return a form that when eval'd in the context of the project will test
 each namespace and print an overall summary."
-  [namespaces]
-  `(do
-     (require ~''clojure.test)
-     (if (and (= 1 (:major *clojure-version*))
-              (= 0 (:minor *clojure-version*)))
-       (println "\"lein test\" is not compatible with Clojure 1.0.\n
-Please consider upgrading to a newer version of Clojure or using"
-                "the lein-test-is plugin.")
-       (let [resolver# (fn [fname#]
-                         (ns-resolve
-                          (find-ns 'clojure.test) fname#))
-             add-numbers# (fn [a# b#] (if (number? a#)
-                                        (+ a# b#) a#))
-             summary# (reduce (fn [summary# n#]
-                                (require n# :reload-all)
-                                (merge-with add-numbers#
-                                            summary#
-                                            ((resolver# ~''run-tests) n#)))
-                              {} '~namespaces)]
-         ((resolver# ~''with-test-out)
+  ([namespaces] (form-for-testing-namespaces namespaces 'clojure.test))
+  ([namespaces test-package]
+     `(do
+        (require '~test-package)
+        (let [resolver# (fn [fname#]
+                          (ns-resolve
+                           (find-ns '~test-package) fname#))
+              add-numbers# (fn [a# b#] (if (number? a#)
+                                         (+ a# b#) a#))
+              summary# (reduce (fn [summary# n#]
+                                 (require n# :reload-all)
+                                 (merge-with add-numbers#
+                                             summary#
+                                             ((resolver# ~''run-tests) n#)))
+                               {} '~namespaces)]
+          ((resolver# ~''with-test-out)
            (println "\n\n--------------------\nTotal:")
            ((resolver# ~''report) summary#))
-         (when-not (= "1.5" (System/getProperty "java.specification.version"))
-           (shutdown-agents))))))
+          (when-not (= "1.5" (System/getProperty "java.specification.version"))
+            (shutdown-agents))))))
 
 (defn test
-  "Run the project's tests. Accept a list of namespaces for which to run all
-tests for. If none are given, runs them all."
+  "Run the project's tests. Accepts a list of namespaces for which to run all
+tests. If none are given, runs them all."
   [project & namespaces]
   (let [namespaces (if (empty? namespaces)
                      (find-namespaces-in-dir (file (:test-path project)))
                      (map symbol namespaces))]
-    (eval-in-project project (form-for-testing-namespaces namespaces))))
+    (eval-in-project
+     project
+     (with-version-guard
+       (form-for-testing-namespaces namespaces)))))