X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=fa39ef3de373a3a921fef21a425111d55509db1e;hb=a8c2d85d8611f7f56eaa0c3406ec423d68f81f96;hp=3538d21141455e8d6938cdae4ff59fc3f497be43;hpb=1ba6b199192c6b5bddb486446ebfeff88a6309b9;p=hath.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 3538d21..fa39ef3 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -1,32 +1,25 @@
-import Test.HUnit
-import Test.QuickCheck.Batch
+import Test.Tasty( TestTree, defaultMain, localOption, testGroup )
+import Test.Tasty.QuickCheck(
+  QuickCheckTests( QuickCheckTests ),
+  QuickCheckMaxRatio( 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)
-
-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 ]
 
+-- | Warning: the QuickCheckMaxRatio option is not a ratio. It's
+--   currently set to \"100%\", so that the test suite passes even if
+--   we have to throw out all of our random test cases.
 main :: IO ()
-main = do
-  putStrLn "HUnit"
-  putStrLn "-----"
-  runTestTT test_suite
-
-  putStrLn ""
-
-  putStrLn "QuickCheck"
-  putStrLn "----------"
-  runTests "Cidr" options [ run prop_all_cidrs_contain_themselves ]
+main =
+  defaultMain $
+    localOption (QuickCheckTests 5000) $
+    localOption (QuickCheckMaxRatio 5000) tests