X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=time-http.git;a=blobdiff_plain;f=Test%2FTime%2FHTTP.hs;h=2f7225e15eaf2fe1e35d8eff196c0579c3917c32;hp=d15836aaef01560a1438a694f62751c37b3bc19f;hb=127b8db;hpb=c1ed8dad6fbdd59c75d047e481997a98e33c2535

diff --git a/Test/Time/HTTP.hs b/Test/Time/HTTP.hs
index d15836a..2f7225e 100644
--- a/Test/Time/HTTP.hs
+++ b/Test/Time/HTTP.hs
@@ -1,13 +1,17 @@
 {-# LANGUAGE
     OverloadedStrings
   , UnicodeSyntax
-  , ViewPatterns
   #-}
 module Main (main) where
 import Control.Applicative
 import Control.Applicative.Unicode
+import Data.Ascii (Ascii)
+import Data.Convertible.Base
+import Data.Tagged
 import Data.Time
-import qualified Data.Time.Asctime as Asctime
+import Data.Time.Asctime
+import qualified Data.Time.HTTP    as HTTP
+import qualified Data.Time.RFC733  as RFC733
 import qualified Data.Time.RFC1123 as RFC1123
 import System.Exit
 import Prelude.Unicode
@@ -51,15 +55,38 @@ instance Arbitrary TimeZone where
 instance Arbitrary ZonedTime where
     arbitrary = ZonedTime <$> arbitrary ⊛ arbitrary
 
+instance Arbitrary DiffTime where
+    arbitrary = secondsToDiffTime <$> choose (0, 86400)
+
+instance Arbitrary UTCTime where
+    arbitrary = UTCTime <$> arbitrary ⊛ arbitrary
+
 tests ∷ [Property]
 tests = [ -- Asctime
-          property ( Asctime.fromAscii "Sun Nov  6 08:49:37 1994"
-                     ≡ Right referenceLocalTime )
+          property ( convertUnsafe ( Tagged "Sun Nov  6 08:49:37 1994"
+                                     ∷ Tagged Asctime Ascii
+                                   )
+                     ≡ referenceLocalTime
+                   )
+
+        , property ( ( Tagged "Sun Nov  6 08:49:37 1994"
+                       ∷ Tagged Asctime Ascii
+                     )
+                     ≡ cs referenceLocalTime
+                   )
 
-        , property ( "Sun Nov  6 08:49:37 1994"
-                     ≡ Asctime.toAscii referenceLocalTime )
+        , property $ \lt → lt ≡ convertUnsafe ( cs (lt ∷ LocalTime)
+                                                ∷ Tagged Asctime Ascii
+                                              )
+
+          -- RFC733
+        , property ( RFC733.fromAscii "Sunday, 06-Nov-94 08:49:37 GMT"
+                     ≡ Right referenceZonedTime )
 
-        , property $ \lt → Right lt ≡ Asctime.fromAscii (Asctime.toAscii lt)
+        , property ( "Sunday, 06-Nov-1994 08:49:37 GMT"
+                     ≡ RFC733.toAscii referenceZonedTime )
+
+        , property $ \zt → Right zt ≡ RFC733.fromAscii (RFC733.toAscii zt)
 
           -- RFC1123
         , property ( RFC1123.fromAscii "Sun, 06 Nov 1994 08:49:37 GMT"
@@ -69,6 +96,12 @@ tests = [ -- Asctime
                      ≡ RFC1123.toAscii referenceZonedTime )
 
         , property $ \zt → Right zt ≡ RFC1123.fromAscii (RFC1123.toAscii zt)
+
+          -- 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 (RFC733.toAscii  (ut2zt ut))
+        , property $ \ut → Right ut ≡ HTTP.fromAscii (RFC1123.toAscii (ut2zt ut))
         ]
     where
       referenceLocalTime
@@ -76,3 +109,7 @@ tests = [ -- Asctime
 
       referenceZonedTime
           = ZonedTime referenceLocalTime utc
+
+      ut2lt = utcToLocalTime utc
+
+      ut2zt = utcToZonedTime utc