Combine some Tetrahedron tests.

Whitespace cleanup.

diff --git a/src/Tests/Tetrahedron.hs b/src/Tests/Tetrahedron.hs
index a2a7b6ebdf54fdaf6e8cdf729e4fe49d05d41ee1..9c28e590fe33182c83aaedfb8a66441e9c6a7aed 100644 (file)
--- a/src/Tests/Tetrahedron.hs
+++ b/src/Tests/Tetrahedron.hs
@@ -1,6 +1,8 @@
 module Tests.Tetrahedron
 where
 
+import Test.Framework (Test, testGroup)
+import Test.Framework.Providers.HUnit (testCase)
 import Test.HUnit
 import Test.QuickCheck (Property, (==>))
 
@@ -33,48 +35,43 @@ test_volume1 =
       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 }
+-- | 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 (first test).
 test_doesnt_contain_point1 :: Assertion
 test_doesnt_contain_point1 =
-    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.5, 0)
       p1 = (0, 0.5, 0)
@@ -86,13 +83,14 @@ test_doesnt_contain_point1 =
                         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 (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)
@@ -104,13 +102,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)
@@ -122,13 +121,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)
@@ -140,13 +140,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)
@@ -158,6 +159,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

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index a866bddcca32cf87de8e0aa4552048f289de9eba..3a0af8187c7417ef6bcb97f7fc92b46fabab7347 100644 (file)
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -53,9 +53,8 @@ misc_tests =
 tetrahedron_tests :: Test.Framework.Test
 tetrahedron_tests =
     testGroup "Tetrahedron Tests" [
+      tetrahedron2_geometry_tests,
       tc "volume (1)" test_volume1,
-      tc "volume (2)" test_volume2,
-      tc "contains point (1)" test_contains_point1,
       tc "doesn't contain point (1)" test_doesnt_contain_point1,
       tc "doesn't contain point (2)" test_doesnt_contain_point2,
       tc "doesn't contain point (3)" test_doesnt_contain_point3,