hasufell
/
ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix tests for 7.10

This commit is contained in:
Daniel Gröber 2015-08-14 09:50:20 +02:00
parent 9cff067a27
commit 6248372477
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/FindSpec.hs
View File

@ -1,6 +1,7 @@
module FindSpec where module FindSpec where
import Language.Haskell.GhcMod.Find import Language.Haskell.GhcMod.Find
import Control.Monad
import Test.Hspec import Test.Hspec
import TestUtils import TestUtils
@ -8,5 +9,5 @@ spec :: Spec
spec = do spec = do
describe "db <- loadSymbolDb" $ do describe "db <- loadSymbolDb" $ do
it "lookupSymbol' db \"head\" contains at least `Data.List'" $ do it "lookupSymbol' db \"head\" contains at least `Data.List'" $ do
db <- runD loadSymbolDb db <- runD $ loadSymbolDb =<< (cradleTempDir `liftM` cradle)
lookupSym "head" db `shouldContain` [ModuleString "Data.List"] lookupSym "head" db `shouldContain` [ModuleString "Data.List"]

2
test/TargetSpec.hs
View File

@ -41,6 +41,6 @@ spec = do
it "Works when a module given as path uses CPP" $ do it "Works when a module given as path uses CPP" $ do
dir <- getCurrentDirectory dir <- getCurrentDirectory
let srcDirs = [dir </> "test/data/target/src"] let srcDirs = [dir </> "test/data/target/src"]
x <- withLightHscEnv [] $ \env -> runNullLog $ do x <- withLightHscEnv [] $ \env -> runD $ do
resolveModule env srcDirs (Left $ dir </> "test/data/target/Cpp.hs") resolveModule env srcDirs (Left $ dir </> "test/data/target/Cpp.hs")
liftIO $ x `shouldBe` Just (ModulePath "Cpp" $ dir </> "test/data/target/Cpp.hs") liftIO $ x `shouldBe` Just (ModulePath "Cpp" $ dir </> "test/data/target/Cpp.hs")