Add hamlet templates and restructure tests

1 files changed, 10 insertions, 16 deletions

diff --git a/tests/Hakyll/Core/Identifier/Tests.hs b/tests/Hakyll/Core/Identifier/Tests.hs
index 910bca3..a7d49e9 100644
--- a/tests/Hakyll/Core/Identifier/Tests.hs
+++ b/tests/Hakyll/Core/Identifier/Tests.hs
@@ -8,22 +8,16 @@ import Test.Framework.Providers.HUnit
 import Test.HUnit hiding (Test)
 
 import Hakyll.Core.Identifier.Pattern
+import TestSuite.Util
 
 tests :: [Test]
-tests = zipWith testCase names matchCases 
-  where
-    names = map (\n -> "match [" ++ show n ++ "]") [1 :: Int ..]
-
--- | Collection of simple cases
---
-matchCases :: [Assertion]
-matchCases =
-    [ Just [["bar"]]                 @=? match "foo/**" "foo/bar"
-    , Just [["foo", "bar"]]          @=? match "**" "foo/bar"
-    , Nothing                        @=? match "*" "foo/bar"
-    , Just []                        @=? match "foo" "foo"
-    , Just [["foo"]]                 @=? match "*/bar" "foo/bar"
-    , Just [["foo", "bar"]]          @=? match "**/qux" "foo/bar/qux"
-    , Just [["foo", "bar"], ["qux"]] @=? match "**/*" "foo/bar/qux"
-    , Just [["foo"], ["bar", "qux"]] @=? match "*/**" "foo/bar/qux"
+tests = fromAssertions "match"
+    [ Just ["bar"]            @=? match "foo/**" "foo/bar"
+    , Just ["foo/bar"]        @=? match "**" "foo/bar"
+    , Nothing                 @=? match "*" "foo/bar"
+    , Just []                 @=? match "foo" "foo"
+    , Just ["foo"]            @=? match "*/bar" "foo/bar"
+    , Just ["foo/bar"]        @=? match "**/qux" "foo/bar/qux"
+    , Just ["foo/bar", "qux"] @=? match "**/*" "foo/bar/qux"
+    , Just ["foo", "bar/qux"] @=? match "*/**" "foo/bar/qux"
     ]