X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=test%2FTest.hs;h=ce8a3573c3f92edaf0c5efa4a523be83479625a9;hb=d25de2bf28d472df5d1d3e050090d243247dab1b;hp=c7e67131d914875b1fb41f98cb8928b8dba1f7e5;hpb=4eb97ef8a3d4b3908fa9b5bbbd5ae77cfa95cecc;p=opengl.git

diff --git a/test/Test.hs b/test/Test.hs
index c7e6713..ce8a357 100644
--- a/test/Test.hs
+++ b/test/Test.hs
@@ -2,32 +2,24 @@
 {-# 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.Replay
 import           Language.Haskell.LSP.Types
-import           Language.Haskell.LSP.Messages
 import           ParsingTests
 
 main = hspec $ do
-  describe "manual session validation" $ do
+  describe "manual session" $ do
     it "passes a test" $
-      runSession "hie" "test/recordings/renamePass" $ do
+      runSession "hie --lsp" "test/data/renamePass" $ do
         doc <- openDoc "Desktop/simple.hs" "haskell"
 
         skipMany loggingNotification
 
-        NotPublishDiagnostics diagsNot <- notification
+        checkNoDiagnostics
         
-        liftIO $ diagsNot ^. params . diagnostics `shouldBe` List []
-        
-        sendRequest (Proxy :: Proxy DocumentSymbolRequest)
-                    TextDocumentDocumentSymbol
-                    (DocumentSymbolParams doc)
-
-        RspDocumentSymbols rspSymbols <- response
+        rspSymbols <- documentSymbols doc
         
         liftIO $ do
           let (List symbols) = fromJust (rspSymbols ^. result)
@@ -39,16 +31,44 @@ main = hspec $ do
     
     it "fails a test" $
       -- TODO: Catch the exception in haskell-lsp-test and provide nicer output
-      let session = runSession "hie" "test/recordings/renamePass" $ do
+      let session = runSession "hie --lsp" "test/data/renamePass" $ do
                       openDoc "Desktop/simple.hs" "haskell"
                       skipMany loggingNotification
-                    request
+                      anyRequest
         in session `shouldThrow` anyException
+    it "can get initialize response" $ runSession "hie --lsp" "test/data/renamePass" $ do
+      rsp <- getInitializeResponse
+      liftIO $ rsp ^. result `shouldNotBe` Nothing
   
   describe "replay session" $ do
     it "passes a test" $
-      replaySession "hie" "test/recordings/renamePass" `shouldReturn` True
+      replaySession "hie --lsp" "test/data/renamePass" `shouldReturn` True
     it "fails a test" $
-      replaySession "hie" "test/recordings/renameFail" `shouldReturn` False
+      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