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

diff --git a/test/Test.hs b/test/Test.hs
index 3fd14e4..16c8d01 100644
--- a/test/Test.hs
+++ b/test/Test.hs
@@ -1,38 +1,71 @@
+{-# 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           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           ParsingTests
 
 main = hspec $ do
-  describe "Replay" $ do
+  describe "manual session" $ do
     it "passes a test" $
-      replay "test/recordings/renamePass/client.log"
-             "test/recordings/renamePass/server.log"
-             "test/recordings/renamePass"
-        `shouldReturn` True
+      runSession "hie --lsp" "test/data/renamePass" $ do
+        doc <- openDoc "Desktop/simple.hs" "haskell"
+
+        skipMany loggingNotification
+
+        checkNoDiagnostics
+        
+        rspSymbols <- documentSymbols doc
+        
+        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
+    
+    it "fails a test" $
+      -- TODO: Catch the exception in haskell-lsp-test and provide nicer output
+      let session = runSession "hie --lsp" "test/data/renamePass" $ do
+                      openDoc "Desktop/simple.hs" "haskell"
+                      skipMany loggingNotification
+                      anyRequest
+        in session `shouldThrow` anyException
+  
+  describe "replay session" $ do
+    it "passes a test" $
+      replaySession "hie --lsp" "test/data/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 "hie --lsp" "test/data/renameFail" `shouldReturn` False
+
+  describe "manual javascript session" $
+    it "passes a test" $
+      runSession "javascript-typescript-stdio" "test/data/javascriptPass" $ do
+        doc <- openDoc "test.js" "javascript"
+        
+        checkNoDiagnostics
+
+        rspSymbols <- documentSymbols doc
+
+        let (List symbols) = fromJust (rspSymbols ^. result)
+            fooSymbol = head symbols
+        liftIO $ do
+          fooSymbol ^. name `shouldBe` "foo"
+          fooSymbol ^. kind `shouldBe` SkFunction
+  
+  parsingSpec
+
+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
\ No newline at end of file