Use normalized filepaths in tests

dhall/tests/Dhall/Test/Diff.hs

@@ -3,9 +3,7 @@
 module Dhall.Test.Diff where
 
 import Data.Text  (Text)
-import Prelude    hiding (FilePath)
 import Test.Tasty (TestTree)
-import Turtle     (FilePath)
 
 import qualified Data.Text                 as Text
 import qualified Data.Text.IO              as Text.IO

dhall/tests/Dhall/Test/Freeze.hs

@@ -4,9 +4,7 @@ module Dhall.Test.Freeze where
 
 import Data.Text    (Text)
 import Dhall.Freeze (Intent (..), Scope (..))
-import Prelude      hiding (FilePath)
 import Test.Tasty   (TestTree)
-import Turtle       (FilePath)
 
 import qualified Data.Text        as Text
 import qualified Data.Text.IO     as Text.IO

dhall/tests/Dhall/Test/Import.hs

@@ -72,7 +72,7 @@ getTests = do
     successTests <- Test.Util.discover (Turtle.chars <* "A.dhall") successTest (do
         path <- Turtle.lstree (importDirectory </> "success")
 
-        Monad.guard (path `notElem` flakyTests)
+        Monad.guard (path `Test.Util.pathNotElem` flakyTests)
 
         return path )
 
@@ -96,7 +96,7 @@ getTests = do
 #endif
                 ]
 
-        _ <- Monad.guard (path `notElem` expectedSuccesses)
+        _ <- Monad.guard (path `Test.Util.pathNotElem` expectedSuccesses)
         _ <- Monad.guard (not ("ENV.dhall" `isSuffixOf` Text.pack path))
         return path )
 

dhall/tests/Dhall/Test/Lint.hs

@@ -4,9 +4,7 @@ module Dhall.Test.Lint where
 
 import Data.Text    (Text)
 import Dhall.Parser (Header (..))
-import Prelude      hiding (FilePath)
 import Test.Tasty   (TestTree)
-import Turtle       (FilePath)
 
 import qualified Data.Text                 as Text
 import qualified Data.Text.IO              as Text.IO

dhall/tests/Dhall/Test/Normalization.hs

@@ -5,9 +5,8 @@ module Dhall.Test.Normalization where
 import Data.Text  (Text)
 import Data.Void  (Void)
 import Dhall.Core (Expr (..), Var (..), throws)
-import Prelude    hiding (FilePath)
+import System.FilePath ((</>))
 import Test.Tasty (TestTree)
-import Turtle     (FilePath, (</>))
 
 import qualified Data.Text        as Text
 import qualified Data.Text.IO     as Text.IO

dhall/tests/Dhall/Test/Parser.hs

@@ -5,9 +5,8 @@ module Dhall.Test.Parser where
 import Data.Text  (Text)
 import Data.Void  (Void)
 import Dhall.Core (Binding (..), Expr (..), Import, Var (..))
-import Prelude    hiding (FilePath)
+import System.FilePath ((</>))
 import Test.Tasty (TestTree)
-import Turtle     (FilePath, (</>))
 
 import qualified Control.Monad        as Monad
 import qualified Data.Bifunctor       as Bifunctor

dhall/tests/Dhall/Test/Schemas.hs

@@ -4,9 +4,7 @@ module Dhall.Test.Schemas where
 
 import Data.Text    (Text)
 import Dhall.Parser (Header (..))
-import Prelude      hiding (FilePath)
 import Test.Tasty   (TestTree)
-import Turtle       (FilePath)
 
 import qualified Data.Text                 as Text
 import qualified Data.Text.IO              as Text.IO

dhall/tests/Dhall/Test/SemanticHash.hs

@@ -3,9 +3,7 @@
 module Dhall.Test.SemanticHash where
 
 import Data.Text  (Text)
-import Prelude    hiding (FilePath)
 import Test.Tasty (TestTree)
-import Turtle     (FilePath)
 
 import qualified Data.Text        as Text
 import qualified Data.Text.IO     as Text.IO

dhall/tests/Dhall/Test/Tags.hs

@@ -4,9 +4,8 @@ module Dhall.Test.Tags where
 
 import Data.Text  (Text)
 import Dhall.Util (Input (..))
-import Prelude    hiding (FilePath)
+import System.FilePath ((</>))
 import Test.Tasty (TestTree)
-import Turtle     (FilePath)
 
 import qualified Data.Text        as Text
 import qualified Data.Text.IO     as Text.IO
@@ -30,7 +29,7 @@ getTests = do
 tagsTest :: Text -> TestTree
 tagsTest prefix =
     Tasty.HUnit.testCase (Text.unpack prefix) $ do
-        let inputFile  = Text.unpack (prefix <> ".dhall")
+        let inputFile  = Text.unpack (Test.Util.toDhallPath prefix <> ".dhall")
         let outputFile = Text.unpack (prefix <> ".tags")
 
         actualTags <- fixPathSeparators <$> Tags.generate (InputFile inputFile) Nothing False
@@ -44,7 +43,7 @@ tagsTest prefix =
 tagsDirTest :: TestTree
 tagsDirTest =
     Tasty.HUnit.testCase "all" $ do
-        let outputFile = Text.unpack . Turtle.format Turtle.fp $ tagsDirectory Turtle.</> "all.tags"
+        let outputFile = Text.unpack . Turtle.format Turtle.fp $ tagsDirectory </> "all.tags"
 
         actualTags <- fmap fixPathSeparators
                       (Tags.generate

dhall/tests/Dhall/Test/TypeInference.hs

@@ -5,9 +5,8 @@ module Dhall.Test.TypeInference where
 
 import Control.Exception (SomeException (..))
 import Data.Text         (Text)
-import Prelude           hiding (FilePath)
+import System.FilePath   ((</>))
 import Test.Tasty        (TestTree)
-import Turtle            (FilePath, (</>))
 
 import qualified Control.Exception as Exception
 import qualified Control.Monad     as Monad

dhall/tests/Dhall/Test/Util.hs

@@ -20,6 +20,7 @@ module Dhall.Test.Util
     , assertDoesntTypeCheck
     , discover
     , Dhall.Test.Util.testCase
+    , pathNotElem
     , toDhallPath
     , managedTestEnvironment
     ) where
@@ -41,11 +42,10 @@ import Dhall.Core
     )
 import Dhall.Import                     (SemanticCacheMode (..), Status (..))
 import Dhall.Parser                     (Src)
-import Prelude                          hiding (FilePath)
 import System.IO.Error                  (isDoesNotExistError)
 import Test.Tasty                       (TestTree)
 import Test.Tasty.HUnit
-import Turtle                           (FilePath, Pattern, Shell, fp)
+import Turtle                           (Pattern, Shell, fp)
 
 import qualified Control.Exception
 import qualified Control.Foldl                    as Foldl
@@ -289,7 +289,7 @@ discover pattern buildTest paths = do
     let shell = do
             path_ <- paths
 
-            let pathText = Turtle.format fp path_
+            let pathText = Turtle.format fp (FilePath.normalise path_)
 
             prefix : _ <- return (Turtle.match pattern pathText)
 
@@ -301,15 +301,18 @@ discover pattern buildTest paths = do
 
 testCase :: Text -> [ FilePath ] -> Assertion -> TestTree
 testCase prefix expectedFailures assertion =
-    if prefix `elem` map (Turtle.format fp) expectedFailures
+    if prefix `elem` map (Turtle.format fp . FilePath.normalise) expectedFailures
     then Tasty.ExpectedFailure.expectFail test
     else test
   where
     test = Test.Tasty.HUnit.testCase (Text.unpack prefix) assertion
 
+pathNotElem :: FilePath -> [FilePath] -> Bool
+pathNotElem this = not . any (FilePath.equalFilePath this)
+
 {-| Path names on Windows are not valid Dhall paths due to using backslashes
     instead of forwardslashes to separate path components.  This utility fixes
     them if necessary
 -}
 toDhallPath :: Text -> Text
-toDhallPath = Text.replace "\\" "/"
+toDhallPath = ("./" <>) . Text.replace "\\" "/"