From 75d9fe614dca572aa1d7cfa53553e9c103eb2dd0 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 25 Jan 2017 15:54:54 +0100 Subject: Cleanup test suite --- spec/src/Thermoprint/Printout.hs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'spec/src') diff --git a/spec/src/Thermoprint/Printout.hs b/spec/src/Thermoprint/Printout.hs index 752ccb5..53b6a3e 100644 --- a/spec/src/Thermoprint/Printout.hs +++ b/spec/src/Thermoprint/Printout.hs @@ -37,7 +37,7 @@ import Data.Proxy (Proxy(..)) import Test.QuickCheck.Arbitrary (Arbitrary(..), CoArbitrary, genericShrink) import Test.QuickCheck.Modifiers (NonNegative(..)) -import Test.QuickCheck.Gen (oneof, scale) +import Test.QuickCheck.Gen (oneof, scale, elements) import Test.QuickCheck.Instances import Test.QuickCheck (forAll, Property) @@ -242,10 +242,14 @@ data MarkupMode = Bold | Underline | DoubleHeight | DoubleWidth - deriving (Generic, NFData, Show, Arbitrary, CoArbitrary, FromJSON, ToJSON - , Eq, Ord, Enum + deriving (Generic, NFData, Show, FromJSON, ToJSON + , Eq, Ord, Enum, Bounded ) +instance Arbitrary MarkupMode where + arbitrary = elements [minBound..maxBound] +instance CoArbitrary MarkupMode + -- | We don't test 'Raw' 'Chunk's instance Arbitrary Chunk where shrink = genericShrink @@ -262,6 +266,7 @@ instance Arbitrary Line where shrink = genericShrink arbitrary = oneof [ Word . TL.filter (not . isSpace) <$> arbitrary -- 'isSpace '\n' == True' , HSpace . getNonNegative <$> arbitrary + , Markup <$> arbitrary <*> arbitrary , JuxtaPos <$> scale' arbitrary ] -- cgit v1.2.3