on master help sign in
Merge pull request #639 from Lysxia/switch-tasty-hunit
003390eAdam Bergmark
aeson.cabal−1
@@ -185,7 +185,6 @@ test-suite tests
185 UnitTests.NullaryConstructors
185 UnitTests.NullaryConstructors
186
186
187 build-depends:
187 build-depends:
188− HUnit,
189 QuickCheck >= 2.10.0.1 && < 2.11,
188 QuickCheck >= 2.10.0.1 && < 2.11,
190 aeson,
189 aeson,
191 integer-logarithms >= 1 && <1.1,
190 integer-logarithms >= 1 && <1.1,
tests/ErrorMessages.hs+1−2
@@ -14,8 +14,7 @@ import Data.Proxy (Proxy(..))
14import Instances ()
14import Instances ()
15import Numeric.Natural (Natural)
15import Numeric.Natural (Natural)
16import Test.Tasty (TestTree)
16import Test.Tasty (TestTree)
17−import Test.Tasty.HUnit (testCase)
18−import Test.HUnit (Assertion, assertFailure, assertEqual)
17+import Test.Tasty.HUnit (Assertion, assertFailure, assertEqual, testCase)
19import qualified Data.ByteString.Lazy.Char8 as L
18import qualified Data.ByteString.Lazy.Char8 as L
20import qualified Data.HashMap.Strict as HM
19import qualified Data.HashMap.Strict as HM
21
20
tests/SerializationFormatSpec.hs+1−2
@@ -36,8 +36,7 @@ import Data.Word (Word8)
36import GHC.Generics (Generic)
36import GHC.Generics (Generic)
37import Instances ()
37import Instances ()
38import Test.Tasty (TestTree, testGroup)
38import Test.Tasty (TestTree, testGroup)
39−import Test.Tasty.HUnit (testCase)
40−import Test.HUnit (assertFailure, assertEqual)
39+import Test.Tasty.HUnit (assertFailure, assertEqual, testCase)
41import Types (Approx(..), Compose3, Compose3', I)
40import Types (Approx(..), Compose3, Compose3', I)
42import qualified Data.ByteString.Lazy.Char8 as L
41import qualified Data.ByteString.Lazy.Char8 as L
43import qualified Data.DList as DList
42import qualified Data.DList as DList
tests/UnitTests.hs+1−2
@@ -44,8 +44,7 @@ import Instances ()
44import System.Directory (getDirectoryContents)
44import System.Directory (getDirectoryContents)
45import System.FilePath ((</>), takeExtension, takeFileName)
45import System.FilePath ((</>), takeExtension, takeFileName)
46import Test.Tasty (TestTree, testGroup)
46import Test.Tasty (TestTree, testGroup)
47−import Test.Tasty.HUnit (testCase)
48−import Test.HUnit (Assertion, assertBool, assertFailure, assertEqual)
47+import Test.Tasty.HUnit (Assertion, assertBool, assertFailure, assertEqual, testCase)
49import Text.Printf (printf)
48import Text.Printf (printf)
50import UnitTests.NullaryConstructors (nullaryConstructors)
49import UnitTests.NullaryConstructors (nullaryConstructors)
51import qualified Data.ByteString.Base16.Lazy as LBase16
50import qualified Data.ByteString.Base16.Lazy as LBase16
tests/UnitTests/NullaryConstructors.hs+1−1
@@ -16,7 +16,7 @@ import Data.Aeson.Types (Parser)
16import Data.ByteString.Builder (toLazyByteString)
16import Data.ByteString.Builder (toLazyByteString)
17import Data.Maybe (fromJust)
17import Data.Maybe (fromJust)
18import Encoders
18import Encoders
19−import Test.HUnit ((@=?), Assertion)
19+import Test.Tasty.HUnit ((@=?), Assertion)
20import Types
20import Types
21import qualified Data.ByteString.Lazy.Char8 as L
21import qualified Data.ByteString.Lazy.Char8 as L
22
22