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

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 3538d21..3085c1b 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -1,32 +1,46 @@
+{-# LANGUAGE NoMonomorphismRestriction #-}
+import Data.Monoid (mempty)
+import Test.Framework (
+  RunnerOptions(),
+  Test,
+  TestName,
+  TestOptions(),
+  defaultMainWithOpts,
+  testGroup
+  )
+import Test.Framework.Options
+import Test.Framework.Runners.Options
+import Test.Framework.Providers.API (TestName)
+import Test.Framework.Providers.HUnit (testCase)
+import Test.Framework.Providers.QuickCheck2 (testProperty)
 import Test.HUnit
-import Test.QuickCheck.Batch
+import Test.QuickCheck (Testable ())
 
-import Cidr (cidr_tests,
-             prop_all_cidrs_contain_themselves)
+import Cidr (cidr_properties, 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])
-
--- QuickCheck options
-options = TestOptions { no_of_tests     = 1000,
-                        length_of_tests = 0, -- No time limit on tests.
-                        debug_tests     = False }
+tests :: [Test.Framework.Test]
+tests = [ cidr_properties,
+          cidr_tests,
+          ipv4address_tests,
+          octet_tests ]
 
 main :: IO ()
 main = do
-  putStrLn "HUnit"
-  putStrLn "-----"
-  runTestTT test_suite
-
-  putStrLn ""
+  let empty_test_opts = mempty :: TestOptions
+  let my_test_opts = empty_test_opts {
+    --
+    -- Increase to 5000 when,
+    --   https://github.com/batterseapower/test-framework/issues/34
+    -- is fixed.
+    --
+    topt_maximum_generated_tests = Just 1000
+  }
+  let empty_runner_opts = mempty :: RunnerOptions
+  let my_runner_opts = empty_runner_opts {
+    ropt_test_options = Just my_test_opts
+  }
 
-  putStrLn "QuickCheck"
-  putStrLn "----------"
-  runTests "Cidr" options [ run prop_all_cidrs_contain_themselves ]
+  defaultMainWithOpts tests my_runner_opts