1 files changed, 23 insertions, 22 deletions
diff --git a/tests/Tests/Readers/LaTeX.hs b/tests/Tests/Readers/LaTeX.hs
index 99ccb3fe2..69355a5c8 100644
--- a/tests/Tests/Readers/LaTeX.hs
+++ b/tests/Tests/Readers/LaTeX.hs
@@ -1,36 +1,37 @@
 module Tests.Readers.LaTeX (tests) where
 
 import Text.Pandoc.Definition
-
 import Test.Framework
 import Tests.Helpers
+import Text.Pandoc.Builder
+import Text.Pandoc
+
+latex :: String -> Pandoc
+latex = readLaTeX defaultParserState{stateSmart = True}
 
 tests :: [Test]
 tests = [ testGroup "basic"
-          [ latexTest "simplest" "word" (Inline  $ Str "word")
-          , latexTest "space"    "some text"
-            (Inlines $ [Str "some", Space, Str "text"])
-
-          , latexTest "emphasis" "\\emph{emphasized}"
-            (Inline  $ Emph [Str "emphasized"])
+          [ "simple" =:
+            latex "word" =?> str "wor d"
+          , "space" =:
+            latex "some text" =?> text "some text"
+          , "emphasized" =:
+            latex "\\emph{emphasized}" =?> (emph $ str "emphasized")
           ]
 
         , testGroup "headers"
-          [ latexTest "1. level" "\\section{header}"
-            $ Block $ Header 1 [Str "header"]
-
-          , latexTest "2. level" "\\subsection{header}"
-            $ Block $ Header 2 [Str "header"]
-
-          , latexTest "3. level" "\\subsubsection{header}"
-            $ Block $ Header 3 [Str "header"]
-
-          , latexTest "with emphasis" "\\section{text \\emph{emph}}"
-            $ Block $ Header 1 [Str "text", Space, Emph [Str "emph"]]
-
-          , latexTest "with link" "\\section{text \\href{/url}{link}}"
-            $ Block
-            $ Header 1 [Str "text", Space, Link [Str "link"] ("/url", "")]
+          [ "level 1" =:
+            latex "\\section{header}" =?> header 1 (str "header")
+          , "level 2" =:
+            latex "\\subsection{header}" =?> header 2 (str "header")
+          , "level 3" =:
+            latex "\\subsubsection{header}" =?> header 3 (str "header")
+          , "emph" =:
+            latex "\\section{text \\emph{emph}}" =?>
+              header 1 (str "text2" +++ space +++ emph (str "emph"))
+          , "link" =:
+            latex "\\section{text \\href{/url}{link}}" =?>
+              header 1 (str "text" +++ space +++ link "/url" "" (str "link"))
           ]
         ]