Some changes:

* almost= is a chatty checker now
* removed some unnecessary assertions

Author: rexim

src/hyperspace/geometry.clj

@@ -19,6 +19,18 @@
   [vtr scalar]
   (mapv #(* scalar %) vtr))
 
+(defn polar->cartesian
+  "Converts polar coordinates to the cartesian ones."
+  [[a, d]]
+  [(* d (Math/cos a))
+   (* d (Math/sin a))])
+
+(defn cartesian->polar
+  "Converts cartesian cooradinates to the polar ones."
+  [[x, y]]
+  [(Math/atan2 y x)
+   (Math/sqrt (+ (* x x) (* y y)))])
+
 (defn vector-length
   "Returns the length of vtr."
   [vtr]
@@ -36,18 +48,6 @@
   [p1 p2]
   (vector-length (vector-subtract p1 p2)))
 
-(defn polar->cartesian
-  "Converts polar coordinates to the cartesian ones."
-  [[a, d]]
-  [(* d (Math/cos a))
-   (* d (Math/sin a))])
-
-(defn cartesian->polar
-  "Converts cartesian cooradinates to the polar ones."
-  [[x, y]]
-  [(Math/atan2 y x)
-   (Math/sqrt (+ (* x x) (* y y)))])
-
 (defn circle-X-circle?
   "Does the first circle intersects the second one?"
   [{position1 :position radius1 :radius}

test/hyperspace/test/checkers.clj

@@ -0,0 +1,6 @@
+(ns hyperspace.test.checkers
+  (:use [midje.sweet]))
+
+(defchecker almost= [expected]
+  (chatty-checker [actual]
+    (< (Math/abs (- expected actual)) 1e-6)))

test/hyperspace/test/geometry.clj

@@ -1,41 +1,40 @@
 (ns hyperspace.test.geometry
   (:use [hyperspace.geometry]
-        [hyperspace.test.utils]
+        [hyperspace.test.checkers]
         [midje.sweet]))
 
-(fact "about vector-sum function"
-      (vector-sum [2] [2]) => [4]
-      (vector-sum [5, 5] [2, 3]) => [7, 8]
-      (vector-sum [1, 2, 3] [4, 5, 6]) => [5, 7, 9]
-      (vector-sum [0.2, 0.4] [0.1, 0.3]) => (just [(almost= 0.3)
-                                                   (almost= 0.7)])
-      (vector-sum [12, 62]) => [12, 62]
-      (vector-sum [1, 2] [3, 4] [5, 6] [7, 8]) => [16, 20])
+(facts "about vector-sum function"
+       (vector-sum [5, 5] [2, 3]) => [7, 8]
+       (vector-sum [0.2, 0.4] [0.1, 0.3]) => (just [(almost= 0.3)
+                                                    (almost= 0.7)])
+       (vector-sum [12, 62]) => [12, 62])
 
-(fact "about vector-subtract function"
-      (vector-subtract [3] [2]) => [1]
-      (vector-subtract [3, 2] [2, 1]) => [1, 1]
-      (vector-subtract [4, 5, 6] [6, 5, 4]) => [-2, 0, 2]
-      (vector-subtract [0.4 0.2] [0.3 0.2]) => (just [(almost= 0.1)
-                                                      (almost= 0.0)])
-      (vector-subtract [4, 6]) => [-4, -6]
-      (vector-subtract [100, 100] [2, 5] [5, 2] [9, 3]) => [84, 90])
+(facts "about vector-subtract function"
+       (vector-subtract [3, 2] [2, 1]) => [1, 1]
+       (vector-subtract [0.4 0.2] [0.3 0.2]) => (just [(almost= 0.1)
+                                                       (almost= 0.0)])
+       (vector-subtract [4, 6]) => [-4, -6])
 
-(fact "about multiply-by-scalar function"
-      (multiply-by-scalar [2] 10) => [20]
-      (multiply-by-scalar [1, 2] 2) => [2, 4]
-      (multiply-by-scalar [5, 2, 1] 5) => [25, 10, 5]
-      (multiply-by-scalar [0.2, 0.5] 3) => (just [(almost= 0.6),
-                                                  (almost= 1.5)]))
+(facts "about multiply-by-scalar function"
+       (multiply-by-scalar [1, 2] 2) => [2, 4]
+       (multiply-by-scalar [0.2, 0.5] 3) => (just [(almost= 0.6),
+                                                   (almost= 1.5)]))
 
-(fact "about vector-length function"
-      (vector-length [7]) => (almost= 7)
-      (vector-length [10, 10]) => (almost= 14.142135623730951)
-      (vector-length [34, 123, 431]) => (almost= 449.4952725001677)
-      (vector-length [1.23, 10.32]) => (almost= 10.393040940937354))
+(facts "about vector-length function"
+       (vector-length [10, 10]) => (almost= 14.142135623730951)
+       (vector-length [1.23, 10.32]) => (almost= 10.393040940937354))
 
-(fact "about normilize-vector function"
-      (vector-length (normilize-vector [7])) => (almost= 1.0)
-      (vector-length (normilize-vector [10, 10])) => (almost= 1.0)
-      (vector-length (normilize-vector [34, 123, 431])) => (almost= 1.0)
-      (vector-length (normilize-vector [1.23, 10.32])) => (almost= 1.0))
+(facts "about normilize-vector function"
+       (cartesian->polar (normilize-vector [10, 10]))
+       =>
+       (just [(almost= (-> [10, 10] cartesian->polar first))
+              (almost= 1.0)])
+
+       (cartesian->polar (normilize-vector [1.23, 10.32]))
+       =>
+       (just [(almost= (-> [1.23, 10.32] cartesian->polar first))
+              (almost= 1.0)]))
+
+(facts "about distance function"
+       (distance [0, 0] [10, 10]) => (almost= (vector-length [10, 10]))
+       (distance [34, 12] [-24, 42]) => (almost= 65.29931086925804))