Re-enable all of the tests for (2.6) and make them pass by switchint the third and...

[spline3.git] / test / TestSuite.hs

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 20a2476d9b06745e14e80b34f2261bc1fd3f7be4..0e0055d6142fafc2249c50623b02f09fb73d33da 100644 (file)
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -2,13 +2,13 @@ import Test.HUnit
 import Test.QuickCheck
 
 import Tests.Cardinal
-import Tests.Cube
-import Tests.Face as TF
+import Tests.Cube as TC
+import Tests.Grid
 import Tests.Misc
 import Tests.Tetrahedron as TT
 
 -- The list of HUnit tests.
-test_suite = TestList (concat [face_tests,
+test_suite = TestList (concat [grid_tests,
                                misc_tests,
                                tetrahedron_tests])
 
@@ -24,37 +24,40 @@ main = do
                           maxDiscard = 500,
                           maxSize = 100 }
 
+
+  putStrLn "\nGrid Tests\n"
+
   putStrLn "\nCube Tests\n"
 
   putStr "prop_all_volumes_positive... "
   quickCheckWith qc_args prop_all_volumes_positive
 
-  putStr "prop_tetrahedron0_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron0_volumes_exact
+  -- putStr "prop_tetrahedron0_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron0_volumes_exact
 
-  putStr "prop_tetrahedron1_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron1_volumes_exact
+  -- putStr "prop_tetrahedron1_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron1_volumes_exact
 
-  putStr "prop_tetrahedron2_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron2_volumes_exact
+  -- putStr "prop_tetrahedron2_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron2_volumes_exact
 
-  putStr "prop_tetrahedron3_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron3_volumes_exact
+  -- putStr "prop_tetrahedron3_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron3_volumes_exact
 
-  putStr "prop_tetrahedron4_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron4_volumes_exact
+  -- putStr "prop_tetrahedron4_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron4_volumes_exact
 
-  putStr "prop_tetrahedron4_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron4_volumes_exact
+  -- putStr "prop_tetrahedron4_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron4_volumes_exact
 
-  putStr "prop_tetrahedron5_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron5_volumes_exact
+  -- putStr "prop_tetrahedron5_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron5_volumes_exact
 
-  putStr "prop_tetrahedron6_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron6_volumes_exact
+  -- putStr "prop_tetrahedron6_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron6_volumes_exact
 
-  putStr "prop_tetrahedron7_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron7_volumes_exact
+  -- putStr "prop_tetrahedron7_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron7_volumes_exact
 
   putStr "prop_tetrahedron0_volumes_positive... "
   quickCheckWith qc_args prop_tetrahedron0_volumes_positive
@@ -131,95 +134,31 @@ main = do
   putStr "prop_v0_all_equal... "
   quickCheckWith qc_args prop_v0_all_equal
 
-  putStrLn "\nMisc Tests\n"
-
-  putStr "prop_factorial_greater... "
-  quickCheckWith qc_args prop_factorial_greater
-
-  putStrLn "\nTetrahedron Tests\n"
-
-  putStr "prop_b0_v0_always_unity... "
-  quickCheckWith qc_args prop_b0_v0_always_unity
-
-  putStr "prop_b0_v1_always_zero... "
-  quickCheckWith qc_args prop_b0_v1_always_zero
-
-  putStr "prop_b0_v2_always_zero... "
-  quickCheckWith qc_args prop_b0_v2_always_zero
-
-  putStr "prop_b0_v3_always_zero... "
-  quickCheckWith qc_args prop_b0_v3_always_zero
-
-  putStr "prop_b1_v1_always_unity... "
-  quickCheckWith qc_args prop_b1_v1_always_unity
-
-  putStr "prop_b1_v0_always_zero... "
-  quickCheckWith qc_args prop_b1_v0_always_zero
-
-  putStr "prop_b1_v2_always_zero... "
-  quickCheckWith qc_args prop_b1_v2_always_zero
-
-  putStr "prop_b1_v3_always_zero... "
-  quickCheckWith qc_args prop_b1_v3_always_zero
-
-  putStr "prop_b2_v2_always_unity... "
-  quickCheckWith qc_args prop_b2_v2_always_unity
-
-  putStr "prop_b2_v0_always_zero... "
-  quickCheckWith qc_args prop_b2_v0_always_zero
-
-  putStr "prop_b2_v1_always_zero... "
-  quickCheckWith qc_args prop_b2_v1_always_zero
-
-  putStr "prop_b2_v3_always_zero... "
-  quickCheckWith qc_args prop_b2_v3_always_zero
-
-  putStr "prop_b3_v3_always_unity... "
-  quickCheckWith qc_args prop_b3_v3_always_unity
-
-  putStr "prop_b3_v0_always_zero... "
-  quickCheckWith qc_args prop_b3_v0_always_zero
-
-  putStr "prop_b3_v1_always_zero... "
-  quickCheckWith qc_args prop_b3_v1_always_zero
-
-  putStr "prop_b3_v2_always_zero... "
-  quickCheckWith qc_args prop_b3_v2_always_zero
-
-  -- putStrLn "\np. 78, (2.4)\n"
-
-  -- putStr "prop_c3000_identity... "
-  -- quickCheckWith qc_args TT.prop_c3000_identity
-
-  -- putStr "prop_c2100_identity... "
-  -- quickCheckWith qc_args TT.prop_c2100_identity
-
-  -- putStr "prop_c1110_identity... "
-  -- quickCheckWith qc_args TT.prop_c1110_identity
-
   -- putStrLn "\np. 78, (2.5)\n"
 
   -- putStr "prop_cijk1_identity... "
   -- quickCheckWith qc_args prop_cijk1_identity
+
+
   -- putStrLn "\np. 79, (2.6)\n"
 
-  -- putStr "prop_c0120_identity1... "
-  -- quickCheckWith qc_args TF.prop_c0120_identity1
+  putStr "prop_c0120_identity1... "
+  quickCheckWith qc_args TC.prop_c0120_identity1
 
-  -- putStr "prop_c0210_identity1... "
-  -- quickCheckWith qc_args TF.prop_c0210_identity1
+  putStr "prop_c0210_identity1... "
+  quickCheckWith qc_args TC.prop_c0210_identity1
 
-  -- putStr "prop_c0300_identity1... "
-  -- quickCheckWith qc_args TF.prop_c0300_identity1
+  putStr "prop_c0300_identity1... "
+  quickCheckWith qc_args TC.prop_c0300_identity1
 
-  -- putStr "prop_c1110_identity... "
-  -- quickCheckWith qc_args TF.prop_c1110_identity
+  putStr "prop_c1110_identity... "
+  quickCheckWith qc_args TC.prop_c1110_identity
 
-  -- putStr "prop_c1200_identity1... "
-  -- quickCheckWith qc_args prop_c1200_identity1
+  putStr "prop_c1200_identity1... "
+  quickCheckWith qc_args TC.prop_c1200_identity1
 
-  -- putStr "prop_c2100_identity1... "
-  -- quickCheckWith qc_args TF.prop_c2100_identity1
+  putStr "prop_c2100_identity1... "
+  quickCheckWith qc_args TC.prop_c2100_identity1
 
   -- putStrLn "\np. 79, (2.7)\n"
 
@@ -281,6 +220,74 @@ main = do
   -- putStr "prop_c0300_identity3... "
   -- quickCheckWith qc_args TF.prop_c0300_identity3
 
+
+  putStrLn "\nMisc Tests\n"
+
+  putStr "prop_factorial_greater... "
+  quickCheckWith qc_args prop_factorial_greater
+
+  putStrLn "\nTetrahedron Tests\n"
+
+  putStr "prop_b0_v0_always_unity... "
+  quickCheckWith qc_args prop_b0_v0_always_unity
+
+  putStr "prop_b0_v1_always_zero... "
+  quickCheckWith qc_args prop_b0_v1_always_zero
+
+  putStr "prop_b0_v2_always_zero... "
+  quickCheckWith qc_args prop_b0_v2_always_zero
+
+  putStr "prop_b0_v3_always_zero... "
+  quickCheckWith qc_args prop_b0_v3_always_zero
+
+  putStr "prop_b1_v1_always_unity... "
+  quickCheckWith qc_args prop_b1_v1_always_unity
+
+  putStr "prop_b1_v0_always_zero... "
+  quickCheckWith qc_args prop_b1_v0_always_zero
+
+  putStr "prop_b1_v2_always_zero... "
+  quickCheckWith qc_args prop_b1_v2_always_zero
+
+  putStr "prop_b1_v3_always_zero... "
+  quickCheckWith qc_args prop_b1_v3_always_zero
+
+  putStr "prop_b2_v2_always_unity... "
+  quickCheckWith qc_args prop_b2_v2_always_unity
+
+  putStr "prop_b2_v0_always_zero... "
+  quickCheckWith qc_args prop_b2_v0_always_zero
+
+  putStr "prop_b2_v1_always_zero... "
+  quickCheckWith qc_args prop_b2_v1_always_zero
+
+  putStr "prop_b2_v3_always_zero... "
+  quickCheckWith qc_args prop_b2_v3_always_zero
+
+  putStr "prop_b3_v3_always_unity... "
+  quickCheckWith qc_args prop_b3_v3_always_unity
+
+  putStr "prop_b3_v0_always_zero... "
+  quickCheckWith qc_args prop_b3_v0_always_zero
+
+  putStr "prop_b3_v1_always_zero... "
+  quickCheckWith qc_args prop_b3_v1_always_zero
+
+  putStr "prop_b3_v2_always_zero... "
+  quickCheckWith qc_args prop_b3_v2_always_zero
+
+  putStrLn "\np. 78, (2.4)\n"
+
+  putStr "prop_c3000_identity... "
+  quickCheckWith qc_args TT.prop_c3000_identity
+
+  putStr "prop_c2100_identity... "
+  quickCheckWith qc_args TT.prop_c2100_identity
+
+  putStr "prop_c1110_identity... "
+  quickCheckWith qc_args TT.prop_c1110_identity
+
+
   putStrLn "\nCardinal Tests\n"
 
   putStr "prop_ccwx_rotation_changes_direction... "