Browse Source

JSON working manually from inside FWB

Zane Kansil 10 years ago
parent
commit
fe8667e692

+ 0 - 34
frameworks/Clojure/pedestal-api/test/pedestal_api/service_test.clj

@@ -1,34 +0,0 @@
-(ns pedestal-api.service-test
-  (:require [clojure.test :refer :all]
-            [io.pedestal.test :refer :all]
-            [io.pedestal.http :as bootstrap]
-            [pedestal-api.service :as service]))
-
-(def service
-  (::bootstrap/service-fn (bootstrap/create-servlet service/service)))
-
-(deftest home-page-test
-  (is (=
-       (:body (response-for service :get "/"))
-       "Hello World!"))
-  (is (=
-       (:headers (response-for service :get "/"))
-       {"Content-Type" "text/html;charset=UTF-8"
-        "Strict-Transport-Security" "max-age=31536000; includeSubdomains"
-        "X-Frame-Options" "DENY"
-        "X-Content-Type-Options" "nosniff"
-        "X-XSS-Protection" "1; mode=block"})))
-
-
-(deftest about-page-test
-  (is (.contains
-       (:body (response-for service :get "/about"))
-       "Clojure 1.6"))
-  (is (=
-       (:headers (response-for service :get "/about"))
-       {"Content-Type" "text/html;charset=UTF-8"
-        "Strict-Transport-Security" "max-age=31536000; includeSubdomains"
-        "X-Frame-Options" "DENY"
-        "X-Content-Type-Options" "nosniff"
-        "X-XSS-Protection" "1; mode=block"})))
-

+ 0 - 0
frameworks/Clojure/pedestal-api/.gitignore → frameworks/Clojure/pedestal/.gitignore


+ 2 - 1
frameworks/Clojure/pedestal-api/README.md → frameworks/Clojure/pedestal/README.md

@@ -5,4 +5,5 @@ This is the Pedestal portion of a [benchmarking test suite](../) comparing a var
 ## Test URLs
 ### JSON Encoding Test
 
-http://localhost:8080/
+http://localhost:8080/json
+

+ 0 - 0
frameworks/Clojure/pedestal-api/config/logback.xml → frameworks/Clojure/pedestal/config/logback.xml


+ 3 - 3
frameworks/Clojure/pedestal-api/project.clj → frameworks/Clojure/pedestal/project.clj

@@ -1,4 +1,4 @@
-(defproject pedestal-api "0.0.1-SNAPSHOT"
+(defproject pedestal "0.0.1-SNAPSHOT"
   :description "FIXME: write description"
   :url "http://example.com/FIXME"
   :license {:name "Eclipse Public License"
@@ -14,6 +14,6 @@
                  [org.clojure/data.json "0.2.5"]]
   :min-lein-version "2.0.0"
   :resource-paths ["config", "resources"]
-  :profiles {:dev {:aliases {"run-dev" ["trampoline" "run" "-m" "pedestal-api.server/run-dev"]}
+  :profiles {:dev {:aliases {"run-dev" ["trampoline" "run" "-m" "pedestal.server/run-dev"]}
                    :dependencies [[io.pedestal/pedestal.service-tools "0.3.1"]]}}
-  :main ^{:skip-aot true} pedestal-api.server)
+  :main ^{:skip-aot true} pedestal.server)

+ 2 - 2
frameworks/Clojure/pedestal-api/src/pedestal_api/server.clj → frameworks/Clojure/pedestal/src/pedestal/server.clj

@@ -1,7 +1,7 @@
-(ns pedestal-api.server
+(ns pedestal.server
   (:gen-class) ; for -main method in uberjar
   (:require [io.pedestal.http :as server]
-            [pedestal-api.service :as service]))
+            [pedestal.service :as service]))
 
 ;; This is an adapted service map, that can be started and stopped
 ;; From the REPL you can call server/start and server/stop on this service

+ 1 - 1
frameworks/Clojure/pedestal-api/src/pedestal_api/service.clj → frameworks/Clojure/pedestal/src/pedestal/service.clj

@@ -1,4 +1,4 @@
-(ns pedestal-api.service
+(ns pedestal.service
   (:require [io.pedestal.http :as bootstrap]
             [io.pedestal.http.route :as route]
             [io.pedestal.http.body-params :as body-params]

+ 20 - 0
frameworks/Clojure/pedestal/test/pedestal/service_test.clj

@@ -0,0 +1,20 @@
+(ns pedestal.service-test
+  (:require [clojure.test :refer :all]
+            [io.pedestal.test :refer :all]
+            [io.pedestal.http :as bootstrap]
+            [pedestal.service :as service]))
+
+(def service
+  (::bootstrap/service-fn (bootstrap/create-servlet service/service)))
+
+(deftest home-page-test
+  (is (=
+       (:body (response-for service :get "/json"))
+       "{\"hello\": \"world\""))
+  (is (=
+       (:headers (response-for service :get "/json"))
+       {"Content-Type" "text/html;charset=UTF-8"
+        "Strict-Transport-Security" "max-age=31536000; includeSubdomains"
+        "X-Frame-Options" "DENY"
+        "X-Content-Type-Options" "nosniff"
+        "X-XSS-Protection" "1; mode=block"})))