1 files changed, 38 insertions, 3 deletions
diff --git a/tests/Tests/Shared.hs b/tests/Tests/Shared.hs
index f4bf13da4..9b55b7b1d 100644
--- a/tests/Tests/Shared.hs
+++ b/tests/Tests/Shared.hs
@@ -5,6 +5,11 @@ import Text.Pandoc.Shared
 import Test.Framework
 import Tests.Helpers
 import Tests.Arbitrary()
+import Test.Framework.Providers.HUnit
+import Test.HUnit ( assertBool, (@?=) )
+import Text.Pandoc.Builder
+import Data.Monoid
+import System.FilePath (joinPath)
 
 tests :: [Test]
 tests = [ testGroup "normalize"
@@ -13,14 +18,44 @@ tests = [ testGroup "normalize"
           , property "p_normalize_no_trailing_spaces"
               p_normalize_no_trailing_spaces
           ]
+        , testGroup "compactify'DL"
+          [ testCase "compactify'DL with empty def" $
+              assertBool "compactify'DL"
+              (let x = [(str "word", [para (str "def"), mempty])]
+               in  compactify'DL x == x)
+          ]
+        , testGroup "collapseFilePath" testCollapse
         ]
 
 p_normalize_blocks_rt :: [Block] -> Bool
-p_normalize_blocks_rt bs = normalize bs == normalize (normalize bs)
+p_normalize_blocks_rt bs =
+  normalizeBlocks bs == normalizeBlocks (normalizeBlocks bs)
 
 p_normalize_inlines_rt :: [Inline] -> Bool
-p_normalize_inlines_rt ils = normalize ils == normalize (normalize ils)
+p_normalize_inlines_rt ils =
+  normalizeInlines ils == normalizeInlines (normalizeInlines ils)
 
 p_normalize_no_trailing_spaces :: [Inline] -> Bool
 p_normalize_no_trailing_spaces ils = null ils' || last ils' /= Space
-  where ils' = normalize $ ils ++ [Space]
+  where ils' = normalizeInlines $ ils ++ [Space]
+
+testCollapse :: [Test]
+testCollapse = map (testCase "collapse")
+ [  (collapseFilePath (joinPath [ ""]) @?= (joinPath [ ""]))
+ ,  (collapseFilePath (joinPath [ ".","foo"]) @?= (joinPath [ "foo"]))
+ ,  (collapseFilePath (joinPath [ ".",".","..","foo"]) @?= (joinPath [ joinPath ["..", "foo"]]))
+ ,  (collapseFilePath (joinPath [ "..","foo"]) @?= (joinPath [ "..","foo"]))
+ ,  (collapseFilePath (joinPath [ "","bar","..","baz"]) @?= (joinPath [ "","baz"]))
+ ,  (collapseFilePath (joinPath [ "","..","baz"]) @?= (joinPath [ "","..","baz"]))
+ ,  (collapseFilePath (joinPath [ ".","foo","..",".","bar","..",".",".","baz"]) @?= (joinPath [ "baz"]))
+ ,  (collapseFilePath (joinPath [ ".",""]) @?= (joinPath [ ""]))
+ ,  (collapseFilePath (joinPath [ ".",".",""]) @?= (joinPath [ ""]))
+ ,  (collapseFilePath (joinPath [ "..",""]) @?= (joinPath [ ".."]))
+ ,  (collapseFilePath (joinPath [ "..",".",""]) @?= (joinPath [ ".."]))
+ ,  (collapseFilePath (joinPath [ ".","..",""]) @?= (joinPath [ ".."]))
+ ,  (collapseFilePath (joinPath [ "..","..",""]) @?= (joinPath [ "..",".."]))
+ ,  (collapseFilePath (joinPath [ "parent","foo","baz","..","bar"]) @?= (joinPath [ "parent","foo","bar"]))
+ ,  (collapseFilePath (joinPath [ "parent","foo","baz","..","..","bar"]) @?= (joinPath [ "parent","bar"]))
+ ,  (collapseFilePath (joinPath [ "parent","foo",".."]) @?= (joinPath [ "parent"]))
+ ,  (collapseFilePath (joinPath [ "","parent","foo","..","..","bar"]) @?= (joinPath [ "","bar"]))
+ ,  (collapseFilePath (joinPath [ "",".","parent","foo"]) @?= (joinPath [ "","parent","foo"]))]