X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=b021fa3de834bd594ea41885df8a66f1ea3fa607;hb=1d371234dc06d20b59d8b42a46e42aebf430b9f4;hp=26c6bc943d2ac7d5b7fbabbdc5c491cc41023bae;hpb=89b8b6e94fcc944a1f4611811265f3c6217af850;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 26c6bc9..b021fa3 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -1,87 +1,66 @@
+module TestSuite
+where
+
+import Data.Monoid (mempty)
+import Test.Framework (
+  RunnerOptions(),
+  Test,
+  TestName,
+  TestOptions(),
+  defaultMainWithOpts,
+  testGroup
+  )
+import Test.Framework.Options
+import Test.Framework.Runners.Options
+import Test.Framework.Providers.API (TestName)
+import Test.Framework.Providers.DocTest
+import Test.Framework.Providers.HUnit (testCase)
+import Test.Framework.Providers.QuickCheck2 (testProperty)
 import Test.HUnit
-import Test.QuickCheck
+import Test.QuickCheck (Testable ())
 
-import Tests.Face
-import Tests.Misc
-import Tests.Tetrahedron
-
--- The list of HUnit tests.
-test_suite = TestList (concat [misc_tests,
-                               tetrahedron_tests])
+import Cardinal (cardinal_tests, cardinal_properties)
+import Cube (cube_properties)
+import FunctionValues (function_values_tests, function_values_properties)
+import Grid (grid_tests, slow_tests)
+import Misc (misc_tests, misc_properties)
+import Tetrahedron (tetrahedron_tests, tetrahedron_properties)
 
 main :: IO ()
 main = do
-  putStrLn "HUnit"
-  putStrLn "-----"
-  runTestTT test_suite
-  putStrLn ""
-  putStrLn "QuickCheck"
-  putStrLn "----------"
-  let qc_args = stdArgs { maxSuccess = 1000,
-                          maxDiscard = 5000,
-                          maxSize = 1000 }
-
-  putStr "prop_all_volumes_nonnegative... "
-  quickCheckWith qc_args prop_all_volumes_nonnegative
-
-  putStr "prop_factorial_greater... "
-  quickCheckWith qc_args prop_factorial_greater
-
-  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
+  dt <- docTest ["src/Everything.hs"] ["-isrc"]
 
-  putStr "prop_b2_v3_always_zero... "
-  quickCheckWith qc_args prop_b2_v3_always_zero
+  let empty_test_opts = mempty :: TestOptions
+  let my_test_opts = empty_test_opts {
+    topt_maximum_generated_tests = Just 1000
+  }
 
-  putStr "prop_b3_v3_always_unity... "
-  quickCheckWith qc_args prop_b3_v3_always_unity
+  let empty_runner_opts = mempty :: RunnerOptions
+  let my_runner_opts = empty_runner_opts {
+    ropt_test_options = Just my_test_opts
+  }
 
-  putStr "prop_b3_v0_always_zero... "
-  quickCheckWith qc_args prop_b3_v0_always_zero
+  defaultMainWithOpts ([dt] ++ tests) my_runner_opts
 
-  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
+-- | Defined so that my test names fit on one line.
+tc :: Test.Framework.Providers.API.TestName -> Test.HUnit.Assertion -> Test.Framework.Test
+tc = testCase
 
-  putStr "prop_c3000_identity... "
-  quickCheckWith qc_args prop_c3000_identity
 
-  putStr "prop_c2100_identity... "
-  quickCheckWith qc_args prop_c2100_identity
+-- | Defined so that my test names fit on one line.
+tp :: Test.QuickCheck.Testable a => Test.Framework.TestName -> a -> Test.Framework.Test
+tp = testProperty
 
-  putStr "prop_c1110_identity... "
-  quickCheckWith qc_args prop_c1110_identity
 
-  return ()
+tests :: [Test.Framework.Test]
+tests = [ cardinal_tests,
+          function_values_tests,
+          grid_tests,
+          misc_tests,
+          tetrahedron_tests,
+          cube_properties,
+          tetrahedron_properties,
+          misc_properties,          
+          cardinal_properties,
+          slow_tests ]