summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJasper Van der Jeugt <jaspervdj@gmail.com>2011-04-08 22:17:04 +0200
committerJasper Van der Jeugt <jaspervdj@gmail.com>2011-04-08 22:17:04 +0200
commita8accd36b117c0a8cadb8dc5161c5a60d62a0aeb (patch)
treeea8475006c8a18d068e8e3896ca9fe8affa6ae43 /tests
parente4545f9c9e0d94ebbba3532deab1fbdc9fbe70d1 (diff)
downloadhakyll-a8accd36b117c0a8cadb8dc5161c5a60d62a0aeb.tar.gz
Minor refactoring
Diffstat (limited to 'tests')
-rw-r--r--tests/Hakyll/Core/DirectedGraph/Tests.hs36
-rw-r--r--tests/TestSuite.hs7
2 files changed, 2 insertions, 41 deletions
diff --git a/tests/Hakyll/Core/DirectedGraph/Tests.hs b/tests/Hakyll/Core/DirectedGraph/Tests.hs
deleted file mode 100644
index 3e04b49..0000000
--- a/tests/Hakyll/Core/DirectedGraph/Tests.hs
+++ /dev/null
@@ -1,36 +0,0 @@
-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
diff --git a/tests/TestSuite.hs b/tests/TestSuite.hs
index 7fd288d..4d2c95d 100644
--- a/tests/TestSuite.hs
+++ b/tests/TestSuite.hs
@@ -1,8 +1,7 @@
-module TestSuite where
+module Main where
import Test.Framework (defaultMain, testGroup)
-import qualified Hakyll.Core.DirectedGraph.Tests
import qualified Hakyll.Core.DependencyAnalyzer.Tests
import qualified Hakyll.Core.Identifier.Tests
import qualified Hakyll.Core.Routes.Tests
@@ -14,9 +13,7 @@ import qualified Hakyll.Web.Util.Url.Tests
main :: IO ()
main = defaultMain
- [ testGroup "Hakyll.Core.DirectedGraph.Tests"
- Hakyll.Core.DirectedGraph.Tests.tests
- , testGroup "Hakyll.Core.DependencyAnalyzer.Tests"
+ [ testGroup "Hakyll.Core.DependencyAnalyzer.Tests"
Hakyll.Core.DependencyAnalyzer.Tests.tests
, testGroup "Hakyll.Core.Identifier.Tests"
Hakyll.Core.Identifier.Tests.tests