diff options
Diffstat (limited to 'test')
45 files changed, 24 insertions, 7 deletions
diff --git a/test/Tests/Writers/Powerpoint.hs b/test/Tests/Writers/Powerpoint.hs index 87ebe990c..344d20238 100644 --- a/test/Tests/Writers/Powerpoint.hs +++ b/test/Tests/Writers/Powerpoint.hs @@ -7,18 +7,21 @@ import System.FilePath import Text.DocTemplates (ToContext(toVal), Context(..)) import qualified Data.Map as M import Data.Text (pack) +import Data.List (unzip4) -- templating is important enough, and can break enough things, that -- we want to run all our tests with both default formatting and a -- template. -modifyPptxName :: FilePath -> FilePath -modifyPptxName fp = - addExtension (dropExtension fp ++ "_templated") "pptx" +modifyPptxName :: FilePath -> String -> FilePath +modifyPptxName fp suffix = + addExtension (dropExtension fp ++ suffix) "pptx" -pptxTests :: String -> WriterOptions -> FilePath -> FilePath -> (TestTree, TestTree) +pptxTests :: String -> WriterOptions -> FilePath -> FilePath -> (TestTree, TestTree, TestTree, TestTree) pptxTests name opts native pptx = let referenceDoc = "pptx/reference_depth.pptx" + movedLayoutsReferenceDoc = "pptx/reference_moved_layouts.pptx" + deletedLayoutsReferenceDoc = "pptx/reference_deleted_layouts.pptx" in ( ooxmlTest writePowerpoint @@ -31,15 +34,29 @@ pptxTests name opts native pptx = name opts{writerReferenceDoc=Just referenceDoc} native - (modifyPptxName pptx) + (modifyPptxName pptx "_templated") + , ooxmlTest + writePowerpoint + name + opts{writerReferenceDoc=Just movedLayoutsReferenceDoc} + native + (modifyPptxName pptx "_moved_layouts") + , ooxmlTest + writePowerpoint + name + opts{writerReferenceDoc=Just deletedLayoutsReferenceDoc} + native + (modifyPptxName pptx "_deleted_layouts") ) -groupPptxTests :: [(TestTree, TestTree)] -> [TestTree] +groupPptxTests :: [(TestTree, TestTree, TestTree, TestTree)] -> [TestTree] groupPptxTests pairs = - let (noRefs, refs) = unzip pairs + let (noRefs, refs, movedLayouts, deletedLayouts) = unzip4 pairs in [ testGroup "Default slide formatting" noRefs , testGroup "With `--reference-doc` pptx file" refs + , testGroup "With layouts in reference doc moved" movedLayouts + , testGroup "With layouts in reference doc deleted" deletedLayouts ] diff --git a/test/pptx/code-custom_deleted_layouts.pptx b/test/pptx/code-custom_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..9282e6354 --- /dev/null +++ b/test/pptx/code-custom_deleted_layouts.pptx diff --git a/test/pptx/code-custom_moved_layouts.pptx b/test/pptx/code-custom_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..a14eeb6c8 --- /dev/null +++ b/test/pptx/code-custom_moved_layouts.pptx diff --git a/test/pptx/code_deleted_layouts.pptx b/test/pptx/code_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..0f503f553 --- /dev/null +++ b/test/pptx/code_deleted_layouts.pptx diff --git a/test/pptx/code_moved_layouts.pptx b/test/pptx/code_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..4d66b1310 --- /dev/null +++ b/test/pptx/code_moved_layouts.pptx diff --git a/test/pptx/document-properties-short-desc_deleted_layouts.pptx b/test/pptx/document-properties-short-desc_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..e4cf6bd7b --- /dev/null +++ b/test/pptx/document-properties-short-desc_deleted_layouts.pptx diff --git a/test/pptx/document-properties-short-desc_moved_layouts.pptx b/test/pptx/document-properties-short-desc_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..8834f885f --- /dev/null +++ b/test/pptx/document-properties-short-desc_moved_layouts.pptx diff --git a/test/pptx/document-properties_deleted_layouts.pptx b/test/pptx/document-properties_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..a00c8059d --- /dev/null +++ b/test/pptx/document-properties_deleted_layouts.pptx diff --git a/test/pptx/document-properties_moved_layouts.pptx b/test/pptx/document-properties_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..c1d2d5282 --- /dev/null +++ b/test/pptx/document-properties_moved_layouts.pptx diff --git a/test/pptx/endnotes_deleted_layouts.pptx b/test/pptx/endnotes_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..5c69a6310 --- /dev/null +++ b/test/pptx/endnotes_deleted_layouts.pptx diff --git a/test/pptx/endnotes_moved_layouts.pptx b/test/pptx/endnotes_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..0d4c491b9 --- /dev/null +++ b/test/pptx/endnotes_moved_layouts.pptx diff --git a/test/pptx/endnotes_toc_deleted_layouts.pptx b/test/pptx/endnotes_toc_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..46708544c --- /dev/null +++ b/test/pptx/endnotes_toc_deleted_layouts.pptx diff --git a/test/pptx/endnotes_toc_moved_layouts.pptx b/test/pptx/endnotes_toc_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..d1200bd7d --- /dev/null +++ b/test/pptx/endnotes_toc_moved_layouts.pptx diff --git a/test/pptx/images_deleted_layouts.pptx b/test/pptx/images_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..7a38ea625 --- /dev/null +++ b/test/pptx/images_deleted_layouts.pptx diff --git a/test/pptx/images_moved_layouts.pptx b/test/pptx/images_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..08d1c27e0 --- /dev/null +++ b/test/pptx/images_moved_layouts.pptx diff --git a/test/pptx/inline_formatting_deleted_layouts.pptx b/test/pptx/inline_formatting_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..bbd5bfeb4 --- /dev/null +++ b/test/pptx/inline_formatting_deleted_layouts.pptx diff --git a/test/pptx/inline_formatting_moved_layouts.pptx b/test/pptx/inline_formatting_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..427492130 --- /dev/null +++ b/test/pptx/inline_formatting_moved_layouts.pptx diff --git a/test/pptx/lists_deleted_layouts.pptx b/test/pptx/lists_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..6512e44bb --- /dev/null +++ b/test/pptx/lists_deleted_layouts.pptx diff --git a/test/pptx/lists_moved_layouts.pptx b/test/pptx/lists_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..2947c3211 --- /dev/null +++ b/test/pptx/lists_moved_layouts.pptx diff --git a/test/pptx/raw_ooxml_deleted_layouts.pptx b/test/pptx/raw_ooxml_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..2ea155657 --- /dev/null +++ b/test/pptx/raw_ooxml_deleted_layouts.pptx diff --git a/test/pptx/raw_ooxml_moved_layouts.pptx b/test/pptx/raw_ooxml_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..e58304172 --- /dev/null +++ b/test/pptx/raw_ooxml_moved_layouts.pptx diff --git a/test/pptx/reference_deleted_layouts.pptx b/test/pptx/reference_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..a9a74ecd5 --- /dev/null +++ b/test/pptx/reference_deleted_layouts.pptx diff --git a/test/pptx/reference_moved_layouts.pptx b/test/pptx/reference_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..72c4f3fd7 --- /dev/null +++ b/test/pptx/reference_moved_layouts.pptx diff --git a/test/pptx/remove_empty_slides_deleted_layouts.pptx b/test/pptx/remove_empty_slides_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..7ae4a5fab --- /dev/null +++ b/test/pptx/remove_empty_slides_deleted_layouts.pptx diff --git a/test/pptx/remove_empty_slides_moved_layouts.pptx b/test/pptx/remove_empty_slides_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..2572f2447 --- /dev/null +++ b/test/pptx/remove_empty_slides_moved_layouts.pptx diff --git a/test/pptx/slide_breaks_deleted_layouts.pptx b/test/pptx/slide_breaks_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..86dfad3b2 --- /dev/null +++ b/test/pptx/slide_breaks_deleted_layouts.pptx diff --git a/test/pptx/slide_breaks_moved_layouts.pptx b/test/pptx/slide_breaks_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..90b3b94a6 --- /dev/null +++ b/test/pptx/slide_breaks_moved_layouts.pptx diff --git a/test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptx b/test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..2c7fd4d8b --- /dev/null +++ b/test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptx diff --git a/test/pptx/slide_breaks_slide_level_1_moved_layouts.pptx b/test/pptx/slide_breaks_slide_level_1_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..8471b1d10 --- /dev/null +++ b/test/pptx/slide_breaks_slide_level_1_moved_layouts.pptx diff --git a/test/pptx/slide_breaks_toc_deleted_layouts.pptx b/test/pptx/slide_breaks_toc_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..1e0b76d46 --- /dev/null +++ b/test/pptx/slide_breaks_toc_deleted_layouts.pptx diff --git a/test/pptx/slide_breaks_toc_moved_layouts.pptx b/test/pptx/slide_breaks_toc_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..918264bc5 --- /dev/null +++ b/test/pptx/slide_breaks_toc_moved_layouts.pptx diff --git a/test/pptx/speaker_notes_after_metadata_deleted_layouts.pptx b/test/pptx/speaker_notes_after_metadata_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..1298870e2 --- /dev/null +++ b/test/pptx/speaker_notes_after_metadata_deleted_layouts.pptx diff --git a/test/pptx/speaker_notes_after_metadata_moved_layouts.pptx b/test/pptx/speaker_notes_after_metadata_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..b844a0b51 --- /dev/null +++ b/test/pptx/speaker_notes_after_metadata_moved_layouts.pptx diff --git a/test/pptx/speaker_notes_afterheader_deleted_layouts.pptx b/test/pptx/speaker_notes_afterheader_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..853b918cb --- /dev/null +++ b/test/pptx/speaker_notes_afterheader_deleted_layouts.pptx diff --git a/test/pptx/speaker_notes_afterheader_moved_layouts.pptx b/test/pptx/speaker_notes_afterheader_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..9fff9f855 --- /dev/null +++ b/test/pptx/speaker_notes_afterheader_moved_layouts.pptx diff --git a/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx b/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..1e7f4968d --- /dev/null +++ b/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx diff --git a/test/pptx/speaker_notes_afterseps_moved_layouts.pptx b/test/pptx/speaker_notes_afterseps_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..e092ae444 --- /dev/null +++ b/test/pptx/speaker_notes_afterseps_moved_layouts.pptx diff --git a/test/pptx/speaker_notes_deleted_layouts.pptx b/test/pptx/speaker_notes_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..6a5ad524f --- /dev/null +++ b/test/pptx/speaker_notes_deleted_layouts.pptx diff --git a/test/pptx/speaker_notes_moved_layouts.pptx b/test/pptx/speaker_notes_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..f95df9622 --- /dev/null +++ b/test/pptx/speaker_notes_moved_layouts.pptx diff --git a/test/pptx/start_numbering_at_deleted_layouts.pptx b/test/pptx/start_numbering_at_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..d9cf91804 --- /dev/null +++ b/test/pptx/start_numbering_at_deleted_layouts.pptx diff --git a/test/pptx/start_numbering_at_moved_layouts.pptx b/test/pptx/start_numbering_at_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..e1b2d4de8 --- /dev/null +++ b/test/pptx/start_numbering_at_moved_layouts.pptx diff --git a/test/pptx/tables_deleted_layouts.pptx b/test/pptx/tables_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..a52222551 --- /dev/null +++ b/test/pptx/tables_deleted_layouts.pptx diff --git a/test/pptx/tables_moved_layouts.pptx b/test/pptx/tables_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..56608a039 --- /dev/null +++ b/test/pptx/tables_moved_layouts.pptx diff --git a/test/pptx/two_column_deleted_layouts.pptx b/test/pptx/two_column_deleted_layouts.pptx Binary files differnew file mode 100644 index 000000000..60a244f94 --- /dev/null +++ b/test/pptx/two_column_deleted_layouts.pptx diff --git a/test/pptx/two_column_moved_layouts.pptx b/test/pptx/two_column_moved_layouts.pptx Binary files differnew file mode 100644 index 000000000..a17f96b18 --- /dev/null +++ b/test/pptx/two_column_moved_layouts.pptx |