2 files changed, 44 insertions, 25 deletions
diff --git a/tests/Hakyll/Web/Urls/Relativize/Tests.hs b/tests/Hakyll/Web/Urls/Relativize/Tests.hs
index 465d266..e14a2a4 100644
--- a/tests/Hakyll/Web/Urls/Relativize/Tests.hs
+++ b/tests/Hakyll/Web/Urls/Relativize/Tests.hs
@@ -1,25 +1,35 @@
+--------------------------------------------------------------------------------
 {-# LANGUAGE OverloadedStrings #-}
 module Hakyll.Web.Urls.Relativize.Tests
     ( tests
     ) where
 
-import Test.Framework
-import Test.HUnit hiding (Test)
 
-import Hakyll.Web.Urls.Relativize
-import TestSuite.Util
+--------------------------------------------------------------------------------
+import           Test.Framework             (Test, testGroup)
+import           Test.HUnit                 ((@=?))
 
-tests :: [Test]
-tests = fromAssertions "relativizeUrls"
-    [ "<a href=\"../foo\">bar</a>" @=?
-        relativizeUrls ".." "<a href=\"/foo\">bar</a>"
-    , "<img src=\"../../images/lolcat.png\"></img>" @=?
-        relativizeUrls "../.." "<img src=\"/images/lolcat.png\" />"
-    , "<a href=\"http://haskell.org\">Haskell</a>" @=?
-        relativizeUrls "../.." "<a href=\"http://haskell.org\">Haskell</a>"
-    , "<a href=\"http://haskell.org\">Haskell</a>" @=?
-        relativizeUrls "../.." "<a href=\"http://haskell.org\">Haskell</a>"
-    , "<script src=\"//ajax.googleapis.com/jquery.min.js\"></script>" @=?
-        relativizeUrls "../.."
-            "<script src=\"//ajax.googleapis.com/jquery.min.js\"></script>"
-    ]
+
+--------------------------------------------------------------------------------
+import           Hakyll.Web.Urls.Relativize
+import           TestSuite.Util
+
+
+--------------------------------------------------------------------------------
+tests :: Test
+tests = testGroup "Hakyll.Web.Urls.Relativize.Tests" $
+    fromAssertions "relativizeUrls"
+        [ "<a href=\"../foo\">bar</a>" @=?
+            relativizeUrlsWith ".." "<a href=\"/foo\">bar</a>"
+        , "<img src=\"../../images/lolcat.png\"></img>" @=?
+            relativizeUrlsWith "../.." "<img src=\"/images/lolcat.png\" />"
+        , "<a href=\"http://haskell.org\">Haskell</a>" @=?
+            relativizeUrlsWith "../.."
+                "<a href=\"http://haskell.org\">Haskell</a>"
+        , "<a href=\"http://haskell.org\">Haskell</a>" @=?
+            relativizeUrlsWith "../.."
+                "<a href=\"http://haskell.org\">Haskell</a>"
+        , "<script src=\"//ajax.googleapis.com/jquery.min.js\"></script>" @=?
+            relativizeUrlsWith "../.."
+                "<script src=\"//ajax.googleapis.com/jquery.min.js\"></script>"
+        ]
diff --git a/tests/Hakyll/Web/Urls/Tests.hs b/tests/Hakyll/Web/Urls/Tests.hs
index 72b6687..56a1838 100644
--- a/tests/Hakyll/Web/Urls/Tests.hs
+++ b/tests/Hakyll/Web/Urls/Tests.hs
@@ -1,17 +1,23 @@
+--------------------------------------------------------------------------------
 module Hakyll.Web.Urls.Tests
     ( tests
     ) where
 
-import Data.Char (toUpper)
 
-import Test.Framework
-import Test.HUnit hiding (Test)
+--------------------------------------------------------------------------------
+import           Data.Char       (toUpper)
+import           Test.Framework  (Test, testGroup)
+import           Test.HUnit      (assert, (@=?))
 
-import Hakyll.Web.Urls
-import TestSuite.Util
 
-tests :: [Test]
-tests = concat
+--------------------------------------------------------------------------------
+import           Hakyll.Web.Urls
+import           TestSuite.Util
+
+
+--------------------------------------------------------------------------------
+tests :: Test
+tests = testGroup "Hakyll.Web.Urls.Tests" $ concat
     [ fromAssertions "withUrls"
         [ "<a href=\"FOO\">bar</a>" @=?
             withUrls (map toUpper) "<a href=\"foo\">bar</a>"
@@ -26,17 +32,20 @@ tests = concat
         , "<style>body > p { line-height: 1.3 }</style>" @=?
             withUrls id "<style>body > p { line-height: 1.3 }</style>"
         ]
+
     , fromAssertions "toUrl"
         [ "/foo/bar.html"    @=? toUrl "foo/bar.html"
         , "/"                @=? toUrl "/"
         , "/funny-pics.html" @=? toUrl "/funny-pics.html"
         ]
+
     , fromAssertions "toSiteRoot"
         [ ".."    @=? toSiteRoot "/foo/bar.html"
         , "."     @=? toSiteRoot "index.html"
         , "."     @=? toSiteRoot "/index.html"
         , "../.." @=? toSiteRoot "foo/bar/qux"
         ]
+
     , fromAssertions "isExternal"
         [ assert (isExternal "http://reddit.com")
         , assert (isExternal "https://mail.google.com")