[gentoo-commits] gentoo-x86 commit in dev-haskell/testpack/files: testpack-2.1.2.1-quickcheck-2.7.patch

[Mark Wright (gienah)]

gienah      14/07/03 11:17:40

  Added:                testpack-2.1.2.1-quickcheck-2.7.patch
  Log:
  Patch testpack-2.1.2.1-r2 for quickcheck-2.7
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

Revision  Changes    Path
1.1                  dev-haskell/testpack/files/testpack-2.1.2.1-quickcheck-2.7.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/testpack/files/testpack-2.1.2.1-quickcheck-2.7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/testpack/files/testpack-2.1.2.1-quickcheck-2.7.patch?rev=1.1&content-type=text/plain

Index: testpack-2.1.2.1-quickcheck-2.7.patch
===================================================================
--- testpack-2.1.2.1-orig/testpack.cabal	2013-02-26 02:03:46.000000000 +1100
+++ testpack-2.1.2.1/testpack.cabal	2014-07-03 20:47:34.432871930 +1000
@@ -39,7 +39,7 @@
 
  Build-Depends: base >= 3 && < 5,
                mtl, HUnit,
-               QuickCheck >= 2.1.0.3 && < 2.5
+               QuickCheck >= 2.1.0.3 && < 2.8
 
  If flag(splitBase)
    Build-Depends: base >= 3 && < 5, containers, random
--- testpack-2.1.2.1-orig/src/Test/HUnit/Tools.hs	2013-02-26 02:03:46.000000000 +1100
+++ testpack-2.1.2.1/src/Test/HUnit/Tools.hs	2014-07-03 21:01:50.373614959 +1000
@@ -25,7 +25,14 @@
 import Test.QuickCheck.Property hiding (Result(reason))
 import qualified Control.Exception
 import qualified Test.HUnit as HU
-import System.Random
+#if MIN_VERSION_QuickCheck(2,7,0)
+import Test.QuickCheck.Random (newQCGen, QCGen(..))
+import System.Random (split)
+#else
+import System.Random (newStdGen, StdGen(..), split)
+#define newStdGen newQCGen
+#define StdGen QCGen
+#endif
 import System.IO
 import Text.Printf
 
@@ -96,7 +103,7 @@
 
 {-
 -- | modified version of the tests function from Test.QuickCheck
-tests :: Args -> Gen Result -> StdGen -> Int -> Int -> [[String]] -> IO ()
+tests :: Args -> Gen Result -> QCGen -> Int -> Int -> [[String]] -> IO ()
 tests config gen rnd0 ntest nfail stamps
   | ntest == maxSuccess config = return ()
   | nfail == maxDiscard config = assertFailure $ "Arguments exhausted after " ++ show ntest ++ " tests."
@@ -128,7 +135,13 @@
 >        q "Integer -> Int (safe bounds)" prop_integer_to_int_pass]
 -}
 qc2hu :: QC.Testable a => Int -> String -> a -> HU.Test
-qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest, maxDiscard = 20000})
+qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest,
+#if MIN_VERSION_QuickCheck(2,5,0)
+                                  maxDiscardRatio = if maxTest /= 0 then 20000 `div` maxTest else 10
+#else
+                                  maxDiscard = 20000
+#endif
+                                 })
 
 {- | Run verbose tests.  Example:
 
@@ -163,18 +176,28 @@
 -- | Tests a property, using test arguments, produces a test result, and prints the results to 'stdout'.
 localquickCheckWithResult :: Testable prop => Args -> prop -> IO Result
 localquickCheckWithResult args p =
-  do 
 #if MIN_VERSION_QuickCheck(2,3,0)
+#if MIN_VERSION_QuickCheck(2,6,0)
+  (if chatty args then withStdioTerminal else withNullTerminal) $ \tm -> do
+#else
+  do
      tm  <- if chatty args then newStdioTerminal else newNullTerminal
+#endif
 #else
+  do
      tm  <- newTerminal
 #endif
      rnd <- case replay args of
-              Nothing      -> newStdGen
+              Nothing      -> newQCGen
               Just (rnd,_) -> return rnd
      test MkState{ terminal          = tm
                  , maxSuccessTests   = maxSuccess args
-                 , maxDiscardedTests = maxDiscard args
+                 , maxDiscardedTests =
+#if MIN_VERSION_QuickCheck(2,5,0)
+                                       maxDiscardRatio args * maxSuccess args
+#else
+                                       maxDiscard args
+#endif
                  , computeSize       = case replay args of
                                          Nothing    -> \n d -> (n * maxSize args)
                                                          `div` maxSuccess args
@@ -190,17 +213,23 @@
 #endif
                  , numSuccessShrinks = 0
                  , numTryShrinks     = 0
+#if MIN_VERSION_QuickCheck(2,7,0)
+                 , numRecentlyDiscardedTests = 0
+                 , numTotTryShrinks = 0
+                 } (unGen (unProperty (property p)))
+#else
                  } (unGen (property p))
+#endif
   where 
 --------------------------------------------------------------------------
 -- main test loop
-    test :: State -> (StdGen -> Int -> Prop) -> IO Result
+    test :: State -> (QCGen -> Int -> Prop) -> IO Result
     test st f
       | numSuccessTests st   >= maxSuccessTests st   = doneTesting st f
       | numDiscardedTests st >= maxDiscardedTests st = giveUp st f
       | otherwise                                    = runATest st f
 
-    doneTesting :: State -> (StdGen -> Int -> Prop) -> IO Result
+    doneTesting :: State -> (QCGen -> Int -> Prop) -> IO Result
     doneTesting st f = 
       do
 #if MIN_VERSION_QuickCheck(2,3,0)
@@ -221,7 +250,7 @@
 #endif
                                    }
   
-    giveUp :: State -> (StdGen -> Int -> Prop) -> IO Result
+    giveUp :: State -> (QCGen -> Int -> Prop) -> IO Result
     giveUp st f =
       do
 #if MIN_VERSION_QuickCheck(2,3,0)
@@ -234,7 +263,7 @@
 #endif
                      }
 
-    runATest :: State -> (StdGen -> Int -> Prop) -> IO Result
+    runATest :: State -> (QCGen -> Int -> Prop) -> IO Result
     runATest st f =
       do
         let size = computeSize st (numSuccessTests st) (numDiscardedTests st)
@@ -266,7 +295,12 @@
           Just False -> -- failed test
             do 
 #if MIN_VERSION_QuickCheck(2,3,0)
+#if MIN_VERSION_QuickCheck(2,3,0)
+               (numShrinks, totFailed, lastFailed) <- foundFailure st res ts
+#else
                numShrinks <- foundFailure st res ts
+#endif
+
                theOutput <- terminalOutput (terminal st)
 #else
                foundFailure st res ts
@@ -288,5 +322,9 @@
                                , numShrinks = numShrinks
                                , output     = theOutput
 #endif
+#if MIN_VERSION_QuickCheck(2,7,0)
+                               , numShrinkTries = totFailed
+                               , numShrinkFinal = lastFailed
+#endif
                                }
       where (rnd1,rnd2) = split (randomSeed st)
--- testpack-2.1.2.1-orig/src/Test/QuickCheck/Tools.hs	2013-02-26 02:03:46.000000000 +1100
+++ testpack-2.1.2.1/src/Test/QuickCheck/Tools.hs	2014-07-03 21:01:23.932306995 +1000
@@ -23,15 +23,27 @@
                               
                              )
 where
+#if MIN_VERSION_QuickCheck(2,6,0)
+import Test.QuickCheck.Property (Result(..), callbacks, expect, theException, ok, reason, stamp)
+#if MIN_VERSION_QuickCheck(2,7,0)
+#else
+import Test.QuickCheck.Property (Result(..), callbacks, expect, interrupted, ok, reason, stamp)
+#endif
+#else
 import Test.QuickCheck hiding (Result, reason)
 import Test.QuickCheck.Property
+#endif
 
 {- | Compare two values.  If same, the test passes.  If different, the result indicates
 what was expected and what was received as part of the error. -}
 (@=?) :: (Eq a, Show a) => a -> a -> Result
 expected @=? actual = 
         MkResult {ok = Just (expected == actual), 
+#if MIN_VERSION_QuickCheck(2,7,0)
+                  expect = True, theException = Nothing,
+#else
                   expect = True, interrupted = False,
+#endif
                   reason = "Result: expected " ++ show expected ++ ", got " ++ show actual,
                   stamp = [], callbacks = []}