X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=6c4b4d9d94b5949b7d4778834ccac74252fbc4c5;hb=7a0d15a1fcdd00ae94b2a1b135ed095033667108;hp=a3563b0721fcc36bb017f561737bb3d437f05fe7;hpb=9849853e69c46b46996e8c775d15661b2aba27a8;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index a3563b0..6c4b4d9 100644
--- 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 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.Cardinal
 import Tests.Cube as TC
-import Tests.Grid
 import Tests.Tetrahedron as TT
 
 main :: IO ()
@@ -25,20 +25,8 @@ main = do
 tc :: Test.Framework.Providers.API.TestName -> Test.HUnit.Assertion -> Test.Framework.Test
 tc = testCase
 
-cardinal_tests :: Test.Framework.Test
-cardinal_tests =
-    testGroup "Cardinal Tests" [
-      tc "c-tilde_2100 rotation correct" test_c_tilde_2100_rotation_correct ]
 
 
-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
@@ -53,29 +41,6 @@ tp :: Test.QuickCheck.Testable a => Test.Framework.TestName -> a -> Test.Framewo
 tp = testProperty
 
 
-cardinal_properties :: Test.Framework.Test
-cardinal_properties =
-    testGroup "Cardinal Properties" [
-      tp "ccwx rotation changes direction" prop_ccwx_rotation_changes_direction,
-      tp "cwx rotation changes direction" prop_cwx_rotation_changes_direction,
-      tp "ccwy rotation changes direction" prop_ccwy_rotation_changes_direction,
-      tp "cwy rotation changes direction" prop_cwy_rotation_changes_direction,
-      tp "ccwz rotation changes direction" prop_ccwz_rotation_changes_direction,
-      tp "cwz rotation changes direction" prop_cwz_rotation_changes_direction,
-      tp "ccwx rotation result unique" prop_ccwx_rotation_result_unique,
-      tp "cwx rotation result unique" prop_cwx_rotation_result_unique,
-      tp "ccwy rotation result unique" prop_ccwy_rotation_result_unique,
-      tp "cwy rotation result unique" prop_cwy_rotation_result_unique,
-      tp "ccwz rotation result unique" prop_ccwz_rotation_result_unique,
-      tp "cwz rotation result unique" prop_cwz_rotation_result_unique,
-      tp "four cwx is identity" prop_four_cwx_is_identity,
-      tp "four ccwx is identity" prop_four_ccwx_is_identity,
-      tp "four cwy is identity" prop_four_cwy_is_identity,
-      tp "four ccwy is identity" prop_four_ccwy_is_identity,
-      tp "four cwz is identity" prop_four_cwz_is_identity,
-      tp "four ccwz is identity" prop_four_ccwz_is_identity]
-
-
 p78_24_properties :: Test.Framework.Test
 p78_24_properties =
     testGroup "p. 78, Section (2.4) Properties" [
@@ -189,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,