@@ -38,8 +38,8 @@ (defn -main ([rooms-dir port] - (load-rooms rooms-dir) + (set-rooms rooms-dir) (defonce server (create-server (Integer. port) mire-handle-client)) (println "Launching Mire server on port" port)) ([rooms-dir] (-main rooms-dir 3333)) - ([] (-main "data/rooms"))) + ([] (-main "data/rooms"))) \ No newline at end of file src/mire/server.clj @@ -2,11 +2,10 @@ (:use [mire commands player rooms] :reload-all) (:use [clojure.contrib test-is seq-utils duck-streams])) -(def rooms-dir "data/rooms/") +(set-rooms "data/rooms/") (defmacro def-command-test [name & body] `(deftest ~name - (load-rooms rooms-dir) (binding [*current-room* (ref (:start rooms)) *inventory* (ref #{}) *player-name* "Tester"] src/mire/test/commands.clj @@ -2,18 +2,18 @@ (:use [mire player rooms] :reload-all) (:use [clojure.contrib test-is seq-utils])) -(deftest test-load-rooms - (load-rooms "data/rooms/") - (doseq [name [:start :closet :hallway :promenade]] - (is (contains? rooms name))) - (is (re-find #"promenade" (:desc (:promenade rooms)))) - (is (= :hallway (:west @(:exits (:promenade rooms))))) - (is (includes? @(:items (:promenade rooms)) :bunny)) - (is (empty? @(:inhabitants (:promenade rooms))))) +(deftest test-set-rooms + (let [rooms (load-rooms "data/rooms/")] + (doseq [name [:start :closet :hallway :promenade]] + (is (contains? rooms name))) + (is (re-find #"promenade" (:desc (:promenade rooms)))) + (is (= :hallway (:west @(:exits (:promenade rooms))))) + (is (includes? @(:items (:promenade rooms)) :bunny)) + (is (empty? @(:inhabitants (:promenade rooms)))))) (deftest test-room-contains? - (load-rooms "data/rooms/") - (let [closet (:closet rooms)] + (let [rooms (load-rooms "data/rooms/") + closet (:closet rooms)] (is (not (empty? (filter #(= % :keys) @(:items closet))))) (is (room-contains? closet "keys")) (is (not (room-contains? closet "monkey"))))) src/mire/test/rooms.clj @@ -3,5 +3,5 @@ (defn move-between-refs "Move one instance of obj between from and to. Must be called in a transaction." [obj from to] - (commute from disj obj) - (commute to conj obj)) \ No newline at end of file + (alter from disj obj) + (alter to conj obj)) \ No newline at end of file src/mire/util.clj cfad91fae6233a89fe040e26c069564b6c917561 858f5fb16405c7e8838a915c2154a80382a052af Phil Hagelberg technomancy@gmail.com http://github.com/technomancy/mire/commit/910d02c5d616672f46430625874cf7a68ed46eb2 910d02c5d616672f46430625874cf7a68ed46eb2 2009-04-17T11:53:53-07:00 2009-04-17T11:53:53-07:00 Merge branch '12-packaging' Unfortunately with the way I'm using branches sequentially, it means a change to any branch cascades down in merges to all branches after it. Sorry for the noise, but it seems to be the only way to keep things consistent. dbc1413244b20cf6a87e40e5f1554a47959516fe Phil Hagelberg technomancy@gmail.com