git.iko.soy/typeable/aeson
on master help sign in
Fix test suite warnings
1906833Adam Bergmark
tests/Instances.hs+1−3
compare with master
unifiedsplit
@@ -16,8 +16,6 @@ import Control.Monad
16import Data.Aeson.Types
16import Data.Aeson.Types
17import Data.Function (on)
17import Data.Function (on)
18import Data.Functor.Compose (Compose (..))
18import Data.Functor.Compose (Compose (..))
19−import Data.Functor.Identity (Identity (..))
20−import Data.Hashable (Hashable (..))
21import Data.Proxy (Proxy(..))
19import Data.Proxy (Proxy(..))
22import Data.Tagged (Tagged(..))
20import Data.Tagged (Tagged(..))
23import Data.Time (ZonedTime(..), TimeZone(..))
21import Data.Time (ZonedTime(..), TimeZone(..))
@@ -31,8 +29,8 @@ import qualified Data.UUID.Types as UUID
31
29
32#if !MIN_VERSION_QuickCheck(2,9,0)
30#if !MIN_VERSION_QuickCheck(2,9,0)
33import Control.Applicative (Const(..))
31import Control.Applicative (Const(..))
34−import Data.List.NonEmpty (NonEmpty(..))
35import Data.Functor.Identity (Identity (..))
32import Data.Functor.Identity (Identity (..))
33+import Data.List.NonEmpty (NonEmpty(..))
36import Data.Version
34import Data.Version
37import Test.QuickCheck (getNonNegative, listOf1, resize)
35import Test.QuickCheck (getNonNegative, listOf1, resize)
38#endif
36#endif
tests/UnitTests.hs+2−4
@@ -17,7 +17,7 @@ module UnitTests
17import Prelude ()
17import Prelude ()
18import Prelude.Compat
18import Prelude.Compat
19
19
20−import Control.Monad (forM, forM_, unless)
20+import Control.Monad (forM, forM_)
21import Data.Aeson ((.=), (.:), (.:?), (.:!), FromJSON(..), FromJSONKeyFunction(..), FromJSONKey(..), ToJSON1(..), decode, eitherDecode, encode, genericToEncoding, genericToJSON, object, withObject)
21import Data.Aeson ((.=), (.:), (.:?), (.:!), FromJSON(..), FromJSONKeyFunction(..), FromJSONKey(..), ToJSON1(..), decode, eitherDecode, encode, genericToEncoding, genericToJSON, object, withObject)
22import Data.Aeson.Internal (JSONPathElement(..), formatError)
22import Data.Aeson.Internal (JSONPathElement(..), formatError)
23import Data.Aeson.TH (deriveJSON, deriveToJSON, deriveToJSON1)
23import Data.Aeson.TH (deriveJSON, deriveToJSON, deriveToJSON1)
@@ -36,8 +36,7 @@ import Data.Time.Format (parseTime)
36import Data.Time.Locale.Compat (defaultTimeLocale)
36import Data.Time.Locale.Compat (defaultTimeLocale)
37import GHC.Generics (Generic)
37import GHC.Generics (Generic)
38import Instances ()
38import Instances ()
39−import System.Directory (doesDirectoryExist, getDirectoryContents)
39+import System.Directory (getDirectoryContents)
40−import System.Exit (exitWith, ExitCode(ExitFailure))
41import System.FilePath ((</>), takeExtension, takeFileName)
40import System.FilePath ((</>), takeExtension, takeFileName)
42import Test.Framework (Test, testGroup)
41import Test.Framework (Test, testGroup)
43import Test.Framework.Providers.HUnit (testCase)
42import Test.Framework.Providers.HUnit (testCase)
@@ -424,7 +423,6 @@ jsonTestSuiteTest path = testCase fileName $ do
424jsonTestSuite :: IO Test
423jsonTestSuite :: IO Test
425jsonTestSuite = do
424jsonTestSuite = do
426 let suitePath = "tests/JSONTestSuite"
425 let suitePath = "tests/JSONTestSuite"
427− exists <- doesDirectoryExist suitePath
428 let suites = ["test_parsing", "test_transform"]
426 let suites = ["test_parsing", "test_transform"]
429 testPaths <- fmap (sort . concat) . forM suites $ \suite -> do
427 testPaths <- fmap (sort . concat) . forM suites $ \suite -> do
430 let dir = suitePath </> suite
428 let dir = suitePath </> suite