fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix tests & refactor

Browse Source
This commit is contained in:
Gregor Kleen 2020-11-04 15:57:20 +01:00
parent 1666081fea
commit af9f96f3f1
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mail.hs
View File

@ -50,7 +50,7 @@ import Settings.Mime
import Data.Monoid (Last(..)) import Data.Monoid (Last(..))
import Control.Monad.Trans.RWS (RWST(..)) import Control.Monad.Trans.RWS (RWST(..))
import Control.Monad.Trans.State (StateT(..), execStateT, mapStateT) import Control.Monad.Trans.State (StateT(..), execStateT, mapStateT)
import Control.Monad.Trans.Writer (execWriter, Writer) import Control.Monad.Trans.Writer (execWriter, execWriterT, Writer)
import Control.Monad.RWS.Class (MonadWriter(..), MonadState(..), modify) import Control.Monad.RWS.Class (MonadWriter(..), MonadState(..), modify)
import Control.Monad.Fail import Control.Monad.Fail
import Control.Monad.Base import Control.Monad.Base
@ -124,8 +124,6 @@ import Language.Haskell.TH (nameBase)
import Network.Mail.Mime.Instances() import Network.Mail.Mime.Instances()
import Control.Monad.Trans.Writer (execWriterT)
makeLenses_ ''Address makeLenses_ ''Address
makeLenses_ ''Mail makeLenses_ ''Mail

4
test/MailSpec.hs
View File

@ -14,7 +14,7 @@ instance Arbitrary MailContext where
arbitrary = genericArbitrary arbitrary = genericArbitrary
shrink = genericShrink shrink = genericShrink
instance Arbitrary VerpMode where instance Arbitrary Address where
arbitrary = genericArbitrary arbitrary = genericArbitrary
shrink = genericShrink shrink = genericShrink
@ -25,5 +25,3 @@ spec = do
[ eqLaws, ordLaws, showReadLaws, monoidLaws ] [ eqLaws, ordLaws, showReadLaws, monoidLaws ]
lawsCheckHspec (Proxy @MailContext) lawsCheckHspec (Proxy @MailContext)
[ eqLaws, ordLaws, showReadLaws, jsonLaws, hashableLaws ] [ eqLaws, ordLaws, showReadLaws, jsonLaws, hashableLaws ]
lawsCheckHspec (Proxy @VerpMode)
[ eqLaws, showReadLaws, jsonLaws ]

10
test/ModelSpec.hs
View File

@ -5,9 +5,10 @@ module ModelSpec where
import TestImport import TestImport
import Settings (getTimeLocale') import Settings (getTimeLocale', VerpMode(..))
import Model.TypesSpec () import Model.TypesSpec ()
import MailSpec ()
import qualified Data.CaseInsensitive as CI import qualified Data.CaseInsensitive as CI
import qualified Data.ByteString.Char8 as CBS import qualified Data.ByteString.Char8 as CBS
@ -203,6 +204,11 @@ instance {-# OVERLAPS #-} (HasCryptoID ns ct pt (ReaderT CryptoIDKey Catch), Arb
where where
tmpKey = unsafePerformIO genKey tmpKey = unsafePerformIO genKey
instance Arbitrary VerpMode where
arbitrary = genericArbitrary
shrink = genericShrink
spec :: Spec spec :: Spec
spec = do spec = do
parallel $ do parallel $ do
@ -214,3 +220,5 @@ spec = do
[ eqLaws ] [ eqLaws ]
lawsCheckHspec (Proxy @Term) lawsCheckHspec (Proxy @Term)
[ eqLaws, jsonLaws ] [ eqLaws, jsonLaws ]
lawsCheckHspec (Proxy @VerpMode)
[ eqLaws, showReadLaws, jsonLaws ]