From fce531cdda756b4da03c74927e67f8b89f4e1554 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 19 May 2019 10:34:18 +0200 Subject: [PATCH] Fix tests --- test/Model/TypesSpec.hs | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/test/Model/TypesSpec.hs b/test/Model/TypesSpec.hs index 7e725c166..289df3136 100644 --- a/test/Model/TypesSpec.hs +++ b/test/Model/TypesSpec.hs @@ -13,6 +13,9 @@ import System.IO.Unsafe import Yesod.Auth.Util.PasswordStore +instance (Arbitrary a, MonoFoldable a) => Arbitrary (NonNull a) where + arbitrary = arbitrary `suchThatMap` fromNullable + instance Arbitrary Season where arbitrary = genericArbitrary shrink = genericShrink @@ -62,10 +65,18 @@ instance Arbitrary SubmissionFileType where arbitrary = genericArbitrary shrink = genericShrink +instance Arbitrary UploadSpecificFile where + arbitrary = genericArbitrary + shrink = genericShrink + instance Arbitrary UploadMode where arbitrary = genericArbitrary shrink = genericShrink +instance Arbitrary UploadModeDescr where + arbitrary = genericArbitrary + shrink = genericShrink + instance Arbitrary SubmissionMode where arbitrary = genericArbitrary shrink = genericShrink @@ -148,10 +159,6 @@ instance Arbitrary AuthenticationMode where instance Arbitrary LecturerType where arbitrary = genericArbitrary shrink = genericShrink - -instance Arbitrary a => Arbitrary (ZIPArchiveName a) where - arbitrary = genericArbitrary - shrink = genericShrink spec :: Spec @@ -177,10 +184,14 @@ spec = do [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws, persistFieldLaws, pathPieceLaws, finiteLaws ] lawsCheckHspec (Proxy @SubmissionFileType) [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws, pathPieceLaws, finiteLaws ] + lawsCheckHspec (Proxy @UploadSpecificFile) + [ eqLaws, showReadLaws, ordLaws, jsonLaws, persistFieldLaws ] lawsCheckHspec (Proxy @UploadMode) - [ eqLaws, showReadLaws, ordLaws, jsonLaws, persistFieldLaws, pathPieceLaws, finiteLaws ] + [ eqLaws, showReadLaws, ordLaws, jsonLaws, persistFieldLaws ] + lawsCheckHspec (Proxy @UploadModeDescr) + [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws, finiteLaws, pathPieceLaws ] lawsCheckHspec (Proxy @SubmissionMode) - [ eqLaws, showReadLaws, ordLaws, jsonLaws, persistFieldLaws, finiteLaws ] + [ eqLaws, showReadLaws, ordLaws, jsonLaws, persistFieldLaws ] lawsCheckHspec (Proxy @SubmissionModeDescr) [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws, finiteLaws, pathPieceLaws ] lawsCheckHspec (Proxy @ExamStatus) @@ -215,8 +226,6 @@ spec = do [ eqLaws, ordLaws, showReadLaws, jsonLaws, persistFieldLaws ] lawsCheckHspec (Proxy @LecturerType) [ eqLaws, ordLaws, showReadLaws, boundedEnumLaws, finiteLaws, jsonLaws, pathPieceLaws, persistFieldLaws ] - lawsCheckHspec (Proxy @(ZIPArchiveName (CI Text))) - [ eqLaws, ordLaws, showReadLaws, pathPieceLaws ] describe "TermIdentifier" $ do it "has compatible encoding/decoding to/from Text" . property $