Merge branch 'hakyll3'

Conflicts:
	hakyll.cabal
	src/Text/Hakyll/Tags.hs

1 files changed, 36 insertions, 0 deletions

diff --git a/tests/Hakyll/Core/DirectedGraph/Tests.hs b/tests/Hakyll/Core/DirectedGraph/Tests.hs
new file mode 100644
index 0000000..3e04b49
--- /dev/null
+++ b/tests/Hakyll/Core/DirectedGraph/Tests.hs
@@ -0,0 +1,36 @@
+module Hakyll.Core.DirectedGraph.Tests
+    ( tests
+    ) where
+
+import Data.Set (Set)
+import qualified Data.Set as S
+
+import Test.Framework
+import Test.Framework.Providers.HUnit
+import Test.HUnit hiding (Test)
+
+import Hakyll.Core.DirectedGraph
+import Hakyll.Core.DirectedGraph.DependencySolver
+
+tests :: [Test]
+tests =
+    [ testCase "solveDependencies [1]" solveDependencies1
+    ]
+
+node :: Ord a => a -> [a] -> (a, Set a)
+node t n = (t, S.fromList n)
+
+testGraph01 :: DirectedGraph Int
+testGraph01 = fromList
+    [ node 8 [2, 4, 6]
+    , node 2 [4, 3]
+    , node 4 [3]
+    , node 6 [4]
+    , node 3 []
+    ]
+
+solveDependencies1 :: Assertion
+solveDependencies1 =  result == [3, 4, 2, 6, 8] || result == [3, 4, 2, 6, 8]
+                    @? "solveDependencies1"
+  where
+    result = solveDependencies testGraph01