Change server filepath to a command to run

[lsp-test.git] / test / Test.hs

diff --git a/test/Test.hs b/test/Test.hs
index 1fd58da97d33508f47683c03194ef191076e5553..a639e38dbb1dd222bc5b202a513623d0a3b53f97 100644 (file)
--- a/test/Test.hs
+++ b/test/Test.hs
@@ -2,31 +2,28 @@
 {-# LANGUAGE OverloadedStrings #-}
 import           Test.Hspec
 import           Data.Maybe
-import           Data.Proxy
 import           Control.Monad.IO.Class
 import           Control.Lens hiding (List)
 import           Language.Haskell.LSP.Test
 import           Language.Haskell.LSP.Test.Replay
 import           Language.Haskell.LSP.Types
-import           Language.Haskell.LSP.Messages
+import           ParsingTests
 
 main = hspec $ do
-  describe "manual session validation" $ 
+  describe "manual session" $ do
     it "passes a test" $
-      runSession "test/recordings/renamePass" $ do
+      runSession "hie --lsp" "test/recordings/renamePass" $ do
         doc <- openDoc "Desktop/simple.hs" "haskell"
 
         skipMany loggingNotification
 
-        NotPublishDiagnostics diagsNot <- notification
+        diagsNot <- notification :: Session PublishDiagnosticsNotification
 
         liftIO $ diagsNot ^. params . diagnostics `shouldBe` List []
         
-        sendRequest (Proxy :: Proxy DocumentSymbolRequest)
-                    TextDocumentDocumentSymbol
-                    (DocumentSymbolParams doc)
+        sendRequest TextDocumentDocumentSymbol (DocumentSymbolParams doc)
 
-        RspDocumentSymbols rspSymbols <- response
+        rspSymbols <- response :: Session DocumentSymbolsResponse
         
         liftIO $ do
           let (List symbols) = fromJust (rspSymbols ^. result)
@@ -36,8 +33,18 @@ main = hspec $ do
           mainSymbol ^. location . range `shouldBe` Range (Position 3 0) (Position 3 4)
           mainSymbol ^. containerName `shouldBe` Nothing
     
+    it "fails a test" $
+      -- TODO: Catch the exception in haskell-lsp-test and provide nicer output
+      let session = runSession "hie --lsp" "test/recordings/renamePass" $ do
+                      openDoc "Desktop/simple.hs" "haskell"
+                      skipMany loggingNotification
+                      anyRequest
+        in session `shouldThrow` anyException
+  
   describe "replay session" $ do
     it "passes a test" $
-      replaySession "test/recordings/renamePass" `shouldReturn` True
+      replaySession "hie --lsp" "test/recordings/renamePass" `shouldReturn` True
     it "fails a test" $
-      replaySession "test/recordings/renameFail" `shouldReturn` False
\ No newline at end of file
+      replaySession "hie --lsp" "test/recordings/renameFail" `shouldReturn` False
+  
+  parsingSpec