Merge branch 'master' of https://github.com/Frege/frege

Take over the QuickCheck port

Author: Ingo60

examples/Concurrent.fr

@@ -1,6 +1,6 @@
 module examples.Concurrent where
 
-import frege.lib.Random
+import System.Random
 import Java.Net (URL)
 import Control.Concurrent as C
 

examples/Euler.fr

@@ -9,7 +9,7 @@ import frege.Prelude hiding(sum, product)
 import frege.prelude.Math
 import Data.TreeMap except(union, delete, insert)
 import Data.List as DL hiding (lookup)
-import frege.lib.QuickCheck (forAll, `==>`, property)
+import frege.test.QuickCheck (forAll, `==>`, property)
 
 bigs = Integer.arbitrary
 

examples/Euler12.fr

@@ -5,7 +5,7 @@ module examples.Euler12 where
 
 import examples.EulerLib
 import Data.List
-import frege.lib.QuickCheck
+import frege.test.QuickCheck
 
 --- compute number of divisors from prime factors combinatorically
 nDivisors :: Long -> Int
@@ -15,7 +15,7 @@ nDivisors  = prod . map ((1+) . length) . group . factors
 property_nDivisors = property law
     where
         -- law :: Long -> Property
-        law n = trivial (n==0) $ 
+        law n = (classify (n==0) "trivial" $ 
                     n == 0 || nDivisors (abs n) == length (divisors (abs  n))
 
 main _ = println . head . dropUntil ((1000<) . nDivisors) . scanl1 (+) $ [1..]

examples/Euler92.fr

@@ -18,7 +18,7 @@
 module examples.Euler92 where
 
 import frege.data.List
-import frege.lib.QuickCheck
+import frege.test.QuickCheck
 
 -- You are the 13904th person to have solved this problem.
 -- runtime 191.446 wallclock seconds. (first version with Map and canonic numbers)

frege/Prelude.fr

@@ -1,12 +1,13 @@
 --- Public interface for the various prelude modules
 package frege.Prelude where
 
-import frege.prelude.PreludeBase public hiding(Ordering)
+import frege.prelude.PreludeBase public hiding(Ordering, Integral.big)
 import frege.control.Semigroupoid public (.)
 import frege.control.Category public (id)
 -- provide some names Haskellers are used to
 import frege.prelude.PreludeBase public (Ordering(Eq EQ, Lt LT, Gt GT), != /=)
 import frege.prelude.PreludeBase public (from toEnum, ord fromEnum)
+import frege.prelude.PreludeBase public (Integral.big toInteger)
 import frege.prelude.PreludeNative public 
 import frege.prelude.PreludeList public
 import frege.prelude.PreludeList public (fold foldl', foldl1 foldl1')

frege/PreludeProperties.fr

@@ -35,22 +35,18 @@
     «•»«•»«•»«•»«•»«•»«•»«•»«•»«•»«•»«•»«•»«•»«•»«•»«•»«•»«•»«•»«•»«•»«•»«•» -}
 
 {--
- * Properties of the /Prelude/.
+ * Properties of the _Prelude_.
  -}
 
-{-
- * $Revision$
- * $Header: E:/iwcvs/fc/frege/test/PreludeProperties.fr,v 1.5 2009/04/24 19:09:19 iw Exp $
- * $Log: PreludeProperties.fr,v $
- -}
 
 package frege.PreludeProperties where
 
 import Data.List 
 
 import frege.prelude.Math (floor)
-import frege.lib.QuickCheck
--- import frege.prelude.PreludeList (union)
+import Test.QuickCheck
+
+trivial = (`classify` "trivial")
 
 --* a generator for all 16-bit characters
 chars = arbitrary::Gen Char
@@ -75,6 +71,8 @@ derive Show Small
 derive Enum Small
 instance Arbitrary Small where
     arbitrary = elements [SA .. SM]
+
+instance CoArbitrary Small where
     coarbitrary n = variant (ord n)
 
 -- funs  = oneof [(Int.+), (-)::Int->Int->Int, Int.min, Int.max] :: Gen (Int->Int->Int)
@@ -314,7 +312,9 @@ p_listDiff = property difflaw where
     difflaw :: [Char] -> [Char] -> Bool
     difflaw xs ys = 
         (xs ++ ys) \\ xs == ys
-        
+
+p_False = once false
+         
 main _ = do
         -- stop at first failed test
         allSingle  <- foldM (checkAnd 1) true singleChecks
@@ -326,7 +326,8 @@ main _ = do
           else System.exit 1
     where
         checkAnd n false prop = return false
-        checkAnd n true  prop = check quick.{configMaxTest = n} prop
+        checkAnd n true  prop = quickCheckWithResult stdArgs.{maxSuccess = n} prop
+                                    >>= return . isSuccess
         singleChecks = [p_DataList]
         laws = [ p_MatcherEquivMatchGroup0, p_listDiff ]
         checks = [ p_OrdChar, p_DoubleRoundFloor, p_Equality, p_FloatRoundFloor,

frege/StandardLibrary.fr

@@ -31,6 +31,6 @@ import Java.lang.Reflect()
 
 import Lib.ForkJoin()
 import Lib.PP()
-import Lib.QuickCheck()
-import Lib.Random()
+import Test.QuickCheck()
+import System.Random()
 

frege/compiler/DocUtils.fr

@@ -51,7 +51,7 @@ import frege.compiler.Data       as D hiding(JType)
 import frege.compiler.Import     as I()
 import frege.compiler.Utilities  as U(print, println, theClassLoader)
 import frege.compiler.Classtools as CT()
-import frege.lib.QuickCheck      as QC(property)
+import Test.QuickCheck      as QC(property)
 
 --- Represents an abstract HTML document.
 data Docu = Doc [Paragraph]

frege/data/NonEmpty.fr

@@ -7,7 +7,7 @@ import Data.Traversable (Traversable)
 import Data.Monoid
 import frege.data.List () 
 import frege.data.Maybe
-import frege.lib.QuickCheck
+import frege.test.QuickCheck
 
 {--
     A 'NonEmpty' is like a list, but never empty.

frege/data/TreeMap.fr

@@ -323,12 +323,13 @@ union s1 = Tree.insertList s1 . Tree.each
 intersection s1 s2 = (Tree.insertList empty . filter ((s2 `contains`) . fst) . Tree.each) s1 
 diff s1 s2 = (Tree.insertList empty . filter (not . (s2 `contains`) . fst) . Tree.each) s1
 
-import frege.lib.QuickCheck
+import Test.QuickCheck
 
-instance Arbitrary (Ord k, Arbitrary k, Arbitrary v) => (Tree k v) where
+instance CoArbitrary (Ord k, CoArbitrary k, CoArbitrary v) => (Tree k v) where
     coarbitrary Tree.Nil = variant 0
     coarbitrary (Tree.Node _ l r k v) 
-        = variant 1 . l.coarbitrary . r.coarbitrary . k.coarbitrary . v.coarbitrary 
+        = variant 1 . l.coarbitrary . r.coarbitrary . k.coarbitrary . v.coarbitrary
+instance Arbitrary (Ord k, Arbitrary k, Arbitrary v) => (Tree k v) where 
     arbitrary :: (Ord k, Arbitrary k, Arbitrary v) => Gen (Tree k v)
     arbitrary   =  liftM Tree.fromList arbitrary