diff --git a/test/NoteHub/test/api.clj b/test/NoteHub/test/api.clj index a57a22f..1318250 100644 --- a/test/NoteHub/test/api.clj +++ b/test/NoteHub/test/api.clj @@ -5,7 +5,6 @@ (def note2 "Another test note") (def pid "somePlugin") (def pid2 "somePlugin2") -(def ver api-version) (defmacro isnt [arg] `(is (not ~arg))) @@ -14,6 +13,7 @@ (f) (revoke-publisher pid)) +#_ (deftest api (testing "API" (testing "publisher registration" @@ -25,28 +25,28 @@ (isnt (valid-publisher? "any_PID")) (isnt (valid-publisher? pid2)))) (testing "note publishing & retrieval" - (let [post-response (post-note note pid (get-signature pid psk note) ver) - get-response (get-note ver (:noteID post-response))] + (let [post-response (post-note note pid (get-signature pid psk note)) + get-response (get-note (:noteID post-response))] (is (:success (:status post-response))) (is (:success (:status get-response))) (is (= note (:note get-response))) (is (= (:longURL post-response) (:longURL get-response))) (is (= (:shortURL post-response) (:shortURL get-response)))) - (isnt (:success (:status (post-note note pid (get-signature pid psk note) ver)))) - (isnt (:success (:status (post-note note pid (get-signature pid "random_psk" note) ver)))) - (is (:success (:status (post-note note pid (get-signature pid psk note) ver)))) + (isnt (:success (:status (post-note note pid (get-signature pid psk note))))) + (isnt (:success (:status (post-note note pid (get-signature pid "random_psk" note))))) + (is (:success (:status (post-note note pid (get-signature pid psk note))))) (let [psk2 (register-publisher "randomPID")] - (is (:success (:status (post-note note "randomPID" (get-signature pid psk2 note) ver)))) + (is (:success (:status (post-note note "randomPID" (get-signature pid psk2 note))))) (is (revoke-publisher pid2)) - (isnt (:success (:status (post-note note "randomPID" (get-signature pid psk2 note) ver)))))) + (isnt (:success (:status (post-note note "randomPID" (get-signature pid psk2 note))))))) (testing "note update" - (let [post-response (post-note note pid (get-signature pid psk note) ver "passwd") + (let [post-response (post-note note pid (get-signature pid psk note) "passwd") note-id (:noteID post-response) - get-response (get-note ver note-id) + get-response (get-note note-id) new-note "a new note!" - update-response (update-note note-id new-note pid (get-signature pid psk new-note) ver "passwd") - get-response-new (get-note ver note-id) - update-response-false (update-note note-id new-note pid (get-signature pid psk new-note) ver "pass") + update-response (update-note note-id new-note pid (get-signature pid psk new-note) "passwd") + get-response-new (get-note note-id) + update-response-false (update-note note-id new-note pid (get-signature pid psk new-note) "pass") ] (is (:success (:status post-response))) (is (:success (:status get-response)))