aboutsummaryrefslogtreecommitdiff
path: root/src/clojure/contrib/test_contrib
diff options
context:
space:
mode:
Diffstat (limited to 'src/clojure/contrib/test_contrib')
-rw-r--r--src/clojure/contrib/test_contrib/complex_numbers.clj313
-rw-r--r--src/clojure/contrib/test_contrib/fnmap.clj39
-rw-r--r--src/clojure/contrib/test_contrib/greatest_least.clj65
-rw-r--r--src/clojure/contrib/test_contrib/java_utils.clj10
-rw-r--r--src/clojure/contrib/test_contrib/macro_utils.clj67
-rw-r--r--src/clojure/contrib/test_contrib/mock_test.clj131
-rw-r--r--src/clojure/contrib/test_contrib/mock_test/test_adapter_test.clj18
-rw-r--r--src/clojure/contrib/test_contrib/monads.clj78
-rw-r--r--src/clojure/contrib/test_contrib/pprint/cl_format.clj670
-rw-r--r--src/clojure/contrib/test_contrib/pprint/helper.clj21
-rw-r--r--src/clojure/contrib/test_contrib/pprint/pretty.clj127
-rw-r--r--src/clojure/contrib/test_contrib/seq_utils_test.clj127
-rw-r--r--src/clojure/contrib/test_contrib/shell_out.clj41
-rw-r--r--src/clojure/contrib/test_contrib/str_utils.clj33
-rw-r--r--src/clojure/contrib/test_contrib/str_utils2.clj119
-rw-r--r--src/clojure/contrib/test_contrib/test_dataflow.clj90
-rw-r--r--src/clojure/contrib/test_contrib/test_graph.clj187
-rw-r--r--src/clojure/contrib/test_contrib/test_java_utils.clj123
-rw-r--r--src/clojure/contrib/test_contrib/test_jmx.clj166
-rw-r--r--src/clojure/contrib/test_contrib/test_lazy_seqs.clj21
-rw-r--r--src/clojure/contrib/test_contrib/test_trace.clj16
-rw-r--r--src/clojure/contrib/test_contrib/walk.clj34
-rw-r--r--src/clojure/contrib/test_contrib/with_ns_test.clj19
23 files changed, 0 insertions, 2515 deletions
diff --git a/src/clojure/contrib/test_contrib/complex_numbers.clj b/src/clojure/contrib/test_contrib/complex_numbers.clj
deleted file mode 100644
index 7498e897..00000000
--- a/src/clojure/contrib/test_contrib/complex_numbers.clj
+++ /dev/null
@@ -1,313 +0,0 @@
-;; Test routines for complex-numbers.clj
-
-;; by Konrad Hinsen
-;; last updated April 2, 2009
-
-;; Copyright (c) Konrad Hinsen, 2008. All rights reserved. The use
-;; and distribution terms for this software are covered by the Eclipse
-;; Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
-;; which can be found in the file epl-v10.html at the root of this
-;; distribution. By using this software in any fashion, you are
-;; agreeing to be bound by the terms of this license. You must not
-;; remove this notice, or any other, from this software.
-
-(ns clojure.contrib.test-contrib.complex-numbers
- (:refer-clojure :exclude [+ - * / = < > <= >=])
- (:use [clojure.test
- :only (deftest is are run-tests)]
- [clojure.contrib.generic.arithmetic
- :only (+ - * /)]
- [clojure.contrib.generic.comparison
- :only (= < > <= >=)]
- [clojure.contrib.generic.math-functions
- :only (abs approx= conjugate exp sqr sqrt)]
- [clojure.contrib.complex-numbers
- :only (complex imaginary real imag)]))
-
-(deftest complex-addition
- (is (= (+ (complex 1 2) (complex 1 2)) (complex 2 4)))
- (is (= (+ (complex 1 2) (complex -3 -7)) (complex -2 -5)))
- (is (= (+ (complex -3 -7) (complex 1 2)) (complex -2 -5)))
- (is (= (+ (complex 1 2) 3) (complex 4 2)))
- (is (= (+ 3 (complex 1 2)) (complex 4 2)))
- (is (= (+ (complex 1 2) -1) (imaginary 2)))
- (is (= (+ -1 (complex 1 2)) (imaginary 2)))
- (is (= (+ (complex 1 2) (imaginary -2)) 1))
- (is (= (+ (imaginary -2) (complex 1 2)) 1))
- (is (= (+ (complex 1 2) (imaginary 5)) (complex 1 7)))
- (is (= (+ (imaginary 5) (complex 1 2)) (complex 1 7)))
- (is (= (+ (complex -3 -7) (complex 1 2)) (complex -2 -5)))
- (is (= (+ (complex 1 2) (complex -3 -7)) (complex -2 -5)))
- (is (= (+ (complex -3 -7) (complex -3 -7)) (complex -6 -14)))
- (is (= (+ (complex -3 -7) 3) (imaginary -7)))
- (is (= (+ 3 (complex -3 -7)) (imaginary -7)))
- (is (= (+ (complex -3 -7) -1) (complex -4 -7)))
- (is (= (+ -1 (complex -3 -7)) (complex -4 -7)))
- (is (= (+ (complex -3 -7) (imaginary -2)) (complex -3 -9)))
- (is (= (+ (imaginary -2) (complex -3 -7)) (complex -3 -9)))
- (is (= (+ (complex -3 -7) (imaginary 5)) (complex -3 -2)))
- (is (= (+ (imaginary 5) (complex -3 -7)) (complex -3 -2)))
- (is (= (+ 3 (complex 1 2)) (complex 4 2)))
- (is (= (+ (complex 1 2) 3) (complex 4 2)))
- (is (= (+ 3 (complex -3 -7)) (imaginary -7)))
- (is (= (+ (complex -3 -7) 3) (imaginary -7)))
- (is (= (+ 3 (imaginary -2)) (complex 3 -2)))
- (is (= (+ (imaginary -2) 3) (complex 3 -2)))
- (is (= (+ 3 (imaginary 5)) (complex 3 5)))
- (is (= (+ (imaginary 5) 3) (complex 3 5)))
- (is (= (+ -1 (complex 1 2)) (imaginary 2)))
- (is (= (+ (complex 1 2) -1) (imaginary 2)))
- (is (= (+ -1 (complex -3 -7)) (complex -4 -7)))
- (is (= (+ (complex -3 -7) -1) (complex -4 -7)))
- (is (= (+ -1 (imaginary -2)) (complex -1 -2)))
- (is (= (+ (imaginary -2) -1) (complex -1 -2)))
- (is (= (+ -1 (imaginary 5)) (complex -1 5)))
- (is (= (+ (imaginary 5) -1) (complex -1 5)))
- (is (= (+ (imaginary -2) (complex 1 2)) 1))
- (is (= (+ (complex 1 2) (imaginary -2)) 1))
- (is (= (+ (imaginary -2) (complex -3 -7)) (complex -3 -9)))
- (is (= (+ (complex -3 -7) (imaginary -2)) (complex -3 -9)))
- (is (= (+ (imaginary -2) 3) (complex 3 -2)))
- (is (= (+ 3 (imaginary -2)) (complex 3 -2)))
- (is (= (+ (imaginary -2) -1) (complex -1 -2)))
- (is (= (+ -1 (imaginary -2)) (complex -1 -2)))
- (is (= (+ (imaginary -2) (imaginary -2)) (imaginary -4)))
- (is (= (+ (imaginary -2) (imaginary 5)) (imaginary 3)))
- (is (= (+ (imaginary 5) (imaginary -2)) (imaginary 3)))
- (is (= (+ (imaginary 5) (complex 1 2)) (complex 1 7)))
- (is (= (+ (complex 1 2) (imaginary 5)) (complex 1 7)))
- (is (= (+ (imaginary 5) (complex -3 -7)) (complex -3 -2)))
- (is (= (+ (complex -3 -7) (imaginary 5)) (complex -3 -2)))
- (is (= (+ (imaginary 5) 3) (complex 3 5)))
- (is (= (+ 3 (imaginary 5)) (complex 3 5)))
- (is (= (+ (imaginary 5) -1) (complex -1 5)))
- (is (= (+ -1 (imaginary 5)) (complex -1 5)))
- (is (= (+ (imaginary 5) (imaginary -2)) (imaginary 3)))
- (is (= (+ (imaginary -2) (imaginary 5)) (imaginary 3)))
- (is (= (+ (imaginary 5) (imaginary 5)) (imaginary 10))))
-
-(deftest complex-subtraction
- (is (= (- (complex 1 2) (complex 1 2)) 0))
- (is (= (- (complex 1 2) (complex -3 -7)) (complex 4 9)))
- (is (= (- (complex -3 -7) (complex 1 2)) (complex -4 -9)))
- (is (= (- (complex 1 2) 3) (complex -2 2)))
- (is (= (- 3 (complex 1 2)) (complex 2 -2)))
- (is (= (- (complex 1 2) -1) (complex 2 2)))
- (is (= (- -1 (complex 1 2)) (complex -2 -2)))
- (is (= (- (complex 1 2) (imaginary -2)) (complex 1 4)))
- (is (= (- (imaginary -2) (complex 1 2)) (complex -1 -4)))
- (is (= (- (complex 1 2) (imaginary 5)) (complex 1 -3)))
- (is (= (- (imaginary 5) (complex 1 2)) (complex -1 3)))
- (is (= (- (complex -3 -7) (complex 1 2)) (complex -4 -9)))
- (is (= (- (complex 1 2) (complex -3 -7)) (complex 4 9)))
- (is (= (- (complex -3 -7) (complex -3 -7)) 0))
- (is (= (- (complex -3 -7) 3) (complex -6 -7)))
- (is (= (- 3 (complex -3 -7)) (complex 6 7)))
- (is (= (- (complex -3 -7) -1) (complex -2 -7)))
- (is (= (- -1 (complex -3 -7)) (complex 2 7)))
- (is (= (- (complex -3 -7) (imaginary -2)) (complex -3 -5)))
- (is (= (- (imaginary -2) (complex -3 -7)) (complex 3 5)))
- (is (= (- (complex -3 -7) (imaginary 5)) (complex -3 -12)))
- (is (= (- (imaginary 5) (complex -3 -7)) (complex 3 12)))
- (is (= (- 3 (complex 1 2)) (complex 2 -2)))
- (is (= (- (complex 1 2) 3) (complex -2 2)))
- (is (= (- 3 (complex -3 -7)) (complex 6 7)))
- (is (= (- (complex -3 -7) 3) (complex -6 -7)))
- (is (= (- 3 (imaginary -2)) (complex 3 2)))
- (is (= (- (imaginary -2) 3) (complex -3 -2)))
- (is (= (- 3 (imaginary 5)) (complex 3 -5)))
- (is (= (- (imaginary 5) 3) (complex -3 5)))
- (is (= (- -1 (complex 1 2)) (complex -2 -2)))
- (is (= (- (complex 1 2) -1) (complex 2 2)))
- (is (= (- -1 (complex -3 -7)) (complex 2 7)))
- (is (= (- (complex -3 -7) -1) (complex -2 -7)))
- (is (= (- -1 (imaginary -2)) (complex -1 2)))
- (is (= (- (imaginary -2) -1) (complex 1 -2)))
- (is (= (- -1 (imaginary 5)) (complex -1 -5)))
- (is (= (- (imaginary 5) -1) (complex 1 5)))
- (is (= (- (imaginary -2) (complex 1 2)) (complex -1 -4)))
- (is (= (- (complex 1 2) (imaginary -2)) (complex 1 4)))
- (is (= (- (imaginary -2) (complex -3 -7)) (complex 3 5)))
- (is (= (- (complex -3 -7) (imaginary -2)) (complex -3 -5)))
- (is (= (- (imaginary -2) 3) (complex -3 -2)))
- (is (= (- 3 (imaginary -2)) (complex 3 2)))
- (is (= (- (imaginary -2) -1) (complex 1 -2)))
- (is (= (- -1 (imaginary -2)) (complex -1 2)))
- (is (= (- (imaginary -2) (imaginary -2)) 0))
- (is (= (- (imaginary -2) (imaginary 5)) (imaginary -7)))
- (is (= (- (imaginary 5) (imaginary -2)) (imaginary 7)))
- (is (= (- (imaginary 5) (complex 1 2)) (complex -1 3)))
- (is (= (- (complex 1 2) (imaginary 5)) (complex 1 -3)))
- (is (= (- (imaginary 5) (complex -3 -7)) (complex 3 12)))
- (is (= (- (complex -3 -7) (imaginary 5)) (complex -3 -12)))
- (is (= (- (imaginary 5) 3) (complex -3 5)))
- (is (= (- 3 (imaginary 5)) (complex 3 -5)))
- (is (= (- (imaginary 5) -1) (complex 1 5)))
- (is (= (- -1 (imaginary 5)) (complex -1 -5)))
- (is (= (- (imaginary 5) (imaginary -2)) (imaginary 7)))
- (is (= (- (imaginary -2) (imaginary 5)) (imaginary -7)))
- (is (= (- (imaginary 5) (imaginary 5)) 0)))
-
-(deftest complex-multiplication
- (is (= (* (complex 1 2) (complex 1 2)) (complex -3 4)))
- (is (= (* (complex 1 2) (complex -3 -7)) (complex 11 -13)))
- (is (= (* (complex -3 -7) (complex 1 2)) (complex 11 -13)))
- (is (= (* (complex 1 2) 3) (complex 3 6)))
- (is (= (* 3 (complex 1 2)) (complex 3 6)))
- (is (= (* (complex 1 2) -1) (complex -1 -2)))
- (is (= (* -1 (complex 1 2)) (complex -1 -2)))
- (is (= (* (complex 1 2) (imaginary -2)) (complex 4 -2)))
- (is (= (* (imaginary -2) (complex 1 2)) (complex 4 -2)))
- (is (= (* (complex 1 2) (imaginary 5)) (complex -10 5)))
- (is (= (* (imaginary 5) (complex 1 2)) (complex -10 5)))
- (is (= (* (complex -3 -7) (complex 1 2)) (complex 11 -13)))
- (is (= (* (complex 1 2) (complex -3 -7)) (complex 11 -13)))
- (is (= (* (complex -3 -7) (complex -3 -7)) (complex -40 42)))
- (is (= (* (complex -3 -7) 3) (complex -9 -21)))
- (is (= (* 3 (complex -3 -7)) (complex -9 -21)))
- (is (= (* (complex -3 -7) -1) (complex 3 7)))
- (is (= (* -1 (complex -3 -7)) (complex 3 7)))
- (is (= (* (complex -3 -7) (imaginary -2)) (complex -14 6)))
- (is (= (* (imaginary -2) (complex -3 -7)) (complex -14 6)))
- (is (= (* (complex -3 -7) (imaginary 5)) (complex 35 -15)))
- (is (= (* (imaginary 5) (complex -3 -7)) (complex 35 -15)))
- (is (= (* 3 (complex 1 2)) (complex 3 6)))
- (is (= (* (complex 1 2) 3) (complex 3 6)))
- (is (= (* 3 (complex -3 -7)) (complex -9 -21)))
- (is (= (* (complex -3 -7) 3) (complex -9 -21)))
- (is (= (* 3 (imaginary -2)) (imaginary -6)))
- (is (= (* (imaginary -2) 3) (imaginary -6)))
- (is (= (* 3 (imaginary 5)) (imaginary 15)))
- (is (= (* (imaginary 5) 3) (imaginary 15)))
- (is (= (* -1 (complex 1 2)) (complex -1 -2)))
- (is (= (* (complex 1 2) -1) (complex -1 -2)))
- (is (= (* -1 (complex -3 -7)) (complex 3 7)))
- (is (= (* (complex -3 -7) -1) (complex 3 7)))
- (is (= (* -1 (imaginary -2)) (imaginary 2)))
- (is (= (* (imaginary -2) -1) (imaginary 2)))
- (is (= (* -1 (imaginary 5)) (imaginary -5)))
- (is (= (* (imaginary 5) -1) (imaginary -5)))
- (is (= (* (imaginary -2) (complex 1 2)) (complex 4 -2)))
- (is (= (* (complex 1 2) (imaginary -2)) (complex 4 -2)))
- (is (= (* (imaginary -2) (complex -3 -7)) (complex -14 6)))
- (is (= (* (complex -3 -7) (imaginary -2)) (complex -14 6)))
- (is (= (* (imaginary -2) 3) (imaginary -6)))
- (is (= (* 3 (imaginary -2)) (imaginary -6)))
- (is (= (* (imaginary -2) -1) (imaginary 2)))
- (is (= (* -1 (imaginary -2)) (imaginary 2)))
- (is (= (* (imaginary -2) (imaginary -2)) -4))
- (is (= (* (imaginary -2) (imaginary 5)) 10))
- (is (= (* (imaginary 5) (imaginary -2)) 10))
- (is (= (* (imaginary 5) (complex 1 2)) (complex -10 5)))
- (is (= (* (complex 1 2) (imaginary 5)) (complex -10 5)))
- (is (= (* (imaginary 5) (complex -3 -7)) (complex 35 -15)))
- (is (= (* (complex -3 -7) (imaginary 5)) (complex 35 -15)))
- (is (= (* (imaginary 5) 3) (imaginary 15)))
- (is (= (* 3 (imaginary 5)) (imaginary 15)))
- (is (= (* (imaginary 5) -1) (imaginary -5)))
- (is (= (* -1 (imaginary 5)) (imaginary -5)))
- (is (= (* (imaginary 5) (imaginary -2)) 10))
- (is (= (* (imaginary -2) (imaginary 5)) 10))
- (is (= (* (imaginary 5) (imaginary 5)) -25)))
-
-(deftest complex-division
- (is (= (/ (complex 1 2) (complex 1 2)) 1))
- (is (= (/ (complex 1 2) (complex -3 -7)) (complex -17/58 1/58)))
- (is (= (/ (complex -3 -7) (complex 1 2)) (complex -17/5 -1/5)))
- (is (= (/ (complex 1 2) 3) (complex 1/3 2/3)))
- (is (= (/ 3 (complex 1 2)) (complex 3/5 -6/5)))
- (is (= (/ (complex 1 2) -1) (complex -1 -2)))
- (is (= (/ -1 (complex 1 2)) (complex -1/5 2/5)))
- (is (= (/ (complex 1 2) (imaginary -2)) (complex -1 1/2)))
- (is (= (/ (imaginary -2) (complex 1 2)) (complex -4/5 -2/5)))
- (is (= (/ (complex 1 2) (imaginary 5)) (complex 2/5 -1/5)))
- (is (= (/ (imaginary 5) (complex 1 2)) (complex 2 1)))
- (is (= (/ (complex -3 -7) (complex 1 2)) (complex -17/5 -1/5)))
- (is (= (/ (complex 1 2) (complex -3 -7)) (complex -17/58 1/58)))
- (is (= (/ (complex -3 -7) (complex -3 -7)) 1))
- (is (= (/ (complex -3 -7) 3) (complex -1 -7/3)))
- (is (= (/ 3 (complex -3 -7)) (complex -9/58 21/58)))
- (is (= (/ (complex -3 -7) -1) (complex 3 7)))
- (is (= (/ -1 (complex -3 -7)) (complex 3/58 -7/58)))
- (is (= (/ (complex -3 -7) (imaginary -2)) (complex 7/2 -3/2)))
- (is (= (/ (imaginary -2) (complex -3 -7)) (complex 7/29 3/29)))
- (is (= (/ (complex -3 -7) (imaginary 5)) (complex -7/5 3/5)))
- (is (= (/ (imaginary 5) (complex -3 -7)) (complex -35/58 -15/58)))
- (is (= (/ 3 (complex 1 2)) (complex 3/5 -6/5)))
- (is (= (/ (complex 1 2) 3) (complex 1/3 2/3)))
- (is (= (/ 3 (complex -3 -7)) (complex -9/58 21/58)))
- (is (= (/ (complex -3 -7) 3) (complex -1 -7/3)))
- (is (= (/ 3 (imaginary -2)) (imaginary 1.5)))
- (is (= (/ (imaginary -2) 3) (imaginary -2/3)))
- (is (= (/ 3 (imaginary 5)) (imaginary -3/5)))
- (is (= (/ (imaginary 5) 3) (imaginary 5/3)))
- (is (= (/ -1 (complex 1 2)) (complex -1/5 2/5)))
- (is (= (/ (complex 1 2) -1) (complex -1 -2)))
- (is (= (/ -1 (complex -3 -7)) (complex 3/58 -7/58)))
- (is (= (/ (complex -3 -7) -1) (complex 3 7)))
- (is (= (/ -1 (imaginary -2)) (imaginary -1/2)))
- (is (= (/ (imaginary -2) -1) (imaginary 2)))
- (is (= (/ -1 (imaginary 5)) (imaginary 1/5)))
- (is (= (/ (imaginary 5) -1) (imaginary -5)))
- (is (= (/ (imaginary -2) (complex 1 2)) (complex -4/5 -2/5)))
- (is (= (/ (complex 1 2) (imaginary -2)) (complex -1 1/2)))
- (is (= (/ (imaginary -2) (complex -3 -7)) (complex 7/29 3/29)))
- (is (= (/ (complex -3 -7) (imaginary -2)) (complex 7/2 -3/2)))
- (is (= (/ (imaginary -2) 3) (imaginary -2/3)))
- (is (= (/ 3 (imaginary -2)) (imaginary 3/2)))
- (is (= (/ (imaginary -2) -1) (imaginary 2)))
- (is (= (/ -1 (imaginary -2)) (imaginary -1/2)))
- (is (= (/ (imaginary -2) (imaginary -2)) 1))
- (is (= (/ (imaginary -2) (imaginary 5)) -2/5))
- (is (= (/ (imaginary 5) (imaginary -2)) -5/2))
- (is (= (/ (imaginary 5) (complex 1 2)) (complex 2 1)))
- (is (= (/ (complex 1 2) (imaginary 5)) (complex 2/5 -1/5)))
- (is (= (/ (imaginary 5) (complex -3 -7)) (complex -35/58 -15/58)))
- (is (= (/ (complex -3 -7) (imaginary 5)) (complex -7/5 3/5)))
- (is (= (/ (imaginary 5) 3) (imaginary 5/3)))
- (is (= (/ 3 (imaginary 5)) (imaginary -3/5)))
- (is (= (/ (imaginary 5) -1) (imaginary -5)))
- (is (= (/ -1 (imaginary 5)) (imaginary 1/5)))
- (is (= (/ (imaginary 5) (imaginary -2)) -5/2))
- (is (= (/ (imaginary -2) (imaginary 5)) -2/5))
- (is (= (/ (imaginary 5) (imaginary 5)) 1)))
-
-(deftest complex-conjugate
- (is (= (conjugate (complex 1 2)) (complex 1 -2)))
- (is (= (conjugate (complex -3 -7)) (complex -3 7)))
- (is (= (conjugate (imaginary -2)) (imaginary 2)))
- (is (= (conjugate (imaginary 5)) (imaginary -5))))
-
-(deftest complex-abs
- (doseq [c [(complex 1 2) (complex -2 3) (complex 4 -2)
- (complex -3 -7) (imaginary -2) (imaginary 5)]]
- (is (approx= (* c (conjugate c))
- (sqr (abs c))
- 1e-14))))
-
-(deftest complex-sqrt
- (doseq [c [(complex 1 2) (complex -2 3) (complex 4 -2)
- (complex -3 -7) (imaginary -2) (imaginary 5)]]
- (let [r (sqrt c)]
- (is (approx= c (sqr r) 1e-14))
- (is (>= (real r) 0)))))
-
-(deftest complex-exp
- (is (approx= (exp (complex 1 2))
- (complex -1.1312043837568135 2.4717266720048188)
- 1e-14))
- (is (approx= (exp (complex 2 3))
- (complex -7.3151100949011028 1.0427436562359045)
- 1e-14))
- (is (approx= (exp (complex 4 -2))
- (complex -22.720847417619233 -49.645957334580565)
- 1e-14))
- (is (approx= (exp (complex 3 -7))
- (complex 15.142531566086868 -13.195928586605717)
- 1e-14))
- (is (approx= (exp (imaginary -2))
- (complex -0.41614683654714241 -0.90929742682568171)
- 1e-14))
- (is (approx= (exp (imaginary 5))
- (complex 0.2836621854632263 -0.95892427466313845)
- 1e-14)))
diff --git a/src/clojure/contrib/test_contrib/fnmap.clj b/src/clojure/contrib/test_contrib/fnmap.clj
deleted file mode 100644
index 7fe87cc3..00000000
--- a/src/clojure/contrib/test_contrib/fnmap.clj
+++ /dev/null
@@ -1,39 +0,0 @@
-(ns clojure.contrib.test-contrib.fnmap
- (:use clojure.contrib.fnmap
- clojure.test))
-
-(deftest acts-like-map
- (let [m1 (fnmap get assoc :key1 1 :key2 2)]
- (are [k v] (= v (get m1 k))
- :key1 1
- :key2 2
- :nonexistent-key nil)
- (are [k v] (= v (k m1))
- :key1 1
- :key2 2
- :nonexistent-key nil)
- (let [m2 (assoc m1 :key3 3 :key4 4)]
- (are [k v] (= v (get m2 k))
- :key1 1
- :key2 2
- :key3 3
- :key4 4
- :nonexistent-key nil))))
-
-(defn assoc-validate [m key value]
- (if (integer? value)
- (assoc m key value)
- (throw (Exception. "Only integers allowed in this map!"))))
-
-(deftest validators
- (let [m (fnmap get assoc-validate)]
- (is (= 2 (:key2 (assoc m :key2 2))))
- (is (thrown? Exception (assoc m :key3 3.14)))))
-
-(defn get-transform [m key]
- (when-let [value (m key)]
- (- value)))
-
-(deftest transforms
- (let [m (fnmap get-transform assoc)]
- (is (= -2 (:key2 (assoc m :key2 2))))))
diff --git a/src/clojure/contrib/test_contrib/greatest_least.clj b/src/clojure/contrib/test_contrib/greatest_least.clj
deleted file mode 100644
index f273aaf2..00000000
--- a/src/clojure/contrib/test_contrib/greatest_least.clj
+++ /dev/null
@@ -1,65 +0,0 @@
-(ns clojure.contrib.test-contrib.greatest-least
- (:use clojure.contrib.greatest-least
- [clojure.test :only (is deftest run-tests)]))
-
-(deftest test-greatest
- (is (nil? (greatest)) "greatest with no arguments is nil")
- (is (= 1 (greatest 1)))
- (is (= 2 (greatest 1 2)))
- (is (= 2 (greatest 2 1)))
- (is (= "b" (greatest "aa" "b"))))
-
-(deftest test-greatest-by
- (is (nil? (greatest-by identity)) "greatest-by with no arguments is nil")
- (is (= "" (greatest-by count "")))
- (is (= "a" (greatest-by count "a" "")))
- (is (= "a" (greatest-by count "" "a")))
- (is (= "aa" (greatest-by count "aa" "b"))))
-
-(deftest test-least
- (is (nil? (least)) "least with no arguments is nil")
- (is (= 1 (least 1)))
- (is (= 1 (least 1 2)))
- (is (= 1 (least 2 1)))
- (is (= "aa" (least "aa" "b"))))
-
-(deftest test-least-by
- (is (nil? (least-by identity)) "least-by with no arguments is nil")
- (is (= "" (least-by count "")))
- (is (= "" (least-by count "a" "")))
- (is (= "" (least-by count "" "a")))
- (is (= "b" (least-by count "aa" "b"))))
-
-(deftest test-all-greatest
- (is (nil? (all-greatest)) "all-greatest with no arguments is nil")
- (is (= (list 1) (all-greatest 1)))
- (is (= (list 1 1) (all-greatest 1 1)))
- (is (= (list 2) (all-greatest 2 1 1)))
- (is (= (list 2) (all-greatest 1 2 1)))
- (is (= (list 2) (all-greatest 1 1 2)))
- (is (= (list :c) (all-greatest :b :c :a))))
-
-(deftest test-all-greatest-by
- (is (nil? (all-greatest-by identity)) "all-greatest-by with no arguments is nil")
- (is (= (list "a")) (all-greatest-by count "a"))
- (is (= (list "a" "a")) (all-greatest-by count "a" "a"))
- (is (= (list "aa")) (all-greatest-by count "aa" "b"))
- (is (= (list "aa")) (all-greatest-by count "b" "aa" "c"))
- (is (= (list "cc" "aa")) (all-greatest-by count "aa" "b" "cc")))
-
-(deftest test-all-least
- (is (nil? (all-least)) "all-least with no arguments is nil")
- (is (= (list 1) (all-least 1)))
- (is (= (list 1 1) (all-least 1 1)))
- (is (= (list 1 1) (all-least 2 1 1)))
- (is (= (list 1 1) (all-least 1 2 1)))
- (is (= (list 1 1) (all-least 1 1 2)))
- (is (= (list :a) (all-least :b :c :a))))
-
-(deftest test-all-least-by
- (is (nil? (all-least-by identity)) "all-least-by with no arguments is nil")
- (is (= (list "a")) (all-least-by count "a"))
- (is (= (list "a" "a")) (all-least-by count "a" "a"))
- (is (= (list "b")) (all-least-by count "aa" "b"))
- (is (= (list "c" "b")) (all-least-by count "b" "aa" "c"))
- (is (= (list "b")) (all-least-by count "aa" "b" "cc")))
diff --git a/src/clojure/contrib/test_contrib/java_utils.clj b/src/clojure/contrib/test_contrib/java_utils.clj
deleted file mode 100644
index 44901ad1..00000000
--- a/src/clojure/contrib/test_contrib/java_utils.clj
+++ /dev/null
@@ -1,10 +0,0 @@
-(ns clojure.contrib.test-contrib.java-utils
- (:use clojure.test clojure.contrib.java-utils))
-
-(deftest t-as-str
- (is (= "foo" (as-str "foo")))
- (is (= "foo" (as-str 'foo)))
- (is (= "foo" (as-str :foo)))
- (is (= "[1 2 3]" (as-str [1 2 3])))
- (is (= "Hello, World!" (as-str "Hello, " :World \!)))
- (is (= (str {:foo :bar}) (as-str {:foo :bar}))))
diff --git a/src/clojure/contrib/test_contrib/macro_utils.clj b/src/clojure/contrib/test_contrib/macro_utils.clj
deleted file mode 100644
index ac1ced06..00000000
--- a/src/clojure/contrib/test_contrib/macro_utils.clj
+++ /dev/null
@@ -1,67 +0,0 @@
-;; Test routines for macro_utils.clj
-
-;; by Konrad Hinsen
-;; last updated May 6, 2009
-
-;; Copyright (c) Konrad Hinsen, 2008. All rights reserved. The use
-;; and distribution terms for this software are covered by the Eclipse
-;; Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
-;; which can be found in the file epl-v10.html at the root of this
-;; distribution. By using this software in any fashion, you are
-;; agreeing to be bound by the terms of this license. You must not
-;; remove this notice, or any other, from this software.
-
-(ns clojure.contrib.test-contrib.macro-utils
- (:use [clojure.test :only (deftest is are run-tests use-fixtures)]
- [clojure.contrib.macro-utils
- :only (macrolet symbol-macrolet defsymbolmacro with-symbol-macros
- mexpand-1 mexpand mexpand-all)]
- [clojure.contrib.monads
- :only (with-monad domonad)]))
-
-(use-fixtures :each
- (fn [f] (binding [*ns* (the-ns 'clojure.contrib.test-contrib.macro-utils)]
- (f))))
-
-(deftest macrolet-test
- (is (= (macroexpand-1
- '(macrolet [(foo [form] `(~form ~form))] (foo x)))
- '(do (x x)))))
-
-(deftest symbol-macrolet-test
- (is (= (macroexpand-1
- '(symbol-macrolet [x xx y yy]
- (exp [a y] (x y))))
- '(do (exp [a yy] (xx yy)))))
- (is (= (macroexpand-1
- '(symbol-macrolet [def foo]
- (def def def)))
- '(do (def def foo))))
- (is (= (macroexpand-1
- '(symbol-macrolet [x foo z bar]
- (let [a x b y x b] [a b x z])))
- '(do (let* [a foo b y x b] [a b x bar]))))
- (is (= (macroexpand-1
- '(symbol-macrolet [x foo z bar]
- (fn ([x y] [x y z]) ([x y z] [x y z]))))
- '(do (fn* ([x y] [x y bar]) ([x y z] [x y z])))))
- (is (= (macroexpand-1
- '(symbol-macrolet [x foo z bar]
- (fn f ([x y] [x y z]) ([x y z] [x y z]))))
- '(do (fn* f ([x y] [x y bar]) ([x y z] [x y z])))))
- (is (= (nth (second (macroexpand-1
- '(symbol-macrolet [x xx y yy z zz]
- (domonad m [a x b y x z] [a b x z])))) 2)
- '(do (m-bind xx (fn* ([a]
- (m-bind yy (fn* ([b]
- (m-bind zz (fn* ([x]
- (m-result [a b x zz]))))))))))))))
-
-(deftest symbol-test
- (defsymbolmacro sum-2-3 (plus 2 3))
- (is (= (macroexpand '(with-symbol-macros (+ 1 sum-2-3)))
- '(do (+ 1 (plus 2 3)))))
- (is (= (macroexpand '(macrolet [(plus [a b] `(+ ~a ~b))] (+ 1 sum-2-3)))
- '(do (+ 1 (clojure.core/+ 2 3)))))
- (ns-unmap *ns* 'sum-2-3))
-
diff --git a/src/clojure/contrib/test_contrib/mock_test.clj b/src/clojure/contrib/test_contrib/mock_test.clj
deleted file mode 100644
index 1737305e..00000000
--- a/src/clojure/contrib/test_contrib/mock_test.clj
+++ /dev/null
@@ -1,131 +0,0 @@
-(ns clojure.contrib.test-contrib.mock-test
- (:use clojure.test)
- (:require [clojure.contrib.mock :as mock]))
-
-; Used as dummy dependency functions
-(defn fn1 {:dynamic true} [x] :ignore)
-(defn fn2 {:dynamic true} [x y] :ignore)
-(defn fn3 {:dynamic true} ([x] :ignore)
- ([x y z] :ignore))
-(defn fn4 {:dynamic true} [x y & r] :ignore)
-
-;functions created using fn directly lack the argslist meta data
-(def #^{:dynamic true} deffed-differently (fn [x] :ignore))
-
-(defmacro assert-called [fn-name called? & body]
- `(let [called-status?# (atom false)]
- (binding [~fn-name (fn [& args#] (reset! called-status?# true))] ~@body)
- (is (= ~called? @called-status?#))))
-
-(deftest test-convenience
- (testing "once"
- (is (false? (mock/once 0)))
- (is (false? (mock/once 123)))
- (is (true? (mock/once 1))))
-
- (testing "never"
- (is (false? (mock/never 4)))
- (is (true? (mock/never 0))))
-
- (testing "more-than"
- (is (false? ((mock/more-than 5) 3)))
- (is (true? ((mock/more-than 5) 9))))
-
- (testing "less-than"
- (is (true? ((mock/less-than 5) 3)))
- (is (false? ((mock/less-than 5) 9))))
-
- (testing "between"
- (is (true? ((mock/between 5 8) 6)))
- (is (false? ((mock/between 5 8) 5)))))
-
-
-(deftest test-returns
- (is (= {:returns 5} (mock/returns 5)))
- (is (= {:other-key "test" :returns nil} (mock/returns nil {:other-key "test"}))))
-
-
-(deftest test-has-args
- (let [ex (:has-args (mock/has-args [1]))]
- (is (fn? ex))
- (is (ex 'fn1 1))
- (is (ex 'fn1 1 5 6))
- (assert-called mock/unexpected-args true (ex 'fn1 5)))
- (is (contains? (mock/has-args [] {:pre-existing-key "test"}) :pre-existing-key))
- (is (true? (((mock/has-args [5]) :has-args)'fn1 5))))
-
-
-(deftest test-has-matching-signature
- (assert-called mock/no-matching-function-signature true
- (mock/has-matching-signature? 'clojure.contrib.test-contrib.mock-test/fn2 [1]))
- (assert-called mock/no-matching-function-signature true
- (mock/has-matching-signature? 'clojure.contrib.test-contrib.mock-test/fn3 [1 3]))
- (assert-called mock/no-matching-function-signature false
- (mock/has-matching-signature? 'clojure.contrib.test-contrib.mock-test/fn3 [1 3 5]))
- (assert-called mock/no-matching-function-signature false
- (mock/has-matching-signature? 'clojure.contrib.test-contrib.mock-test/fn4 [1 3 5 7 9]))
- (assert-called mock/no-matching-function-signature false
- (mock/has-matching-signature? 'clojure.contrib.test-contrib.mock-test/fn4 [1 3]))
- (assert-called mock/no-matching-function-signature true
- (mock/has-matching-signature? 'clojure.contrib.test-contrib.mock-test/fn4 [1]))
- (assert-called mock/no-matching-function-signature false
- (mock/has-matching-signature? 'clojure.contrib.test-contrib.mock-test/deffed-differently [1])))
-
-
-(deftest test-times
- (is (fn? ((mock/times #(= 1 %)) :times)))
- (is (contains? (mock/times #(= 1 %) {:existing-key "test"}) :existing-key)))
-
-(deftest test-make-mock
- (testing "invalid arguments"
- (is (thrown? IllegalArgumentException (mock/make-mock [5]))))
-
- (testing "valid counter and unevaluated returns"
- (let [[mock counter count-checker] (mock/make-mock 'fn1 (mock/returns 5 (mock/times 1)))]
- (is (fn? mock))
- (is (= 0 @counter))
- (is (= 5 (mock :ignore-me)))
- (is (= 1 @counter))))
-
- (testing "returns as expected"
- (let [[mock] (mock/make-mock 'fn1 (mock/returns 5))]
- (is (= 5 (mock :ignore))))
- (let [[mock] (mock/make-mock 'fn1 (mock/returns #(* 2 %)))]
- (is (= 10 ((mock :ignore) 5)) ":returns a function should not automatically
- evaluate it.")))
-
- (testing "calls replacement-fn and returns the result"
- (let [[mock] (mock/make-mock 'fn1 (mock/calls #(* 3 %)))]
- (is (= 15 (mock 5))))
- (let [[mock] (mock/make-mock 'fn1 (mock/calls #(* 2 %) (mock/returns 3)))]
- (is (= 10 (mock 5)))))
-
- (testing "argument validation"
- (let [[mock] (mock/make-mock 'fn1 (mock/has-args [#(= 5 %)]))]
- (assert-called mock/unexpected-args true (mock "test"))
- (is (nil? (mock 5))))))
-
-
-(deftest test-make-count-checker
- (let [checker (mock/make-count-checker 5 5)]
- (assert-called mock/incorrect-invocation-count false (checker 'fn1 5))
- (assert-called mock/incorrect-invocation-count true (checker 'fn1 3))))
-
-
-(deftest test-validate-counts
- (assert-called mock/incorrect-invocation-count false
- (mock/validate-counts (list [(fn []) (atom 0) (mock/make-count-checker #(< % 6) '#(< % 6)) 'fn1])))
- (assert-called mock/incorrect-invocation-count true
- (mock/validate-counts (list [(fn []) (atom 0) (mock/make-count-checker 4 4) 'fn1]))))
-
-
-(deftest test-expect-macro
- (let [under-test (fn [x] (fn1 x))]
- (is (true? (mock/expect [fn1 (mock/times 1 (mock/has-args [#(= 3 %)]))]
- (under-test 3))))
- (assert-called mock/unexpected-args true (mock/expect [fn1 (mock/times 1 (mock/has-args [#(= 4 %)]))]
- (under-test 3))))
- (let [under-test (fn [] (fn2 (fn1 1) 3))]
- (is (true? (mock/expect [fn1 (mock/times 1 (mock/has-args [#(= 1 %)] (mock/returns 2)))
- fn2 (mock/times 1 (mock/has-args [#(= 2 %) #(= 3 %)] (mock/returns 5)))]
- (under-test)))))) \ No newline at end of file
diff --git a/src/clojure/contrib/test_contrib/mock_test/test_adapter_test.clj b/src/clojure/contrib/test_contrib/mock_test/test_adapter_test.clj
deleted file mode 100644
index 5f21ce11..00000000
--- a/src/clojure/contrib/test_contrib/mock_test/test_adapter_test.clj
+++ /dev/null
@@ -1,18 +0,0 @@
-(ns clojure.contrib.test-contrib.mock-test.test-adapter-test
- (:use clojure.contrib.mock.test-adapter
- [clojure.contrib.test-contrib.mock-test :only (assert-called)]
- clojure.test))
-
-(deftest test-report-problem-called
- (def #^{:private true :dynamic true} fn1 (fn [x] "dummy code"))
- (def #^{:private true :dynamic true} fn2 (fn [x y] "dummy code2"))
- (let [under-test (fn [x] (fn1 x))]
- (assert-called clojure.contrib.mock.test-adapter/report-problem
- true (expect [fn1 (times 5)] (under-test "hi")))))
-
-(deftest test-is-report-called
- (assert-called clojure.test/report true
- (clojure.contrib.mock.test-adapter/report-problem
- 'fn-name 5 6 "fake problem")))
-
-
diff --git a/src/clojure/contrib/test_contrib/monads.clj b/src/clojure/contrib/test_contrib/monads.clj
deleted file mode 100644
index f523f0ec..00000000
--- a/src/clojure/contrib/test_contrib/monads.clj
+++ /dev/null
@@ -1,78 +0,0 @@
-;; Test routines for monads.clj
-
-;; by Konrad Hinsen
-;; last updated March 28, 2009
-
-;; Copyright (c) Konrad Hinsen, 2008. All rights reserved. The use
-;; and distribution terms for this software are covered by the Eclipse
-;; Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
-;; which can be found in the file epl-v10.html at the root of this
-;; distribution. By using this software in any fashion, you are
-;; agreeing to be bound by the terms of this license. You must not
-;; remove this notice, or any other, from this software.
-
-(ns clojure.contrib.test-contrib.monads
- (:use [clojure.test :only (deftest is are run-tests)]
- [clojure.contrib.monads
- :only (with-monad domonad m-lift m-seq m-chain
- sequence-m maybe-m state-m maybe-t sequence-t)]))
-
-(deftest sequence-monad
- (with-monad sequence-m
- (are [a b] (= a b)
- (domonad [x (range 3) y (range 2)] (+ x y))
- '(0 1 1 2 2 3)
- (domonad [x (range 5) y (range (+ 1 x)) :when (= (+ x y) 2)] (list x y))
- '((1 1) (2 0))
- ((m-lift 2 #(list %1 %2)) (range 3) (range 2))
- '((0 0) (0 1) (1 0) (1 1) (2 0) (2 1))
- (m-seq (replicate 3 (range 2)))
- '((0 0 0) (0 0 1) (0 1 0) (0 1 1) (1 0 0) (1 0 1) (1 1 0) (1 1 1))
- ((m-chain (replicate 3 range)) 5)
- '(0 0 0 1 0 0 1 0 1 2)
- (m-plus (range 3) (range 2))
- '(0 1 2 0 1))))