X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=7cd8d937938b9e245156823ed5e3b393c5b5d3cb;hb=eee156f562f9c1c1194a67cef12f146304d88ce9;hp=4450f1d34001afaf731f17159492c09e6501c7b1;hpb=a23ed449c784cdf81501c696bec10b1fbaeefc5f;p=hath.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 4450f1d..7cd8d93 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -1,34 +1,21 @@
-import Test.HUnit
-import Test.QuickCheck.Batch
+import Test.Tasty ( TestTree, defaultMain, localOption, testGroup )
+import Test.Tasty.QuickCheck ( QuickCheckTests(..), QuickCheckMaxRatio(..) )
+import Cidr ( cidr_properties, cidr_tests )
+import IPv4Address ( ipv4address_properties, ipv4address_tests )
+import Octet ( octet_properties, octet_tests )
 
-import Cidr (cidr_tests,
-             prop_all_cidrs_contain_themselves,
-             prop_contains_proper_intransitive)
-
-import IPv4Address (ipv4address_tests)
-import Maskable (maskable_tests)
-import Octet (octet_tests)
-
--- The list of HUnit tests.
-test_suite = TestList (concat [cidr_tests,
-                               ipv4address_tests,
-                               maskable_tests,
-                               octet_tests])
-
--- QuickCheck options
-options = TestOptions { no_of_tests     = 1000,
-                        length_of_tests = 0, -- No time limit on tests.
-                        debug_tests     = False }
+tests :: TestTree
+tests = testGroup "All Tests" [
+          cidr_properties,
+          cidr_tests,
+          ipv4address_properties,
+          ipv4address_tests,
+          octet_properties,
+          octet_tests ]
 
+-- TODO: Run 5000 generated tests, we have a large space.
 main :: IO ()
-main = do
-  putStrLn "HUnit"
-  putStrLn "-----"
-  runTestTT test_suite
-
-  putStrLn ""
-
-  putStrLn "QuickCheck"
-  putStrLn "----------"
-  runTests "Cidr" options [ run prop_all_cidrs_contain_themselves,
-                            run prop_contains_proper_intransitive]
+main =
+  defaultMain $
+    localOption (QuickCheckTests 5000) $
+    localOption (QuickCheckMaxRatio 50) tests