[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 1e9c963a3a0138625c77abe863766acc54053531
Merge: 1284e14641e9f205455c425d7262df107ad84a58 773aadeeaaad90adbbbab55d07fdad121cf8e210
Author: John Goerzen <jgoerzen at complete.org>
Date:   Thu Oct 19 01:21:58 2006 +0100

    Merge in qunit patch

diff --combined testsrc/Listtest.hs
index 322ee6c,dc9f78a..df21c6d
--- a/testsrc/Listtest.hs
+++ b/testsrc/Listtest.hs
@@@ -17,24 -17,14 +17,13 @@@ Foundation, Inc., 59 Temple Place, Suit
  -}
  
  module Listtest(tests) where
 -
 -import Data.List
  import Test.HUnit
 -
  import MissingH.List
- 
- import System.Random hiding (split)
 +import Data.List
++import Test.HUnit
 +import Test.QuickCheck as QC
- 
- qunit :: (QC.Testable a) => String -> a -> Test
- qunit lbl property =
-     TestLabel lbl $ TestCase $
-               do stdGen <- newStdGen
-                  case generate 100 stdGen (evaluate property) of
-                    (Result (Just True) _ _ ) -> return ()
-                    (Result res stamp args) -> assertFailure $ show (res, stamp, args)
- 
- 
- 
+ import MissingH.HUnit
  
 -
  test_delFromAL = 
      let f :: [(String, Int)] -> [(String, Int)] -> Test
          f inp exp = TestCase $ exp @=? (delFromAL inp "testkey") in
@@@ -230,14 -220,14 +219,14 @@@ test_spanList 
  
  
  test_merge =
-     qunit "prop_merge" prop_merge
+     qctest "prop_merge" prop_merge
  
  prop_merge xs ys =
      merge (sort xs) (sort ys) == sort (xs ++ ys)
            where types = xs :: [Int]
  
  test_mergeBy =
-     qunit "test_mergeBy" prop_mergeBy
+     qctest "test_mergeBy" prop_mergeBy
  
  prop_mergeBy xs ys =
      mergeBy cmp (sortBy cmp xs) (sortBy cmp ys) == sortBy cmp (xs ++ ys)

-- 
haskell-testpack