X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=73723c270fa810119cfb97013adf6d1fdb37b0a5;hb=1f20ae355d28b53fc2e1e31c4bd131e9ede00a87;hp=f82fbdf916e95485840d5d1eda92d32bcf99539b;hpb=b70a46d402df62ea02a4b111ab59666d2405462a;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index f82fbdf..73723c2 100644
--- 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,23 +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" [
-      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
@@ -57,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
@@ -171,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,
@@ -212,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,
@@ -228,4 +227,5 @@ tests = [ cardinal_tests,
 --          p78_25_properties,
           p79_26_properties,
           p79_27_properties,
-          p79_28_properties ]
+          p79_28_properties,
+          slow_tests ]