git.iko.soy/typeable/postgresql-simple
on master help sign in
test: Rename Util to Common, and move more imports to it so test modules will have less to import
feeebd7Joey Adams
postgresql-simple.cabal+1−1
@@ -70,9 +70,9 @@ test-suite test
70 hs-source-dirs: test
70 hs-source-dirs: test
71 main-is: Main.hs
71 main-is: Main.hs
72 other-modules:
72 other-modules:
73+ Common
73 Bytea
74 Bytea
74 Notify
75 Notify
75− Util
76
76
77 ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-unused-do-bind
77 ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-unused-do-bind
78
78
test/Bytea.hs+2−6
@@ -1,12 +1,8 @@
1{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
2module Bytea (testBytea) where
2module Bytea (testBytea) where
3
3
4−import Util (md5)
4+import Common
5−
6−import Database.PostgreSQL.Simple
7−import Test.HUnit
8−
9−import qualified Data.ByteString as B
5+import qualified Data.ByteString as B
10
6
11testBytea :: Connection -> Test
7testBytea :: Connection -> Test
12testBytea conn = TestList
8testBytea conn = TestList
test/Util.hs → test/Common.hsrenamed+7−3
@@ -1,9 +1,13 @@
1−module Util (
1+module Common (
2+ module Database.PostgreSQL.Simple,
3+ module Test.HUnit,
2 md5,
4 md5,
3) where
5) where
4
6
5−import Data.ByteString (ByteString)
7+import Data.ByteString (ByteString)
6−import Data.Text (Text)
8+import Data.Text (Text)
9+import Database.PostgreSQL.Simple
10+import Test.HUnit
7
11
8import qualified Crypto.Hash.MD5 as MD5
12import qualified Crypto.Hash.MD5 as MD5
9import qualified Data.ByteString.Base16 as Base16
13import qualified Data.ByteString.Base16 as Base16
test/Notify.hs+2−2
@@ -1,14 +1,14 @@
1{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
2module Notify (testNotify) where
2module Notify (testNotify) where
3
3
4+import Common
5+
4import Control.Applicative
6import Control.Applicative
5import Control.Concurrent
7import Control.Concurrent
6import Control.Monad
8import Control.Monad
7import Data.Function
9import Data.Function
8import Data.List
10import Data.List
9−import Database.PostgreSQL.Simple
10import Database.PostgreSQL.Simple.Notification
11import Database.PostgreSQL.Simple.Notification
11−import Test.HUnit
12
12
13import qualified Data.ByteString as B
13import qualified Data.ByteString as B
14
14