Tests for Data.Time.RFC1123

Ditz-issue: c8c594f249504e28212f18a8a5c6b8a708b99f79

diff --git a/Data/Time/HTTP/Common.hs b/Data/Time/HTTP/Common.hs
index 1cfa89e9c63528268d721d309927dc58f981f586..f7c74c91e1326b5944ea06d5082c0415ac2f0044 100644 (file)
--- a/Data/Time/HTTP/Common.hs
+++ b/Data/Time/HTTP/Common.hs
@@ -40,6 +40,7 @@ import Control.Monad
 import Data.Ascii (AsciiBuilder)
 import qualified Data.Ascii as A
 import Data.Attoparsec.Char8 as P
 import Data.Ascii (AsciiBuilder)
 import qualified Data.Ascii as A
 import Data.Attoparsec.Char8 as P

+import Data.Char

 import Data.Monoid.Unicode
 import Data.Fixed
 import Data.Time
 import Data.Monoid.Unicode
 import Data.Fixed
 import Data.Time


@@ -242,20 +243,11 @@ read2' = do n1 ← (char ' ' *> pure 0) <|> digit'
             return (n1 * 10 + n2)
 
 digit' ∷ Num n ⇒ Parser n
             return (n1 * 10 + n2)
 
 digit' ∷ Num n ⇒ Parser n

-digit' = fromC <$> P.digit
-
-fromC ∷ Num n ⇒ Char → n
-fromC '0' = 0
-fromC '1' = 1
-fromC '2' = 2
-fromC '3' = 3
-fromC '4' = 4
-fromC '5' = 5
-fromC '6' = 6
-fromC '7' = 7
-fromC '8' = 8
-fromC '9' = 9
-fromC _   = undefined
+{-# INLINE digit' #-}
+digit' = fromIntegral <$> fromC <$> P.digit
+    where
+      {-# INLINE fromC #-}
+      fromC c = ord c - ord '0'

 
 show4digitsTZ ∷ TimeZone → AsciiBuilder
 show4digitsTZ tz
 
 show4digitsTZ ∷ TimeZone → AsciiBuilder
 show4digitsTZ tz

diff --git a/Test/Time/HTTP.hs b/Test/Time/HTTP.hs
index bb60928a75da1497e8c74fee3dc4c08bb231bd38..d15836aaef01560a1438a694f62751c37b3bc19f 100644 (file)
--- a/Test/Time/HTTP.hs
+++ b/Test/Time/HTTP.hs
@@ -8,6 +8,7 @@ import Control.Applicative
 import Control.Applicative.Unicode
 import Data.Time
 import qualified Data.Time.Asctime as Asctime
 import Control.Applicative.Unicode
 import Data.Time
 import qualified Data.Time.Asctime as Asctime

+import qualified Data.Time.RFC1123 as RFC1123

 import System.Exit
 import Prelude.Unicode
 import Test.QuickCheck
 import System.Exit
 import Prelude.Unicode
 import Test.QuickCheck


@@ -37,11 +38,41 @@ instance Arbitrary TimeOfDay where
 instance Arbitrary LocalTime where
     arbitrary = LocalTime <$> arbitrary ⊛ arbitrary
 
 instance Arbitrary LocalTime where
     arbitrary = LocalTime <$> arbitrary ⊛ arbitrary
 

+instance Eq ZonedTime where
+    a == b = zonedTimeToUTC a ≡ zonedTimeToUTC b
+
+instance Arbitrary TimeZone where
+    arbitrary
+        = do m ← choose (-1439, 1439)
+             s ← arbitrary
+             n ← arbitrary
+             return $ TimeZone m s n
+
+instance Arbitrary ZonedTime where
+    arbitrary = ZonedTime <$> arbitrary ⊛ arbitrary
+

 tests ∷ [Property]
 tests = [ -- Asctime
           property ( Asctime.fromAscii "Sun Nov  6 08:49:37 1994"
 tests ∷ [Property]
 tests = [ -- Asctime
           property ( Asctime.fromAscii "Sun Nov  6 08:49:37 1994"

-                     ≡ Right (LocalTime (ModifiedJulianDay 49662) (TimeOfDay 8 49 37)) )
-        , property ( Asctime.toAscii (LocalTime (ModifiedJulianDay 49662) (TimeOfDay 8 49 37))
-                     ≡ "Sun Nov  6 08:49:37 1994" )
+                     ≡ Right referenceLocalTime )
+
+        , property ( "Sun Nov  6 08:49:37 1994"
+                     ≡ Asctime.toAscii referenceLocalTime )
+

         , property $ \lt → Right lt ≡ Asctime.fromAscii (Asctime.toAscii lt)
         , property $ \lt → Right lt ≡ Asctime.fromAscii (Asctime.toAscii lt)

+
+          -- RFC1123
+        , property ( RFC1123.fromAscii "Sun, 06 Nov 1994 08:49:37 GMT"
+                     ≡ Right referenceZonedTime )
+
+        , property ( "Sun, 06 Nov 1994 08:49:37 GMT"
+                     ≡ RFC1123.toAscii referenceZonedTime )
+
+        , property $ \zt → Right zt ≡ RFC1123.fromAscii (RFC1123.toAscii zt)

         ]
         ]

+    where
+      referenceLocalTime
+          = LocalTime (ModifiedJulianDay 49662) (TimeOfDay 8 49 37)
+
+      referenceZonedTime
+          = ZonedTime referenceLocalTime utc