improving tests; wip

src/NoteHub/api.clj

@@ -28,8 +28,8 @@
   ([success message & params]
    (assoc (create-response success) :message (apply format message params))))
 
-(defn- getURL [noteID description]
-  (if (description)
+(defn- getURL [noteID & description]
+  (if description
     (str domain (storage/get-short-url noteID))
     (str domain (sreplace noteID #" " "/"))))
 

test/NoteHub/test/api.clj

@@ -4,8 +4,6 @@
   (:use [NoteHub.api]
         [clojure.test]))
 
-(def note "Hello world, this is a test note!")
-(def note2 "Another test note")
 (def pid "somePlugin")
 (def pid2 "somePlugin2")
 
@@ -14,16 +12,20 @@
 (defn register-publisher-fixture [f]
   (def psk (storage/register-publisher pid))
   (f)
-  (storage/revoke-publisher pid))
+  (storage/revoke-publisher pid)
+  (storage/revoke-publisher pid2))
+
+(use-fixtures :each register-publisher-fixture)
 
 (deftest api
   (testing "API"
     (testing "publisher registration"
-      (let [psk2 (storage/register-publisher pid2)]
       (is (storage/valid-publisher? pid))
+      (isnt (storage/valid-publisher? pid2))
+      (let [psk2 (storage/register-publisher pid2)]
+        (is (= psk2 (storage/get-psk pid2)))
         (is (storage/valid-publisher? pid2))
         (is (storage/revoke-publisher pid2))
-        (isnt (storage/revoke-publisher "anyPID"))
         (isnt (storage/valid-publisher? "any_PID"))
         (isnt (storage/valid-publisher? pid2))))
     #_ (testing "note publishing & retrieval"