add printer tests, restructure test-clojure

3 files changed, 80 insertions, 8 deletions

diff --git a/src/clojure/contrib/test_clojure/printer.clj b/src/clojure/contrib/test_clojure/printer.clj
new file mode 100644
index 00000000..d5779ec1
--- /dev/null
+++ b/src/clojure/contrib/test_clojure/printer.clj
@@ -0,0 +1,76 @@
+;;  Copyright (c) Stephen C. Gilardi. All rights reserved. The use and
+;;  distribution terms for this software are covered by the Common Public
+;;  License 1.0 (http://opensource.org/licenses/cpl.php) which can be found
+;;  in the file CPL.TXT 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.
+;;
+;;  scgilardi (gmail)
+;;  Created 29 October 2008
+
+(deftest t-print-length-empty-seq
+  (let [coll () val "()"]
+    (is (= val (binding [*print-length* 0] (print-str coll))))
+    (is (= val (binding [*print-length* 1] (print-str coll))))))
+
+(deftest t-print-length-seq
+  (let [coll (range 5)
+        length-val '((0 "(...)")
+                     (1 "(0 ...)")
+                     (2 "(0 1 ...)")
+                     (3 "(0 1 2 ...)")
+                     (4 "(0 1 2 3 ...)")
+                     (5 "(0 1 2 3 4)"))]
+    (doseq [length val] length-val
+      (binding [*print-length* length]
+        (is (= val (print-str coll)))))))
+
+(deftest t-print-length-empty-vec
+  (let [coll [] val "[]"]
+    (is (= val (binding [*print-length* 0] (print-str coll))))
+    (is (= val (binding [*print-length* 1] (print-str coll))))))
+
+(deftest t-print-length-vec
+  (let [coll [0 1 2 3 4]
+        length-val '((0 "[...]")
+                     (1 "[0 ...]")
+                     (2 "[0 1 ...]")
+                     (3 "[0 1 2 ...]")
+                     (4 "[0 1 2 3 ...]")
+                     (5 "[0 1 2 3 4]"))]
+    (doseq [length val] length-val
+      (binding [*print-length* length]
+        (is (= val (print-str coll)))))))
+
+(deftest t-print-level-seq
+  (let [coll '(0 (1 (2 (3 (4)))))
+        level-val '((0 "#")
+                    (1 "(0 #)")
+                    (2 "(0 (1 #))")
+                    (3 "(0 (1 (2 #)))")
+                    (4 "(0 (1 (2 (3 #))))")
+                    (5 "(0 (1 (2 (3 (4)))))"))]
+    (doseq [level val] level-val
+      (binding [*print-level* level]
+        (is (= val (print-str coll)))))))
+
+(deftest t-print-level-length-coll
+  (let [coll '(if (member x y) (+ (first x) 3) (foo (a b c d "Baz")))
+        level-length-val
+        '((0 1 "#")
+          (1 1 "(if ...)")
+          (1 2 "(if # ...)")
+          (1 3 "(if # # ...)")
+          (1 4 "(if # # #)")
+          (2 1 "(if ...)")
+          (2 2 "(if (member x ...) ...)")
+          (2 3 "(if (member x y) (+ # 3) ...)")
+          (3 2 "(if (member x ...) ...)")
+          (3 3 "(if (member x y) (+ (first x) 3) ...)")
+          (3 4 "(if (member x y) (+ (first x) 3) (foo (a b c d ...)))")
+          (3 5 "(if (member x y) (+ (first x) 3) (foo (a b c d Baz)))"))]
+    (doseq [level length val] level-length-val
+      (binding [*print-level* level
+                *print-length* length]
+        (is (= val (print-str coll)))))))
diff --git a/src/clojure/contrib/test_clojure/reader/reader.clj b/src/clojure/contrib/test_clojure/reader.clj
index 4f436e93..7517b588 100644
--- a/src/clojure/contrib/test_clojure/reader/reader.clj
+++ b/src/clojure/contrib/test_clojure/reader.clj
@@ -6,8 +6,6 @@
 ;;  this license. You must not remove this notice, or any other, from this
 ;;  software.
 ;;
-;;  clojure.contrib.test-clojure.Reader.clj
-;;
 ;;  Tests for the Clojure functions documented at the URL:
 ;;
 ;;    http://clojure.org/Reader
@@ -15,9 +13,6 @@
 ;;  scgilardi (gmail)
 ;;  Created 22 October 2008
 
-(ns clojure.contrib.test-clojure.reader
-  (:use clojure.contrib.test-is))
-
 ;; Symbols
 
 (deftest t-Symbols
diff --git a/src/clojure/contrib/test_clojure/test_clojure.clj b/src/clojure/contrib/test_clojure/test_clojure.clj
index e6adc194..b839b142 100644
--- a/src/clojure/contrib/test_clojure/test_clojure.clj
+++ b/src/clojure/contrib/test_clojure/test_clojure.clj
@@ -14,8 +14,9 @@
 ;;  Created 22 October 2008
 
 (ns clojure.contrib.test-clojure
-  (:use (clojure.contrib test-is)
-        (clojure.contrib.test-clojure reader)))
+  (:use clojure.contrib.test-is)
+  (:load "reader.clj" "printer.clj"))
 
 (binding [*test-out* (java.io.PrintWriter. *out*)]
-  (run-tests 'clojure.contrib.test-clojure.reader))
+  (run-tests)
+  (println))