X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=test%2FTest.hs;h=1fd58da97d33508f47683c03194ef191076e5553;hb=d94df9a0302192037f92e9bdf4c99b92ce84fa4d;hp=3fd14e4c5dc9cbad53ff157cbffd0e8da8aecfae;hpb=287998584f8dc2ec1c1995733ca38d38d8d9f031;p=lsp-test.git

diff --git a/test/Test.hs b/test/Test.hs
index 3fd14e4..1fd58da 100644
--- a/test/Test.hs
+++ b/test/Test.hs
@@ -1,38 +1,43 @@
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedStrings #-}
 import           Test.Hspec
-import System.IO
-import System.Directory
-import Control.Lens
-import Language.Haskell.LSP.Test.Recorded
--- import Language.Haskell.LSP.Test.Parsing
--- import Language.Haskell.LSP.Test.Files
-import qualified Language.Haskell.LSP.TH.DataTypesJSON as LSP
+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
 
 main = hspec $ do
-  describe "Replay" $ do
+  describe "manual session validation" $ 
     it "passes a test" $
-      replay "test/recordings/renamePass/client.log"
-             "test/recordings/renamePass/server.log"
-             "test/recordings/renamePass"
-        `shouldReturn` True
+      runSession "test/recordings/renamePass" $ do
+        doc <- openDoc "Desktop/simple.hs" "haskell"
+
+        skipMany loggingNotification
+
+        NotPublishDiagnostics diagsNot <- notification
+
+        liftIO $ diagsNot ^. params . diagnostics `shouldBe` List []
+        
+        sendRequest (Proxy :: Proxy DocumentSymbolRequest)
+                    TextDocumentDocumentSymbol
+                    (DocumentSymbolParams doc)
+
+        RspDocumentSymbols rspSymbols <- response
+        
+        liftIO $ do
+          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" $ do
+    it "passes a test" $
+      replaySession "test/recordings/renamePass" `shouldReturn` True
     it "fails a test" $
-      replay "test/recordings/documentSymbolFail/client.log"
-             "test/recordings/documentSymbolFail/server.log" 
-             "test/recordings/documentSymbolFail"
-        `shouldReturn` False
-
-  -- describe "file swapping" $ do
-  --   it "gets the base directory" $ do
-  --     h <- openFile "test/recordings/renamePass/client.log" ReadMode
-  --     msgs <- getAllMessages h
-  --     rootDir msgs `shouldBe` "/Users/luke/Desktop"
-  
-    -- it "gets builds a mapping of files" $ do
-    --   h <- openFile "test/recordings/renamePass/client.log" ReadMode
-    --   msgs <- getAllMessages h
-    --   let root = rootDir msgs
-    --   swapped <- swapFiles root "test/recordings/renamePass/" msgs
-    --   let (Just n) = decode (swapped !! 3) :: Maybe LSP.DidOpenNotification
-
-    --   cd <- getCurrentDirectory
-
-    --   n .^ params . uri `shouldBe` LSP.uriFromFilePath (cd </> "test/recordings/renamePass/")
+      replaySession "test/recordings/renameFail" `shouldReturn` False
\ No newline at end of file