diff --git a/test/monger/test/clj_time_local_date_test.clj b/test/monger/test/clj_time_local_date_test.clj deleted file mode 100644 index cfa77bc..0000000 --- a/test/monger/test/clj_time_local_date_test.clj +++ /dev/null @@ -1,32 +0,0 @@ -;; requires profile dev2 for clj-time -(set! *warn-on-reflection* true) - -(ns monger.test.clj-time-local-date-test - (:import java.util.Date) - (:require [monger core joda-time] - [clojure stacktrace] - [monger.collection :as mgcol] - [clj-time.core :as dt] - [clj-time.coerce :as dt-coerce] - [monger.test.helper :as helper]) - (:use [clojure.test] - [monger.operators] - [monger.test.fixtures])) - -(monger.core/connect!) -(monger.core/set-db! (monger.core/get-db "monger-test")) - -(use-fixtures :each purge-people purge-docs purge-things purge-libraries) - -(deftest find-with-local-date - (let [collection "libraries"] - (mgcol/insert-batch collection [{:language "Clojure" :name "aleph" :created_at (dt/now)} - {:language "R" - :name "bayes" - :created_at (dt-coerce/to-date-time (dt/plus (dt/today) (dt/days 1)))}]) - (are [n the-criteria] - (= n (.count (mgcol/find collection the-criteria))) - 2 {:created_at {$gt (dt/today)}} - 1 {:created_at {"$gte" (dt/today) "$lt" (dt/plus (dt/today) (dt/days 1))}} - 1 {:created_at {"$gte" (dt/plus (dt/today) (dt/days 1))}}))) - diff --git a/test/monger/test/lib_integration_test.clj b/test/monger/test/lib_integration_test.clj index 6777383..ad78a6b 100644 --- a/test/monger/test/lib_integration_test.clj +++ b/test/monger/test/lib_integration_test.clj @@ -1,7 +1,7 @@ (ns monger.test.lib-integration-test (:use clojure.test monger.conversion) - (:import [org.joda.time DateTime DateMidnight] + (:import [org.joda.time DateTime DateMidnight LocalDate] org.bson.types.ObjectId com.mongodb.DBObject) (:require monger.json @@ -31,6 +31,10 @@ (is (instance? java.util.Date d)) (is (= 1318464000000 (.getTime ^java.util.Date d))))) +(deftest ^{:integration true} conversion-of-joda-localdate-to-db-object + (let [d (to-db-object (LocalDate. 2011 10 13))] + (is (instance? java.util.Date d)) + (is (= 1318456800000 (.getTime ^java.util.Date d))))) (deftest ^{:integration true} conversion-of-java-util-date-to-joda-datetime (let [input (.toDate ^DateTime (t/date-time 2011 10 13 23 55 0)) @@ -38,8 +42,12 @@ (is (instance? org.joda.time.DateTime output)) (is (= input (.toDate ^DateTime output))))) - (deftest ^{:integration true} test-reader-extensions (let [^DateTime d (t/date-time 2011 10 13 23 55 0)] (binding [*print-dup* true] (pr-str d)))) + +(deftest ^{:integration true} test-reader-extensions-for-localdate + (let [^DateTime d (t/today)] + (binding [*print-dup* true] + (pr-str d)))) \ No newline at end of file