Switch from test-framework to tasty

Author: Bodigrim

tests/Tests.hs

@@ -4,10 +4,10 @@ module Main
     ( main
     ) where
 
-import Test.Framework (defaultMain)
+import Test.Tasty (defaultMain, testGroup)
 
 import qualified Tests.Properties as Properties
 import qualified Tests.Regressions as Regressions
 
 main :: IO ()
-main = defaultMain [Properties.tests, Regressions.tests]
+main = defaultMain $ testGroup "All" [Properties.tests, Regressions.tests]

tests/Tests/Properties.hs

@@ -27,8 +27,8 @@ import Data.Word (Word, Word8, Word16, Word32, Word64)
 import Data.Maybe (mapMaybe)
 import Numeric (showEFloat, showFFloat, showGFloat, showHex)
 import Prelude hiding (replicate)
-import Test.Framework (Test, testGroup)
-import Test.Framework.Providers.QuickCheck2 (testProperty)
+import Test.Tasty (TestTree, testGroup)
+import Test.Tasty.QuickCheck (testProperty)
 import Test.QuickCheck hiding ((.&.))
 import Test.QuickCheck.Monadic
 import Test.QuickCheck.Property (Property(..))
@@ -968,7 +968,7 @@ shorten n t@(S.Stream arr off len)
     | n > 0     = S.Stream arr off (smaller (exactSize n) len)
     | otherwise = t
 
-tests :: Test
+tests :: TestTree
 tests =
   testGroup "Properties" [
     testGroup "creation/elimination" [

tests/Tests/Properties/Mul.hs

@@ -7,8 +7,8 @@ import Control.Exception as E (SomeException, catch, evaluate)
 import Data.Int (Int32, Int64)
 import Data.Text.Internal (mul, mul32, mul64)
 import System.IO.Unsafe (unsafePerformIO)
-import Test.Framework (Test)
-import Test.Framework.Providers.QuickCheck2 (testProperty)
+import Test.Tasty (TestTree)
+import Test.Tasty.QuickCheck (testProperty)
 import Test.QuickCheck hiding ((.&.))
 
 mulRef :: (Integral a, Bounded a) => a -> a -> Maybe a
@@ -32,7 +32,7 @@ t_mul64 a b = mulRef a b === eval mul64 a b
 t_mul :: Int -> Int -> Property
 t_mul a b = mulRef a b === eval mul a b
 
-tests :: [Test]
+tests :: [TestTree]
 tests = [
    testProperty "t_mul" t_mul
  , testProperty "t_mul32" t_mul32

tests/Tests/Regressions.hs

@@ -9,7 +9,7 @@ module Tests.Regressions
 import Control.Exception (SomeException, handle)
 import Data.Char (isLetter)
 import System.IO
-import Test.HUnit (assertBool, assertEqual, assertFailure)
+import Test.Tasty.HUnit (assertBool, assertEqual, assertFailure)
 import qualified Data.ByteString as B
 import Data.ByteString.Char8 ()
 import qualified Data.ByteString.Lazy as LB
@@ -21,8 +21,8 @@ import qualified Data.Text.IO as T
 import qualified Data.Text.Lazy as LT
 import qualified Data.Text.Lazy.Encoding as LE
 import qualified Data.Text.Unsafe as T
-import qualified Test.Framework as F
-import qualified Test.Framework.Providers.HUnit as F
+import qualified Test.Tasty as F
+import qualified Test.Tasty.HUnit as F
 
 import Tests.Utils (withTempFile)
 
@@ -115,7 +115,7 @@ t301 = do
     original@(T.Text originalArr originalOff originalLen) = T.pack "1234567890"
     T.Text newArr _off _len = T.take 1 $ T.drop 1 original
 
-tests :: F.Test
+tests :: F.TestTree
 tests = F.testGroup "Regressions"
     [ F.testCase "hGetContents_crash" hGetContents_crash
     , F.testCase "lazy_encode_crash" lazy_encode_crash

tests/text-tests.cabal

@@ -159,7 +159,6 @@ test-suite tests
     Data.Text.Show
 
   build-depends:
-    HUnit >= 1.2,
     QuickCheck >= 2.14.1 && < 2.15,
     array,
     base <5,
@@ -170,9 +169,9 @@ test-suite tests
     quickcheck-unicode >= 1.0.1.0,
     random,
     template-haskell,
-    test-framework >= 0.4,
-    test-framework-hunit >= 0.2,
-    test-framework-quickcheck2 >= 0.2
+    tasty,
+    tasty-hunit,
+    tasty-quickcheck
 
   if flag(bytestring-builder)
     build-depends: bytestring         >= 0.9    && < 0.10.4,

th-tests/tests/Lift.hs

@@ -8,16 +8,15 @@ module Lift
 import qualified Data.Text as S
 import qualified Data.Text.Lazy as L
 import Language.Haskell.TH.Syntax (lift)
-import Test.HUnit (assertBool, assertEqual, assertFailure)
-import qualified Test.Framework as F
-import qualified Test.Framework.Providers.HUnit as F
+import Test.Tasty.HUnit (testCase, assertEqual)
+import Test.Tasty (TestTree, testGroup)
 
-tests :: F.Test
-tests = F.testGroup "TH lifting Text"
-  [ F.testCase "strict" $ assertEqual "strict"
+tests :: TestTree
+tests = testGroup "TH lifting Text"
+  [ testCase "strict" $ assertEqual "strict"
       $(lift ("foo" :: S.Text))
       ("foo" :: S.Text)
-  , F.testCase "lazy" $ assertEqual "lazy"
+  , testCase "lazy" $ assertEqual "lazy"
       $(lift ("foo" :: L.Text))
       ("foo" :: L.Text)
   ]

th-tests/tests/th-tests.hs

@@ -4,9 +4,9 @@ module Main
     ( main
     ) where
 
-import Test.Framework (defaultMain)
+import Test.Tasty (defaultMain)
 
 import qualified Lift
 
 main :: IO ()
-main = defaultMain [Lift.tests]
+main = defaultMain Lift.tests

th-tests/th-tests.cabal

@@ -24,9 +24,8 @@ test-suite th-tests
   other-modules:
     Lift
   build-depends:
-    HUnit >= 1.2,
     base <5,
     template-haskell,
     text,
-    test-framework >= 0.4,
-    test-framework-hunit >= 0.2
+    tasty,
+    tasty-hunit