X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=test%2FTest.hs;h=fd2466677b3c80702f25482dc5e515225e8eb142;hb=3081abf6552222c5dfc7928d4c708dd03015548e;hp=2bd8f4e83b8bf75cef7d32a6f0bc808ae7e6379e;hpb=13928a9c66b4a352ae784660877d4fae57ac81d9;p=lsp-test.git

diff --git a/test/Test.hs b/test/Test.hs
index 2bd8f4e..fd24666 100644
--- a/test/Test.hs
+++ b/test/Test.hs
@@ -1,34 +1,36 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# 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.Recorded
-import           Language.Haskell.LSP.TH.DataTypesJSON
+import           Language.Haskell.LSP.Test.Replay
+import           Language.Haskell.LSP.Types
+import           Language.Haskell.LSP.Messages
 
 main = hspec $ do
   describe "manual session validation" $ 
     it "passes a test" $
       runSession "test/recordings/renamePass" $ do
-        docItem <- getDocItem "Desktop/simple.hs" "haskell"
-        docId   <- TextDocumentIdentifier <$> getDocUri "Desktop/simple.hs"
+        doc <- openDoc "Desktop/simple.hs" "haskell"
 
-        sendNotification TextDocumentDidOpen (DidOpenTextDocumentParams docItem)
+        skipMany loggingNotification
 
-        (NotificationMessage _ TextDocumentPublishDiagnostics (PublishDiagnosticsParams _ (List diags))) <-
-          getMessage :: Session PublishDiagnosticsNotification
+        NotPublishDiagnostics diagsNot <- notification
 
-        liftIO $ diags `shouldBe` []
+        liftIO $ diagsNot ^. params . diagnostics `shouldBe` List []
         
         sendRequest (Proxy :: Proxy DocumentSymbolRequest)
                     TextDocumentDocumentSymbol
-                    (DocumentSymbolParams docId)
+                    (DocumentSymbolParams doc)
+
+        RspDocumentSymbols rspSymbols <- response
         
-        (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)