X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=test%2FTest.hs;h=a639e38dbb1dd222bc5b202a513623d0a3b53f97;hb=7d0ddb8022d9cccc68a99008dd55c1d39ddda3e7;hp=95e3d5e9eeb1dce39add9f5c89a104d7c54a9d17;hpb=bf56f6dd8c0b0fc34770135819caa54a6410b1df;p=lsp-test.git

diff --git a/test/Test.hs b/test/Test.hs
index 95e3d5e..a639e38 100644
--- a/test/Test.hs
+++ b/test/Test.hs
@@ -1,39 +1,50 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE OverloadedStrings #-}
 import           Test.Hspec
-import           Data.Proxy
+import           Data.Maybe
 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.TH.DataTypesJSON
+import           Language.Haskell.LSP.Types
+import           ParsingTests
 
 main = hspec $ do
-  describe "manual session validation" $ 
+  describe "manual session" $ do
     it "passes a test" $
-      runSession "test/recordings/renamePass" $ do
-        docItem <- getDocItem "Desktop/simple.hs" "haskell"
-        docId   <- TextDocumentIdentifier <$> getDocUri "Desktop/simple.hs"
+      runSession "hie --lsp" "test/recordings/renamePass" $ do
+        doc <- openDoc "Desktop/simple.hs" "haskell"
 
-        sendNotification TextDocumentDidOpen (DidOpenTextDocumentParams docItem)
+        skipMany loggingNotification
 
-        (NotificationMessage _ TextDocumentPublishDiagnostics (PublishDiagnosticsParams _ (List diags))) <-
-          getMessage :: Session PublishDiagnosticsNotification
+        diagsNot <- notification :: Session PublishDiagnosticsNotification
 
-        liftIO $ diags `shouldBe` []
+        liftIO $ diagsNot ^. params . diagnostics `shouldBe` List []
         
-        sendRequest (Proxy :: Proxy DocumentSymbolRequest)
-                    TextDocumentDocumentSymbol
-                    (DocumentSymbolParams docId)
+        sendRequest TextDocumentDocumentSymbol (DocumentSymbolParams doc)
+
+        rspSymbols <- response :: Session DocumentSymbolsResponse
         
-        (ResponseMessage _ _ (Just (List symbols)) Nothing) <- getMessage :: Session DocumentSymbolsResponse
         liftIO $ do
-          let mainSymbol = head symbols
+          let (List symbols) = fromJust (rspSymbols ^. result)
+              mainSymbol = head symbols
           mainSymbol ^. name `shouldBe` "main"
           mainSymbol ^. kind `shouldBe` SkFunction
           mainSymbol ^. location . range `shouldBe` Range (Position 3 0) (Position 3 4)
           mainSymbol ^. containerName `shouldBe` Nothing
     
-  describe "replay session" $
+    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
\ No newline at end of file
+      replaySession "hie --lsp" "test/recordings/renamePass" `shouldReturn` True
+    it "fails a test" $
+      replaySession "hie --lsp" "test/recordings/renameFail" `shouldReturn` False
+  
+  parsingSpec