Merge pull request #634 from Lysxia/switch-tasty

Switch to tasty

Author: bergmark

aeson.cabal

@@ -204,9 +204,9 @@ test-suite tests
     scientific,
     tagged,
     template-haskell,
-    test-framework,
-    test-framework-hunit,
-    test-framework-quickcheck2,
+    tasty,
+    tasty-hunit,
+    tasty-quickcheck,
     text,
     time,
     time-locale-compat,

stack-lts6.yaml

@@ -12,7 +12,6 @@ extra-deps:
 - hashable-1.2.6.1
 - integer-logarithms-1
 - quickcheck-instances-0.3.16
-- test-framework-quickcheck2-0.3.0.4
 - th-abstraction-0.2.2.0
 flags:
 flags:

stack-lts7.yaml

@@ -8,7 +8,6 @@ extra-deps:
 - hashable-1.2.6.1
 - integer-logarithms-1
 - quickcheck-instances-0.3.16
-- test-framework-quickcheck2-0.3.0.4
 - th-abstraction-0.2.2.0
 flags:
   aeson:

stack-lts8.yaml

@@ -7,7 +7,6 @@ extra-deps:
 - base-compat-0.9.3
 - quickcheck-instances-0.3.16
 - th-abstraction-0.2.2.0
-- test-framework-quickcheck2-0.3.0.4
 flags:
   aeson:
     fast: true

tests/DataFamilies/Properties.hs

@@ -9,12 +9,12 @@ import DataFamilies.Encoders
 import DataFamilies.Instances ()
 import Properties hiding (tests)
 
-import Test.Framework (Test, testGroup)
-import Test.Framework.Providers.QuickCheck2 (testProperty)
+import Test.Tasty (TestTree, testGroup)
+import Test.Tasty.QuickCheck (testProperty)
 
 --------------------------------------------------------------------------------
 
-tests :: Test
+tests :: TestTree
 tests = testGroup "data families" [
     testGroup "template-haskell" [
       testGroup "toJSON" [

tests/ErrorMessages.hs

@@ -13,13 +13,13 @@ import Data.Aeson (FromJSON(..), eitherDecode)
 import Data.Proxy (Proxy(..))
 import Instances ()
 import Numeric.Natural (Natural)
-import Test.Framework (Test)
-import Test.Framework.Providers.HUnit (testCase)
+import Test.Tasty (TestTree)
+import Test.Tasty.HUnit (testCase)
 import Test.HUnit (Assertion, assertFailure, assertEqual)
 import qualified Data.ByteString.Lazy.Char8 as L
 import qualified Data.HashMap.Strict as HM
 
-tests :: [Test]
+tests :: [TestTree]
 tests =
     [
       testCase "Int" int

tests/Properties.hs

@@ -33,8 +33,8 @@ import Data.Version (Version)
 import Encoders
 import Instances ()
 import Numeric.Natural (Natural)
-import Test.Framework (Test, testGroup)
-import Test.Framework.Providers.QuickCheck2 (testProperty)
+import Test.Tasty (TestTree, testGroup)
+import Test.Tasty.QuickCheck (testProperty)
 import Test.QuickCheck (Arbitrary(..), Property, Testable, (===), (.&&.), counterexample)
 import Types
 import qualified Data.Attoparsec.Lazy as L
@@ -228,7 +228,7 @@ isEmptyArray' = (Array mempty ==)
 --------------------------------------------------------------------------------
 
 
-tests :: Test
+tests :: TestTree
 tests = testGroup "properties" [
   testGroup "encode" [
       testProperty "encodeDouble" encodeDouble

tests/SerializationFormatSpec.hs

@@ -35,8 +35,8 @@ import Data.Time (fromGregorian)
 import Data.Word (Word8)
 import GHC.Generics (Generic)
 import Instances ()
-import Test.Framework (Test, testGroup)
-import Test.Framework.Providers.HUnit (testCase)
+import Test.Tasty (TestTree, testGroup)
+import Test.Tasty.HUnit (testCase)
 import Test.HUnit (assertFailure, assertEqual)
 import Types (Approx(..), Compose3, Compose3', I)
 import qualified Data.ByteString.Lazy.Char8 as L
@@ -54,7 +54,7 @@ import qualified Data.Tree as Tree
 import qualified Data.UUID.Types as UUID
 import qualified Data.Vector as Vector
 
-tests :: [Test]
+tests :: [TestTree]
 tests =
   [
     testGroup "To JSON representation" $ fmap assertJsonEncodingExample jsonEncodingExamples
@@ -246,7 +246,7 @@ instance (ToJSON a, ToJSON b) => ToJSON (MyEither a b) where
 instance (FromJSON a, FromJSON b) => FromJSON (MyEither a b) where
     parseJSON = genericParseJSON defaultOptions { sumEncoding = UntaggedValue }
 
-assertJsonExample :: Example -> Test
+assertJsonExample :: Example -> TestTree
 assertJsonExample (Example name bss val) = testCase name $ do
     assertSomeEqual "encode"           bss        (encode val)
     assertSomeEqual "encode/via value" bss        (encode $ toJSON val)
@@ -255,7 +255,7 @@ assertJsonExample (Example name bss val) = testCase name $ do
 assertJsonExample (MaybeExample name bs mval) = testCase name $
     assertEqual "decode" mval (decode bs)
 
-assertJsonEncodingExample :: Example -> Test
+assertJsonEncodingExample :: Example -> TestTree
 assertJsonEncodingExample (Example name bss val) = testCase name $ do
     assertSomeEqual "encode"           bss (encode val)
     assertSomeEqual "encode/via value" bss (encode $ toJSON val)

tests/Tests.hs

@@ -3,12 +3,13 @@ module Main (main) where
 import Prelude ()
 import Prelude.Compat
 
-import Test.Framework (defaultMain)
+import Test.Tasty (defaultMain, testGroup)
 import qualified DataFamilies.Properties as DF
 import qualified Properties
 import qualified UnitTests
 
 main :: IO ()
 main = do
     ioTests <- UnitTests.ioTests
-    defaultMain (DF.tests : Properties.tests : UnitTests.tests : ioTests)
+    let allTests = DF.tests : Properties.tests : UnitTests.tests : ioTests
+    defaultMain (testGroup "tests" allTests)

tests/UnitTests.hs

@@ -43,8 +43,8 @@ import GHC.Generics (Generic)
 import Instances ()
 import System.Directory (getDirectoryContents)
 import System.FilePath ((</>), takeExtension, takeFileName)
-import Test.Framework (Test, testGroup)
-import Test.Framework.Providers.HUnit (testCase)
+import Test.Tasty (TestTree, testGroup)
+import Test.Tasty.HUnit (testCase)
 import Test.HUnit (Assertion, assertBool, assertFailure, assertEqual)
 import Text.Printf (printf)
 import UnitTests.NullaryConstructors (nullaryConstructors)
@@ -62,7 +62,7 @@ import qualified SerializationFormatSpec
 import Data.Aeson.Parser.UnescapeFFI ()
 import Data.Aeson.Parser.UnescapePure ()
 
-tests :: Test
+tests :: TestTree
 tests = testGroup "unit" [
     testGroup "SerializationFormatSpec" SerializationFormatSpec.tests
   , testGroup "ErrorMessages" ErrorMessages.tests
@@ -346,13 +346,13 @@ issue351 = [
 -- Comparison between bytestring and text encoders
 ------------------------------------------------------------------------------
 
-ioTests :: IO [Test]
+ioTests :: IO [TestTree]
 ioTests = do
   enc <- encoderComparisonTests
   js <- jsonTestSuite
   return [enc, js]
 
-encoderComparisonTests :: IO Test
+encoderComparisonTests :: IO TestTree
 encoderComparisonTests = do
   encoderTests <- forM testFiles $ \file0 -> do
       let file = "benchmarks/json-data/" ++ file0
@@ -412,7 +412,7 @@ unescapeString = do
 
 -- JSONTestSuite
 
-jsonTestSuiteTest :: FilePath -> Test
+jsonTestSuiteTest :: FilePath -> TestTree
 jsonTestSuiteTest path = testCase fileName $ do
     payload <- L.readFile path
     let result = eitherDecode payload :: Either String Value
@@ -427,7 +427,7 @@ jsonTestSuiteTest path = testCase fileName $ do
 -- Build a collection of tests based on the current contents of the
 -- JSONTestSuite test directories.
 
-jsonTestSuite :: IO Test
+jsonTestSuite :: IO TestTree
 jsonTestSuite = do
   let suitePath = "tests/JSONTestSuite"
   let suites = ["test_parsing", "test_transform"]
@@ -508,7 +508,7 @@ showOptions =
 newtype SingleMaybeField = SingleMaybeField { smf :: Maybe Int }
   deriving (Eq, Show, Generic)
 
-singleMaybeField :: [Test]
+singleMaybeField :: [TestTree]
 singleMaybeField = do
   (gName, gToJSON, gToEncoding, gFromJSON) <-
     [ ("generic", genericToJSON opts, genericToEncoding opts, parse (genericParseJSON opts))