X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=test%2FTest.hs;h=c6ef7e29e90ca44e6ad592e379aa7f3ef64579f7;hb=22df37c703e39fa5ebeb130be5785b3a9713c520;hp=d9ecf219e7779794e39bb2fa053f264e186b704a;hpb=0f8b9d328f4d950ff0a2e1c3b5aed593b21c2d3a;p=opengl.git

diff --git a/test/Test.hs b/test/Test.hs
index d9ecf21..c6ef7e2 100644
--- a/test/Test.hs
+++ b/test/Test.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
+
 import           Test.Hspec
 import           Data.Aeson
 import           Data.Default
@@ -11,6 +12,7 @@ import           Control.Concurrent
 import           Control.Monad.IO.Class
 import           Control.Lens hiding (List)
 import           GHC.Generics
+import           Language.Haskell.LSP.Messages
 import           Language.Haskell.LSP.Test
 import           Language.Haskell.LSP.Test.Replay
 import           Language.Haskell.LSP.TH.ClientCapabilities
@@ -25,7 +27,7 @@ main = hspec $ do
 
         skipMany loggingNotification
 
-        checkNoDiagnostics
+        noDiagnostics
 
         rspSymbols <- documentSymbols doc
 
@@ -45,7 +47,7 @@ main = hspec $ do
                       anyRequest
         in session `shouldThrow` anyException
     it "can get initialize response" $ runSession "hie --lsp" "test/data/renamePass" $ do
-      rsp <- getInitializeResponse
+      rsp <- initializeResponse
       liftIO $ rsp ^. result `shouldNotBe` Nothing
 
     it "can register specific capabilities" $ do
@@ -55,30 +57,50 @@ main = hspec $ do
           conf = def { capabilities = caps }
       runSessionWithConfig conf "hie --lsp" "test/data/renamePass" $ return ()
 
-    it "times out" $
+    describe "exceptions" $ do
+      it "throw on time out" $
         let sesh = runSessionWithConfig (def {timeout = 10}) "hie --lsp" "test/data/renamePass" $ do
                 skipMany loggingNotification
                 _ <- request :: Session ApplyWorkspaceEditRequest
                 return ()
         in sesh `shouldThrow` anySessionException
 
-    it "doesn't time out" $ runSessionWithConfig (def {timeout = 10}) "hie --lsp" "test/data/renamePass" $ do
+      it "don't throw when no time out" $ runSessionWithConfig (def {timeout = 5}) "hie --lsp" "test/data/renamePass" $ do
         loggingNotification
-      liftIO $ threadDelay 5
+        liftIO $ threadDelay 10
+        _ <- openDoc "Desktop/simple.hs" "haskell"
+        return ()
+
+      it "throw when there's an unexpected message" $
+        let selector (UnexpectedMessageException "Publish diagnostics notification" (NotLogMessage _)) = True
+            selector _ = False
+          in runSession "hie --lsp" "test/data/renamePass" publishDiagnosticsNotification `shouldThrow` selector
 
+      it "throw when there's an unexpected message 2" $
+        let selector (UnexpectedMessageException "Response" (NotPublishDiagnostics _)) = True
+            selector _ = False
+            sesh = do
+              doc <- openDoc "Desktop/simple.hs" "haskell"
+              sendRequest TextDocumentDocumentSymbol (DocumentSymbolParams doc)
+              skipMany anyNotification
+              response :: Session RenameResponse -- the wrong type
+          in runSession "hie --lsp" "test/data/renamePass" sesh
+            `shouldThrow` selector
 
   describe "replay session" $ do
     it "passes a test" $
-      replaySession "hie --lsp" "test/data/renamePass" `shouldReturn` True
+      replaySession "hie --lsp" "test/data/renamePass"
     it "fails a test" $
-      replaySession "hie --lsp" "test/data/renameFail" `shouldReturn` False
+      let selector (ReplayOutOfOrderException _ _) = True
+          selector _ = False
+        in replaySession "hie --lsp" "test/data/renameFail" `shouldThrow` selector
 
   describe "manual javascript session" $
     it "passes a test" $
       runSession "javascript-typescript-stdio" "test/data/javascriptPass" $ do
         doc <- openDoc "test.js" "javascript"
 
-        checkNoDiagnostics
+        noDiagnostics
 
         rspSymbols <- documentSymbols doc
 
@@ -88,7 +110,7 @@ main = hspec $ do
           fooSymbol ^. name `shouldBe` "foo"
           fooSymbol ^. kind `shouldBe` SkFunction
 
-  describe "text document state" $
+  describe "text document VFS" $
     it "sends back didChange notifications" $
       runSession "hie --lsp" "test/data/refactor" $ do
         doc <- openDoc "Main.hs" "haskell"
@@ -108,11 +130,28 @@ main = hspec $ do
           u `shouldBe` doc ^. uri
           es `shouldBe` [TextEdit (Range (Position 1 0) (Position 1 18)) "main = return 42"]
 
-        checkNoDiagnostics
+        noDiagnostics
 
         contents <- documentContents doc
         liftIO $ contents `shouldBe` "main :: IO Int\nmain = return 42"
     
+  describe "documentEdit" $
+    it "automatically consumes applyedit requests" $
+      runSession "hie --lsp" "test/data/refactor" $ do
+        doc <- openDoc "Main.hs" "haskell"
+
+        let args = toJSON $ AOP (doc ^. uri)
+                                (Position 1 14)
+                                "Redundant bracket"
+            reqParams = ExecuteCommandParams "applyrefact:applyOne" (Just (List [args]))
+        sendRequest WorkspaceExecuteCommand reqParams
+        skipMany anyNotification
+        _ <- response :: Session ExecuteCommandResponse
+
+        contents <- documentEdit doc
+        liftIO $ contents `shouldBe` "main :: IO Int\nmain = return 42"
+        noDiagnostics
+
   parsingSpec
 
 data ApplyOneParams = AOP
@@ -121,12 +160,3 @@ data ApplyOneParams = AOP
   , hintTitle :: String
   } deriving (Generic, ToJSON)
 
-checkNoDiagnostics :: Session ()
-checkNoDiagnostics = do
-  diagsNot <- notification :: Session PublishDiagnosticsNotification
-  liftIO $ diagsNot ^. params . diagnostics `shouldBe` List []
-
-documentSymbols :: TextDocumentIdentifier -> Session DocumentSymbolsResponse
-documentSymbols doc = do
-  sendRequest TextDocumentDocumentSymbol (DocumentSymbolParams doc)
-  response