From 32d779b5de22b9ebe321a367a2a2749eef06103c Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 19 Jan 2016 17:29:36 +0000 Subject: Fixed tests for Printout.BBCode --- tp-bbcode/test/Thermoprint/Printout/BBCodeSpec.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tp-bbcode/test') diff --git a/tp-bbcode/test/Thermoprint/Printout/BBCodeSpec.hs b/tp-bbcode/test/Thermoprint/Printout/BBCodeSpec.hs index c10018f..d2cdeed 100644 --- a/tp-bbcode/test/Thermoprint/Printout/BBCodeSpec.hs +++ b/tp-bbcode/test/Thermoprint/Printout/BBCodeSpec.hs @@ -19,7 +19,7 @@ import Control.Monad (zipWithM_) import Data.Monoid ((<>)) import Data.Function (on) -import qualified Data.Sequence as Seq (fromList) +import Data.Sequence (Seq) instance Eq Block where (==) = (==) `on` cotext @@ -35,10 +35,10 @@ spec = do example n (s, ts) = let str = "Example " <> show n in specify str $ bbcode s == (pOut <$> ts) -pOut :: [Block] -> Printout -pOut = pure . Seq.fromList . map Cooked +pOut :: Seq Block -> Printout +pOut = fmap (pure . Cooked) -examples :: [(Text, Either BBCodeError [Block])] +examples :: [(Text, Either BBCodeError (Seq Block))] examples = [ ("Hello World!" , Right [Line (JuxtaPos ["Hello", HSpace 1, "World!"])]) , ("Hello [hspace width=2/] World!" @@ -46,5 +46,5 @@ examples = [ ("Hello World!" , ("Par1\n\nPar2\n\nPar3 Word2" , Right [Line ("Par1"), Line ("Par2"), Line (JuxtaPos ["Par3", HSpace 1, "Word2"])]) , ("Par1 [hspace=3/]\n\n[vspace=2/]Par2\n\nPar3 Word2" - , Right [Line (JuxtaPos ["Par1", HSpace 4]), NewlSep [VSpace 1, Line ("Par2")], Line (JuxtaPos ["Par3", HSpace 1, "Word2"])]) + , Right [Line (JuxtaPos ["Par1", HSpace 4]), NewlSep [VSpace 2, Line ("Par2")], Line (JuxtaPos ["Par3", HSpace 1, "Word2"])]) ] -- cgit v1.2.3