Make test more robust

Author: uhbif19

plugins/hls-hindent-plugin/src/Path/Find.hs

@@ -11,16 +11,17 @@ module Path.Find
   ,findInParents)
   where
 
-import Control.Exception (evaluate)
-import Control.DeepSeq (force)
-import Control.Monad
-import Control.Monad.Catch
-import Control.Monad.IO.Class
-import System.IO.Error (isPermissionError)
-import Data.List
-import Path
-import Path.IO hiding (findFiles)
-import System.PosixCompat.Files (getSymbolicLinkStatus, isSymbolicLink)
+import           Control.DeepSeq          (force)
+import           Control.Exception        (evaluate)
+import           Control.Monad
+import           Control.Monad.Catch
+import           Control.Monad.IO.Class
+import           Data.List
+import           Path
+import           Path.IO                  hiding (findFiles)
+import           System.IO.Error          (isPermissionError)
+import           System.PosixCompat.Files (getSymbolicLinkStatus,
+                                           isSymbolicLink)
 
 -- | Find the location of a file matching the given predicate.
 findFileUp :: (MonadIO m,MonadThrow m)
@@ -95,4 +96,4 @@ findInParents f path = do
             let next = parent path
             if next == path
                 then return Nothing
-                else findInParents f next
+                else findInParents f next

test/functional/Format.hs

@@ -6,6 +6,7 @@ import           Control.Lens            ((^.))
 import           Control.Monad.IO.Class
 import           Data.Aeson
 import qualified Data.ByteString.Lazy    as BS
+import qualified Data.Text               as T
 import qualified Data.Text.Encoding      as T
 import qualified Data.Text.IO            as T
 import           Language.LSP.Test
@@ -47,8 +48,7 @@ providerTests = testGroup "formatting provider" [
     testCase "respects none" $ runSessionWithConfig (formatConfig "none") hlsCommand fullCaps "test/testdata/format" $ do
         doc <- openDoc "Format.hs" "haskell"
         resp <- request STextDocumentFormatting $ DocumentFormattingParams Nothing doc (FormattingOptions 2 True Nothing Nothing Nothing)
-        liftIO $ resp ^. LSP.result @?= Left (ResponseError InvalidRequest "No plugin enabled for STextDocumentFormatting, available:\nPluginId \"floskell\"\nPluginId \"fourmolu\"\nPluginId \"ormolu\"\nPluginId \"stylish-haskell\"\nPluginId \"brittany\"\n" Nothing)
-
+        liftIO $ foramattingNoneResultCorrect (resp ^. LSP.result) @? "Result incorrect"
     , requiresOrmoluPlugin . requiresFloskellPlugin $ testCase "can change on the fly" $ runSession hlsCommand fullCaps "test/testdata/format" $ do
         formattedOrmolu <- liftIO $ T.readFile "test/testdata/format/Format.ormolu.formatted.hs"
         formattedFloskell <- liftIO $ T.readFile "test/testdata/format/Format.floskell.formatted.hs"
@@ -81,6 +81,10 @@ providerTests = testGroup "formatting provider" [
        formatDoc doc (FormattingOptions 2 True Nothing Nothing Nothing)
        documentContents doc >>= liftIO . (@?= formattedFloskell)
     ]
+        where
+            foramattingNoneResultCorrect (Left (ResponseError InvalidRequest text Nothing)) =
+                T.isPrefixOf "No plugin enabled for STextDocumentFormatting" text
+            foramattingNoneResultCorrect _ = False
 
 formatLspConfig :: Value -> Value
 formatLspConfig provider = object [ "haskell" .= object ["formattingProvider" .= (provider :: Value)] ]