1906833 · typeable/aeson

git.iko.soy/typeable/aeson

Fix test suite warnings

commit19068335e027a6136ff0ab4331b2b618b5146bcc authorAdam Bergmark <adam@bergmark.nl> dateSun 19 Feb 2017, 14:46 (10 years ago) parent440fdb3

2 files changed+3−7

compare with master

unifiedsplit

tests/Instances.hs+1−3 tests/UnitTests.hs+2−4

tests/Instances.hs+1−3

@@ -16,8 +16,6 @@ import Control.Monad

1616import Data.Aeson.Types

1717import Data.Function (on)

1818import Data.Functor.Compose (Compose (..))

19−import Data.Functor.Identity (Identity (..))

20−import Data.Hashable (Hashable (..))

2119import Data.Proxy (Proxy(..))

2220import Data.Tagged (Tagged(..))

2321import Data.Time (ZonedTime(..), TimeZone(..))

@@ -31,8 +29,8 @@ import qualified Data.UUID.Types as UUID

3129

3230#if !MIN_VERSION_QuickCheck(2,9,0)

3331import Control.Applicative (Const(..))

34−import Data.List.NonEmpty (NonEmpty(..))

3532import Data.Functor.Identity (Identity (..))

33+import Data.List.NonEmpty (NonEmpty(..))

3634import Data.Version

3735import Test.QuickCheck (getNonNegative, listOf1, resize)

3836#endif

tests/UnitTests.hs+2−4

@@ -17,7 +17,7 @@ module UnitTests

1717import Prelude ()

1818import Prelude.Compat

1919

20−import Control.Monad (forM, forM_, unless)

20+import Control.Monad (forM, forM_)

2121import Data.Aeson ((.=), (.:), (.:?), (.:!), FromJSON(..), FromJSONKeyFunction(..), FromJSONKey(..), ToJSON1(..), decode, eitherDecode, encode, genericToEncoding, genericToJSON, object, withObject)

2222import Data.Aeson.Internal (JSONPathElement(..), formatError)

2323import Data.Aeson.TH (deriveJSON, deriveToJSON, deriveToJSON1)

@@ -36,8 +36,7 @@ import Data.Time.Format (parseTime)

3636import Data.Time.Locale.Compat (defaultTimeLocale)

3737import GHC.Generics (Generic)

3838import Instances ()

39−import System.Directory (doesDirectoryExist, getDirectoryContents)

40−import System.Exit (exitWith, ExitCode(ExitFailure))

39+import System.Directory (getDirectoryContents)

4140import System.FilePath ((</>), takeExtension, takeFileName)

4241import Test.Framework (Test, testGroup)

4342import Test.Framework.Providers.HUnit (testCase)

@@ -424,7 +423,6 @@ jsonTestSuiteTest path = testCase fileName $ do

424423jsonTestSuite :: IO Test

425424jsonTestSuite = do

426425 let suitePath = "tests/JSONTestSuite"

427− exists <- doesDirectoryExist suitePath

428426 let suites = ["test_parsing", "test_transform"]

429427 testPaths <- fmap (sort . concat) . forM suites $ \suite -> do

430428 let dir = suitePath </> suite