4f7664a · text · git.iko.soy

git.iko.soy/text

on master help sign in

Further generalise the formatRealFloat tests (gh-105)

4f7664aBryan O'Sullivan12 years ago

tests/Tests/Properties.hs+14−9

compare with master

unifiedsplit

@@ -24,7 +24,7 @@ import Data.Text.Internal.Search (indices)

24import Data.Text.Lazy.Read as TL

25import Data.Text.Read as T

26import Data.Word (Word, Word8, Word16, Word32, Word64)

27−import Numeric (showGFloat, showHex)

27+import Numeric (showEFloat, showFFloat, showGFloat, showHex)

28import Prelude hiding (replicate)

29import Test.Framework (Test, testGroup)

30import Test.Framework.Providers.QuickCheck2 (testProperty)

@@ -779,14 +779,19 @@ tb_realfloat = (TB.toLazyText . TB.realFloat) `eq` (TL.pack . show)

779tb_realfloat_float (a::Float) = tb_realfloat a

780tb_realfloat_double (a::Double) = tb_realfloat a

781

782+showFloat :: (RealFloat a) => TB.FPFormat -> Maybe Int -> a -> ShowS

783+showFloat TB.Exponent = showEFloat

784+showFloat TB.Fixed = showFFloat

785+showFloat TB.Generic = showGFloat

786+

782−tb_formatRealFloat_G :: (RealFloat a, Show a) => a -> Precision a -> Property

787+tb_formatRealFloat :: (RealFloat a, Show a) => a -> TB.FPFormat -> Precision a -> Property

783−tb_formatRealFloat_G a prec =

788+tb_formatRealFloat a fmt prec =

784− TB.formatRealFloat TB.Generic p a ===

789+ TB.formatRealFloat fmt p a ===

785− TB.fromString (showGFloat p a "")

790+ TB.fromString (showFloat fmt p a "")

786 where p = precision a prec

791 where p = precision a prec

787

792

788−tb_formatRealFloat_G_float (a::Float) = tb_formatRealFloat_G a

793+tb_formatRealFloat_float (a::Float) = tb_formatRealFloat a

789−tb_formatRealFloat_G_double (a::Double) = tb_formatRealFloat_G a

794+tb_formatRealFloat_double (a::Double) = tb_formatRealFloat a

790

795

791-- Reading.

796-- Reading.

792

797

@@ -1294,8 +1299,8 @@ tests =

1294 testGroup "realfloat" [

1299 testGroup "realfloat" [

1295 testProperty "tb_realfloat_double" tb_realfloat_double,

1300 testProperty "tb_realfloat_double" tb_realfloat_double,

1296 testProperty "tb_realfloat_float" tb_realfloat_float,

1301 testProperty "tb_realfloat_float" tb_realfloat_float,

1297− testProperty "tb_formatRealFloat_G_float" tb_formatRealFloat_G_float,

1302+ testProperty "tb_formatRealFloat_float" tb_formatRealFloat_float,

1298− testProperty "tb_formatRealFloat_G_double" tb_formatRealFloat_G_double

1303+ testProperty "tb_formatRealFloat_double" tb_formatRealFloat_double

1299 ],

1304 ],

1300 testProperty "tb_fromText" tb_fromText,

1305 testProperty "tb_fromText" tb_fromText,

1301 testProperty "tb_singleton" tb_singleton

1306 testProperty "tb_singleton" tb_singleton

tests/Tests/QuickCheckUtils.hs+5−1

@@ -40,10 +40,11 @@ import Control.DeepSeq (NFData (..), deepseq)

40import Control.Exception (bracket)

41import Data.String (IsString, fromString)

42import Data.Text.Foreign (I16)

43+import Data.Text.Lazy.Builder.RealFloat (FPFormat(..))

43import Data.Word (Word8, Word16)

44import Data.Word (Word8, Word16)

44import Debug.Trace (trace)

45import Debug.Trace (trace)

45import System.Random (Random (..), RandomGen)

46import System.Random (Random (..), RandomGen)

46−import Test.QuickCheck hiding (Small (..), (.&.))

47+import Test.QuickCheck hiding (Fixed(..), Small (..), (.&.))

47import Test.QuickCheck.Monadic (assert, monadicIO, run)

48import Test.QuickCheck.Monadic (assert, monadicIO, run)

48import Test.QuickCheck.Unicode (string)

49import Test.QuickCheck.Unicode (string)

49import Tests.Utils

50import Tests.Utils

@@ -266,6 +267,9 @@ eqP f g s w = eql "orig" (f s) (g t) &&

266 | a =^= b = True

267 | a =^= b = True

267 | otherwise = trace (d ++ ": " ++ show a ++ " /= " ++ show b) False

268 | otherwise = trace (d ++ ": " ++ show a ++ " /= " ++ show b) False

268

269

270+instance Arbitrary FPFormat where

271+ arbitrary = elements [Exponent, Fixed, Generic]

272+

269newtype Precision a = Precision (Maybe Int)

273newtype Precision a = Precision (Maybe Int)

270 deriving (Eq, Show)

274 deriving (Eq, Show)

271

275