diff options
Diffstat (limited to 'tests/Tests')
| -rw-r--r-- | tests/Tests/Readers/Org.hs | 17 | ||||
| -rw-r--r-- | tests/Tests/Readers/RST.hs | 5 |
2 files changed, 9 insertions, 13 deletions
diff --git a/tests/Tests/Readers/Org.hs b/tests/Tests/Readers/Org.hs index d4fedc797..49423bd11 100644 --- a/tests/Tests/Readers/Org.hs +++ b/tests/Tests/Readers/Org.hs @@ -1490,14 +1490,11 @@ tests = mconcat [ para $ spcSep [ "The", "first", "lines", "of" , "Goethe's", emph "Faust" <> ":"] - , para $ mconcat - [ spcSep [ "Habe", "nun,", "ach!", "Philosophie," ] - , linebreak - , spcSep [ "Juristerei", "und", "Medizin," ] - , linebreak - , spcSep [ "Und", "leider", "auch", "Theologie!" ] - , linebreak - , spcSep [ "Durchaus", "studiert,", "mit", "heißem", "Bemühn." ] + , lineBlock + [ "Habe nun, ach! Philosophie," + , "Juristerei und Medizin," + , "Und leider auch Theologie!" + , "Durchaus studiert, mit heißem Bemühn." ] ] @@ -1508,7 +1505,7 @@ tests = , "bar" , "#+END_VERSE" ] =?> - para ("foo" <> linebreak <> linebreak <> "bar") + lineBlock [ "foo", mempty, "bar" ] , "Verse block with varying indentation" =: unlines [ "#+BEGIN_VERSE" @@ -1516,7 +1513,7 @@ tests = , "my old friend" , "#+END_VERSE" ] =?> - para ("\160\160hello darkness" <> linebreak <> "my old friend") + lineBlock [ "\160\160hello darkness", "my old friend" ] , "Raw block LaTeX" =: unlines [ "#+BEGIN_LaTeX" diff --git a/tests/Tests/Readers/RST.hs b/tests/Tests/Readers/RST.hs index 622f5e48b..e47432250 100644 --- a/tests/Tests/Readers/RST.hs +++ b/tests/Tests/Readers/RST.hs @@ -19,8 +19,7 @@ infix 4 =: tests :: [Test] tests = [ "line block with blank line" =: - "| a\n|\n| b" =?> para (str "a") <> - para (str "\160b") + "| a\n|\n| b" =?> lineBlock [ "a", mempty, "\160b" ] , testGroup "field list" [ "general" =: unlines [ "para" @@ -135,7 +134,7 @@ tests = [ "line block with blank line" =: codeBlock "block quotes\n\ncan go on for many lines" <> para "but must stop here") , "line block with 3 lines" =: "| a\n| b\n| c" - =?> para ("a" <> linebreak <> "b" <> linebreak <> "c") + =?> lineBlock ["a", "b", "c"] , "quoted literal block using >" =: "::\n\n> quoted\n> block\n\nOrdinary paragraph" =?> codeBlock "> quoted\n> block" <> para "Ordinary paragraph" , "quoted literal block using | (not a line block)" =: "::\n\n| quoted\n| block\n\nOrdinary paragraph" |