Migrate from test-framework to tasty (#796)

Author: Bodigrim

containers-tests/containers-tests.cabal

@@ -266,11 +266,10 @@ test-suite map-lazy-properties
     CPP
 
   build-depends:
-      HUnit
-    , QuickCheck                  >=2.7.1
-    , test-framework
-    , test-framework-hunit
-    , test-framework-quickcheck2
+      QuickCheck                  >=2.7.1
+    , tasty
+    , tasty-hunit
+    , tasty-quickcheck
     , transformers
 
 test-suite map-strict-properties
@@ -291,11 +290,10 @@ test-suite map-strict-properties
     CPP
 
   build-depends:
-      HUnit
-    , QuickCheck                  >=2.7.1
-    , test-framework
-    , test-framework-hunit
-    , test-framework-quickcheck2
+      QuickCheck                  >=2.7.1
+    , tasty
+    , tasty-hunit
+    , tasty-quickcheck
     , transformers
 
 test-suite bitqueue-properties
@@ -311,9 +309,8 @@ test-suite bitqueue-properties
 
   build-depends:    containers-tests
   build-depends:
-      QuickCheck                  >=2.7.1
-    , test-framework
-    , test-framework-quickcheck2
+      tasty
+    , tasty-quickcheck
 
 test-suite set-properties
   default-language: Haskell2010
@@ -332,11 +329,10 @@ test-suite set-properties
 
   build-depends:    containers-tests
   build-depends:
-      HUnit
-    , QuickCheck                  >=2.7.1
-    , test-framework
-    , test-framework-hunit
-    , test-framework-quickcheck2
+      QuickCheck                  >=2.7.1
+    , tasty
+    , tasty-hunit
+    , tasty-quickcheck
     , transformers
 
   if impl(ghc >= 8.6)
@@ -363,11 +359,10 @@ test-suite intmap-lazy-properties
     CPP
 
   build-depends:
-      HUnit
-    , QuickCheck                  >=2.7.1
-    , test-framework
-    , test-framework-hunit
-    , test-framework-quickcheck2
+      QuickCheck                  >=2.7.1
+    , tasty
+    , tasty-hunit
+    , tasty-quickcheck
 
 test-suite intmap-strict-properties
   default-language: Haskell2010
@@ -389,11 +384,10 @@ test-suite intmap-strict-properties
 
   build-depends:    containers-tests
   build-depends:
-      HUnit
-    , QuickCheck                  >=2.7.1
-    , test-framework
-    , test-framework-hunit
-    , test-framework-quickcheck2
+      QuickCheck                  >=2.7.1
+    , tasty
+    , tasty-hunit
+    , tasty-quickcheck
 
 test-suite intset-properties
   default-language: Haskell2010
@@ -413,11 +407,9 @@ test-suite intset-properties
 
   build-depends:    containers-tests
   build-depends:
-      HUnit
-    , QuickCheck                  >=2.7.1
-    , test-framework
-    , test-framework-hunit
-    , test-framework-quickcheck2
+      tasty
+    , tasty-hunit
+    , tasty-quickcheck
 
 test-suite seq-properties
   default-language: Haskell2010
@@ -437,8 +429,8 @@ test-suite seq-properties
 
   build-depends:
       QuickCheck                  >=2.7.1
-    , test-framework
-    , test-framework-quickcheck2
+    , tasty
+    , tasty-quickcheck
     , transformers
 
 test-suite tree-properties
@@ -459,8 +451,8 @@ test-suite tree-properties
 
   build-depends:
       QuickCheck                  >=2.7.1
-    , test-framework
-    , test-framework-quickcheck2
+    , tasty
+    , tasty-quickcheck
     , transformers
 
 test-suite map-strictness-properties
@@ -474,11 +466,10 @@ test-suite map-strictness-properties
     , base                        >=4.6     && <5
     , ChasingBottoms
     , deepseq                     >=1.2     && <1.5
-    , HUnit
     , QuickCheck                  >=2.7.1
-    , test-framework              >=0.3.3
-    , test-framework-quickcheck2  >=0.2.9
-    , test-framework-hunit
+    , tasty
+    , tasty-quickcheck
+    , tasty-hunit
 
   ghc-options:      -Wall
   other-extensions:
@@ -509,11 +500,10 @@ test-suite intmap-strictness-properties
     , base                        >=4.6     && <5
     , ChasingBottoms
     , deepseq                     >=1.2     && <1.5
-    , HUnit
     , QuickCheck                  >=2.7.1
-    , test-framework              >=0.3.3
-    , test-framework-quickcheck2  >=0.2.9
-    , test-framework-hunit
+    , tasty
+    , tasty-quickcheck
+    , tasty-hunit
 
   ghc-options:      -Wall
 
@@ -542,8 +532,8 @@ test-suite intset-strictness-properties
     , ChasingBottoms
     , deepseq                     >=1.2     && <1.5
     , QuickCheck                  >=2.7.1
-    , test-framework              >=0.3.3
-    , test-framework-quickcheck2  >=0.2.9
+    , tasty
+    , tasty-quickcheck
 
   ghc-options:      -Wall
 
@@ -564,7 +554,7 @@ test-suite listutils-properties
     , ChasingBottoms
     , deepseq                     >=1.2   && <1.5
     , QuickCheck                  >=2.7.1
-    , test-framework              >=0.3.3
-    , test-framework-quickcheck2  >=0.2.9
+    , tasty
+    , tasty-quickcheck
 
   ghc-options:    -Wall

containers-tests/tests/IntMapValidity.hs

@@ -2,7 +2,7 @@ module IntMapValidity (valid) where
 
 import Data.Bits (xor, (.&.))
 import Data.IntMap.Internal
-import Test.QuickCheck (Property, counterexample, property, (.&&.))
+import Test.Tasty.QuickCheck (Property, counterexample, property, (.&&.))
 import Utils.Containers.Internal.BitUtil (bitcount)
 
 {--------------------------------------------------------------------

containers-tests/tests/IntSetValidity.hs

@@ -3,7 +3,7 @@ module IntSetValidity (valid) where
 
 import Data.Bits (xor, (.&.))
 import Data.IntSet.Internal
-import Test.QuickCheck (Property, counterexample, property, (.&&.))
+import Test.Tasty.QuickCheck (Property, counterexample, property, (.&&.))
 import Utils.Containers.Internal.BitUtil (bitcount)
 
 {--------------------------------------------------------------------

containers-tests/tests/bitqueue-properties.hs

@@ -5,9 +5,8 @@
 import Control.Applicative ((<$>))
 #endif
 import qualified Data.List as List
-import Test.Framework
-import Test.Framework.Providers.QuickCheck2
-import Test.QuickCheck
+import Test.Tasty
+import Test.Tasty.QuickCheck
 import Utils.Containers.Internal.BitUtil (wordSize)
 import Utils.Containers.Internal.BitQueue
     ( BitQueue
@@ -19,9 +18,9 @@ import Utils.Containers.Internal.BitQueue
 default (Int)
 
 main :: IO ()
-main = defaultMain $ map testNum [0..(wordSize - 2)]
+main = defaultMain $ testGroup "bitqueue-properties" $ map testNum [0..(wordSize - 2)]
 
-testNum :: Int -> Test
+testNum :: Int -> TestTree
 testNum n = testProperty ("Size "++show n) (prop_n n)
 
 prop_n :: Int -> Gen Bool

containers-tests/tests/intmap-properties.hs

@@ -27,18 +27,16 @@ import qualified Prelude (map)
 import Data.List (nub,sort)
 import qualified Data.List as List
 import qualified Data.IntSet as IntSet
-import Test.Framework
-import Test.Framework.Providers.HUnit
-import Test.Framework.Providers.QuickCheck2
-import Test.HUnit hiding (Test, Testable)
-import Test.QuickCheck
-import Test.QuickCheck.Function (Fun(..), apply)
+import Test.Tasty
+import Test.Tasty.HUnit
+import Test.Tasty.QuickCheck
+import Test.QuickCheck.Function (apply)
 import Test.QuickCheck.Poly (A, B, C)
 
 default (Int)
 
 main :: IO ()
-main = defaultMain
+main = defaultMain $ testGroup "intmap-properties"
          [
                testCase "index"      test_index
              , testCase "index_lookup" test_index_lookup
@@ -237,16 +235,6 @@ type UMap = IntMap ()
 type IMap = IntMap Int
 type SMap = IntMap String
 
-----------------------------------------------------------------
-
-tests :: [Test]
-tests = [ testGroup "Test Case" [
-             ]
-        , testGroup "Property Test" [
-             ]
-        ]
-
-
 ----------------------------------------------------------------
 -- Unit tests
 ----------------------------------------------------------------

containers-tests/tests/intmap-strictness.hs

@@ -4,15 +4,13 @@
 module Main (main) where
 
 import Test.ChasingBottoms.IsBottom
-import Test.Framework (Test, TestName, defaultMain, testGroup)
-import Test.Framework.Providers.QuickCheck2 (testProperty)
-import Test.QuickCheck (Arbitrary(arbitrary))
+import Test.Tasty (TestTree, TestName, defaultMain, testGroup)
+import Test.Tasty.HUnit
+import Test.Tasty.QuickCheck (testProperty, Arbitrary(arbitrary), Fun)
 #if __GLASGOW_HASKELL__ >= 806
-import Test.QuickCheck (Property)
+import Test.Tasty.QuickCheck (Property)
 #endif
-import Test.QuickCheck.Function (Fun(..), apply)
-import Test.Framework.Providers.HUnit
-import Test.HUnit hiding (Test)
+import Test.QuickCheck.Function (apply)
 
 import Data.IntMap.Strict (IntMap)
 import qualified Data.IntMap.Strict as M
@@ -126,7 +124,7 @@ pStrictFoldl' m = whnfHasNoThunks (M.foldl' (flip (:)) [] m)
 -- in most cases. An exception is `L.fromListWith const`, which cannot
 -- evaluate the `const` calls.
 
-tExtraThunksM :: Test
+tExtraThunksM :: TestTree
 tExtraThunksM = testGroup "IntMap.Strict - extra thunks" $
     if not isUnitSupported then [] else
     -- for strict maps, all the values should be evaluated to ()
@@ -141,14 +139,14 @@ tExtraThunksM = testGroup "IntMap.Strict - extra thunks" $
     ]
   where
     m0 = M.singleton 42 ()
-    check :: TestName -> IntMap () -> Test
+    check :: TestName -> IntMap () -> TestTree
     check n m = testCase n $ case M.lookup 42 m of
         Just v -> assertBool msg (isUnit v)
-        _      -> assertString "key not found"
+        _      -> assertBool "key not found" False
       where
         msg = "too lazy -- expected fully evaluated ()"
 
-tExtraThunksL :: Test
+tExtraThunksL :: TestTree
 tExtraThunksL = testGroup "IntMap.Lazy - extra thunks" $
     if not isUnitSupported then [] else
     -- for lazy maps, the *With functions should leave `const () ()` thunks,
@@ -164,18 +162,18 @@ tExtraThunksL = testGroup "IntMap.Lazy - extra thunks" $
     ]
   where
     m0 = L.singleton 42 ()
-    check :: TestName -> Bool -> L.IntMap () -> Test
+    check :: TestName -> Bool -> L.IntMap () -> TestTree
     check n e m = testCase n $ case L.lookup 42 m of
         Just v -> assertBool msg (e == isUnit v)
-        _      -> assertString "key not found"
+        _      -> assertBool "key not found" False
       where
         msg | e         = "too lazy -- expected fully evaluated ()"
             | otherwise = "too strict -- expected a thunk"
 
 ------------------------------------------------------------------------
 -- * Test list
 
-tests :: [Test]
+tests :: [TestTree]
 tests =
     [
     -- Basic interface
@@ -214,7 +212,7 @@ tests =
 -- * Test harness
 
 main :: IO ()
-main = defaultMain tests
+main = defaultMain $ testGroup "intmap-strictness" tests
 
 ------------------------------------------------------------------------
 -- * Utilities

containers-tests/tests/intset-properties.hs

@@ -9,14 +9,13 @@ import Data.Monoid (mempty)
 import qualified Data.Set as Set
 import IntSetValidity (valid)
 import Prelude hiding (lookup, null, map, filter, foldr, foldl)
-import Test.Framework
-import Test.Framework.Providers.HUnit
-import Test.Framework.Providers.QuickCheck2
-import Test.HUnit hiding (Test, Testable)
-import Test.QuickCheck hiding ((.&.))
+import Test.Tasty
+import Test.Tasty.HUnit
+import Test.Tasty.QuickCheck hiding ((.&.))
 
 main :: IO ()
-main = defaultMain [ testCase "lookupLT" test_lookupLT
+main = defaultMain $ testGroup "intset-properties"
+                   [ testCase "lookupLT" test_lookupLT
                    , testCase "lookupGT" test_lookupGT
                    , testCase "lookupLE" test_lookupLE
                    , testCase "lookupGE" test_lookupGE

containers-tests/tests/intset-strictness.hs

@@ -7,11 +7,10 @@ module Main (main) where
 import Prelude hiding (foldl)
 
 import Test.ChasingBottoms.IsBottom
-import Test.Framework (Test, defaultMain, testGroup)
-import Test.Framework.Providers.QuickCheck2 (testProperty)
-import Test.QuickCheck (Arbitrary (..))
+import Test.Tasty (TestTree, defaultMain, testGroup)
+import Test.Tasty.QuickCheck (testProperty, Arbitrary (..))
 #if __GLASGOW_HASKELL__ >= 806
-import Test.QuickCheck (Property)
+import Test.Tasty.QuickCheck (Property)
 #endif
 
 import Data.IntSet
@@ -52,9 +51,8 @@ pStrictFoldl' m = whnfHasNoThunks (foldl' (flip (:)) [] m)
 ------------------------------------------------------------------------
 -- * Test list
 
-tests :: [Test]
+tests :: TestTree
 tests =
-    [
     -- Basic interface
       testGroup "IntSet"
       [ testProperty "foldl is lazy in accumulator" pFoldlAccLazy
@@ -63,7 +61,6 @@ tests =
       , testProperty "strict foldl'" pStrictFoldl'
 #endif
       ]
-    ]
 
 ------------------------------------------------------------------------
 -- * Test harness