Add identifier/pattern modules

3 files changed, 44 insertions, 12 deletions

diff --git a/tests/Hakyll/Core/DirectedGraph/Tests.hs b/tests/Hakyll/Core/DirectedGraph/Tests.hs
index 4ce5944..1a9b406 100644
--- a/tests/Hakyll/Core/DirectedGraph/Tests.hs
+++ b/tests/Hakyll/Core/DirectedGraph/Tests.hs
@@ -15,9 +15,9 @@ import Hakyll.Core.DirectedGraph.ObsoleteFilter
 
 tests :: [Test]
 tests =
-    [ testCase "solveDependencies01" solveDependencies01
-    , testCase "filterObsolete01"    filterObsolete01
-    , testCase "filterObsolete02"    filterObsolete02
+    [ testCase "solveDependencies [1]" solveDependencies1
+    , testCase "filterObsolete [1]"    filterObsolete1
+    , testCase "filterObsolete [2]"    filterObsolete2
     ]
 
 node :: Ord a => a -> [a] -> (a, Set a)
@@ -32,17 +32,17 @@ testGraph01 = fromList
     , node 3 []
     ]
 
-solveDependencies01 :: Assertion
-solveDependencies01 =  result == [3, 4, 2, 6, 8] || result == [3, 4, 2, 6, 8]
-                    @? "solveDependencies01"
+solveDependencies1 :: Assertion
+solveDependencies1 =  result == [3, 4, 2, 6, 8] || result == [3, 4, 2, 6, 8]
+                    @? "solveDependencies1"
   where
     result = solveDependencies testGraph01
 
-filterObsolete01 :: Assertion
-filterObsolete01 =  nodes (filterObsolete [6] testGraph01) == S.fromList [6, 8]
-                 @? "filterObsolete01"
+filterObsolete1 :: Assertion
+filterObsolete1 =  nodes (filterObsolete [6] testGraph01) == S.fromList [6, 8]
+                 @? "filterObsolete1"
 
-filterObsolete02 :: Assertion
-filterObsolete02 =
+filterObsolete2 :: Assertion
+filterObsolete2 =
     nodes (filterObsolete [4] testGraph01) == S.fromList [4, 2, 6, 8]
-        @? "filterObsolete02"
+        @? "filterObsolete2"
diff --git a/tests/Hakyll/Core/Identifier/Tests.hs b/tests/Hakyll/Core/Identifier/Tests.hs
new file mode 100644
index 0000000..910bca3
--- /dev/null
+++ b/tests/Hakyll/Core/Identifier/Tests.hs
@@ -0,0 +1,29 @@
+{-# LANGUAGE OverloadedStrings #-}
+module Hakyll.Core.Identifier.Tests
+    ( tests
+    ) where
+
+import Test.Framework
+import Test.Framework.Providers.HUnit
+import Test.HUnit hiding (Test)
+
+import Hakyll.Core.Identifier.Pattern
+
+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"
+    ]
diff --git a/tests/TestSuite.hs b/tests/TestSuite.hs
index 26b26f0..f75001f 100644
--- a/tests/TestSuite.hs
+++ b/tests/TestSuite.hs
@@ -3,9 +3,12 @@ module TestSuite where
 import Test.Framework (defaultMain, testGroup)
 
 import qualified Hakyll.Core.DirectedGraph.Tests
+import qualified Hakyll.Core.Identifier.Tests
 
 main :: IO ()
 main = defaultMain
     [ testGroup "Hakyll.Core.DirectedGraph.Tests"
         Hakyll.Core.DirectedGraph.Tests.tests
+    , testGroup "Hakyll.Core.Identifier.Tests"
+        Hakyll.Core.Identifier.Tests.tests
     ]