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

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 897807f..fa39ef3 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -1,15 +1,25 @@
-import Test.HUnit
+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)
-import IPv4Address (ipv4address_tests)
-import Maskable (maskable_tests)
-import Octet (octet_tests)
+tests :: TestTree
+tests = testGroup "All Tests" [
+          cidr_properties,
+          cidr_tests,
+          ipv4address_properties,
+          ipv4address_tests,
+          octet_properties,
+          octet_tests ]
 
-test_suite = TestList (concat [cidr_tests,
-                               ipv4address_tests,
-                               maskable_tests,
-                               octet_tests])
-
-main :: IO Counts
-main = do
-  runTestTT test_suite
+-- | 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 =
+  defaultMain $
+    localOption (QuickCheckTests 5000) $
+    localOption (QuickCheckMaxRatio 5000) tests