Merge pull request #105 from jeffwindsor/issue-5

Issue 5 - Move HIE Tests and convert to Tasty

Author: alanz

haskell-language-server.cabal

@@ -205,69 +205,59 @@ executable haskell-language-server-wrapper
     , process
   default-language:    Haskell2010
 
-
 test-suite func-test
-  import: agpl
-  type: exitcode-stdio-1.0
-  default-language: Haskell2010
-  build-tool-depends:  hspec-discover:hspec-discover
-                     , haskell-language-server:haskell-language-server
-                     , cabal-helper:cabal-helper-main
-                     , ghcide:ghcide-test-preprocessor
-
-  build-depends:
-      base >=4.7 && <5
-    , aeson
-    , data-default
-    , haskell-lsp-types == 0.22.*
-    , hls-test-utils
-    , hspec
-    , lens
-    , lsp-test >= 0.10.0.0
-    , text
-    , unordered-containers
-  other-modules:
-                     --  CompletionSpec
-                     -- , CommandSpec
-                     -- , DeferredSpec
-                     -- , DefinitionSpec
-                     -- , DiagnosticsSpec
-                      FormatSpec
-                     -- , FunctionalBadProjectSpec
-                     -- , FunctionalCodeActionsSpec
-                     -- , FunctionalLiquidSpec
-                     , FunctionalSpec
-                     -- , HaReSpec
-                     -- , HieBiosSpec
-                     -- , HighlightSpec
-                     -- , HoverSpec
-                     , PluginSpec
-                     -- , ProgressSpec
-                     -- , ReferencesSpec
-                     -- , RenameSpec
-                     -- , SymbolsSpec
-                     -- , TypeDefinitionSpec
-                     , Utils
-                     , Paths_haskell_language_server
-
-  hs-source-dirs:
-      test/functional
-  ghc-options:
-         -Wall
-         -Wredundant-constraints
-         -Wno-name-shadowing
-         -threaded -rtsopts -with-rtsopts=-N
+  import:               agpl
+  type:                 exitcode-stdio-1.0
+  default-language:     Haskell2010
+  build-tool-depends:   haskell-language-server:haskell-language-server
+                      , ghcide:ghcide-test-preprocessor
+  build-depends:        base >=4.7 && <5
+                      , aeson
+                      , data-default
+                      , directory
+                      , filepath
+                      , haskell-language-server
+                      , haskell-lsp
+                      , haskell-lsp-types
+                      , hls-test-utils
+                      , hspec-expectations
+                      , lens
+                      , lsp-test >= 0.10.0.0
+                      , tasty
+                      , tasty-ant-xml
+                      , tasty-expected-failure
+                      , tasty-hunit
+                      , tasty-rerun
+                      , text
+                      , unordered-containers
+  hs-source-dirs:       test/functional
+  main-is:              Main.hs
+  other-modules:        Command
+                      , Completion
+                      , Deferred
+                      , Definition
+                      , Diagnostic
+                      , Format
+                      , FunctionalBadProject
+                      , FunctionalCodeAction
+                      , FunctionalLiquid
+                      , HieBios
+                      , Highlight
+                      , Progress
+                      , Reference
+                      , Rename
+                      , Symbol
+                      , TypeDefinition
+  ghc-options:          -Wall
+                        -Wno-name-shadowing
+                        -threaded -rtsopts -with-rtsopts=-N
   if flag(pedantic)
-     ghc-options:      -Werror
-  main-is: Main.hs
-  -- other-modules:
-  --       Development.IDE.Test
-  --       Development.IDE.Test.Runfiles
+     ghc-options: -Werror -Wredundant-constraints
 
 library hls-test-utils
   import: agpl
   hs-source-dirs:      test/utils
-  exposed-modules:     TestUtils
+  exposed-modules:     Test.Hls.Util
   build-depends:       base
                      , haskell-language-server
                      , haskell-lsp
@@ -281,7 +271,9 @@ library hls-test-utils
                      , hslogger
                      , hspec
                      , hspec-core
+                     , lsp-test
                      , stm
+                     , tasty-hunit
                      , text
                      , unordered-containers
                      , yaml

hie.yaml.stack

@@ -6,6 +6,9 @@ cradle:
     - path: "./test/functional/"
       component: "haskell-language-server:func-test"
 
+    - path: "./test/src/"
+      component: "haskell-language-server:tasty"
+
     # This target does not currently work (stack 2.1.3)
     # - path: "./test/utils"
     #   component: "haskell-language-server:lib:hls-test-utils"

test/functional/Command.hs

@@ -0,0 +1,38 @@
+{-# LANGUAGE OverloadedStrings #-}
+module Command (tests) where
+
+import Control.Lens hiding (List)
+import Control.Monad.IO.Class
+import qualified Data.Text as T
+import Data.Char
+import Language.Haskell.LSP.Test
+import Language.Haskell.LSP.Types as LSP
+import Language.Haskell.LSP.Types.Lens as LSP
+import Test.Hls.Util
+import Test.Tasty
+import Test.Tasty.HUnit
+import Test.Tasty.ExpectedFailure (ignoreTestBecause)
+import Test.Hspec.Expectations
+
+
+--TODO : Response Message no longer has 4 inputs
+tests :: TestTree
+tests = testGroup "commands" [
+    testCase "are prefixed" $
+        runSession hieCommand fullCaps "test/testdata/" $ do
+            ResponseMessage _ _ (Right res) <- initializeResponse
+            let List cmds = res ^. LSP.capabilities . executeCommandProvider . _Just . commands
+                f x = (T.length (T.takeWhile isNumber x) >= 1) && (T.count ":" x >= 2)
+            liftIO $ do
+                cmds `shouldSatisfy` all f
+                cmds `shouldNotSatisfy` null
+    , ignoreTestBecause "Broken: Plugin package doesn't exist" $
+      testCase "get de-prefixed" $
+        runSession hieCommand fullCaps "test/testdata/" $ do
+            ResponseMessage _ _ (Left err) <- request
+                WorkspaceExecuteCommand
+                (ExecuteCommandParams "1234:package:add" (Just (List [])) Nothing) :: Session ExecuteCommandResponse
+            let ResponseError _ msg _ = err
+            -- We expect an error message about the dud arguments, but should pickup "add" and "package"
+            liftIO $ msg `shouldSatisfy` T.isInfixOf "while parsing args for add in plugin package"
+    ]