Mostly explicit imports from external packages

(Thanks to HLS for the suggestions.)

This should harden the code base against ecosystem changes like what
happened for random-1.3.

QuickCheck and HUnit are not imported qualified everywhere yet,
because HLS failed on some modules.

Author: andreasabel

core/src/Test/Framework.hs

@@ -14,4 +14,4 @@ import Test.Framework.Core (Test, TestName, testGroup, plusTestOptions, buildTes
 import Test.Framework.Options
 import Test.Framework.Runners.Console
 import Test.Framework.Runners.Options
-import Test.Framework.Seed
+import Test.Framework.Seed

core/src/Test/Framework/Core.hs

@@ -5,8 +5,8 @@ import Test.Framework.Improving
 import Test.Framework.Options
 
 import Control.Arrow (first, second)
-import Control.Concurrent.MVar
-import Data.Typeable
+import Control.Concurrent.MVar ( withMVar, newMVar, MVar )
+import Data.Typeable ( Typeable )
 
 
 -- | Something like the result of a test: works in concert with 'Testlike'.

core/src/Test/Framework/Improving.hs

@@ -5,10 +5,10 @@ module Test.Framework.Improving (
     ) where
 
 import Control.Concurrent
-import Control.Monad
-import Control.Applicative as App
+    ( yield, getChanContents, newChan, writeChan, Chan )
+import Control.Monad (ap, liftM)
 
-import System.Timeout
+import System.Timeout ( timeout )
 
 
 data i :~> f = Finished f
@@ -41,7 +41,7 @@ instance Applicative (ImprovingIO i f) where
     (<*>) = ap
 
 instance Monad (ImprovingIO i f) where
-    return = App.pure
+    return = pure
     ma >>= f = IIO $ \chan -> do
                     a <- unIIO ma chan
                     unIIO (f a) chan

core/src/Test/Framework/Options.hs

@@ -3,8 +3,8 @@ module Test.Framework.Options where
 import Test.Framework.Seed
 import Test.Framework.Utilities
 
-import Data.Monoid
-import Data.Semigroup as Sem hiding (Last(..))
+import Data.Monoid ( Last(Last, getLast) )
+import Data.Semigroup as Sem ( Semigroup((<>)) )
 
 
 type TestOptions = TestOptions' Maybe
@@ -43,5 +43,5 @@ instance Monoid (TestOptions' Maybe) where
             topt_maximum_test_depth = Nothing,
             topt_timeout = Nothing
         }
-    
+
     mappend = (Sem.<>)

core/src/Test/Framework/Providers/API.hs

@@ -18,4 +18,4 @@ import Test.Framework.Core
 import Test.Framework.Improving
 import Test.Framework.Options
 import Test.Framework.Seed
-import Test.Framework.Utilities
+import Test.Framework.Utilities

core/src/Test/Framework/Runners/Console.hs

@@ -17,9 +17,15 @@ import Test.Framework.Utilities
 
 import Control.Monad (when)
 import System.Console.GetOpt
-import System.Environment
+    ( getOpt,
+      usageInfo,
+      ArgDescr(NoArg, ReqArg),
+      ArgOrder(Permute),
+      OptDescr(..) )
+import System.Environment ( getArgs, getProgName )
 import System.Exit
-import System.IO
+    ( exitSuccess, exitWith, ExitCode(ExitFailure, ExitSuccess) )
+import System.IO ( hIsTerminalDevice, hPutStrLn, stderr, stdout )
 
 -- | @Nothing@ signifies that usage information should be displayed.
 -- @Just@ simply gives us the contribution to overall options by the command line option.

core/src/Test/Framework/Runners/Console/Colors.hs

@@ -1,6 +1,6 @@
 module Test.Framework.Runners.Console.Colors where
 
-import Text.PrettyPrint.ANSI.Leijen
+import Text.PrettyPrint.ANSI.Leijen ( green, red, Doc )
 
 
 colorFail, colorPass :: Doc -> Doc
@@ -9,4 +9,4 @@ colorPass = green
 
 colorPassOrFail :: Bool -> Doc -> Doc
 colorPassOrFail True  = colorPass
-colorPassOrFail False = colorFail
+colorPassOrFail False = colorFail

core/src/Test/Framework/Runners/Console/ProgressBar.hs

@@ -2,7 +2,7 @@ module Test.Framework.Runners.Console.ProgressBar (
         Progress(..), progressBar
     ) where
 
-import Text.PrettyPrint.ANSI.Leijen hiding (width)
+import Text.PrettyPrint.ANSI.Leijen ( (<>), char, text, Doc )
 
 
 data Progress = Progress Int Int
@@ -16,4 +16,4 @@ progressBar color width (Progress count total) = char '[' <> progress_doc <> spa
     progress_chars = round (characters_per_tick * fromIntegral count)
     space_chars = available_width - progress_chars
     progress_doc = color (text (reverse (take progress_chars ('>' : repeat '='))))
-    space_doc = text (replicate space_chars ' ')
+    space_doc = text (replicate space_chars ' ')

core/src/Test/Framework/Runners/Console/Run.hs

@@ -13,10 +13,13 @@ import Test.Framework.Runners.Statistics
 import Test.Framework.Runners.TimedConsumption
 import Test.Framework.Utilities
 
-import System.Console.ANSI
-import System.IO
+import System.Console.ANSI ( clearLine, cursorUpLine )
+import System.IO ( hFlush, stdout )
 
 import Text.PrettyPrint.ANSI.Leijen
+    ( (<>), (<+>),
+      brackets, char, empty, indent, linebreak, plain, putDoc, text,
+      Doc )
 
 import Control.Arrow (second, (&&&))
 import Control.Monad (unless)

core/src/Test/Framework/Runners/Console/Statistics.hs

@@ -6,9 +6,9 @@ import Test.Framework.Runners.Statistics
 import Test.Framework.Runners.Console.Colors
 import Test.Framework.Runners.Console.Table
 
-import Text.PrettyPrint.ANSI.Leijen
+import Text.PrettyPrint.ANSI.Leijen ( empty, text, Doc )
 
-import Data.List
+import Data.List ( sort )
 
 
 -- | Displays statistics as a string something like this:
@@ -23,14 +23,14 @@ showFinalTestStatistics :: TestStatistics -> Doc
 showFinalTestStatistics ts = renderTable $ [Column label_column] ++ (map Column test_type_columns) ++ [Column total_column]
   where
     test_types = sort $ testCountTestTypes (ts_total_tests ts)
-    
+
     label_column      = [TextCell empty,              TextCell (text "Passed"),                        TextCell (text "Failed"),                  TextCell (text "Total")]
     total_column      = [TextCell (text "Total"),     testStatusTotal colorPass ts_passed_tests,       testStatusTotal colorFail ts_failed_tests, testStatusTotal (colorPassOrFail (ts_no_failures ts)) ts_total_tests]
     test_type_columns = [ [TextCell (text test_type), testStat colorPass (countTests ts_passed_tests), testStat colorFail failures,               testStat (colorPassOrFail (failures <= 0)) (countTests ts_total_tests)]
                         | test_type <- test_types
                         , let countTests = testCountForType test_type . ($ ts)
                               failures   = countTests ts_failed_tests ]
-    
+
     testStatusTotal color status_accessor = TextCell (coloredNumber color (testCountTotal (status_accessor ts)))
     testStat color number = TextCell (coloredNumber color number)
 
@@ -39,4 +39,4 @@ coloredNumber color number
   | number == 0 = number_doc
   | otherwise   = color number_doc
   where
-    number_doc = text (show number)
+    number_doc = text (show number)