From 4914e4d7f638b7771ecdaf24ee0516c05505697c Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 18 Jan 2016 05:42:26 +0000 Subject: Disallow paragraphs everywhere but at the top --- bbcode/test/Text/BBCodeSpec.hs | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'bbcode/test/Text') diff --git a/bbcode/test/Text/BBCodeSpec.hs b/bbcode/test/Text/BBCodeSpec.hs index e24c661..241cd76 100644 --- a/bbcode/test/Text/BBCodeSpec.hs +++ b/bbcode/test/Text/BBCodeSpec.hs @@ -20,44 +20,44 @@ spec = do example n (s, ts) = let str = "Example " <> show n in specify str (bbcode s == Right ts) -examples :: [(Text, [DomTree])] +examples :: [(Text, DomForest)] examples = [ ("[t]test[/t]" - , [Element "t" [] [Content "test"]]) + , pure [Element "t" [] [Content "test"]]) , ("[t]te\\st[/t]" - , [Element "t" [] [Content "te\\st"]]) + , pure [Element "t" [] [Content "te\\st"]]) , ("[t]te\\[st[/t]" - , [Element "t" [] [Content "te[st"]]) + , pure [Element "t" [] [Content "te[st"]]) , ("[t]test\\\\[/t]" - , [Element "t" [] [Content "test\\"]]) + , pure [Element "t" [] [Content "test\\"]]) , ("[\\t]test[/\\t]" - , [Element "\\t" [] [Content "test"]]) + , pure [Element "\\t" [] [Content "test"]]) , ("[t attr]test[/t]" - , [Element "t" [("attr", "")] [Content "test"]]) + , pure [Element "t" [("attr", "")] [Content "test"]]) , ("[t=attr]test[/t]" - , [Element "t" [("", "attr")] [Content "test"]]) + , pure [Element "t" [("", "attr")] [Content "test"]]) , ("[t attr=val]test[/t]" - , [Element "t" [("attr", "val")] [Content "test"]]) + , pure [Element "t" [("attr", "val")] [Content "test"]]) , ("[t attr=\"val\"]test[/t]" - , [Element "t" [("attr", "val")] [Content "test"]]) + , pure [Element "t" [("attr", "val")] [Content "test"]]) , ("[t attr=\"va]l\"]test[/t]" - , [Element "t" [("attr", "va]l")] [Content "test"]]) + , pure [Element "t" [("attr", "va]l")] [Content "test"]]) , ("[t attr=\"va\\\"l\"]test[/t]" - , [Element "t" [("attr", "va\"l")] [Content "test"]]) + , pure [Element "t" [("attr", "va\"l")] [Content "test"]]) , ("[t attr=\"val\" attr2=\"val2\" ]test[/t]" - , [Element "t" [("attr", "val"), ("attr2", "val2")] [Content "test"]]) + , pure [Element "t" [("attr", "val"), ("attr2", "val2")] [Content "test"]]) , ("[br/]" - , [Element "br" [] []]) + , pure [Element "br" [] []]) , ("[br attr/]" - , [Element "br" [("attr", "")] []]) + , pure [Element "br" [("attr", "")] []]) , ("[br=val/]" - , [Element "br" [("", "val")] []]) + , pure [Element "br" [("", "val")] []]) , ("[br attr=val/]" - , [Element "br" [("attr", "val")] []]) + , pure [Element "br" [("attr", "val")] []]) , ("[br attr=val val2/]" - , [Element "br" [("attr", "val"), ("val2", "")] []]) + , pure [Element "br" [("attr", "val"), ("val2", "")] []]) , ("foo\n\nbar" - , [Paragraph [Content "foo"], Paragraph [Content "bar"]]) - , ("[b]foo\n\nbar[/b]" - , [Element "b" [] [Paragraph [Content "foo"], Paragraph [Content "bar"]]]) + , [[Content "foo"], [Content "bar"]]) + , ("[b]foo[/b]\n\n[b]bar[/b]" + , [[Element "b" [] [Content "foo"]], [Element "b" [] [Content "bar"]]]) ] -- cgit v1.2.3