Update for QuickCheck 2.

diff --git a/src/Bit.hs b/src/Bit.hs
index 3799516c04c4514dd1a9241d0ea25ba753789438..a4241bc2a72b8a062649def5d1daa40f0a13f030 100644 (file)
--- a/src/Bit.hs
+++ b/src/Bit.hs
@@ -14,7 +14,6 @@ instance Show Bit where
 
 instance Arbitrary Bit where
     arbitrary = elements [ Zero, One ]
-    coarbitrary _ = variant 0
 
 
 bit_to_int :: Bit -> Int

diff --git a/src/Cidr.hs b/src/Cidr.hs
index b5dc9d2b8022de1fdf89e01bea4ebc3644c3f137..422a0adf076216f16b128791a610eee54fc9ca42 100644 (file)
--- a/src/Cidr.hs
+++ b/src/Cidr.hs
@@ -45,7 +45,6 @@ instance Arbitrary Cidr where
       mask <- arbitrary :: Gen Maskbits
       return (Cidr ipv4 mask)
 
-    coarbitrary _ = variant 0
 
 instance Eq Cidr where
   cidr1 == cidr2 = (cidr1 `equivalent` cidr2)

diff --git a/src/IPv4Address.hs b/src/IPv4Address.hs
index 575ce0d453d805e6647be844d80b9d9783fdb6c6..e72dd592ee1c2f1ad8a3fe5dad6fe26fc43701b1 100644 (file)
--- a/src/IPv4Address.hs
+++ b/src/IPv4Address.hs
@@ -46,8 +46,6 @@ instance Arbitrary IPv4Address where
       oct4 <- arbitrary :: Gen Octet
       return (IPv4Address oct1 oct2 oct3 oct4)
 
-    coarbitrary _ = variant 0
-
 
 
 instance Maskable IPv4Address where

diff --git a/src/Maskbits.hs b/src/Maskbits.hs
index 59efc2d2e6d61454d55abcf7d88f7c5a782f2542..06314e395f2043c12da778f81405203692e5ded2 100644 (file)
--- a/src/Maskbits.hs
+++ b/src/Maskbits.hs
@@ -116,8 +116,6 @@ instance Arbitrary Maskbits where
                            ThirtyOne,
                            ThirtyTwo ]
 
-    coarbitrary _ = variant 0
-
 
 
 -- There are only 32 bits in an IPv4 address, so there

diff --git a/src/Octet.hs b/src/Octet.hs
index 98fcb028771bfe387e6fc33c046ef27cd9aa54f7..7faf1d7851c18ac864147c2b5220c568ffe1a5b4 100644 (file)
--- a/src/Octet.hs
+++ b/src/Octet.hs
@@ -38,8 +38,6 @@ instance Arbitrary Octet where
       a8 <- arbitrary :: Gen Bit
       return (Octet a1 a2 a3 a4 a5 a6 a7 a8)
 
-    coarbitrary _ = variant 0
-
 
 instance Maskable Octet where
     apply_mask _ Maskbits.None _ = Octet.None

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 3c00d06cab0473c8f3891b4e31739ef716cc0114..d7cc5fffe7b60141d3d17090820d4bb50336dfb4 100644 (file)
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -1,5 +1,6 @@
+{-# LANGUAGE NoMonomorphismRestriction #-}
 import Test.HUnit
-import Test.QuickCheck.Batch
+import Test.QuickCheck (Args(..), quickCheckWith, stdArgs)
 
 import Cidr (cidr_tests,
              prop_all_cidrs_contain_themselves,
@@ -13,11 +14,6 @@ test_suite = TestList (concat [cidr_tests,
                                ipv4address_tests,
                                octet_tests])
 
--- 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"
@@ -28,5 +24,9 @@ main = do
 
   putStrLn "QuickCheck"
   putStrLn "----------"
-  runTests "Cidr" options [ run prop_all_cidrs_contain_themselves,
-                            run prop_contains_proper_intransitive]
+  qc prop_all_cidrs_contain_themselves
+  qc prop_contains_proper_intransitive
+  where
+    args :: Args
+    args =  stdArgs { maxDiscard = 5000 }
+    qc = quickCheckWith args