X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=7b1a55a099bf31c49fcf5d5203d08a43e254834e;hb=ec2bcae0167bcc09c30e7618a5d7601510593610;hp=25057ef382aa7a38003511cfbf94901a17ea7726;hpb=957754c693525096c5fd7427decd6404bbb03379;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 25057ef..7b1a55a 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -11,9 +11,9 @@ import Test.QuickCheck (Testable ())
 
 import Cardinal (cardinal_tests, cardinal_properties)
 import FunctionValues (function_values_tests, function_values_properties)
+import Grid (grid_tests, slow_tests)
 import Misc (misc_tests, misc_properties)
 import Tests.Cube as TC
-import Tests.Grid
 import Tests.Tetrahedron as TT
 
 main :: IO ()
@@ -27,14 +27,6 @@ tc = testCase
 
 
 
-grid_tests :: Test.Framework.Test
-grid_tests =
-    testGroup "Grid Tests" [
-      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 ]
 
 
 tetrahedron_tests :: Test.Framework.Test
@@ -122,9 +114,18 @@ 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 "opposite octant tetrahedra are disjoint (1)"
+     prop_opposite_octant_tetrahedra_disjoint1,
+  tp "opposite octant tetrahedra are disjoint (2)"
+     prop_opposite_octant_tetrahedra_disjoint2,
+  tp "opposite octant tetrahedra are disjoint (3)"
+     prop_opposite_octant_tetrahedra_disjoint3,
+  tp "opposite octant tetrahedra are disjoint (4)"
+     prop_opposite_octant_tetrahedra_disjoint4,
+  tp "opposite octant tetrahedra are disjoint (5)"
+     prop_opposite_octant_tetrahedra_disjoint5,
+  tp "opposite octant tetrahedra are disjoint (6)"
+     prop_opposite_octant_tetrahedra_disjoint6,
   tp "all volumes positive" prop_all_volumes_positive,
   tp "all volumes exact" prop_all_volumes_exact,
   tp "v0 all equal" prop_v0_all_equal,
@@ -162,14 +163,6 @@ tetrahedron_properties =
          $ 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,