Fix references to old CPP names in tests, update tests (#4159)

Author: jhrcek

plugins/hls-eval-plugin/test/cabal.project

@@ -1,3 +1,3 @@
 packages:
   testdata/
-  info-util/
+  testdata/info-util/

test/functional/Progress.hs

@@ -37,7 +37,7 @@ tests =
 
               (codeLensResponse, activeProgressTokens) <- expectProgressMessagesTill
                 (responseForId SMethod_TextDocumentCodeLens lspId)
-                ["Setting up testdata (for T1.hs)", "Processing", "Indexing"]
+                ["Setting up testdata (for T1.hs)", "Processing"]
                 []
 
               -- this is a test so exceptions result in fails
@@ -59,15 +59,15 @@ tests =
                 void configurationRequest
                 setHlsConfig (formatLspConfig "ormolu")
                 doc <- openDoc "Format.hs" "haskell"
-                expectProgressMessages ["Setting up testdata (for Format.hs)", "Processing", "Indexing"] []
+                expectProgressMessages ["Setting up format (for Format.hs)", "Processing", "Indexing"] []
                 _ <- sendRequest SMethod_TextDocumentFormatting $ DocumentFormattingParams Nothing doc (FormattingOptions 2 True Nothing Nothing Nothing)
                 expectProgressMessages ["Formatting Format.hs"] []
         , requiresFourmoluPlugin $ testCase "fourmolu plugin sends progress notifications" $ do
             runSessionWithConfig (def { ignoreConfigurationRequests = False }) hlsLspCommand progressCaps "test/testdata/format" $ do
                 void configurationRequest
                 setHlsConfig (formatLspConfig "fourmolu")
                 doc <- openDoc "Format.hs" "haskell"
-                expectProgressMessages ["Setting up testdata (for Format.hs)", "Processing", "Indexing"] []
+                expectProgressMessages ["Setting up format (for Format.hs)", "Processing", "Indexing"] []
                 _ <- sendRequest SMethod_TextDocumentFormatting $ DocumentFormattingParams Nothing doc (FormattingOptions 2 True Nothing Nothing Nothing)
                 expectProgressMessages ["Formatting Format.hs"] []
         ]

test/utils/Test/Hls/Flags.hs

@@ -10,7 +10,7 @@ import           Test.Hls (TestTree, ignoreTestBecause)
 
 -- | Disable test unless the eval flag is set
 requiresEvalPlugin            :: TestTree -> TestTree
-#if eval
+#if hls_eval
 requiresEvalPlugin            = id
 #else
 requiresEvalPlugin            = ignoreTestBecause "Eval plugin disabled"
@@ -19,23 +19,23 @@ requiresEvalPlugin            = ignoreTestBecause "Eval plugin disabled"
 -- * Formatters
 -- | Disable test unless the floskell flag is set
 requiresFloskellPlugin        :: TestTree -> TestTree
-#if floskell
+#if hls_floskell
 requiresFloskellPlugin        = id
 #else
 requiresFloskellPlugin        = ignoreTestBecause "Floskell plugin disabled"
 #endif
 
 -- | Disable test unless the fourmolu flag is set
 requiresFourmoluPlugin        :: TestTree -> TestTree
-#if fourmolu
+#if hls_fourmolu
 requiresFourmoluPlugin        = id
 #else
 requiresFourmoluPlugin        = ignoreTestBecause "Fourmolu plugin disabled"
 #endif
 
 -- | Disable test unless the ormolu flag is set
 requiresOrmoluPlugin          :: TestTree -> TestTree
-#if ormolu
+#if hls_ormolu
 requiresOrmoluPlugin          = id
 #else
 requiresOrmoluPlugin          = ignoreTestBecause "Ormolu plugin disabled"