From e5446fd4017949e1735251abed8644d90983eb3a Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Wed, 26 Mar 2014 11:28:55 +0100 Subject: Revert "Added test case for global metadata" This reverts commit 46b6f78da8ed814bef6972f4712d8b13e76c1122. Conflicts: tests/data/posts/metadata --- tests/Hakyll/Core/Provider/GlobalMetadata/Tests.hs | 31 ---------------------- tests/TestSuite.hs | 2 -- tests/data/metadata | 27 ------------------- tests/data/posts/2013-10-18-metadata-test.md | 4 --- .../posts/2013-10-18-metadata-test.md.metadata | 2 -- tests/data/posts/metadata | 20 -------------- 6 files changed, 86 deletions(-) delete mode 100644 tests/Hakyll/Core/Provider/GlobalMetadata/Tests.hs delete mode 100644 tests/data/metadata delete mode 100644 tests/data/posts/2013-10-18-metadata-test.md delete mode 100644 tests/data/posts/2013-10-18-metadata-test.md.metadata delete mode 100644 tests/data/posts/metadata (limited to 'tests') diff --git a/tests/Hakyll/Core/Provider/GlobalMetadata/Tests.hs b/tests/Hakyll/Core/Provider/GlobalMetadata/Tests.hs deleted file mode 100644 index 289e2ac..0000000 --- a/tests/Hakyll/Core/Provider/GlobalMetadata/Tests.hs +++ /dev/null @@ -1,31 +0,0 @@ --------------------------------------------------------------------------------- -{-# LANGUAGE OverloadedStrings #-} -module Hakyll.Core.Provider.GlobalMetadata.Tests - ( tests - ) where - --------------------------------------------------------------------------------- -import qualified Data.Map as M -import Control.Monad (forM_) -import Test.Framework (Test, testGroup) -import Test.HUnit (Assertion, (@=?)) - - --------------------------------------------------------------------------------- -import Hakyll.Core.Provider (resourceMetadata) -import TestSuite.Util - --------------------------------------------------------------------------------- -tests :: Test -tests = testGroup "Hakyll.Core.Provider.GlobalMetadata.Tests" $ - fromAssertions "page" [testPage] - -testPage :: Assertion -testPage = do - store <- newTestStore - provider <- newTestProvider store - - metadata <- resourceMetadata provider "posts/2013-10-18-metadata-test.md" - forM_ ["1", "2", "3", "4", "5", "6", "7", "8"] $ \a -> - Just a @=? M.lookup ('a':a) metadata - diff --git a/tests/TestSuite.hs b/tests/TestSuite.hs index 9cc446e..3622301 100644 --- a/tests/TestSuite.hs +++ b/tests/TestSuite.hs @@ -12,7 +12,6 @@ import Test.Framework (defaultMain) import qualified Hakyll.Core.Dependencies.Tests import qualified Hakyll.Core.Identifier.Tests import qualified Hakyll.Core.Provider.Metadata.Tests -import qualified Hakyll.Core.Provider.GlobalMetadata.Tests import qualified Hakyll.Core.Provider.Tests import qualified Hakyll.Core.Routes.Tests import qualified Hakyll.Core.Rules.Tests @@ -33,7 +32,6 @@ main = defaultMain [ Hakyll.Core.Dependencies.Tests.tests , Hakyll.Core.Identifier.Tests.tests , Hakyll.Core.Provider.Metadata.Tests.tests - , Hakyll.Core.Provider.GlobalMetadata.Tests.tests , Hakyll.Core.Provider.Tests.tests , Hakyll.Core.Routes.Tests.tests , Hakyll.Core.Rules.Tests.tests diff --git a/tests/data/metadata b/tests/data/metadata deleted file mode 100644 index 1145976..0000000 --- a/tests/data/metadata +++ /dev/null @@ -1,27 +0,0 @@ ---- posts/2013-10-18-metadata-test.md -a1: 8 -a2: 8 -a3: 8 -a4: 8 -a5: 8 -a6: 8 -a7: 8 -a8: 8 - ---- posts/* -a1: 7 -a2: 7 -a3: 7 -a4: 7 -a5: 7 -a6: 7 -a7: 7 - ---- ** -a1: 6 -a2: 6 -a3: 6 -a4: 6 -a5: 6 -a6: 6 - diff --git a/tests/data/posts/2013-10-18-metadata-test.md b/tests/data/posts/2013-10-18-metadata-test.md deleted file mode 100644 index 86a3e67..0000000 --- a/tests/data/posts/2013-10-18-metadata-test.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -a1: 1 ---- -Nothing interesting here. diff --git a/tests/data/posts/2013-10-18-metadata-test.md.metadata b/tests/data/posts/2013-10-18-metadata-test.md.metadata deleted file mode 100644 index 7ee78b6..0000000 --- a/tests/data/posts/2013-10-18-metadata-test.md.metadata +++ /dev/null @@ -1,2 +0,0 @@ -a1: 2 -a2: 2 diff --git a/tests/data/posts/metadata b/tests/data/posts/metadata deleted file mode 100644 index 4a1be71..0000000 --- a/tests/data/posts/metadata +++ /dev/null @@ -1,20 +0,0 @@ ---- ** -a1: 5 -a2: 5 -a3: 5 -a4: 5 -a5: 5 - ---- * -a1: 4 -a2: 4 -a3: 4 -a4: 4 - ---- 2013-10-18-metadata-test.md -a1: 3 -a2: 3 -a3: 3 - ---- nonexistent -a3: 0 -- cgit v1.2.3