From 15e288decf703a2db57fb4118d4ed6dbdc85c677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Thu, 17 Jul 2014 15:53:04 +0200 Subject: [PATCH] Remove some redundant stuff from test suite --- test/CheckSpec.hs | 1 - test/InfoSpec.hs | 7 ------- 2 files changed, 8 deletions(-) diff --git a/test/CheckSpec.hs b/test/CheckSpec.hs index 8b9334e..5fee185 100644 --- a/test/CheckSpec.hs +++ b/test/CheckSpec.hs @@ -2,7 +2,6 @@ module CheckSpec where import Data.List (isSuffixOf, isInfixOf, isPrefixOf) import Language.Haskell.GhcMod -import Language.Haskell.GhcMod.Cradle import System.FilePath import Test.Hspec diff --git a/test/InfoSpec.hs b/test/InfoSpec.hs index caba4da..adfcb32 100644 --- a/test/InfoSpec.hs +++ b/test/InfoSpec.hs @@ -4,7 +4,6 @@ module InfoSpec where import Control.Applicative ((<$>)) import Data.List (isPrefixOf) import Language.Haskell.GhcMod -import Language.Haskell.GhcMod.Cradle #if __GLASGOW_HASKELL__ < 706 import System.Environment.Executable (getExecutablePath) #else @@ -22,38 +21,32 @@ spec = do describe "types" $ do it "shows types of the expression and its outers" $ do withDirectory_ "test/data/ghc-mod-check" $ do - cradle <- findCradleWithoutSandbox res <- runD $ types "Data/Foo.hs" 9 5 res `shouldBe` "9 5 11 40 \"Int -> a -> a -> a\"\n7 1 11 40 \"Int -> Integer\"\n" it "works with a module using TemplateHaskell" $ do withDirectory_ "test/data" $ do - cradle <- findCradleWithoutSandbox res <- runD $ types "Bar.hs" 5 1 res `shouldBe` unlines ["5 1 5 20 \"[Char]\""] it "works with a module that imports another module using TemplateHaskell" $ do withDirectory_ "test/data" $ do - cradle <- findCradleWithoutSandbox res <- runD $ types "Main.hs" 3 8 res `shouldBe` unlines ["3 8 3 16 \"String -> IO ()\"", "3 8 3 20 \"IO ()\"", "3 1 3 20 \"IO ()\""] describe "info" $ do it "works for non-export functions" $ do withDirectory_ "test/data" $ do - cradle <- findCradleWithoutSandbox res <- runD $ info "Info.hs" "fib" res `shouldSatisfy` ("fib :: Int -> Int" `isPrefixOf`) it "works with a module using TemplateHaskell" $ do withDirectory_ "test/data" $ do - cradle <- findCradleWithoutSandbox res <- runD $ info "Bar.hs" "foo" res `shouldSatisfy` ("foo :: ExpQ" `isPrefixOf`) it "works with a module that imports another module using TemplateHaskell" $ do withDirectory_ "test/data" $ do - cradle <- findCradleWithoutSandbox res <- runD $ info "Main.hs" "bar" res `shouldSatisfy` ("bar :: [Char]" `isPrefixOf`)