X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=0cc376e63ac9c5658755374d66ffb951f25e0842;hb=251e0edfe4326017c43b4489d2f22ca8bef8ce90;hp=0e11d1c0cfc4cf675862f47af66d4dfa3885a668;hpb=3a954903101eca7594a65824868517b9758e188d;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 0e11d1c..0cc376e 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -1,44 +1,32 @@
-module TestSuite
+module Main (main)
 where
 
-import Test.Framework (defaultMain, testGroup, Test, TestName, TestOptions(..))
-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 (Testable ())
+import Test.Tasty ( TestTree, defaultMain, localOption, testGroup )
+import Test.Tasty.QuickCheck ( QuickCheckTests(..) )
 
-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)
+import Cardinal ( cardinal_tests, cardinal_properties )
+import Cube ( cube_properties )
+import FunctionValues ( function_values_tests, function_values_properties )
+import Grid ( grid_properties, grid_tests, slow_tests )
+import Misc ( misc_tests, misc_properties )
+import Tetrahedron ( tetrahedron_tests, tetrahedron_properties )
 
 main :: IO ()
 main = do
-  dt <- docTest ["src/Everything.hs"] ["-isrc"]
-  defaultMain $ [dt] ++ tests
-
--- | 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
-
-
-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 ]
+  defaultMain $ localOption (QuickCheckTests 500) tests
+
+
+tests :: TestTree
+tests =
+  testGroup "All tests"
+    [ cardinal_tests,
+      function_values_tests,
+      grid_tests,
+      misc_tests,
+      tetrahedron_tests,
+      grid_properties,
+      cube_properties,
+      tetrahedron_properties,
+      misc_properties,
+      cardinal_properties,
+      slow_tests ]