A bunch more test cleanup.

[spline3.git] / test / TestSuite.hs

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index f82fbdf916e95485840d5d1eda92d32bcf99539b..a3563b0721fcc36bb017f561737bb3d437f05fe7 100644 (file)
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -9,11 +9,11 @@ import Test.Framework.Providers.QuickCheck2 (testProperty)
 import Test.HUnit
 import Test.QuickCheck (Testable ())
 
+import FunctionValues (function_values_tests, function_values_properties)
+import Misc (misc_tests, misc_properties)
 import Tests.Cardinal
 import Tests.Cube as TC
-import Tests.FunctionValues
 import Tests.Grid
-import Tests.Misc
 import Tests.Tetrahedron as TT
 
 main :: IO ()
@@ -30,50 +30,28 @@ 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" [
-      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,
-      tc "zeros reproduced" test_zeros_reproduced,
-      tc "trilinear9x9x9 reproduced" test_trilinear9x9x9_reproduced ]
-
+      tc "zeros reproduced" test_zeros_reproduced ]
 
-misc_tests :: Test.Framework.Test
-misc_tests =
-    testGroup "Misc Tests" [
-      tc "flatten (1)" test_flatten1 ]
 
 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
 tp = testProperty
 
-misc_properties :: Test.Framework.Test
-misc_properties =
-    testGroup "Misc Properties" [
-      tp "factorial greater" prop_factorial_greater ]
 
 cardinal_properties :: Test.Framework.Test
 cardinal_properties =
@@ -171,6 +149,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,
@@ -205,14 +186,17 @@ tetrahedron_properties =
       tp "swapping_vertices_doesnt_affect_coefficients3"
          $ prop_swapping_vertices_doesnt_affect_coefficients3,
       tp "swapping_vertices_doesnt_affect_coefficients4"
-         $ prop_swapping_vertices_doesnt_affect_coefficients4,
-      tp "x rotation doesn't affect front" prop_x_rotation_doesnt_affect_front,
-      tp "x rotation doesn't affect back" prop_x_rotation_doesnt_affect_back,
-      tp "y rotation doesn't affect left" prop_y_rotation_doesnt_affect_left,
-      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 ]
-                 
+         $ prop_swapping_vertices_doesnt_affect_coefficients4 ]
+
+
+-- 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,
@@ -228,4 +212,5 @@ tests = [ cardinal_tests,
 --          p78_25_properties,
           p79_26_properties,
           p79_27_properties,
-          p79_28_properties ]
+          p79_28_properties,
+          slow_tests ]