Move the Grid tests into the Grid module.

[spline3.git] / test / TestSuite.hs

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 25057ef382aa7a38003511cfbf94901a17ea7726..6c4b4d9d94b5949b7d4778834ccac74252fbc4c5 100644 (file)
--- 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
@@ -162,14 +154,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,