Easier running of individual tests in GHCi

6 files changed, 51 insertions, 51 deletions

diff --git a/tests/StylishHaskell/Parse/Tests.hs b/tests/StylishHaskell/Parse/Tests.hs
index 5b3fbe1..87febd9 100644
--- a/tests/StylishHaskell/Parse/Tests.hs
+++ b/tests/StylishHaskell/Parse/Tests.hs
@@ -7,7 +7,7 @@ module StylishHaskell.Parse.Tests
 --------------------------------------------------------------------------------
 import           Test.Framework                 (Test, testGroup)
 import           Test.Framework.Providers.HUnit (testCase)
-import           Test.HUnit                     (assert)
+import           Test.HUnit                     (Assertion, assert)
 
 
 --------------------------------------------------------------------------------
@@ -17,15 +17,14 @@ import           StylishHaskell.Parse
 --------------------------------------------------------------------------------
 tests :: Test
 tests = testGroup "StylishHaskell.Parse"
-    [ testBom
-    , testExtraExtensions
+    [ testCase "UTF-8 Byte Order Mark" testBom
+    , testCase "Extra extensions"      testExtraExtensions
     ]
 
 
 --------------------------------------------------------------------------------
-testBom :: Test
-testBom = testCase "UTF-8 Byte Order Mark" $ assert $ isRight $
-    parseModule [] Nothing input
+testBom :: Assertion
+testBom = assert $ isRight $ parseModule [] Nothing input
   where
     input = unlines
         [ '\xfeff' : "foo :: Int"
@@ -34,8 +33,8 @@ testBom = testCase "UTF-8 Byte Order Mark" $ assert $ isRight $
 
 
 --------------------------------------------------------------------------------
-testExtraExtensions :: Test
-testExtraExtensions = testCase "Extra extensions" $ assert $ isRight $
+testExtraExtensions :: Assertion
+testExtraExtensions = assert $ isRight $
     parseModule ["TemplateHaskell"] Nothing "$(foo)"
 
 
diff --git a/tests/StylishHaskell/Step/Imports/Tests.hs b/tests/StylishHaskell/Step/Imports/Tests.hs
index d443956..c6c0553 100644
--- a/tests/StylishHaskell/Step/Imports/Tests.hs
+++ b/tests/StylishHaskell/Step/Imports/Tests.hs
@@ -7,7 +7,7 @@ module StylishHaskell.Step.Imports.Tests
 --------------------------------------------------------------------------------
 import           Test.Framework                 (Test, testGroup)
 import           Test.Framework.Providers.HUnit (testCase)
-import           Test.HUnit                     ((@=?))
+import           Test.HUnit                     (Assertion, (@=?))
 
 
 --------------------------------------------------------------------------------
@@ -18,10 +18,10 @@ import           StylishHaskell.Tests.Util
 --------------------------------------------------------------------------------
 tests :: Test
 tests = testGroup "StylishHaskell.Step.Imports.Tests"
-    [ case01
-    , case02
-    , case03
-    , case04
+    [ testCase "case 01" case01
+    , testCase "case 02" case02
+    , testCase "case 03" case03
+    , testCase "case 04" case04
     ]
 
 
@@ -42,8 +42,8 @@ input = unlines
 
 
 --------------------------------------------------------------------------------
-case01 :: Test
-case01 = testCase "case 01" $ expected @=? testStep (step Global) input
+case01 :: Assertion
+case01 = expected @=? testStep (step Global) input
   where
     expected = unlines
         [ "module Herp where"
@@ -60,8 +60,8 @@ case01 = testCase "case 01" $ expected @=? testStep (step Global) input
 
 
 --------------------------------------------------------------------------------
-case02 :: Test
-case02 = testCase "case 02" $ expected @=? testStep (step Group) input
+case02 :: Assertion
+case02 = expected @=? testStep (step Group) input
   where
     expected = unlines
         [ "module Herp where"
@@ -78,8 +78,8 @@ case02 = testCase "case 02" $ expected @=? testStep (step Group) input
 
 
 --------------------------------------------------------------------------------
-case03 :: Test
-case03 = testCase "case 03" $ expected @=? testStep (step None) input
+case03 :: Assertion
+case03 = expected @=? testStep (step None) input
   where
     expected = unlines
         [ "module Herp where"
@@ -94,8 +94,10 @@ case03 = testCase "case 03" $ expected @=? testStep (step None) input
         , "herp = putStrLn \"import Hello world\""
         ]
 
-case04 :: Test
-case04 = testCase "case 04" $ expected @=? testStep (step Global) input'
+
+--------------------------------------------------------------------------------
+case04 :: Assertion
+case04 = expected @=? testStep (step Global) input'
   where
     input' =
         "import Data.Aeson.Types (object, typeMismatch, FromJSON(..)," ++
diff --git a/tests/StylishHaskell/Step/LanguagePragmas/Tests.hs b/tests/StylishHaskell/Step/LanguagePragmas/Tests.hs
index 89ac4e9..d543479 100644
--- a/tests/StylishHaskell/Step/LanguagePragmas/Tests.hs
+++ b/tests/StylishHaskell/Step/LanguagePragmas/Tests.hs
@@ -7,7 +7,7 @@ module StylishHaskell.Step.LanguagePragmas.Tests
 --------------------------------------------------------------------------------
 import           Test.Framework                      (Test, testGroup)
 import           Test.Framework.Providers.HUnit      (testCase)
-import           Test.HUnit                          ((@=?))
+import           Test.HUnit                          (Assertion, (@=?))
 
 
 --------------------------------------------------------------------------------
@@ -18,17 +18,16 @@ import           StylishHaskell.Tests.Util
 --------------------------------------------------------------------------------
 tests :: Test
 tests = testGroup "StylishHaskell.Step.LanguagePragmas.Tests"
-    [ case01
-    , case02
-    , case03
-    , case04
+    [ testCase "case 01" case01
+    , testCase "case 02" case02
+    , testCase "case 03" case03
+    , testCase "case 04" case04
     ]
 
 
 --------------------------------------------------------------------------------
-case01 :: Test
-case01 = testCase "case 01" $
-    expected @=? testStep (step Vertical False) input
+case01 :: Assertion
+case01 = expected @=? testStep (step Vertical False) input
   where
     input = unlines
         [ "{-# LANGUAGE ViewPatterns #-}"
@@ -46,9 +45,8 @@ case01 = testCase "case 01" $
 
 
 --------------------------------------------------------------------------------
-case02 :: Test
-case02 = testCase "case 02" $
-    expected @=? testStep (step Vertical True) input
+case02 :: Assertion
+case02 = expected @=? testStep (step Vertical True) input
   where
     input = unlines
         [ "{-# LANGUAGE BangPatterns #-}"
@@ -63,9 +61,8 @@ case02 = testCase "case 02" $
 
 
 --------------------------------------------------------------------------------
-case03 :: Test
-case03 = testCase "case 03" $
-    expected @=? testStep (step Vertical True) input
+case03 :: Assertion
+case03 = expected @=? testStep (step Vertical True) input
   where
     input = unlines
         [ "{-# LANGUAGE BangPatterns #-}"
@@ -80,9 +77,8 @@ case03 = testCase "case 03" $
 
 
 --------------------------------------------------------------------------------
-case04 :: Test
-case04 = testCase "case 04" $
-    expected @=? testStep (step Compact False) input
+case04 :: Assertion
+case04 = expected @=? testStep (step Compact False) input
   where
     input = unlines
         [ "{-# LANGUAGE TypeOperators, StandaloneDeriving, DeriveDataTypeable,"
diff --git a/tests/StylishHaskell/Step/Tabs/Tests.hs b/tests/StylishHaskell/Step/Tabs/Tests.hs
index 58be7de..6ad0607 100644
--- a/tests/StylishHaskell/Step/Tabs/Tests.hs
+++ b/tests/StylishHaskell/Step/Tabs/Tests.hs
@@ -7,7 +7,7 @@ module StylishHaskell.Step.Tabs.Tests
 --------------------------------------------------------------------------------
 import           Test.Framework                 (Test, testGroup)
 import           Test.Framework.Providers.HUnit (testCase)
-import           Test.HUnit                     ((@=?))
+import           Test.HUnit                     (Assertion, (@=?))
 
 
 --------------------------------------------------------------------------------
@@ -17,12 +17,14 @@ import           StylishHaskell.Tests.Util
 
 --------------------------------------------------------------------------------
 tests :: Test
-tests = testGroup "StylishHaskell.Step.Tabs.Tests" [case01]
+tests = testGroup "StylishHaskell.Step.Tabs.Tests"
+    [ testCase "case 01" case01
+    ]
 
 
 --------------------------------------------------------------------------------
-case01 :: Test
-case01 = testCase "case 01" $ expected @=? testStep (step 4) input
+case01 :: Assertion
+case01 = expected @=? testStep (step 4) input
   where
     input = unlines
         [ "module Main"
@@ -39,4 +41,3 @@ case01 = testCase "case 01" $ expected @=? testStep (step 4) input
         , "    = Bar"
         , "    | Qux"
         ]
-
diff --git a/tests/StylishHaskell/Step/TrailingWhitespace/Tests.hs b/tests/StylishHaskell/Step/TrailingWhitespace/Tests.hs
index 22b2b26..2d78b08 100644
--- a/tests/StylishHaskell/Step/TrailingWhitespace/Tests.hs
+++ b/tests/StylishHaskell/Step/TrailingWhitespace/Tests.hs
@@ -7,7 +7,7 @@ module StylishHaskell.Step.TrailingWhitespace.Tests
 --------------------------------------------------------------------------------
 import           Test.Framework                         (Test, testGroup)
 import           Test.Framework.Providers.HUnit         (testCase)
-import           Test.HUnit                             ((@=?))
+import           Test.HUnit                             (Assertion, (@=?))
 
 
 --------------------------------------------------------------------------------
@@ -17,12 +17,14 @@ import           StylishHaskell.Tests.Util
 
 --------------------------------------------------------------------------------
 tests :: Test
-tests = testGroup "StylishHaskell.Step.TrailingWhitespace.Tests" [case01]
+tests = testGroup "StylishHaskell.Step.TrailingWhitespace.Tests"
+    [ testCase "case 01" case01
+    ]
 
 
 --------------------------------------------------------------------------------
-case01 :: Test
-case01 = testCase "case 01" $ expected @=? testStep step input
+case01 :: Assertion
+case01 = expected @=? testStep step input
   where
     input = unlines
         [ "module Main where"
diff --git a/tests/StylishHaskell/Step/UnicodeSyntax/Tests.hs b/tests/StylishHaskell/Step/UnicodeSyntax/Tests.hs
index fe8e8a2..ae401b2 100644
--- a/tests/StylishHaskell/Step/UnicodeSyntax/Tests.hs
+++ b/tests/StylishHaskell/Step/UnicodeSyntax/Tests.hs
@@ -7,7 +7,7 @@ module StylishHaskell.Step.UnicodeSyntax.Tests
 --------------------------------------------------------------------------------
 import           Test.Framework                    (Test, testGroup)
 import           Test.Framework.Providers.HUnit    (testCase)
-import           Test.HUnit                        ((@=?))
+import           Test.HUnit                        (Assertion, (@=?))
 
 
 --------------------------------------------------------------------------------
@@ -18,13 +18,13 @@ import           StylishHaskell.Tests.Util
 --------------------------------------------------------------------------------
 tests :: Test
 tests = testGroup "StylishHaskell.Step.UnicodeSyntax.Tests"
-    [ case01
+    [ testCase "case 01" case01
     ]
 
 
 --------------------------------------------------------------------------------
-case01 :: Test
-case01 = testCase "case 01" $ expected @=? testStep (step True) input
+case01 :: Assertion
+case01 = expected @=? testStep (step True) input
   where
     input = unlines
         [ "sort :: Ord a => [a] -> [a]"