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 48493f8d4bb6ce8819243c38dd9aedd3c8e065d6..0e0055d6142fafc2249c50623b02f09fb73d33da 100644 (file)
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -2,15 +2,13 @@ import Test.HUnit
 import Test.QuickCheck
 
 import Tests.Cardinal
-import Tests.Cube
-import Tests.Face as TF
-import Tests.Grid as TG
+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,
-                               grid_tests,
+test_suite = TestList (concat [grid_tests,
                                misc_tests,
                                tetrahedron_tests])
 
@@ -136,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"
 
@@ -286,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... "