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

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index b021fa3..bac18ec 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -1,4 +1,4 @@
-module TestSuite
+module Main
 where
 
 import Data.Monoid (mempty)
@@ -13,7 +13,6 @@ import Test.Framework (
 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
@@ -28,11 +27,9 @@ import Tetrahedron (tetrahedron_tests, tetrahedron_properties)
 
 main :: IO ()
 main = do
-  dt <- docTest ["src/Everything.hs"] ["-isrc"]
-
   let empty_test_opts = mempty :: TestOptions
   let my_test_opts = empty_test_opts {
-    topt_maximum_generated_tests = Just 1000
+    topt_maximum_generated_tests = Just 500
   }
 
   let empty_runner_opts = mempty :: RunnerOptions
@@ -40,17 +37,7 @@ main = do
     ropt_test_options = Just my_test_opts
   }
 
-  defaultMainWithOpts ([dt] ++ tests) my_runner_opts
-
-
--- | Defined so that my test names fit on one line.
-tc :: Test.Framework.Providers.API.TestName -> Test.HUnit.Assertion -> Test.Framework.Test
-tc = testCase
-
-
--- | Defined so that my test names fit on one line.
-tp :: Test.QuickCheck.Testable a => Test.Framework.TestName -> a -> Test.Framework.Test
-tp = testProperty
+  defaultMainWithOpts tests my_runner_opts
 
 
 tests :: [Test.Framework.Test]
@@ -61,6 +48,6 @@ tests = [ cardinal_tests,
           tetrahedron_tests,
           cube_properties,
           tetrahedron_properties,
-          misc_properties,          
+          misc_properties,
           cardinal_properties,
           slow_tests ]