Revised tests directory.

Renamed some tests, introducing subsidiary directories
for fb2, docx, epub.

Cleaned up tests in cabal file.

Combined dokuwiki-writer and dokuwiki_inline_formatting tests.
This commit is contained in:
John MacFarlane 2014-08-13 11:16:50 -07:00
parent fa71a08ed3
commit 40e67b8737
82 changed files with 199 additions and 224 deletions

View file

@ -40,44 +40,44 @@ Description: Pandoc is a Haskell library for converting from one markup
only adding a reader or writer. only adding a reader or writer.
Data-Files: Data-Files:
-- templates -- templates
data/templates/default.html, data/templates/default.html
data/templates/default.html5, data/templates/default.html5
data/templates/default.docbook, data/templates/default.docbook
data/templates/default.beamer, data/templates/default.beamer
data/templates/default.opendocument, data/templates/default.opendocument
data/templates/default.icml, data/templates/default.icml
data/templates/default.opml, data/templates/default.opml
data/templates/default.latex, data/templates/default.latex
data/templates/default.context, data/templates/default.context
data/templates/default.texinfo, data/templates/default.texinfo
data/templates/default.man, data/templates/default.man
data/templates/default.markdown, data/templates/default.markdown
data/templates/default.rst, data/templates/default.rst
data/templates/default.plain, data/templates/default.plain
data/templates/default.mediawiki, data/templates/default.mediawiki
data/templates/default.rtf, data/templates/default.rtf
data/templates/default.s5, data/templates/default.s5
data/templates/default.slidy, data/templates/default.slidy
data/templates/default.slideous, data/templates/default.slideous
data/templates/default.revealjs, data/templates/default.revealjs
data/templates/default.dzslides, data/templates/default.dzslides
data/templates/default.asciidoc, data/templates/default.asciidoc
data/templates/default.haddock, data/templates/default.haddock
data/templates/default.textile, data/templates/default.textile
data/templates/default.org, data/templates/default.org
data/templates/default.epub, data/templates/default.epub
data/templates/default.epub3, data/templates/default.epub3
-- data for ODT writer -- data for ODT writer
data/reference.odt, data/reference.odt
-- data for docx writer -- data for docx writer
data/reference.docx, data/reference.docx
-- stylesheet for EPUB writer -- stylesheet for EPUB writer
data/epub.css, data/epub.css
-- data for LaTeXMathML writer -- data for LaTeXMathML writer
data/LaTeXMathML.js, data/LaTeXMathML.js
data/MathMLinHTML.js, data/MathMLinHTML.js
-- data for dzslides writer -- data for dzslides writer
data/dzslides/template.html, data/dzslides/template.html
-- sample lua custom writer -- sample lua custom writer
data/sample.lua data/sample.lua
-- documentation -- documentation
@ -86,118 +86,94 @@ Extra-Source-Files:
-- documentation -- documentation
INSTALL, BUGS, CONTRIBUTING.md, changelog INSTALL, BUGS, CONTRIBUTING.md, changelog
-- code to create pandoc.1 man page -- code to create pandoc.1 man page
man/man1/pandoc.1.template, man/man1/pandoc.1.template
man/man5/pandoc_markdown.5.template, man/man5/pandoc_markdown.5.template
-- generated man pages (produced post-build) -- generated man pages (produced post-build)
man/man1/pandoc.1, man/man1/pandoc.1
man/man5/pandoc_markdown.5, man/man5/pandoc_markdown.5
-- tests -- tests
tests/bodybg.gif, tests/bodybg.gif
tests/*.native
tests/docbook-reader.docbook tests/docbook-reader.docbook
tests/html-reader.html, tests/html-reader.html
tests/opml-reader.opml, tests/opml-reader.opml
tests/haddock-reader.haddock, tests/haddock-reader.haddock
tests/insert, tests/insert
tests/lalune.jpg, tests/lalune.jpg
tests/movie.jpg, tests/movie.jpg
tests/latex-reader.latex, tests/latex-reader.latex
tests/textile-reader.textile, tests/textile-reader.textile
tests/markdown-reader-more.txt, tests/markdown-reader-more.txt
tests/markdown-citations.txt, tests/markdown-citations.txt
tests/textile-reader.textile, tests/textile-reader.textile
tests/mediawiki-reader.wiki, tests/mediawiki-reader.wiki
tests/rst-reader.rst, tests/rst-reader.rst
tests/s5.basic.html, tests/s5-basic.html
tests/s5.fancy.html, tests/s5-fancy.html
tests/s5.fragment.html, tests/s5-fragment.html
tests/s5.inserts.html, tests/s5-inserts.html
tests/tables.context, tests/tables.context
tests/tables.docbook, tests/tables.docbook
tests/tables.html, tests/tables.html
tests/tables.latex, tests/tables.latex
tests/tables.man, tests/tables.man
tests/tables.plain, tests/tables.plain
tests/tables.markdown, tests/tables.markdown
tests/tables.mediawiki, tests/tables.mediawiki
tests/tables.textile, tests/tables.textile
tests/tables.opendocument, tests/tables.opendocument
tests/tables.org, tests/tables.org
tests/tables.asciidoc, tests/tables.asciidoc
tests/tables.haddock, tests/tables.haddock
tests/tables.texinfo, tests/tables.texinfo
tests/tables.rst, tests/tables.rst
tests/tables.rtf, tests/tables.rtf
tests/tables.txt, tests/tables.txt
tests/tables.fb2, tests/tables.fb2
tests/testsuite.txt, tests/testsuite.txt
tests/writer.latex, tests/writer.latex
tests/writer.context, tests/writer.context
tests/writer.docbook, tests/writer.docbook
tests/writer.html, tests/writer.html
tests/writer.man, tests/writer.man
tests/writer.markdown, tests/writer.markdown
tests/writer.plain, tests/writer.plain
tests/writer.mediawiki, tests/writer.mediawiki
tests/writer.textile, tests/writer.textile
tests/writer.opendocument, tests/writer.opendocument
tests/writer.org, tests/writer.org
tests/writer.asciidoc, tests/writer.asciidoc
tests/writer.haddock, tests/writer.haddock
tests/writer.rst, tests/writer.rst
tests/writer.rtf, tests/writer.icml
tests/writer.texinfo, tests/writer.rtf
tests/writer.fb2, tests/writer.texinfo
tests/writer.opml, tests/writer.fb2
tests/lhs-test.markdown, tests/writer.opml
tests/lhs-test.markdown+lhs, tests/writer.dokuwiki
tests/lhs-test.rst, tests/dokuwiki_inline_formatting.dokuwiki
tests/lhs-test.rst+lhs, tests/lhs-test.markdown
tests/lhs-test.latex, tests/lhs-test.markdown+lhs
tests/lhs-test.latex+lhs, tests/lhs-test.rst
tests/lhs-test.html, tests/lhs-test.rst+lhs
tests/lhs-test.html+lhs, tests/lhs-test.latex
tests/lhs-test.fragment.html+lhs, tests/lhs-test.latex+lhs
tests/pipe-tables.txt, tests/lhs-test.html
tests/*.epub tests/lhs-test.html+lhs
tests/fb2.basic.markdown, tests/lhs-test.fragment.html+lhs
tests/fb2.basic.fb2, tests/pipe-tables.txt
tests/fb2.titles.markdown, tests/fb2/*.markdown
tests/fb2.titles.fb2, tests/fb2/*.fb2
tests/fb2.images.markdown, tests/fb2/images-embedded.html
tests/fb2.images.fb2, tests/fb2/images-embedded.fb2
tests/fb2.images-embedded.html, tests/fb2/test-small.png
tests/fb2.images-embedded.fb2, tests/fb2/test.jpg
tests/fb2.math.markdown, tests/docx/*.docx
tests/fb2.math.fb2, tests/docx/*.native
tests/fb2.test-small.png, tests/epub/*.epub
tests/fb2.test.jpg, tests/epub/*.native
tests/docx.already_auto_ident.docx,
tests/docx.block_quotes.docx,
tests/docx.codeblock.docx,
tests/docx.deep_normalize.docx,
tests/docx.definition_list.docx,
tests/docx.drop_cap.docx,
tests/docx.hanging_indent.docx,
tests/docx.headers.docx,
tests/docx.image.docx,
tests/docx.inline_images.docx,
tests/docx.inline_code.docx,
tests/docx.inline_formatting.docx,
tests/docx.links.docx,
tests/docx.lists.docx,
tests/docx.metadata.docx,
tests/docx.metadata_after_normal.docx,
tests/docx.normalize.docx,
tests/docx.notes.docx,
tests/docx.tables.docx,
tests/docx.tabs.docx,
tests/docx.track_changes_deletion.docx,
tests/docx.track_changes_insertion.docx,
tests/docx.trailing_spaces_in_formatting.docx,
tests/docx.unicode.docx,
tests/*.native,
tests/txt2tags.t2t tests/txt2tags.t2t
Extra-Tmp-Files: man/man1/pandoc.1, Extra-Tmp-Files: man/man1/pandoc.1
man/man5/pandoc_markdown.5 man/man5/pandoc_markdown.5
Source-repository head Source-repository head

View file

@ -111,12 +111,12 @@ tests = [ testGroup "markdown"
"testsuite.native" "testsuite.native" "testsuite.native" "testsuite.native"
] ]
, testGroup "fb2" , testGroup "fb2"
[ fb2WriterTest "basic" [] "fb2.basic.markdown" "fb2.basic.fb2" [ fb2WriterTest "basic" [] "fb2/basic.markdown" "fb2/basic.fb2"
, fb2WriterTest "titles" [] "fb2.titles.markdown" "fb2.titles.fb2" , fb2WriterTest "titles" [] "fb2/titles.markdown" "fb2/titles.fb2"
, fb2WriterTest "images" [] "fb2.images.markdown" "fb2.images.fb2" , fb2WriterTest "images" [] "fb2/images.markdown" "fb2/images.fb2"
, fb2WriterTest "images-embedded" [] "fb2.images-embedded.html" "fb2.images-embedded.fb2" , fb2WriterTest "images-embedded" [] "fb2/images-embedded.html" "fb2/images-embedded.fb2"
, fb2WriterTest "math" [] "fb2/math.markdown" "fb2/math.fb2"
, fb2WriterTest "tables" [] "tables.native" "tables.fb2" , fb2WriterTest "tables" [] "tables.native" "tables.fb2"
, fb2WriterTest "math" [] "fb2.math.markdown" "fb2.math.fb2"
, fb2WriterTest "testsuite" [] "testsuite.native" "writer.fb2" , fb2WriterTest "testsuite" [] "testsuite.native" "writer.fb2"
] ]
, testGroup "mediawiki" , testGroup "mediawiki"
@ -126,10 +126,8 @@ tests = [ testGroup "markdown"
] ]
, testGroup "dokuwiki" , testGroup "dokuwiki"
[ testGroup "writer" $ writerTests "dokuwiki" [ testGroup "writer" $ writerTests "dokuwiki"
, test "writer-more" ["-r", "native", "-w", "dokuwiki", "-s"] , test "inline_formatting" ["-r", "native", "-w", "dokuwiki", "-s"]
"dokuwiki-writer.native" "dokuwiki-writer.dokuwiki" "dokuwiki_inline_formatting.native" "dokuwiki_inline_formatting.dokuwiki"
, test "writer-inline_formatting" ["-r", "native", "-w", "dokuwiki", "-s"]
"dokuwiki.inline_formatting.native" "dokuwiki.inline_formatting.dokuwiki"
] ]
, testGroup "opml" , testGroup "opml"
[ test "basic" ["-r", "native", "-w", "opml", "--columns=78", "-s"] [ test "basic" ["-r", "native", "-w", "opml", "--columns=78", "-s"]
@ -147,11 +145,11 @@ tests = [ testGroup "markdown"
"txt2tags.t2t" "txt2tags.native" ] "txt2tags.t2t" "txt2tags.native" ]
, testGroup "epub" [ , testGroup "epub" [
test "features" ["-r", "epub", "-w", "native"] test "features" ["-r", "epub", "-w", "native"]
"epub.features.epub" "epub.features.native" "epub/features.epub" "epub/features.native"
, test "wasteland" ["-r", "epub", "-w", "native"] , test "wasteland" ["-r", "epub", "-w", "native"]
"epub.wasteland.epub" "epub.wasteland.native" "epub/wasteland.epub" "epub/wasteland.native"
, test "formatting" ["-r", "epub", "-w", "native"] , test "formatting" ["-r", "epub", "-w", "native"]
"epub.formatting.epub" "epub.formatting.native" "epub/formatting.epub" "epub/formatting.native"
] ]
, testGroup "other writers" $ map (\f -> testGroup f $ writerTests f) , testGroup "other writers" $ map (\f -> testGroup f $ writerTests f)
[ "opendocument" , "context" , "texinfo", "icml" [ "opendocument" , "context" , "texinfo", "icml"
@ -194,7 +192,7 @@ s5WriterTest :: String -> [String] -> String -> Test
s5WriterTest modifier opts format s5WriterTest modifier opts format
= test (format ++ " writer (" ++ modifier ++ ")") = test (format ++ " writer (" ++ modifier ++ ")")
(["-r", "native", "-w", format] ++ opts) (["-r", "native", "-w", format] ++ opts)
"s5.native" ("s5." ++ modifier <.> "html") "s5.native" ("s5-" ++ modifier <.> "html")
fb2WriterTest :: String -> [String] -> String -> String -> Test fb2WriterTest :: String -> [String] -> String -> String -> Test
fb2WriterTest title opts inputfile normfile = fb2WriterTest title opts inputfile normfile =

View file

@ -100,135 +100,135 @@ tests :: [Test]
tests = [ testGroup "inlines" tests = [ testGroup "inlines"
[ testCompare [ testCompare
"font formatting" "font formatting"
"docx.inline_formatting.docx" "docx/inline_formatting.docx"
"docx.inline_formatting.native" "docx/inline_formatting.native"
, testCompare , testCompare
"hyperlinks" "hyperlinks"
"docx.links.docx" "docx/links.docx"
"docx.links.native" "docx/links.native"
, testCompare , testCompare
"inline image" "inline image"
"docx.image.docx" "docx/image.docx"
"docx.image_no_embed.native" "docx/image_no_embed.native"
, testCompare , testCompare
"inline image in links" "inline image in links"
"docx.inline_images.docx" "docx/inline_images.docx"
"docx.inline_images.native" "docx/inline_images.native"
, testCompare , testCompare
"handling unicode input" "handling unicode input"
"docx.unicode.docx" "docx/unicode.docx"
"docx.unicode.native" "docx/unicode.native"
, testCompare , testCompare
"literal tabs" "literal tabs"
"docx.tabs.docx" "docx/tabs.docx"
"docx.tabs.native" "docx/tabs.native"
, testCompare , testCompare
"normalizing inlines" "normalizing inlines"
"docx.normalize.docx" "docx/normalize.docx"
"docx.normalize.native" "docx/normalize.native"
, testCompare , testCompare
"normalizing inlines deep inside blocks" "normalizing inlines deep inside blocks"
"docx.deep_normalize.docx" "docx/deep_normalize.docx"
"docx.deep_normalize.native" "docx/deep_normalize.native"
, testCompare , testCompare
"move trailing spaces outside of formatting" "move trailing spaces outside of formatting"
"docx.trailing_spaces_in_formatting.docx" "docx/trailing_spaces_in_formatting.docx"
"docx.trailing_spaces_in_formatting.native" "docx/trailing_spaces_in_formatting.native"
, testCompare , testCompare
"inline code (with VerbatimChar style)" "inline code (with VerbatimChar style)"
"docx.inline_code.docx" "docx/inline_code.docx"
"docx.inline_code.native" "docx/inline_code.native"
] ]
, testGroup "blocks" , testGroup "blocks"
[ testCompare [ testCompare
"headers" "headers"
"docx.headers.docx" "docx/headers.docx"
"docx.headers.native" "docx/headers.native"
, testCompare , testCompare
"headers already having auto identifiers" "headers already having auto identifiers"
"docx.already_auto_ident.docx" "docx/already_auto_ident.docx"
"docx.already_auto_ident.native" "docx/already_auto_ident.native"
, testCompare , testCompare
"lists" "lists"
"docx.lists.docx" "docx/lists.docx"
"docx.lists.native" "docx/lists.native"
, testCompare , testCompare
"definition lists" "definition lists"
"docx.definition_list.docx" "docx/definition_list.docx"
"docx.definition_list.native" "docx/definition_list.native"
, testCompare , testCompare
"footnotes and endnotes" "footnotes and endnotes"
"docx.notes.docx" "docx/notes.docx"
"docx.notes.native" "docx/notes.native"
, testCompare , testCompare
"blockquotes (parsing indent as blockquote)" "blockquotes (parsing indent as blockquote)"
"docx.block_quotes.docx" "docx/block_quotes.docx"
"docx.block_quotes_parse_indent.native" "docx/block_quotes_parse_indent.native"
, testCompare , testCompare
"hanging indents" "hanging indents"
"docx.hanging_indent.docx" "docx/hanging_indent.docx"
"docx.hanging_indent.native" "docx/hanging_indent.native"
, testCompare , testCompare
"tables" "tables"
"docx.tables.docx" "docx/tables.docx"
"docx.tables.native" "docx/tables.native"
, testCompare , testCompare
"code block" "code block"
"docx.codeblock.docx" "docx/codeblock.docx"
"docx.codeblock.native" "docx/codeblock.native"
, testCompare , testCompare
"dropcap paragraphs" "dropcap paragraphs"
"docx.drop_cap.docx" "docx/drop_cap.docx"
"docx.drop_cap.native" "docx/drop_cap.native"
] ]
, testGroup "track changes" , testGroup "track changes"
[ testCompare [ testCompare
"insertion (default)" "insertion (default)"
"docx.track_changes_insertion.docx" "docx/track_changes_insertion.docx"
"docx.track_changes_insertion_accept.native" "docx/track_changes_insertion_accept.native"
, testCompareWithOpts def{readerTrackChanges=AcceptChanges} , testCompareWithOpts def{readerTrackChanges=AcceptChanges}
"insert insertion (accept)" "insert insertion (accept)"
"docx.track_changes_insertion.docx" "docx/track_changes_insertion.docx"
"docx.track_changes_insertion_accept.native" "docx/track_changes_insertion_accept.native"
, testCompareWithOpts def{readerTrackChanges=RejectChanges} , testCompareWithOpts def{readerTrackChanges=RejectChanges}
"remove insertion (reject)" "remove insertion (reject)"
"docx.track_changes_insertion.docx" "docx/track_changes_insertion.docx"
"docx.track_changes_insertion_reject.native" "docx/track_changes_insertion_reject.native"
, testCompare , testCompare
"deletion (default)" "deletion (default)"
"docx.track_changes_deletion.docx" "docx/track_changes_deletion.docx"
"docx.track_changes_deletion_accept.native" "docx/track_changes_deletion_accept.native"
, testCompareWithOpts def{readerTrackChanges=AcceptChanges} , testCompareWithOpts def{readerTrackChanges=AcceptChanges}
"remove deletion (accept)" "remove deletion (accept)"
"docx.track_changes_deletion.docx" "docx/track_changes_deletion.docx"
"docx.track_changes_deletion_accept.native" "docx/track_changes_deletion_accept.native"
, testCompareWithOpts def{readerTrackChanges=RejectChanges} , testCompareWithOpts def{readerTrackChanges=RejectChanges}
"insert deletion (reject)" "insert deletion (reject)"
"docx.track_changes_deletion.docx" "docx/track_changes_deletion.docx"
"docx.track_changes_deletion_reject.native" "docx/track_changes_deletion_reject.native"
, testCompareWithOpts def{readerTrackChanges=AllChanges} , testCompareWithOpts def{readerTrackChanges=AllChanges}
"keep insertion (all)" "keep insertion (all)"
"docx.track_changes_deletion.docx" "docx/track_changes_deletion.docx"
"docx.track_changes_deletion_all.native" "docx/track_changes_deletion_all.native"
, testCompareWithOpts def{readerTrackChanges=AllChanges} , testCompareWithOpts def{readerTrackChanges=AllChanges}
"keep deletion (all)" "keep deletion (all)"
"docx.track_changes_deletion.docx" "docx/track_changes_deletion.docx"
"docx.track_changes_deletion_all.native" "docx/track_changes_deletion_all.native"
] ]
, testGroup "media" , testGroup "media"
[ testMediaBag [ testMediaBag
"image extraction" "image extraction"
"docx.image.docx" "docx/image.docx"
] ]
, testGroup "metadata" , testGroup "metadata"
[ testCompareWithOpts def{readerStandalone=True} [ testCompareWithOpts def{readerStandalone=True}
"metadata fields" "metadata fields"
"docx.metadata.docx" "docx/metadata.docx"
"docx.metadata.native" "docx/metadata.native"
, testCompareWithOpts def{readerStandalone=True} , testCompareWithOpts def{readerStandalone=True}
"stop recording metadata with normal text" "stop recording metadata with normal text"
"docx.metadata_after_normal.docx" "docx/metadata_after_normal.docx"
"docx.metadata_after_normal.native" "docx/metadata_after_normal.native"
] ]
] ]

View file

@ -28,6 +28,6 @@ tests :: [Test]
tests = tests =
[ testGroup "EPUB Mediabag" [ testGroup "EPUB Mediabag"
[ testCase "features bag" [ testCase "features bag"
(testMediaBag "epub.features.epub" featuresBag) (testMediaBag "epub/features.epub" featuresBag)
] ]
] ]

View file

@ -1,3 +0,0 @@
hello %%//%% world %%**%% from %%__%% me
''%%hello // world ** from __ me%%''

View file

@ -1,2 +0,0 @@
[Para [Str "hello",Space,Str "//",Space,Str "world",Space,Str "**",Space,Str "from",Space,Str "__",Space,Str "me"]
,Para [Code ("",[],[]) "hello // world ** from __ me"]]

View file

@ -7,3 +7,7 @@ Some people use single underlines for //emphasis//.
Above the line is <sup>superscript</sup> and below the line is <sub>subscript</sub>. Above the line is <sup>superscript</sup> and below the line is <sub>subscript</sub>.
A line\\ break. A line\\ break.
hello %%//%% world %%**%% from %%__%% me
''%%hello // world ** from __ me%%''

View file

@ -2,4 +2,6 @@
,Para [Str "This",Space,Str "is",Space,SmallCaps [Str "Small",Space,Str "Caps"],Str ",",Space,Str "and",Space,Str "this",Space,Str "is",Space,Strikeout [Str "strikethrough"],Str "."] ,Para [Str "This",Space,Str "is",Space,SmallCaps [Str "Small",Space,Str "Caps"],Str ",",Space,Str "and",Space,Str "this",Space,Str "is",Space,Strikeout [Str "strikethrough"],Str "."]
,Para [Str "Some",Space,Str "people",Space,Str "use",Space,Span ("",[],[("underline","single")]) [Str "single",Space,Str "underlines",Space,Str "for",Space,Emph [Str "emphasis"]],Str "."] ,Para [Str "Some",Space,Str "people",Space,Str "use",Space,Span ("",[],[("underline","single")]) [Str "single",Space,Str "underlines",Space,Str "for",Space,Emph [Str "emphasis"]],Str "."]
,Para [Str "Above",Space,Str "the",Space,Str "line",Space,Str "is",Space,Superscript [Str "superscript"],Space,Str "and",Space,Str "below",Space,Str "the",Space,Str "line",Space,Str "is",Space,Subscript [Str "subscript"],Str "."] ,Para [Str "Above",Space,Str "the",Space,Str "line",Space,Str "is",Space,Superscript [Str "superscript"],Space,Str "and",Space,Str "below",Space,Str "the",Space,Str "line",Space,Str "is",Space,Subscript [Str "subscript"],Str "."]
,Para [Str "A",Space,Str "line",LineBreak,Str "break."]] ,Para [Str "A",Space,Str "line",LineBreak,Str "break."]
,Para [Str "hello",Space,Str "//",Space,Str "world",Space,Str "**",Space,Str "from",Space,Str "__",Space,Str "me"]
,Para [Code ("",[],[]) "hello // world ** from __ me"]]

View file

@ -4,10 +4,10 @@ Small inline image: ![alt text a small PNG image][inline-image].
Paragraph image: Paragraph image:
![alt text of a big JPEG image](fb2.test.jpg "image title text") ![alt text of a big JPEG image](fb2/test.jpg "image title text")
![alt text of a big missing image](missing.jpg) ![alt text of a big missing image](missing.jpg)
A missing image inline: ![alt text of missing image](missing.jpg). A missing image inline: ![alt text of missing image](missing.jpg).
[inline-image]: fb2.test-small.png [inline-image]: fb2/test-small.png

View file

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 4 KiB

View file

Before

Width:  |  Height:  |  Size: 150 KiB

After

Width:  |  Height:  |  Size: 150 KiB