Fleshed out first servlet unit test

mmcgrana · fdc7d0f0b9141040439cc4f6251c11382ef72d91 · weavejester committed Aug 1, 2010 · Aug 1, 2010 · fdc7d0f
1 parent 7315672
commit fdc7d0f0b9141040439cc4f6251c11382ef72d91
Unified Split

Showing with 15 additions and 3 deletions.

+15 −3 ring-servlet/test/ring/util/servlet_test.clj
@@ -15,8 +15,8 @@
     (getRemoteAddr [] (request :remote-addr))
     (getRequestURI [] (request :uri))
     (getQueryString [] (request :query-string))
-    (getScheme [] (str (request :scheme)))
-    (getMethod [] (-> request :request-method str .toUpperCase))
+    (getScheme [] (name (request :scheme)))
+    (getMethod [] (-> request :request-method name .toUpperCase))
     (getHeaderNames [] (enumeration (keys (request :headers))))
     (getHeader [name] (get-in request [:headers name]))
     (getContentType [] (request :content-type))
@@ -53,7 +53,19 @@
                 :body           nil}
           resp (atom {})
           svlt (servlet (fn [r]
-                          (is (= (:uri r) (:uri req)))
+                          (are [k v] (= (r k) v)
+                            :server-port    8080
+                            :server-name    "foobar"
+                            :remote-addr    "127.0.0.1"
+                            :uri            "/foo"
+                            :query-string   "a=b"
+                            :scheme         :http
+                            :request-method :get
+                            :headers        {"x-server" "Foo"}
+                            :content-type   "text/plain"
+                            :content-length 10
+                            :character-encoding "UTF-8"
+                            :body           nil)
                           {:status 200, :headers {}}))]
       (doto svlt
         (.init (servlet-config))