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

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 897807f..3c00d06 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -1,15 +1,32 @@
 import Test.HUnit
+import Test.QuickCheck.Batch
+
+import Cidr (cidr_tests,
+             prop_all_cidrs_contain_themselves,
+             prop_contains_proper_intransitive)
 
-import Cidr (cidr_tests)
 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])
 
-main :: IO Counts
+-- QuickCheck options
+options = TestOptions { no_of_tests     = 1000,
+                        length_of_tests = 0, -- No time limit on tests.
+                        debug_tests     = False }
+
+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]