Support QuickCheck 2

libmpd.cabal

@@ -52,7 +52,7 @@ Library
 Executable test
     Hs-Source-Dirs:     . tests
     Main-Is:            tests/Main.hs
-    Build-Depends:      base, network, mtl, filepath, utf8-string, QuickCheck < 2
+    Build-Depends:      base, network, mtl, filepath, utf8-string, QuickCheck ==2.1.*
     ghc-options:        -Wall -Werror -fno-warn-warnings-deprecations
 
     if flag(coverage)

tests/Arbitrary.hs

@@ -17,6 +17,12 @@ import Test.QuickCheck
 
 import Network.MPD.Commands.Types
 
+-- No longer provided by QuickCheck 2
+two :: Monad m => m a -> m (a, a)
+two m = liftM2 (,) m m
+
+three :: Monad m => m a -> m (a, a, a)
+three m = liftM3 (,,) m m m
 
 -- Generate a positive number.
 positive :: (Arbitrary a, Num a) => Gen a
@@ -26,10 +32,6 @@ positive = abs `fmap` arbitrary
 field :: Gen String
 field = (filter (/= '\n') . dropWhile isSpace) `fmap` arbitrary
 
-
-instance Arbitrary Char where
-    arbitrary = choose ('\0', '\128')
-
 -- an assoc. string is a string of the form "key: value", followed by
 -- the key and value separately.
 data AssocString = AS String String String

tests/Commands.hs

@@ -119,7 +119,7 @@ test_ :: [(Expect, Response String)] -> StringMPD () -> IO ()
 test_ a b = test a (Right ()) b
 
 mycheck :: QC.Testable a => a -> Int -> IO ()
-mycheck a n = QC.check QC.defaultConfig { QC.configMaxTest = n } a
+mycheck a n = QC.quickCheckWith QC.stdArgs { QC.maxSize = n } a
 
 showResult :: Show a => Result a -> String
 showResult Ok =

tests/Properties.hs

@@ -9,7 +9,6 @@ import Network.MPD.Commands.Types
 import Network.MPD.Utils
 
 import Control.Monad
-import Data.Char
 import Data.List
 import Data.Maybe
 import System.Environment
@@ -41,7 +40,7 @@ main = do
                   ,("parseStats", mytest prop_parseStats)]
 
 mytest :: Testable a => a -> Int -> IO ()
-mytest a n = check defaultConfig { configMaxTest = n } a
+mytest a n = quickCheckWith stdArgs { maxSize = n } a
 
 prop_parseDate_simple :: YearString -> Bool
 prop_parseDate_simple (YS x) = isJust $ parseDate x