X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Test%2FTime%2FHTTP.hs;h=25e9e47fb9d087dac57375b0feeeaed285f92295;hb=7fd4893fdd44f360647fa99c7f96ed96d2f7bac4;hp=7ef3210af7d0a49390bf1859613bf76be50ad443;hpb=782e6a9bfebeb1036921a293549395c17f0f035c;p=time-http.git

diff --git a/Test/Time/HTTP.hs b/Test/Time/HTTP.hs
index 7ef3210..25e9e47 100644
--- a/Test/Time/HTTP.hs
+++ b/Test/Time/HTTP.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE
-    OverloadedStrings
+    FlexibleInstances
+  , OverloadedStrings
   , UnicodeSyntax
   #-}
 module Main (main) where
@@ -8,12 +9,14 @@ import Control.Applicative.Unicode
 import Data.Ascii (Ascii)
 import Data.Attempt hiding (Failure, Success)
 import Data.Convertible.Base
+import Data.Proxy
 import Data.Tagged
 import Data.Time
 import Data.Time.Asctime
-import qualified Data.Time.HTTP    as HTTP
+import Data.Time.HTTP
 import Data.Time.RFC733
-import qualified Data.Time.RFC1123 as RFC1123
+import Data.Time.RFC822
+import Data.Time.RFC1123
 import System.Exit
 import Prelude.Unicode
 import Test.QuickCheck
@@ -30,9 +33,20 @@ runTest prop
            Failure {}           → exitFailure
            NoExpectedFailure {} → exitFailure
 
+data Cent20
+
+cent20 ∷ Proxy Cent20
+cent20 = Proxy
+
 instance Arbitrary Day where
     arbitrary = ModifiedJulianDay <$> arbitrary
 
+instance Arbitrary (Tagged Cent20 Day) where
+    arbitrary = ((Tagged ∘) ∘) ∘ fromGregorian
+                <$> choose (1900, 1999)
+                ⊛ arbitrary
+                ⊛ arbitrary
+
 instance Arbitrary TimeOfDay where
     arbitrary
         = do h ← choose (0, 23)
@@ -43,6 +57,11 @@ instance Arbitrary TimeOfDay where
 instance Arbitrary LocalTime where
     arbitrary = LocalTime <$> arbitrary ⊛ arbitrary
 
+instance Arbitrary (Tagged Cent20 LocalTime) where
+    arbitrary = (Tagged ∘) ∘ LocalTime <$>
+                (flip proxy cent20 <$> arbitrary)
+                ⊛ arbitrary
+
 instance Eq ZonedTime where
     a == b = zonedTimeToUTC a ≡ zonedTimeToUTC b
 
@@ -56,12 +75,18 @@ instance Arbitrary TimeZone where
 instance Arbitrary ZonedTime where
     arbitrary = ZonedTime <$> arbitrary ⊛ arbitrary
 
+instance Arbitrary (Tagged Cent20 ZonedTime) where
+    arbitrary = (Tagged ∘) ∘ ZonedTime <$> (flip proxy cent20 <$> arbitrary) ⊛ arbitrary
+
 instance Arbitrary DiffTime where
     arbitrary = secondsToDiffTime <$> choose (0, 86400)
 
 instance Arbitrary UTCTime where
     arbitrary = UTCTime <$> arbitrary ⊛ arbitrary
 
+instance Arbitrary (Tagged Cent20 UTCTime) where
+    arbitrary = (Tagged ∘) ∘ UTCTime <$> (flip proxy cent20 <$> arbitrary) ⊛ arbitrary
+
 tests ∷ [Property]
 tests = [ -- Asctime
           property ( fromAttempt (ca (Tagged "Sun Nov  6 08:49:37 1994" ∷ Tagged Asctime Ascii))
@@ -87,28 +112,58 @@ tests = [ -- Asctime
         , property $ \zt → Just zt ≡ fromAttempt (ca (cs (zt ∷ ZonedTime)
                                                         ∷ Tagged RFC733 Ascii))
 
+          -- RFC822
+        , property ( fromAttempt (ca (Tagged "Sun, 06 Nov 94 08:49:37 GMT" ∷ Tagged RFC822 Ascii))
+                     ≡ Just referenceZonedTime
+                   )
+
+        , property ( (Tagged "Sun, 06 Nov 94 08:49:37 GMT" ∷ Tagged RFC822 Ascii)
+                     ≡ cs referenceZonedTime
+                   )
+        , property $ \zt → Just (untag zt) ≡ fromAttempt (ca (cs (untag (zt ∷ Tagged Cent20 ZonedTime))
+                                                                ∷ Tagged RFC822 Ascii))
+
           -- RFC1123
-        , property ( RFC1123.fromAscii "Sun, 06 Nov 1994 08:49:37 GMT"
-                     ≡ Right referenceZonedTime )
+        , property ( fromAttempt (ca (Tagged "Sun, 06 Nov 1994 08:49:37 GMT" ∷ Tagged RFC1123 Ascii))
+                     ≡ Just referenceZonedTime
+                   )
 
-        , property ( "Sun, 06 Nov 1994 08:49:37 GMT"
-                     ≡ RFC1123.toAscii referenceZonedTime )
+        , property ( (Tagged "Sun, 06 Nov 1994 08:49:37 GMT" ∷ Tagged RFC1123 Ascii)
+                     ≡ cs referenceZonedTime
+                   )
 
-        , property $ \zt → Right zt ≡ RFC1123.fromAscii (RFC1123.toAscii zt)
+        , property $ \zt → Just zt ≡ fromAttempt (ca (cs (zt ∷ ZonedTime)
+                                                        ∷ Tagged RFC1123 Ascii))
 
           -- HTTP
-        , property $ \ut → Right ut ≡ HTTP.fromAscii (HTTP.toAscii           ut )
-        , property $ \ut → Right ut ≡ HTTP.fromAscii (untag (cs (ut2lt ut) ∷ Tagged Asctime Ascii))
-        , property $ \ut → Right ut ≡ HTTP.fromAscii (untag (cs (ut2zt ut) ∷ Tagged RFC733  Ascii))
-        , property $ \ut → Right ut ≡ HTTP.fromAscii (RFC1123.toAscii (ut2zt ut))
+        , property ( (Tagged "Sun, 06 Nov 1994 08:49:37 GMT" ∷ Tagged HTTP Ascii)
+                     ≡ cs referenceUTCTime
+                   )
+        , property $ \ut → Just ut ≡ fromAttempt (ca (cs ut ∷ Tagged HTTP Ascii) ∷ Attempt UTCTime)
+        , property $ \ut → Just ut ≡ fromAttempt (ca (retagHTTP (cs (ut2lt ut) ∷ Tagged Asctime Ascii)))
+        , property $ \ut → Just ut ≡ fromAttempt (ca (retagHTTP (cs (ut2zt ut) ∷ Tagged RFC733  Ascii)))
+        , property $ \ut → Just (untag ut) ≡ fromAttempt (ca (retagHTTP (cs (ut2zt (untag (ut ∷ Tagged Cent20 UTCTime)))
+                                                                           ∷ Tagged RFC822 Ascii)))
+        , property $ \ut → Just ut ≡ fromAttempt (ca (retagHTTP (cs (ut2zt ut) ∷ Tagged RFC1123 Ascii)))
         ]
     where
+      referenceLocalTime ∷ LocalTime
       referenceLocalTime
           = LocalTime (ModifiedJulianDay 49662) (TimeOfDay 8 49 37)
 
+      referenceZonedTime ∷ ZonedTime
       referenceZonedTime
           = ZonedTime referenceLocalTime utc
 
+      referenceUTCTime ∷ UTCTime
+      referenceUTCTime
+          = zonedTimeToUTC referenceZonedTime
+
+      ut2lt ∷ UTCTime → LocalTime
       ut2lt = utcToLocalTime utc
 
+      ut2zt ∷ UTCTime → ZonedTime
       ut2zt = utcToZonedTime utc
+
+      retagHTTP ∷ Tagged s b → Tagged HTTP b
+      retagHTTP = retag