Merge pull request #639 from Lysxia/switch-tasty-hunit

Replace HUnit tests with tasty-hunit

Author: bergmark

aeson.cabal

@@ -185,7 +185,6 @@ test-suite tests
     UnitTests.NullaryConstructors
 
   build-depends:
-    HUnit,
     QuickCheck >= 2.10.0.1 && < 2.11,
     aeson,
     integer-logarithms >= 1 && <1.1,

tests/ErrorMessages.hs

@@ -14,8 +14,7 @@ import Data.Proxy (Proxy(..))
 import Instances ()
 import Numeric.Natural (Natural)
 import Test.Tasty (TestTree)
-import Test.Tasty.HUnit (testCase)
-import Test.HUnit (Assertion, assertFailure, assertEqual)
+import Test.Tasty.HUnit (Assertion, assertFailure, assertEqual, testCase)
 import qualified Data.ByteString.Lazy.Char8 as L
 import qualified Data.HashMap.Strict as HM
 

tests/SerializationFormatSpec.hs

@@ -36,8 +36,7 @@ import Data.Word (Word8)
 import GHC.Generics (Generic)
 import Instances ()
 import Test.Tasty (TestTree, testGroup)
-import Test.Tasty.HUnit (testCase)
-import Test.HUnit (assertFailure, assertEqual)
+import Test.Tasty.HUnit (assertFailure, assertEqual, testCase)
 import Types (Approx(..), Compose3, Compose3', I)
 import qualified Data.ByteString.Lazy.Char8 as L
 import qualified Data.DList as DList

tests/UnitTests.hs

@@ -44,8 +44,7 @@ import Instances ()
 import System.Directory (getDirectoryContents)
 import System.FilePath ((</>), takeExtension, takeFileName)
 import Test.Tasty (TestTree, testGroup)
-import Test.Tasty.HUnit (testCase)
-import Test.HUnit (Assertion, assertBool, assertFailure, assertEqual)
+import Test.Tasty.HUnit (Assertion, assertBool, assertFailure, assertEqual, testCase)
 import Text.Printf (printf)
 import UnitTests.NullaryConstructors (nullaryConstructors)
 import qualified Data.ByteString.Base16.Lazy as LBase16

tests/UnitTests/NullaryConstructors.hs

@@ -16,7 +16,7 @@ import Data.Aeson.Types (Parser)
 import Data.ByteString.Builder (toLazyByteString)
 import Data.Maybe (fromJust)
 import Encoders
-import Test.HUnit ((@=?), Assertion)
+import Test.Tasty.HUnit ((@=?), Assertion)
 import Types
 import qualified Data.ByteString.Lazy.Char8 as L