X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=077faa9dfb5e57b2eb0c9fd9d9fdc3639a179353;hb=62e6ea5912a0ef9b21d034590700d6b450f942fb;hp=3e958e1f5895842bf79eb8ecc634ae76ff1aa30a;hpb=190b6c22ab150e1877b0b94a33253832eb7764d2;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 3e958e1..077faa9 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -4,11 +4,13 @@ import Test.QuickCheck
 import Tests.Cardinal
 import Tests.Cube
 import Tests.Face as TF
+import Tests.Grid as TG
 import Tests.Misc
 import Tests.Tetrahedron as TT
 
 -- The list of HUnit tests.
 test_suite = TestList (concat [face_tests,
+                               grid_tests,
                                misc_tests,
                                tetrahedron_tests])
 
@@ -24,11 +26,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_all_volumes_exact... "
-  quickCheckWith qc_args prop_all_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_tetrahedron2_volumes_exact... "
+  quickCheckWith qc_args prop_tetrahedron2_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_tetrahedron5_volumes_exact... "
+  quickCheckWith qc_args prop_tetrahedron5_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_tetrahedron0_volumes_positive... "
   quickCheckWith qc_args prop_tetrahedron0_volumes_positive
@@ -54,12 +85,64 @@ main = do
   putStr "prop_tetrahedron7_volumes_positive... "
   quickCheckWith qc_args prop_tetrahedron7_volumes_positive
 
+  putStr "prop_tetrahedron8_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron8_volumes_positive
+
+  putStr "prop_tetrahedron9_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron9_volumes_positive
+
+  putStr "prop_tetrahedron10_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron10_volumes_positive
+
+  putStr "prop_tetrahedron11_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron11_volumes_positive
+
+  putStr "prop_tetrahedron12_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron12_volumes_positive
+
+  putStr "prop_tetrahedron13_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron13_volumes_positive
+
+  putStr "prop_tetrahedron14_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron14_volumes_positive
+
+  putStr "prop_tetrahedron15_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron15_volumes_positive
+
+  putStr "prop_tetrahedron16_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron16_volumes_positive
+
+  putStr "prop_tetrahedron17_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron17_volumes_positive
+
+  putStr "prop_tetrahedron18_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron18_volumes_positive
+
+  putStr "prop_tetrahedron19_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron19_volumes_positive
+
+  putStr "prop_tetrahedron20_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron20_volumes_positive
+
+  putStr "prop_tetrahedron21_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron21_volumes_positive
+
+  putStr "prop_tetrahedron22_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron22_volumes_positive
+
+  putStr "prop_tetrahedron23_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron23_volumes_positive
+
   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
 
@@ -203,10 +286,30 @@ main = do
   -- putStr "prop_c0300_identity3... "
   -- quickCheckWith qc_args TF.prop_c0300_identity3
 
+  putStrLn "\nCardinal Tests\n"
+
   putStr "prop_ccwx_rotation_changes_direction... "
   quickCheckWith qc_args prop_ccwx_rotation_changes_direction
 
   putStr "prop_cwx_rotation_changes_direction... "
   quickCheckWith qc_args prop_cwx_rotation_changes_direction
 
+  putStr "prop_four_cwx_is_identity... "
+  quickCheckWith qc_args prop_four_cwx_is_identity
+
+  putStr "prop_four_ccwx_is_identity... "
+  quickCheckWith qc_args prop_four_ccwx_is_identity
+
+  putStr "prop_four_cwy_is_identity... "
+  quickCheckWith qc_args prop_four_cwy_is_identity
+
+  putStr "prop_four_ccwy_is_identity... "
+  quickCheckWith qc_args prop_four_ccwy_is_identity
+
+  putStr "prop_four_cwz_is_identity... "
+  quickCheckWith qc_args prop_four_cwz_is_identity
+
+  putStr "prop_four_ccwz_is_identity... "
+  quickCheckWith qc_args prop_four_ccwz_is_identity
+
   return ()