From 18db74b0bac9e1577d21692c6d2a43446b9a69b6 Mon Sep 17 00:00:00 2001 From: James Reeves Date: Wed, 21 Mar 2012 20:20:34 +0000 Subject: [PATCH] Replaced references to ring.util.test with ring.util.io (fixes #57) --- .../ring/middleware/multipart_params/test/byte_array.clj | 2 +- .../test/ring/middleware/multipart_params/test/temp_file.clj | 2 +- ring-core/test/ring/middleware/test/multipart_params.clj | 2 +- ring-core/test/ring/middleware/test/params.clj | 12 ++++++------ ring-core/test/ring/middleware/test/resource.clj | 2 +- ring-devel/test/ring/handler/test/dump.clj | 6 +++--- ring-devel/test/ring/middleware/test/lint.clj | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ring-core/test/ring/middleware/multipart_params/test/byte_array.clj b/ring-core/test/ring/middleware/multipart_params/test/byte_array.clj index fbf72db..55cb6c7 100644 --- a/ring-core/test/ring/middleware/multipart_params/test/byte_array.clj +++ b/ring-core/test/ring/middleware/multipart_params/test/byte_array.clj @@ -1,6 +1,6 @@ (ns ring.middleware.multipart-params.test.byte-array (:use clojure.test - ring.util.test + [ring.util.io :only (string-input-stream)] ring.middleware.multipart-params.byte-array)) (deftest test-byte-array-store diff --git a/ring-core/test/ring/middleware/multipart_params/test/temp_file.clj b/ring-core/test/ring/middleware/multipart_params/test/temp_file.clj index 370ef88..584e3af 100644 --- a/ring-core/test/ring/middleware/multipart_params/test/temp_file.clj +++ b/ring-core/test/ring/middleware/multipart_params/test/temp_file.clj @@ -1,6 +1,6 @@ (ns ring.middleware.multipart-params.test.temp-file (:use clojure.test - ring.util.test + [ring.util.io :only (string-input-stream)] ring.middleware.multipart-params.temp-file)) (deftest test-temp-file-store diff --git a/ring-core/test/ring/middleware/test/multipart_params.clj b/ring-core/test/ring/middleware/test/multipart_params.clj index c541022..dce3c71 100644 --- a/ring-core/test/ring/middleware/test/multipart_params.clj +++ b/ring-core/test/ring/middleware/test/multipart_params.clj @@ -1,7 +1,7 @@ (ns ring.middleware.test.multipart-params (:use clojure.test ring.middleware.multipart-params - ring.util.test) + [ring.util.io :only (string-input-stream)]) (:import java.io.InputStream)) (defn string-store [item] diff --git a/ring-core/test/ring/middleware/test/params.clj b/ring-core/test/ring/middleware/test/params.clj index 0617cd9..36d66ae 100644 --- a/ring-core/test/ring/middleware/test/params.clj +++ b/ring-core/test/ring/middleware/test/params.clj @@ -1,7 +1,7 @@ (ns ring.middleware.test.params (:use clojure.test - ring.middleware.params) - (:require [ring.util.test :as tu])) + ring.middleware.params + [ring.util.io :only (string-input-stream)])) (def wrapped-echo (wrap-params identity)) @@ -15,7 +15,7 @@ (deftest wrap-params-query-and-form-params (let [req {:query-string "foo=bar" :content-type "application/x-www-form-urlencoded" - :body (tu/string-input-stream "biz=bat%25")} + :body (string-input-stream "biz=bat%25")} resp (wrapped-echo req)] (is (= {"foo" "bar"} (:query-params resp))) (is (= {"biz" "bat%"} (:form-params resp))) @@ -23,7 +23,7 @@ (deftest wrap-params-not-form-encoded (let [req {:content-type "application/json" - :body (tu/string-input-stream "{foo: \"bar\"}")} + :body (string-input-stream "{foo: \"bar\"}")} resp (wrapped-echo req)] (is (empty? (:form-params resp))) (is (empty? (:params resp))))) @@ -31,7 +31,7 @@ (deftest wrap-params-always-assocs-maps (let [req {:query-string "" :content-type "application/x-www-form-urlencoded" - :body (tu/string-input-stream "")} + :body (string-input-stream "")} resp (wrapped-echo req)] (is (= {} (:query-params resp))) (is (= {} (:form-params resp))) @@ -40,7 +40,7 @@ (deftest wrap-params-encoding (let [req {:character-encoding "UTF-16" :content-type "application/x-www-form-urlencoded" - :body (tu/string-input-stream "hello=world" "UTF-16")} + :body (string-input-stream "hello=world" "UTF-16")} resp (wrapped-echo req)] (is (= (:params resp) {"hello" "world"})) (is (= (:form-params resp) {"hello" "world"})))) diff --git a/ring-core/test/ring/middleware/test/resource.clj b/ring-core/test/ring/middleware/test/resource.clj index ff0648f..8e43dab 100644 --- a/ring-core/test/ring/middleware/test/resource.clj +++ b/ring-core/test/ring/middleware/test/resource.clj @@ -1,6 +1,6 @@ (ns ring.middleware.test.resource (:use clojure.test - ring.util.test + [ring.util.io :only (string-input-stream)] ring.middleware.resource)) (defn test-handler [request] diff --git a/ring-devel/test/ring/handler/test/dump.clj b/ring-devel/test/ring/handler/test/dump.clj index da052d3..c434e5f 100644 --- a/ring-devel/test/ring/handler/test/dump.clj +++ b/ring-devel/test/ring/handler/test/dump.clj @@ -1,12 +1,12 @@ (ns ring.handler.test.dump (:use clojure.test - ring.handler.dump) - (:require [ring.util.test :as tu])) + [ring.util.io :only (string-input-stream)] + ring.handler.dump)) (def post-req {:uri "/foo/bar" :request-method :post - :body (tu/string-input-stream "post body")}) + :body (string-input-stream "post body")}) (def get-req {:uri "/foo/bar" diff --git a/ring-devel/test/ring/middleware/test/lint.clj b/ring-devel/test/ring/middleware/test/lint.clj index 43e2b83..2c5be01 100644 --- a/ring-devel/test/ring/middleware/test/lint.clj +++ b/ring-devel/test/ring/middleware/test/lint.clj @@ -1,7 +1,7 @@ (ns ring.middleware.test.lint (:use clojure.test + [ring.util.io :only (string-input-stream)] ring.middleware.lint) - (:require [ring.util.test :as tu]) (:import (java.io File InputStream))) (def valid-request @@ -110,7 +110,7 @@ [nil {:foo "bar"} {"bar" :foo} {"Bar" "foo"}]) (lints-req :body - [nil (tu/string-input-stream "thebody")] + [nil (string-input-stream "thebody")] ["thebody" :thebody]) @@ -123,5 +123,5 @@ [nil {:foo "bar"} {"foo" :bar} {"dir" 123}]) (lints-resp :body - [nil "thebody" (list "foo" "bar") (tu/string-input-stream "thebody") (File. "test/ring/assets/foo.html")] + [nil "thebody" (list "foo" "bar") (string-input-stream "thebody") (File. "test/ring/assets/foo.html")] [123 :thebody])