dhall:tasty: s/skip/expectedFailures (#1438)

dhall/tests/Dhall/Test/Normalization.hs

@@ -138,11 +138,11 @@ alphaNormalizationTest prefix = do
 -}
 unitTest :: Text -> TestTree
 unitTest prefix = do
-    let skip = []
+    let expectedFailures = []
 
     let prefixString = Text.unpack prefix
 
-    Test.Util.testCase prefix skip $ do
+    Test.Util.testCase prefix expectedFailures $ do
         let actualPath   = prefixString <> "A.dhall"
         let expectedPath = prefixString <> "B.dhall"
 

dhall/tests/Dhall/Test/Parser.hs

@@ -121,14 +121,14 @@ notesInLetInLet = do
 
 shouldParse :: Text -> TestTree
 shouldParse path = do
-    let skip =
+    let expectedFailures =
             -- This is a bug created by a parsing performance
             -- improvement
             [ parseDirectory </> "success/unit/MergeParenAnnotation" ]
 
     let pathString = Text.unpack path
 
-    Test.Util.testCase path skip $ do
+    Test.Util.testCase path expectedFailures $ do
         text <- Text.IO.readFile (pathString <> "A.dhall")
 
         encoded <- ByteString.Lazy.readFile (pathString <> "B.dhallb")
@@ -151,7 +151,7 @@ shouldParse path = do
 
 shouldNotParse :: Text -> TestTree
 shouldNotParse path = do
-    let skip =
+    let expectedFailures =
             [ -- These two unexpected successes are due to not correctly
               -- requiring non-empty whitespace after the `:` in a type
               -- annotation
@@ -190,7 +190,7 @@ shouldNotParse path = do
 
     let pathString = Text.unpack path
 
-    Test.Util.testCase path skip (do
+    Test.Util.testCase path expectedFailures (do
         bytes <- ByteString.readFile pathString
 
         case Text.Encoding.decodeUtf8' bytes of
@@ -202,11 +202,11 @@ shouldNotParse path = do
 
 shouldDecode :: Text -> TestTree
 shouldDecode pathText = do
-    let skip = []
+    let expectedFailures = []
 
     let pathString = Text.unpack pathText
 
-    Test.Util.testCase pathText skip (do
+    Test.Util.testCase pathText expectedFailures (do
         bytes <- ByteString.Lazy.readFile (pathString <> "A.dhallb")
 
         term <- Core.throws (Serialise.deserialiseOrFail bytes)
@@ -227,11 +227,11 @@ shouldDecode pathText = do
 
 shouldNotDecode :: Text -> TestTree
 shouldNotDecode pathText = do
-    let skip = []
+    let expectedFailures = []
 
     let pathString = Text.unpack pathText
 
-    Test.Util.testCase pathText skip (do
+    Test.Util.testCase pathText expectedFailures (do
         bytes <- ByteString.Lazy.readFile (pathString <> ".dhallb")
 
         term <- Core.throws (Serialise.deserialiseOrFail bytes)

dhall/tests/Dhall/Test/TypeInference.hs

@@ -44,9 +44,9 @@ getTests = do
 
 successTest :: Text -> TestTree
 successTest prefix = do
-    let skip = []
+    let expectedFailures = []
 
-    Test.Util.testCase prefix skip $ do
+    Test.Util.testCase prefix expectedFailures $ do
         let prefixFP = Text.unpack prefix
 
         actualCode <- Text.IO.readFile (prefixFP <> "A.dhall")
@@ -80,7 +80,7 @@ successTest prefix = do
 
 failureTest :: Text -> TestTree
 failureTest prefix = do
-    let skip = [ typeInferenceDirectory </> "failure/unit/MergeEmptyNeedsDirectAnnotation1"
+    let expectedFailures = [ typeInferenceDirectory </> "failure/unit/MergeEmptyNeedsDirectAnnotation1"
 
                -- Duplicate fields are incorrectly caught during parsing:
                -- https://github.com/dhall-lang/dhall-haskell/issues/772
@@ -91,7 +91,7 @@ failureTest prefix = do
                , typeInferenceDirectory </> "failure/unit/UnionTypeDuplicateVariants2"
                ]
 
-    Test.Util.testCase prefix skip $ do
+    Test.Util.testCase prefix expectedFailures $ do
         let prefixFP = Text.unpack prefix
 
         code <- Text.IO.readFile (prefixFP <> ".dhall")

dhall/tests/Dhall/Test/Util.hs

@@ -210,8 +210,8 @@ discover pattern buildTest paths = do
     return (Tasty.testGroup "discover" tests)
 
 testCase :: Text -> [ FilePath ] -> Assertion -> TestTree
-testCase prefix skip assertion =
-    if prefix `elem` map (Turtle.format fp) skip
+testCase prefix expectedFailures assertion =
+    if prefix `elem` map (Turtle.format fp) expectedFailures
     then Tasty.ExpectedFailure.expectFail test
     else test
   where