Import cleanup in Assertions.

[spline3.git] / src / Assertions.hs

diff --git a/src/Assertions.hs b/src/Assertions.hs
index 44d793b989be2f4eb83955995adfca976e4cfb9b..023cf6503adc11b8bf7d6b26d3aad6193c4b1612 100644 (file)
--- a/src/Assertions.hs
+++ b/src/Assertions.hs
@@ -1,17 +1,23 @@
 -- | The Assertions module contains assertions for use in HUnit
 --   tests. They primarily fill the need for an equality test that
 --   works with floating point numbers.
-module Assertions
+--
+module Assertions (
+  assertAlmostEqual,
+  assertTrue )
 where
 
-import Control.Monad (unless)
-import Test.HUnit
+import Control.Monad ( unless )
+import Test.HUnit (
+  Assertion,
+  assertBool,
+  assertFailure )
+
+import Comparisons ( (~=) )
 
-import Comparisons
-import Point
 
 -- | An HUnit assertion that wraps the almost_equals function. Stolen
---   from the definition of 'assertEqual' in Test/HUnit/Base.hs.
+--   from the definition of 'assertEqual' in Test\/HUnit\/Base.hs.
 assertAlmostEqual :: String -> Double -> Double -> Assertion
 assertAlmostEqual preface expected actual =
   unless (actual ~= expected) (assertFailure msg)
@@ -19,10 +25,7 @@ assertAlmostEqual preface expected actual =
                 "expected: " ++ show expected ++ "\n but got: " ++ show actual
 
 
--- | An HUnit assertion that wraps the is_close function. Stolen
---   from the definition of 'assertEqual' in Test/HUnit/Base.hs.
-assertClose :: String -> Point -> Point -> Assertion
-assertClose preface expected actual =
-  unless (actual `is_close` expected) (assertFailure msg)
-    where msg = (if null preface then "" else preface ++ "\n") ++
-                "expected: " ++ show expected ++ "\n but got: " ++ show actual
+
+-- | It's asinine that this doesn't exist already.
+assertTrue :: String -> Bool -> Assertion
+assertTrue = assertBool