X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTests%2FTetrahedron.hs;h=3d47862bf638e69aeb8296b3ef1c946b8a44218d;hb=dee2b5197cb2eea8ec6e234a44d2ad5b3587302e;hp=393b9602a4783a7a79189038f9293285b0b94d4d;hpb=f5367b88967f31b37159b345357df8460bbb8d69;p=spline3.git

diff --git a/src/Tests/Tetrahedron.hs b/src/Tests/Tetrahedron.hs
index 393b960..3d47862 100644
--- a/src/Tests/Tetrahedron.hs
+++ b/src/Tests/Tetrahedron.hs
@@ -1,108 +1,92 @@
 module Tests.Tetrahedron
 where
 
+import Test.Framework (Test, testGroup)
+import Test.Framework.Providers.HUnit (testCase)
 import Test.HUnit
-import Test.QuickCheck
+import Test.QuickCheck (Property, (==>))
 
 import Cardinal
 import Comparisons
-import Point
 import FunctionValues
 import Tests.FunctionValues()
 import Tetrahedron
 import ThreeDimensional
 
-instance Arbitrary Tetrahedron where
-    arbitrary = do
-      rnd_v0 <- arbitrary :: Gen Point
-      rnd_v1 <- arbitrary :: Gen Point
-      rnd_v2 <- arbitrary :: Gen Point
-      rnd_v3 <- arbitrary :: Gen Point
-      rnd_fv <- arbitrary :: Gen FunctionValues
-      return (Tetrahedron rnd_fv rnd_v0 rnd_v1 rnd_v2 rnd_v3)
-
 -- HUnit Tests
 
 
--- | 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 :: Assertion
-test_volume1 =
-    assertEqual "volume is correct" True (vol ~= (-1/3))
-    where
-      p0 = (0, -0.5, 0)
-      p1 = (0, 0.5, 0)
-      p2 = (2, 0, 0)
-      p3 = (1, 0, 1)
-      t = Tetrahedron { v0 = p0,
-                        v1 = p1,
-                        v2 = p2,
-                        v3 = p3,
-                        fv = empty_values }
-      vol = volume t
-
-
--- | 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 :: Assertion
-test_volume2 =
-    assertEqual "volume is correct" True (vol ~= (1/3))
-    where
-      p0 = (0, -0.5, 0)
-      p1 = (2, 0, 0)
-      p2 = (0, 0.5, 0)
-      p3 = (1, 0, 1)
-      t = Tetrahedron { v0 = p0,
-                        v1 = p1,
-                        v2 = p2,
-                        v3 = p3,
-                        fv = empty_values }
-      vol = volume t
-
-
--- | Ensure that a tetrahedron contains a particular point chosen to
---   be inside of it.
-test_contains_point1 :: Assertion
-test_contains_point1 =
-    assertEqual "contains an inner point" True (contains_point t inner_point)
-    where
-      p0 = (0, -0.5, 0)
-      p1 = (0, 0.5, 0)
-      p2 = (2, 0, 0)
-      p3 = (1, 0, 1)
-      inner_point = (1, 0, 0.5)
-      t = Tetrahedron { v0 = p0,
-                        v1 = p1,
-                        v2 = p2,
-                        v3 = p3,
-                        fv = empty_values }
-
-
--- | Ensure that a tetrahedron does not contain a particular point chosen to
---   be outside of it (first test).
-test_doesnt_contain_point1 :: Assertion
-test_doesnt_contain_point1 =
-    assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
-    where
-      p0 = (0, -0.5, 0)
-      p1 = (0, 0.5, 0)
-      p2 = (2, 0, 0)
-      p3 = (1, 0, 1)
-      exterior_point = (5, 2, -9.0212)
-      t = Tetrahedron { v0 = p0,
-                        v1 = p1,
-                        v2 = p2,
-                        v3 = p3,
-                        fv = empty_values }
+-- | Check the volume of a particular tetrahedron (computed by hand)
+--   and whether or not it contains a specific point chosen to be
+--   outside of it. Its vertices are in clockwise order, so the volume
+--   should be negative.
+tetrahedron1_geometry_tests :: Test.Framework.Test
+tetrahedron1_geometry_tests =
+  testGroup "tetrahedron1 geometry"
+              [ testCase "volume1" volume1,
+                testCase "doesn't contain point1" doesnt_contain_point1]
+  where
+    p0 = (0, -0.5, 0)
+    p1 = (0, 0.5, 0)
+    p2 = (2, 0, 0)
+    p3 = (1, 0, 1)
+    t = Tetrahedron { v0 = p0,
+                      v1 = p1,
+                      v2 = p2,
+                      v3 = p3,
+                      fv = empty_values }
+
+    volume1 :: Assertion
+    volume1 =
+      assertEqual "volume is correct" True (vol ~= (-1/3))
+      where
+        vol = volume t
+
+    doesnt_contain_point1 :: Assertion
+    doesnt_contain_point1 =
+      assertEqual "doesn't contain an exterior point" False contained
+      where
+        exterior_point = (5, 2, -9.0212)
+        contained = contains_point t exterior_point
+
+
+-- | Check the volume of a particular tetrahedron (computed by hand)
+--   and whether or not it contains a specific point chosen to be
+--   inside of it. Its vertices are in counter-clockwise order, so the
+--   volume should be positive.
+tetrahedron2_geometry_tests :: Test.Framework.Test
+tetrahedron2_geometry_tests =
+  testGroup "tetrahedron2 geometry"
+              [ testCase "volume1" volume1,
+                testCase "contains point1" contains_point1]
+  where
+    p0 = (0, -0.5, 0)
+    p1 = (2, 0, 0)
+    p2 = (0, 0.5, 0)
+    p3 = (1, 0, 1)
+    t = Tetrahedron { v0 = p0,
+                      v1 = p1,
+                      v2 = p2,
+                      v3 = p3,
+                      fv = empty_values }
+
+    volume1 :: Assertion
+    volume1 = assertEqual "volume1 is correct" True (vol ~= (1/3))
+      where
+        vol = volume t
+
+    contains_point1 :: Assertion
+    contains_point1 = assertEqual "contains an inner point" True contained
+        where
+          inner_point = (1, 0, 0.5)
+          contained = contains_point t inner_point
 
 
 -- | Ensure that a tetrahedron does not contain a particular point chosen to
 --   be outside of it (second test).
 test_doesnt_contain_point2 :: Assertion
 test_doesnt_contain_point2 =
-    assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
+    assertEqual "doesn't contain an exterior point" False contained
     where
       p0 = (0, 1, 1)
       p1 = (1, 1, 1)
@@ -114,13 +98,14 @@ test_doesnt_contain_point2 =
                         v2 = p2,
                         v3 = p3,
                         fv = empty_values }
+      contained = contains_point t exterior_point
 
 
 -- | Ensure that a tetrahedron does not contain a particular point chosen to
 --   be outside of it (third test).
 test_doesnt_contain_point3 :: Assertion
 test_doesnt_contain_point3 =
-    assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
+    assertEqual "doesn't contain an exterior point" False contained
     where
       p0 = (1, 1, 1)
       p1 = (1, 0, 1)
@@ -132,13 +117,14 @@ test_doesnt_contain_point3 =
                         v2 = p2,
                         v3 = p3,
                         fv = empty_values }
+      contained = contains_point t exterior_point
 
 
 -- | Ensure that a tetrahedron does not contain a particular point chosen to
 --   be outside of it (fourth test).
 test_doesnt_contain_point4 :: Assertion
 test_doesnt_contain_point4 =
-    assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
+    assertEqual "doesn't contain an exterior point" False contained
     where
       p0 = (1, 0, 1)
       p1 = (0, 0, 1)
@@ -150,13 +136,14 @@ test_doesnt_contain_point4 =
                         v2 = p2,
                         v3 = p3,
                         fv = empty_values }
+      contained = contains_point t exterior_point
 
 
 -- | Ensure that a tetrahedron does not contain a particular point chosen to
 --   be outside of it (fifth test).
 test_doesnt_contain_point5 :: Assertion
 test_doesnt_contain_point5 =
-    assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point)
+    assertEqual "doesn't contain an exterior point" False contained
     where
       p0 = (0, 0, 1)
       p1 = (0, 1, 1)
@@ -168,6 +155,7 @@ test_doesnt_contain_point5 =
                         v2 = p2,
                         v3 = p3,
                         fv = empty_values }
+      contained = contains_point t exterior_point
 
 
 -- | The barycentric coordinate of v0 with respect to itself should