@@ -8,8 +8,7 @@ ;; (ns clojure.contrib.test-clojure.data-structures - (:use clojure.contrib.test-is - [clojure.contrib.test-clojure.test-utils :only (all-are)])) + (:use clojure.contrib.test-is)) ;; *** Helper functions *** test/clojure/contrib/test_clojure/data_structures.clj @@ -6,28 +6,25 @@ ;; terms of this license. You must not remove this notice, or any other, ;; from this software. -(ns clojure.contrib.test-clojure.test-utils - (:use [clojure.contrib.combinatorics :only (combinations)])) +(ns clojure.contrib.test-clojure.test-utils) - -(defn exception - "Use this function to ensure that execution of a program doesn't + (defn exception + "Use this function to ensure that execution of a program doesn't reach certain point." - [] - (throw (new Exception "Exception which should never occur"))) - + [] + (throw (new Exception "Exception which should never occur"))) -(defmacro all-are - "Test all-with-all. - (all-are (= _1 _2) - a b c) - => - (do - (is (= a b)) - (is (= a c)) - (is (= b c)))" - [expr & args] - (concat - (list 'clojure.contrib.template/do-template (list 'clojure.contrib.test-is/is expr)) - (apply concat (combinations args 2)))) +;; (defmacro all-are +;; "Test all-with-all. +;; (all-are (= _1 _2) +;; a b c) +;; => +;; (do +;; (is (= a b)) +;; (is (= a c)) +;; (is (= b c)))" +;; [expr & args] +;; (concat +;; (list 'clojure.contrib.template/do-template (list 'clojure.contrib.test-is/is expr)) +;; (apply concat (combinations args 2))))) test/clojure/contrib/test_clojure/test_utils.clj d5f4c4cb9e406236e6aa8c0f1e65b7dcd0bf35af Stuart Halloway stu@thinkrelevance.com http://github.com/stuarthalloway/clojure/commit/30ef397b0c3cac1a62f70fe84315b7f0e2505b89 30ef397b0c3cac1a62f70fe84315b7f0e2505b89 2009-06-23T21:34:22-07:00 2009-06-23T21:34:22-07:00 gtic: break dependency on combinatorics via all-are f98dfda5f201633a2501189eb391695a8df8908e Stuart Halloway stu@thinkrelevance.com