X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTests%2FTetrahedron.hs;h=18fe2baf6f8527a0188d1a604aed5b91eecf4e5c;hb=a2cc10f44d77965b97c21ba74aa2acb302cd8fe0;hp=1ec4c8e6a0672e2541d383ae233b1e684b801291;hpb=7c648d2c1ca966c4ba1dfff08a13100f065d5dbf;p=spline3.git

diff --git a/src/Tests/Tetrahedron.hs b/src/Tests/Tetrahedron.hs
index 1ec4c8e..18fe2ba 100644
--- a/src/Tests/Tetrahedron.hs
+++ b/src/Tests/Tetrahedron.hs
@@ -27,9 +27,9 @@ instance Arbitrary Tetrahedron where
 -- | Check the volume of a particular tetrahedron against the value
 --   computed by hand. Its vertices are in clockwise order, so the
 --   volume should be negative.
-test_volume1 :: Test
+test_volume1 :: Assertion
 test_volume1 =
-    TestCase $ assertEqual "volume is correct" True (vol ~= (-1/3))
+    assertEqual "volume is correct" True (vol ~= (-1/3))
     where
       p0 = (0, -0.5, 0)
       p1 = (0, 0.5, 0)
@@ -46,9 +46,9 @@ test_volume1 =
 -- | Check the volume of a particular tetrahedron against the value
 --   computed by hand. Its vertices are in counter-clockwise order, so
 --   the volume should be positive.
-test_volume2 :: Test
+test_volume2 :: Assertion
 test_volume2 =
-    TestCase $ assertEqual "volume is correct" True (vol ~= (1/3))
+    assertEqual "volume is correct" True (vol ~= (1/3))
     where
       p0 = (0, -0.5, 0)
       p1 = (2, 0, 0)
@@ -64,9 +64,9 @@ test_volume2 =
 
 -- | Ensure that a tetrahedron contains a particular point chosen to
 --   be inside of it.
-test_contains_point1 :: Test
+test_contains_point1 :: Assertion
 test_contains_point1 =
-    TestCase $ assertEqual "contains an inner point" True (contains_point t inner_point)
+    assertEqual "contains an inner point" True (contains_point t inner_point)
     where
       p0 = (0, -0.5, 0)
       p1 = (0, 0.5, 0)
@@ -82,9 +82,9 @@ test_contains_point1 =
 
 -- | Ensure that a tetrahedron does not contain a particular point chosen to
 --   be outside of it (first test).
-test_doesnt_contain_point1 :: Test
+test_doesnt_contain_point1 :: Assertion
 test_doesnt_contain_point1 =
-    TestCase $ assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
+    assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
     where
       p0 = (0, -0.5, 0)
       p1 = (0, 0.5, 0)
@@ -100,9 +100,9 @@ test_doesnt_contain_point1 =
 
 -- | Ensure that a tetrahedron does not contain a particular point chosen to
 --   be outside of it (second test).
-test_doesnt_contain_point2 :: Test
+test_doesnt_contain_point2 :: Assertion
 test_doesnt_contain_point2 =
-    TestCase $ assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
+    assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
     where
       p0 = (0, 1, 1)
       p1 = (1, 1, 1)
@@ -118,9 +118,9 @@ test_doesnt_contain_point2 =
 
 -- | Ensure that a tetrahedron does not contain a particular point chosen to
 --   be outside of it (third test).
-test_doesnt_contain_point3 :: Test
+test_doesnt_contain_point3 :: Assertion
 test_doesnt_contain_point3 =
-    TestCase $ assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
+    assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
     where
       p0 = (1, 1, 1)
       p1 = (1, 0, 1)
@@ -136,9 +136,9 @@ test_doesnt_contain_point3 =
 
 -- | Ensure that a tetrahedron does not contain a particular point chosen to
 --   be outside of it (fourth test).
-test_doesnt_contain_point4 :: Test
+test_doesnt_contain_point4 :: Assertion
 test_doesnt_contain_point4 =
-    TestCase $ assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
+    assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
     where
       p0 = (1, 0, 1)
       p1 = (0, 0, 1)
@@ -154,9 +154,9 @@ test_doesnt_contain_point4 =
 
 -- | Ensure that a tetrahedron does not contain a particular point chosen to
 --   be outside of it (fifth test).
-test_doesnt_contain_point5 :: Test
+test_doesnt_contain_point5 :: Assertion
 test_doesnt_contain_point5 =
-    TestCase $ assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
+    assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
     where
       p0 = (0, 0, 1)
       p1 = (0, 1, 1)
@@ -169,17 +169,6 @@ test_doesnt_contain_point5 =
                         v3 = p3,
                         fv = empty_values }
 
--- | A list of all HUnit tests defined in this module.
-tetrahedron_tests :: [Test]
-tetrahedron_tests = [test_volume1,
-                     test_volume2,
-                     test_contains_point1,
-                     test_doesnt_contain_point1,
-                     test_doesnt_contain_point2,
-                     test_doesnt_contain_point3,
-                     test_doesnt_contain_point4,
-                     test_doesnt_contain_point5 ]
-
 
 -- | The barycentric coordinate of v0 with respect to itself should
 --   be one.