pptx: Restructure tests

- Use dashes consistently rather than underscores
- Make a folder for each set of tests
- List test files explicitly (Cabal doesn’t support ** until version
  2.4)

1 files changed, 57 insertions, 57 deletions

diff --git a/test/Tests/Writers/Powerpoint.hs b/test/Tests/Writers/Powerpoint.hs
index fd6d01d2d..fd9871659 100644
--- a/test/Tests/Writers/Powerpoint.hs
+++ b/test/Tests/Writers/Powerpoint.hs
@@ -15,13 +15,13 @@ import Data.List (unzip4)
 
 modifyPptxName :: FilePath -> String -> FilePath
 modifyPptxName fp suffix =
-  addExtension (dropExtension fp ++ suffix) "pptx"
+  addExtension (takeDirectory fp ++ suffix) "pptx"
 
 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"
+  let referenceDoc = "pptx/reference-depth.pptx"
+      movedLayoutsReferenceDoc = "pptx/reference-moved-layouts.pptx"
+      deletedLayoutsReferenceDoc = "pptx/reference-deleted-layouts.pptx"
   in
     ( ooxmlTest
       writePowerpoint
@@ -34,19 +34,19 @@ pptxTests name opts native pptx =
       name
       opts{writerReferenceDoc=Just referenceDoc}
       native
-      (modifyPptxName pptx "_templated")
+      (modifyPptxName pptx "/templated")
     , ooxmlTest
       writePowerpoint
       name
       opts{writerReferenceDoc=Just movedLayoutsReferenceDoc}
       native
-      (modifyPptxName pptx "_moved_layouts")
+      (modifyPptxName pptx "/moved-layouts")
     , ooxmlTest
       writePowerpoint
       name
       opts{writerReferenceDoc=Just deletedLayoutsReferenceDoc}
       native
-      (modifyPptxName pptx "_deleted_layouts")
+      (modifyPptxName pptx "/deleted-layouts")
     )
 
 groupPptxTests :: [(TestTree, TestTree, TestTree, TestTree)] -> [TestTree]
@@ -63,112 +63,112 @@ groupPptxTests pairs =
 tests :: [TestTree]
 tests = groupPptxTests [ pptxTests "Inline formatting"
                          def
-                         "pptx/inline_formatting.native"
-                         "pptx/inline_formatting.pptx"
+                         "pptx/inline-formatting/input.native"
+                         "pptx/inline-formatting/output.pptx"
                        , pptxTests "Slide breaks (default slide-level)"
                          def
-                         "pptx/slide_breaks.native"
-                         "pptx/slide_breaks.pptx"
+                         "pptx/slide-breaks/input.native"
+                         "pptx/slide-breaks/output.pptx"
                        , pptxTests "slide breaks (slide-level set to 1)"
                          def{ writerSlideLevel = Just 1 }
-                         "pptx/slide_breaks.native"
-                         "pptx/slide_breaks_slide_level_1.pptx"
+                         "pptx/slide-breaks/input.native"
+                         "pptx/slide-breaks-slide-level-1/output.pptx"
                        , pptxTests "lists"
                          def
-                         "pptx/lists.native"
-                         "pptx/lists.pptx"
+                         "pptx/lists/input.native"
+                         "pptx/lists/output.pptx"
                        , pptxTests "start ordered list at specified num"
                          def
-                         "pptx/start_numbering_at.native"
-                         "pptx/start_numbering_at.pptx"
+                         "pptx/start-numbering-at/input.native"
+                         "pptx/start-numbering-at/output.pptx"
                        , pptxTests "tables"
                          def
-                         "pptx/tables.native"
-                         "pptx/tables.pptx"
+                         "pptx/tables/input.native"
+                         "pptx/tables/output.pptx"
                        , pptxTests "table of contents"
                          def{ writerTableOfContents = True }
-                         "pptx/slide_breaks.native"
-                         "pptx/slide_breaks_toc.pptx"
+                         "pptx/slide-breaks/input.native"
+                         "pptx/slide-breaks-toc/output.pptx"
                        , pptxTests "end notes"
                          def
-                         "pptx/endnotes.native"
-                         "pptx/endnotes.pptx"
+                         "pptx/endnotes/input.native"
+                         "pptx/endnotes/output.pptx"
                        , pptxTests "end notes, with table of contents"
                          def { writerTableOfContents = True }
-                         "pptx/endnotes.native"
-                         "pptx/endnotes_toc.pptx"
+                         "pptx/endnotes/input.native"
+                         "pptx/endnotes-toc/output.pptx"
                        , pptxTests "images"
                          def
-                         "pptx/images.native"
-                         "pptx/images.pptx"
+                         "pptx/images/input.native"
+                         "pptx/images/output.pptx"
                        , pptxTests "two-column layout"
                          def
-                         "pptx/two_column.native"
-                         "pptx/two_column.pptx"
+                         "pptx/two-column/input.native"
+                         "pptx/two-column/output.pptx"
                        , pptxTests "speaker notes"
                          def
-                         "pptx/speaker_notes.native"
-                         "pptx/speaker_notes.pptx"
+                         "pptx/speaker-notes/input.native"
+                         "pptx/speaker-notes/output.pptx"
                        , pptxTests "speaker notes after a separating block"
                          def
-                         "pptx/speaker_notes_afterseps.native"
-                         "pptx/speaker_notes_afterseps.pptx"
+                         "pptx/speaker-notes-afterseps/input.native"
+                         "pptx/speaker-notes-afterseps/output.pptx"
                        , pptxTests "speaker notes after a separating header"
                          def
-                         "pptx/speaker_notes_afterheader.native"
-                         "pptx/speaker_notes_afterheader.pptx"
+                         "pptx/speaker-notes-afterheader/input.native"
+                         "pptx/speaker-notes-afterheader/output.pptx"
                        , pptxTests "speaker notes after metadata"
                          def
-                         "pptx/speaker_notes_after_metadata.native"
-                         "pptx/speaker_notes_after_metadata.pptx"
+                         "pptx/speaker-notes-after-metadata/input.native"
+                         "pptx/speaker-notes-after-metadata/output.pptx"
                        , pptxTests "remove empty slides"
                          def
-                         "pptx/remove_empty_slides.native"
-                         "pptx/remove_empty_slides.pptx"
+                         "pptx/remove-empty-slides/input.native"
+                         "pptx/remove-empty-slides/output.pptx"
                        , pptxTests "raw ooxml"
                          def
-                         "pptx/raw_ooxml.native"
-                         "pptx/raw_ooxml.pptx"
+                         "pptx/raw-ooxml/input.native"
+                         "pptx/raw-ooxml/output.pptx"
                        , pptxTests "metadata, custom properties"
                          def
-                         "pptx/document-properties.native"
-                         "pptx/document-properties.pptx"
+                         "pptx/document-properties/input.native"
+                         "pptx/document-properties/output.pptx"
                        , pptxTests "metadata, short description"
                          def
-                         "pptx/document-properties-short-desc.native"
-                         "pptx/document-properties-short-desc.pptx"
+                         "pptx/document-properties-short-desc/input.native"
+                         "pptx/document-properties-short-desc/output.pptx"
                        , pptxTests "inline code and code blocks"
                          def
-                         "pptx/code.native"
-                         "pptx/code.pptx"
+                         "pptx/code/input.native"
+                         "pptx/code/output.pptx"
                        , pptxTests "inline code and code blocks, custom formatting"
                          def { writerVariables = Context $ M.fromList
                                  [(pack "monofont", toVal $ pack "Consolas")] }
-                         "pptx/code.native"
-                         "pptx/code-custom.pptx"
+                         "pptx/code/input.native"
+                         "pptx/code-custom/output.pptx"
                        , pptxTests ("Using slide level 0, if the first thing on "
                                     <> "a slide is a h1 it's used as the "
                                     <> "slide title")
                          def { writerSlideLevel = Just 0 }
-                         "pptx/slide-level-0-h1-with-image.native"
-                         "pptx/slide-level-0-h1-with-image.pptx"
+                         "pptx/slide-level-0/h1-with-image/input.native"
+                         "pptx/slide-level-0/h1-with-image/output.pptx"
                        , pptxTests ("Using slide level 0, if the first thing on "
                                     <> "a slide is a h2 it's used as the "
                                     <> "slide title")
                          def { writerSlideLevel = Just 0 }
-                         "pptx/slide-level-0-h2-with-image.native"
-                         "pptx/slide-level-0-h2-with-image.pptx"
+                         "pptx/slide-level-0/h2-with-image/input.native"
+                         "pptx/slide-level-0/h2-with-image/output.pptx"
                        , pptxTests ("Using slide level 0, if the first thing on "
                                     <> "a slide is a heading it's used as the "
                                     <> "slide title (works with a table)")
                          def { writerSlideLevel = Just 0 }
-                         "pptx/slide-level-0-h1-with-table.native"
-                         "pptx/slide-level-0-h1-with-table.pptx"
+                         "pptx/slide-level-0/h1-with-table/input.native"
+                         "pptx/slide-level-0/h1-with-table/output.pptx"
                        , pptxTests ("Using slide level 0, if the first thing on "
                                     <> "a slide is a heading it's used as the "
                                     <> "slide title (two headings forces a "
                                     <> "slide break though)")
                          def { writerSlideLevel = Just 0 }
-                         "pptx/slide-level-0-h1-h2-with-table.native"
-                         "pptx/slide-level-0-h1-h2-with-table.pptx"
+                         "pptx/slide-level-0/h1-h2-with-table/input.native"
+                         "pptx/slide-level-0/h1-h2-with-table/output.pptx"
                        ]