From 4ccd30fe3ec899389e8159cc51e830c9edd9f875 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 13 Jan 2011 10:59:44 -0800 Subject: Moved Tests.Shared -> Tests.Helpers. Tests.Shared would be the natural place to put tests for functions in Text.Pandoc.Shared. --- tests/Tests/Helpers.hs | 26 ++++++++++++++++++++++++++ tests/Tests/Readers/LaTeX.hs | 2 +- tests/Tests/Shared.hs | 26 -------------------------- 3 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 tests/Tests/Helpers.hs delete mode 100644 tests/Tests/Shared.hs diff --git a/tests/Tests/Helpers.hs b/tests/Tests/Helpers.hs new file mode 100644 index 000000000..272fa16bc --- /dev/null +++ b/tests/Tests/Helpers.hs @@ -0,0 +1,26 @@ +module Tests.Helpers where + +import Text.Pandoc + +import Test.Framework +import Test.Framework.Providers.HUnit +import Test.HUnit hiding (Test) + +data Expect = Inline Inline + | Inlines [Inline] + | Block Block + | Blocks [Block] + +assertPandoc :: Expect -> Pandoc -> Assertion +assertPandoc (Inline e) (Pandoc _ [Para [g]]) = e @=? g +assertPandoc (Inlines e) (Pandoc _ [Para g] ) = e @=? g +assertPandoc (Block e) (Pandoc _ [g] ) = e @=? g +assertPandoc (Blocks e) (Pandoc _ g ) = e @=? g +assertPandoc _ _ = assertFailure "Wrong structure of Pandoc document." + +latexTest :: String-> String -> Expect -> Test +latexTest = readerTestWithState defaultParserState readLaTeX + +readerTestWithState :: ParserState -> (ParserState -> String -> Pandoc) -> String -> String -> Expect -> Test +readerTestWithState state reader name string exp = testCase name $ exp `assertPandoc` reader state string + diff --git a/tests/Tests/Readers/LaTeX.hs b/tests/Tests/Readers/LaTeX.hs index 58a27f09b..093ff07e5 100644 --- a/tests/Tests/Readers/LaTeX.hs +++ b/tests/Tests/Readers/LaTeX.hs @@ -3,7 +3,7 @@ module Tests.Readers.LaTeX (tests) where import Text.Pandoc.Definition import Test.Framework -import Tests.Shared +import Tests.Helpers tests :: [Test] tests = [ testGroup "basic" [ latexTest "simplest" "word" diff --git a/tests/Tests/Shared.hs b/tests/Tests/Shared.hs deleted file mode 100644 index f5b13986d..000000000 --- a/tests/Tests/Shared.hs +++ /dev/null @@ -1,26 +0,0 @@ -module Tests.Shared where - -import Text.Pandoc - -import Test.Framework -import Test.Framework.Providers.HUnit -import Test.HUnit hiding (Test) - -data Expect = Inline Inline - | Inlines [Inline] - | Block Block - | Blocks [Block] - -assertPandoc :: Expect -> Pandoc -> Assertion -assertPandoc (Inline e) (Pandoc _ [Para [g]]) = e @=? g -assertPandoc (Inlines e) (Pandoc _ [Para g] ) = e @=? g -assertPandoc (Block e) (Pandoc _ [g] ) = e @=? g -assertPandoc (Blocks e) (Pandoc _ g ) = e @=? g -assertPandoc _ _ = assertFailure "Wrong structure of Pandoc document." - -latexTest :: String-> String -> Expect -> Test -latexTest = readerTestWithState defaultParserState readLaTeX - -readerTestWithState :: ParserState -> (ParserState -> String -> Pandoc) -> String -> String -> Expect -> Test -readerTestWithState state reader name string exp = testCase name $ exp `assertPandoc` reader state string - -- cgit v1.2.3