X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=48493f8d4bb6ce8819243c38dd9aedd3c8e065d6;hb=76ff394c3e5a551e2a6bbf51fbee4e91b90b1611;hp=20a2476d9b06745e14e80b34f2261bc1fd3f7be4;hpb=01925d099b231a128f6bd51abd61bf9ff9c424b6;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 20a2476..48493f8 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,37 +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_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