RFC1123

[time-http.git] / Test / Time / HTTP.hs

diff --git a/Test/Time/HTTP.hs b/Test/Time/HTTP.hs
index 7ef3210af7d0a49390bf1859613bf76be50ad443..3022d0d78c1ef3a95da6fae4d00dff11bf0ff355 100644 (file)
--- a/Test/Time/HTTP.hs
+++ b/Test/Time/HTTP.hs
@@ -13,7 +13,7 @@ import Data.Time
 import Data.Time.Asctime
 import qualified Data.Time.HTTP    as HTTP
 import Data.Time.RFC733
-import qualified Data.Time.RFC1123 as RFC1123
+import Data.Time.RFC1123
 import System.Exit
 import Prelude.Unicode
 import Test.QuickCheck
@@ -88,19 +88,22 @@ tests = [ -- Asctime
                                                         ∷ Tagged RFC733 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 $ \ut → Right ut ≡ HTTP.fromAscii (untag (cs (ut2zt ut) ∷ Tagged RFC1123 Ascii))
         ]
     where
       referenceLocalTime