De-dupe some more Tetrahedron tests.

[spline3.git] / test / TestSuite.hs

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 1d4a235e0320310b88464acb42d65f5542c8b48e..3d058e457c18e9c0906ea90003585514b6eab864 100644 (file)
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -37,35 +37,12 @@ function_values_tests =
 grid_tests :: Test.Framework.Test
 grid_tests =
     testGroup "Grid Tests" [
-      tc "trilinear c0030" test_trilinear_c0030,
-      tc "trilinear c0003" test_trilinear_c0003,
-      tc "trilinear c0021" test_trilinear_c0021,
-      tc "trilinear c0012" test_trilinear_c0012,
-      tc "trilinear c0120" test_trilinear_c0120,
-      tc "trilinear c0102" test_trilinear_c0102,
-      tc "trilinear c0111" test_trilinear_c0111,
-      tc "trilinear c0210" test_trilinear_c0210,
-      tc "trilinear c0201" test_trilinear_c0201,
-      tc "trilinear c0300" test_trilinear_c0300,
-      tc "trilinear c1020" test_trilinear_c1020,
-      tc "trilinear c1002" test_trilinear_c1002,
-      tc "trilinear c1011" test_trilinear_c1011,
-      tc "trilinear c1110" test_trilinear_c1110,
-      tc "trilinear c1101" test_trilinear_c1101,
-      tc "trilinear c1200" test_trilinear_c1200,
-      tc "trilinear c2010" test_trilinear_c2010,
-      tc "trilinear c2001" test_trilinear_c2001,
-      tc "trilinear c2100" test_trilinear_c2100,
-      tc "trilinear c3000" test_trilinear_c3000,
-      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,
       tc "zeros reproduced" test_zeros_reproduced,
-      tc "trilinear9x9x9 reproduced" test_trilinear9x9x9_reproduced,
-      tc "tetrahedra collision test isn't too sensitive"
-         test_tetrahedra_collision_sensitivity ]
+      tc "trilinear9x9x9 reproduced" test_trilinear9x9x9_reproduced ]
 
 
 misc_tests :: Test.Framework.Test
@@ -76,10 +53,8 @@ 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,
+      tetrahedron1_geometry_tests,
+      tetrahedron2_geometry_tests,
       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,