Move the FunctionValues tests into the FunctionValues module.

[spline3.git] / test / TestSuite.hs

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 23bc60394497ca47ea5a10ea2147a9f711ddeb39..73723c270fa810119cfb97013adf6d1fdb37b0a5 100644 (file)
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -9,9 +9,9 @@ import Test.Framework.Providers.QuickCheck2 (testProperty)
 import Test.HUnit
 import Test.QuickCheck (Testable ())
 
+import FunctionValues (functionvalues_tests)
 import Tests.Cardinal
 import Tests.Cube as TC
-import Tests.FunctionValues
 import Tests.Grid
 import Tests.Misc
 import Tests.Tetrahedron as TT
@@ -30,40 +30,15 @@ cardinal_tests =
     testGroup "Cardinal Tests" [
       tc "c-tilde_2100 rotation correct" test_c_tilde_2100_rotation_correct ]
 
-function_values_tests :: Test.Framework.Test
-function_values_tests =
-    testGroup "FunctionValues Tests" [ tc "test directions" test_directions ]
 
 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 "zeros reproduced" test_zeros_reproduced ]
 
 
 misc_tests :: Test.Framework.Test
@@ -74,14 +49,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
@@ -188,6 +158,9 @@ p79_28_properties =
 cube_properties :: Test.Framework.Test
 cube_properties =
     testGroup "Cube Properties" [
+  tp "front/back tetrahedra are disjoint" prop_front_back_tetrahedra_disjoint,
+  tp "top/down tetrahedra are disjoint" prop_top_down_tetrahedra_disjoint,
+  tp "left/right tetrahedra are disjoint" prop_left_right_tetrahedra_disjoint,
   tp "all volumes positive" prop_all_volumes_positive,
   tp "all volumes exact" prop_all_volumes_exact,
   tp "v0 all equal" prop_v0_all_equal,
@@ -229,7 +202,16 @@ tetrahedron_properties =
       tp "y rotation doesn't affect right" prop_y_rotation_doesnt_affect_right,
       tp "z rotation doesn't affect top" prop_z_rotation_doesnt_affect_top,
       tp "z rotation doesn't affect down" prop_z_rotation_doesnt_affect_down ]
-                 
+
+
+-- Do the slow tests last so we can stop paying attention.
+slow_tests :: Test.Framework.Test
+slow_tests =
+    testGroup "Slow Tests" [
+      tp "cube indices within bounds" prop_cube_indices_never_go_out_of_bounds,
+      tc "trilinear9x9x9 reproduced" test_trilinear9x9x9_reproduced ]
+
+
 tests :: [Test.Framework.Test]
 tests = [ cardinal_tests,
           function_values_tests,
@@ -245,4 +227,5 @@ tests = [ cardinal_tests,
 --          p78_25_properties,
           p79_26_properties,
           p79_27_properties,
-          p79_28_properties ]
+          p79_28_properties,
+          slow_tests ]