[commit: packages/time] format-widths, ghc, master: test: minor clean-up (e71ecc3)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/time

On branches: format-widths,ghc,master
Link       : http://git.haskell.org/packages/time.git/commitdiff/e71ecc300deee5782773a434769d3dc04e2e3831

>---------------------------------------------------------------

commit e71ecc300deee5782773a434769d3dc04e2e3831
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Fri Feb 3 14:02:22 2017 -0800

    test: minor clean-up


>---------------------------------------------------------------

e71ecc300deee5782773a434769d3dc04e2e3831
 test/main/Main.hs       | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 test/main/Test/Tests.hs | 36 ------------------------------------
 time.cabal              | 39 +++++++++++++++++++--------------------
 3 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/test/main/Main.hs b/test/main/Main.hs
index 7602d2a..e0c3eaf 100644
--- a/test/main/Main.hs
+++ b/test/main/Main.hs
@@ -1,7 +1,50 @@
 module Main where
-import Test.Tasty
-import Test.Tests
+
 import Foreign.C.Types
+import Test.Tasty
+import Test.Calendar.AddDays
+import Test.Calendar.Calendars
+import Test.Calendar.ClipDates
+import Test.Calendar.ConvertBack
+import Test.Calendar.Easter
+import Test.Calendar.LongWeekYears
+import Test.Calendar.MonthDay
+import Test.Calendar.Valid
+import Test.Clock.Conversion
+import Test.Clock.Resolution
+import Test.Clock.TAI
+import Test.Format.Format
+import Test.Format.ParseTime
+import Test.LocalTime.Time
+import Test.LocalTime.TimeZone
+
+
+tests :: TestTree
+tests = testGroup "Time" [
+    testGroup "Calendar" [
+        addDaysTest,
+        testCalendars,
+        clipDates,
+        convertBack,
+        longWeekYears,
+        testMonthDay,
+        testEaster,
+        testValid
+        ],
+    testGroup "Clock" [
+        testClockConversion,
+        testResolution,
+        testTAI
+        ],
+    testGroup "Format" [
+        testFormat,
+        testParseTime
+        ],
+    testGroup "LocalTime" [
+        testTime,
+        testTimeZone
+        ]
+    ]
 
 main :: IO ()
 main = do
diff --git a/test/main/Test/Tests.hs b/test/main/Test/Tests.hs
deleted file mode 100644
index e95cb68..0000000
--- a/test/main/Test/Tests.hs
+++ /dev/null
@@ -1,36 +0,0 @@
-module Test.Tests where
-
-import Test.Tasty
-
-import Test.Calendar.AddDays
-import Test.Calendar.ClipDates
-import Test.Clock.Conversion
-import Test.Calendar.ConvertBack
-import Test.Calendar.LongWeekYears
-import Test.Clock.Resolution
-import Test.Calendar.Calendars
-import Test.Calendar.Easter
-import Test.Format.Format
-import Test.Calendar.MonthDay
-import Test.Format.ParseTime
-import Test.Clock.TAI
-import Test.LocalTime.Time
-import Test.LocalTime.TimeZone
-import Test.Calendar.Valid
-
-tests :: TestTree
-tests = testGroup "time" [ addDaysTest
-        , clipDates
-        , testClockConversion
-        , convertBack
-        , longWeekYears
-        , testResolution
-        , testCalendars
-        , testEaster
-        , testFormat
-        , testMonthDay
-        , testParseTime
-        , testTAI
-        , testTime
-        , testTimeZone
-        , testValid ]
diff --git a/time.cabal b/time.cabal
index e8f9934..cc43eff 100644
--- a/time.cabal
+++ b/time.cabal
@@ -137,27 +137,26 @@ test-suite test-main
         unix
     main-is: Main.hs
     other-modules:
-        Test.Tests
-        Test.Clock.Conversion
-        Test.LocalTime.Time
-        Test.LocalTime.TimeRef
-        Test.Format.ParseTime
-        Test.Calendar.MonthDay
-        Test.Calendar.MonthDayRef
-        Test.Format.Format
-        Test.Calendar.Easter
-        Test.Calendar.EasterRef
+        Test.TestUtil
+        Test.Calendar.AddDays
+        Test.Calendar.AddDaysRef
         Test.Calendar.Calendars
         Test.Calendar.CalendarsRef
-        Test.Clock.TAI
-        Test.LocalTime.TimeZone
-        Test.Calendar.Valid
-        Test.Clock.Resolution
-        Test.Calendar.LongWeekYears
-        Test.Calendar.LongWeekYearsRef
-        Test.Calendar.ConvertBack
         Test.Calendar.ClipDates
         Test.Calendar.ClipDatesRef
-        Test.Calendar.AddDays
-        Test.Calendar.AddDaysRef
-        Test.TestUtil
+        Test.Calendar.ConvertBack
+        Test.Calendar.Easter
+        Test.Calendar.EasterRef
+        Test.Calendar.LongWeekYears
+        Test.Calendar.LongWeekYearsRef
+        Test.Calendar.MonthDay
+        Test.Calendar.MonthDayRef
+        Test.Calendar.Valid
+        Test.Clock.Conversion
+        Test.Clock.Resolution
+        Test.Clock.TAI
+        Test.Format.Format
+        Test.Format.ParseTime
+        Test.LocalTime.Time
+        Test.LocalTime.TimeRef
+        Test.LocalTime.TimeZone