X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=time-http.git;a=blobdiff_plain;f=Test%2FTime%2FFormat%2FHTTP.hs;fp=Test%2FTime%2FHTTP.hs;h=6555cdbbd01d18c49626c1cdfcf2d9ddb2297370;hp=25e9e47fb9d087dac57375b0feeeaed285f92295;hb=91c2402d530afff7f1fd4eee333f84cbe18d1014;hpb=7fd4893fdd44f360647fa99c7f96ed96d2f7bac4 diff --git a/Test/Time/HTTP.hs b/Test/Time/Format/HTTP.hs similarity index 92% rename from Test/Time/HTTP.hs rename to Test/Time/Format/HTTP.hs index 25e9e47..6555cdb 100644 --- a/Test/Time/HTTP.hs +++ b/Test/Time/Format/HTTP.hs @@ -12,11 +12,11 @@ import Data.Convertible.Base import Data.Proxy import Data.Tagged import Data.Time -import Data.Time.Asctime -import Data.Time.HTTP -import Data.Time.RFC733 -import Data.Time.RFC822 -import Data.Time.RFC1123 +import Data.Time.Format.Asctime +import Data.Time.Format.HTTP +import Data.Time.Format.RFC733 +import Data.Time.Format.RFC822 +import Data.Time.Format.RFC1123 import System.Exit import Prelude.Unicode import Test.QuickCheck @@ -97,8 +97,7 @@ tests = [ -- Asctime ≡ cs referenceLocalTime ) - , property $ \lt → Just lt ≡ fromAttempt (ca (cs (lt ∷ LocalTime) - ∷ Tagged Asctime Ascii)) + , property $ \lt → Just lt ≡ fromAttempt (ca (cs (lt ∷ LocalTime) ∷ Tagged Asctime Ascii)) -- RFC733 , property ( fromAttempt (ca (Tagged "Sunday, 06-Nov-94 08:49:37 GMT" ∷ Tagged RFC733 Ascii)) @@ -109,8 +108,7 @@ tests = [ -- Asctime ≡ cs referenceZonedTime ) - , property $ \zt → Just zt ≡ fromAttempt (ca (cs (zt ∷ ZonedTime) - ∷ Tagged RFC733 Ascii)) + , 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)) @@ -132,8 +130,7 @@ tests = [ -- Asctime ≡ cs referenceZonedTime ) - , property $ \zt → Just zt ≡ fromAttempt (ca (cs (zt ∷ ZonedTime) - ∷ Tagged RFC1123 Ascii)) + , property $ \zt → Just zt ≡ fromAttempt (ca (cs (zt ∷ ZonedTime) ∷ Tagged RFC1123 Ascii)) -- HTTP , property ( (Tagged "Sun, 06 Nov 1994 08:49:37 GMT" ∷ Tagged HTTP Ascii) @@ -141,7 +138,7 @@ tests = [ -- Asctime ) , 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 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)))