more tests

Ditz-issue: 0a3272772c73cf31486eb2b6691fa38232d3c4c5

diff --git a/Test/Time/HTTP.hs b/Test/Time/HTTP.hs
index afa17bf70ab2e65639db18fde00912364eaedc45..25e9e47fb9d087dac57375b0feeeaed285f92295 100644 (file)
--- a/Test/Time/HTTP.hs
+++ b/Test/Time/HTTP.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE
 {-# LANGUAGE

-    OverloadedStrings
+    FlexibleInstances
+  , OverloadedStrings

   , UnicodeSyntax
   #-}
 module Main (main) where
   , UnicodeSyntax
   #-}
 module Main (main) where


@@ -8,11 +9,13 @@ import Control.Applicative.Unicode
 import Data.Ascii (Ascii)
 import Data.Attempt hiding (Failure, Success)
 import Data.Convertible.Base
 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 Data.Time.HTTP
 import Data.Time.RFC733
 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 System.Exit
 import Prelude.Unicode
 import Data.Time.RFC1123
 import System.Exit
 import Prelude.Unicode


@@ -30,9 +33,20 @@ runTest prop
            Failure {}           → exitFailure
            NoExpectedFailure {} → exitFailure
 
            Failure {}           → exitFailure
            NoExpectedFailure {} → exitFailure
 

+data Cent20
+
+cent20 ∷ Proxy Cent20
+cent20 = Proxy
+

 instance Arbitrary Day where
     arbitrary = ModifiedJulianDay <$> arbitrary
 
 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)
 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 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
 
 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 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 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))
 tests ∷ [Property]
 tests = [ -- Asctime
           property ( fromAttempt (ca (Tagged "Sun Nov  6 08:49:37 1994" ∷ Tagged Asctime Ascii))


@@ -87,6 +112,17 @@ tests = [ -- Asctime
         , 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))
+                     ≡ 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 ( fromAttempt (ca (Tagged "Sun, 06 Nov 1994 08:49:37 GMT" ∷ Tagged RFC1123 Ascii))
                      ≡ Just referenceZonedTime
           -- RFC1123
         , property ( fromAttempt (ca (Tagged "Sun, 06 Nov 1994 08:49:37 GMT" ∷ Tagged RFC1123 Ascii))
                      ≡ Just referenceZonedTime


@@ -100,9 +136,14 @@ tests = [ -- Asctime
                                                         ∷ Tagged RFC1123 Ascii))
 
           -- HTTP
                                                         ∷ Tagged RFC1123 Ascii))
 
           -- HTTP

+        , 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 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
         , property $ \ut → Just ut ≡ fromAttempt (ca (retagHTTP (cs (ut2zt ut) ∷ Tagged RFC1123 Ascii)))
         ]
     where


@@ -114,6 +155,10 @@ tests = [ -- Asctime
       referenceZonedTime
           = ZonedTime referenceLocalTime utc
 
       referenceZonedTime
           = ZonedTime referenceLocalTime utc
 

+      referenceUTCTime ∷ UTCTime
+      referenceUTCTime
+          = zonedTimeToUTC referenceZonedTime
+

       ut2lt ∷ UTCTime → LocalTime
       ut2lt = utcToLocalTime utc
 
       ut2lt ∷ UTCTime → LocalTime
       ut2lt = utcToLocalTime utc
 

diff --git a/time-http.cabal b/time-http.cabal
index 32dfebd5dc8130307e1584ddc68e0012712ca086..270160e6eddaaa455b629d0293c004afe298d7d3 100644 (file)
--- a/time-http.cabal
+++ b/time-http.cabal
@@ -1,5 +1,5 @@
 Name:                time-http
 Name:                time-http

-Version:             0.2
+Version:             0.3

 Synopsis:            Parse and format HTTP/1.1 Date and Time strings
 Description:
         This package provides functionalities to parse and format
 Synopsis:            Parse and format HTTP/1.1 Date and Time strings
 Description:
         This package provides functionalities to parse and format