From ddd6a892470181b321ac2f80ffb76809f15419c8 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 28 Dec 2017 10:01:09 -0800
Subject: Text.Pandoc.Class: add insertInFileTree (API change).

This gives a pure way to insert an ersatz file into a FileTree.

In addition, we normalize paths both on insertion and on
lookup, so that "foo" and "./foo" will be judged equivalent.
---
 test/Tests/Readers/Org/Directive.hs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'test/Tests/Readers/Org/Directive.hs')

diff --git a/test/Tests/Readers/Org/Directive.hs b/test/Tests/Readers/Org/Directive.hs
index 1970a0471..862315ef3 100644
--- a/test/Tests/Readers/Org/Directive.hs
+++ b/test/Tests/Readers/Org/Directive.hs
@@ -1,7 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 module Tests.Readers.Org.Directive (tests) where
 
-import Control.Arrow (second)
 import Data.Time (UTCTime (UTCTime), secondsToDiffTime)
 import Data.Time.Calendar (Day (ModifiedJulianDay))
 import Test.Tasty (TestTree, testGroup)
@@ -10,7 +9,6 @@ import Tests.Readers.Org.Shared ((=:), tagSpan)
 import Text.Pandoc
 import Text.Pandoc.Builder
 import qualified Data.ByteString as BS
-import qualified Data.Map as Map
 import qualified Data.Text as T
 
 testWithFiles :: (ToString c)
@@ -31,11 +29,8 @@ orgWithFiles fileDefs input =
 files :: [(FilePath, BS.ByteString)] -> FileTree
 files fileDefs =
   let dummyTime = UTCTime (ModifiedJulianDay 125) (secondsToDiffTime 0)
-      fileInfo content = FileInfo
-                         { infoFileMTime = dummyTime
-                         , infoFileContents = content
-                         }
-  in FileTree (Map.fromList (map (second fileInfo) fileDefs))
+  in foldr (\(fp, bs) -> insertInFileTree fp (FileInfo dummyTime bs))
+      mempty fileDefs
 
 tests :: [TestTree]
 tests =
-- 
cgit v1.2.3