From ef083b383e4dadce10ad3444402e3082080f1a3b Mon Sep 17 00:00:00 2001 From: "Michael S. Klishin" Date: Sun, 3 Jun 2012 16:38:14 +0400 Subject: [PATCH] Cosmetics --- test/monger/test/query_operators_test.clj | 99 +++++++++++------------ 1 file changed, 49 insertions(+), 50 deletions(-) diff --git a/test/monger/test/query_operators_test.clj b/test/monger/test/query_operators_test.clj index 544abf4..7592e27 100644 --- a/test/monger/test/query_operators_test.clj +++ b/test/monger/test/query_operators_test.clj @@ -26,16 +26,16 @@ (deftest find-with-conditional-operators-comparison (let [collection "libraries"] - (mgcol/insert-batch collection [{ :language "Clojure", :name "monger" :users 1} - { :language "Clojure", :name "langohr" :users 5 } - { :language "Clojure", :name "incanter" :users 15 } - { :language "Scala", :name "akka" :users 150}]) + (mgcol/insert-batch collection [{:language "Clojure" :name "monger" :users 1} + {:language "Clojure" :name "langohr" :users 5} + {:language "Clojure" :name "incanter" :users 15} + {:language "Scala" :name "akka" :users 150}]) (are [a b] (= a (.count (mgcol/find collection b))) - 2 { :users { $gt 10 }} - 3 { :users { $gte 5 }} - 2 { :users { $lt 10 }} - 2 { :users { $lte 5 }} - 1 { :users { $gt 10 $lt 150 }}))) + 2 {:users {$gt 10}} + 3 {:users {$gte 5}} + 2 {:users {$lt 10}} + 2 {:users {$lte 5}} + 1 {:users {$gt 10 $lt 150}}))) ;; ;; $ne @@ -43,11 +43,11 @@ (deftest find-with-and-or-operators (let [collection "libraries"] - (mgcol/insert-batch collection [{ :language "Ruby", :name "mongoid" :users 1} - { :language "Clojure", :name "langohr" :users 5 } - { :language "Clojure", :name "incanter" :users 15 } - { :language "Scala", :name "akka" :users 150}]) - (is (= 2 (.count (mgcol/find collection {$ne { :language "Clojure" }})))))) + (mgcol/insert-batch collection [{:language "Ruby" :name "mongoid" :users 1} + {:language "Clojure" :name "langohr" :users 5} + {:language "Clojure" :name "incanter" :users 15} + {:language "Scala" :name "akka" :users 150}]) + (is (= 2 (.count (mgcol/find collection {$ne {:language "Clojure"}})))))) ;; @@ -56,16 +56,16 @@ (deftest find-with-and-or-operators (let [collection "libraries"] - (mgcol/insert-batch collection [{ :language "Ruby", :name "mongoid" :users 1} - { :language "Clojure", :name "langohr" :users 5 } - { :language "Clojure", :name "incanter" :users 15 } - { :language "Scala", :name "akka" :users 150}]) - (is (= 1 (.count (mgcol/find collection {$and [{ :language "Clojure" } - { :users { $gt 10 } }]})))) - (is (= 3 (.count (mgcol/find collection {$or [{ :language "Clojure" } - {:users { $gt 10 } } ]})))) - (is (= 1 (.count (mgcol/find collection {$nor [{ :language "Clojure" } - {:users { $gt 10 } } ]})))))) + (mgcol/insert-batch collection [{:language "Ruby" :name "mongoid" :users 1} + {:language "Clojure" :name "langohr" :users 5} + {:language "Clojure" :name "incanter" :users 15} + {:language "Scala" :name "akka" :users 150}]) + (is (= 1 (.count (mgcol/find collection {$and [{:language "Clojure"} + {:users {$gt 10}}]})))) + (is (= 3 (.count (mgcol/find collection {$or [{:language "Clojure"} + {:users {$gt 10}} ]})))) + (is (= 1 (.count (mgcol/find collection {$nor [{:language "Clojure"} + {:users {$gt 10}} ]})))))) ;; ;; $all, $in, $nin @@ -73,40 +73,39 @@ (deftest find-on-embedded-arrays (let [collection "libraries"] - (mgcol/insert-batch collection [{ :language "Clojure", :tags [ "functional" ] } - { :language "Scala", :tags [ "functional" "object-oriented" ] } - { :language "Ruby", :tags [ "object-oriented" "dynamic" ] }]) + (mgcol/insert-batch collection [{:language "Clojure" :tags [ "functional" ]} + {:language "Scala" :tags [ "functional" "object-oriented" ]} + {:language "Ruby" :tags [ "object-oriented" "dynamic" ]}]) - (is (= "Scala" (:language (first (mgcol/find-maps collection { :tags { $all [ "functional" "object-oriented" ] } } ))))) - (is (= 3 (.count (mgcol/find-maps collection { :tags { $in [ "functional" "object-oriented" ] } } )))) - (is (= 2 (.count (mgcol/find-maps collection { :language { $in [ "Scala" "Ruby" ] } } )))) - (is (= 1 (.count (mgcol/find-maps collection { :tags { $nin [ "dynamic", "object-oriented" ] } } )))) - (is (= 3 (.count (mgcol/find-maps collection { :language { $nin [ "C#" ] } } )))))) + (is (= "Scala" (:language (first (mgcol/find-maps collection {:tags {$all [ "functional" "object-oriented" ]}} ))))) + (is (= 3 (.count (mgcol/find-maps collection {:tags {$in [ "functional" "object-oriented" ]}} )))) + (is (= 2 (.count (mgcol/find-maps collection {:language {$in [ "Scala" "Ruby" ]}} )))) + (is (= 1 (.count (mgcol/find-maps collection {:tags {$nin [ "dynamic" "object-oriented" ]}} )))) + (is (= 3 (.count (mgcol/find-maps collection {:language {$nin [ "C#" ]}} )))))) (deftest find-with-conditional-operators-on-embedded-documents (let [collection "people"] - (mgcol/insert-batch collection [{ :name "Bob", :comments [ { :text "Nice!" :rating 1 } - { :text "Love it" :rating 4 } - { :text "What?":rating -5 } ] } - { :name "Alice", :comments [ { :text "Yeah" :rating 2 } - { :text "Doh" :rating 1 } - { :text "Agreed" :rating 3 } - ] } ]) + (mgcol/insert-batch collection [{:name "Bob" :comments [{:text "Nice!" :rating 1} + {:text "Love it" :rating 4} + {:text "What?":rating -5} ]} + {:name "Alice" :comments [{:text "Yeah" :rating 2} + {:text "Doh" :rating 1} + {:text "Agreed" :rating 3}]}]) (are [a b] (= a (.count (mgcol/find collection b))) - 1 { :comments { $elemMatch { :text "Nice!" :rating { $gte 1 } } } } - 2 { "comments.rating" 1 } - 1 { "comments.rating" { $gt 3 } }))) + 1 {:comments {$elemMatch {:text "Nice!" :rating {$gte 1}}}} + 2 {"comments.rating" 1} + 1 {"comments.rating" {$gt 3}}))) -(deftest ^{:focus true} find-with-regex-operator +(deftest find-with-regex-operator (let [collection "libraries"] - (mgcol/insert-batch collection [{ :language "Ruby", :name "Mongoid" :users 1} - { :language "Clojure", :name "Langohr" :users 5 } - { :language "Clojure", :name "Incanter" :users 15 } - { :language "Scala", :name "Akka" :users 150}]) + (mgcol/insert-batch collection [{:language "Ruby" :name "Mongoid" :users 1} + {:language "Clojure" :name "Langohr" :users 5} + {:language "Clojure" :name "Incanter" :users 15} + {:language "Scala" :name "Akka" :users 150}]) (are [query results] (is (= results (.count (mgcol/find collection query)))) - {:language {$regex "Clo.*" }} 2 + {:language {$regex "Clo.*"}} 2 {:language {$regex "clo.*" $options "i"}} 2 {:name {$regex "aK.*" $options "i"}} 1 - {:language {$regex ".*by" }} 1 - {:language {$regex ".*ala.*" }} 1))) + {:language {$regex ".*by"}} 1 + {:language {$regex ".*ala.*"}} 1)))