Even more Tetrahedron de-dupe.

[spline3.git] / test / TestSuite.hs

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index f82fbdf916e95485840d5d1eda92d32bcf99539b..541694cd17980c4a062e82c52caad77a2a5bef0d 100644 (file)
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -37,11 +37,7 @@ function_values_tests =
 grid_tests :: Test.Framework.Test
 grid_tests =
     testGroup "Grid Tests" [
-      trilinear_c0_t0_coefficient_tests,
-      tc "trilinear f0_t0_v0" test_trilinear_f0_t0_v0,
-      tc "trilinear f0_t0_v1" test_trilinear_f0_t0_v1,
-      tc "trilinear f0_t0_v2" test_trilinear_f0_t0_v2,
-      tc "trilinear f0_t0_v3" test_trilinear_f0_t0_v3,
+      trilinear_c0_t0_tests,
       tc "tetrahedra collision test isn't too sensitive"
          test_tetrahedra_collision_sensitivity,
       tc "trilinear reproduced" test_trilinear_reproduced,
@@ -57,14 +53,9 @@ misc_tests =
 tetrahedron_tests :: Test.Framework.Test
 tetrahedron_tests =
     testGroup "Tetrahedron 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,
-      tc "doesn't contain point (4)" test_doesnt_contain_point4,
-      tc "doesn't contain point (5)" test_doesnt_contain_point5 ]
+      tetrahedron1_geometry_tests,
+      tetrahedron2_geometry_tests,
+      containment_tests ]
 
 -- | Defined so that my test names fit on one line.
 tp :: Test.QuickCheck.Testable a => Test.Framework.TestName -> a -> Test.Framework.Test