From 557cee1f50522a04825b9ee7f903ff3368b778e4 Mon Sep 17 00:00:00 2001 From: Patrick Date: Wed, 29 May 2024 19:02:59 +0800 Subject: [PATCH 1/2] Migrate UnitTests --- ghcide/test/exe/Main.hs | 2 +- ghcide/test/exe/UnitTests.hs | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ghcide/test/exe/Main.hs b/ghcide/test/exe/Main.hs index 558115fc24..ba59791293 100644 --- a/ghcide/test/exe/Main.hs +++ b/ghcide/test/exe/Main.hs @@ -99,7 +99,7 @@ main = do , THTests.tests , SymlinkTests.tests , SafeTests.tests - , UnitTests.tests recorder + , UnitTests.tests , HaddockTests.tests , PositionMappingTests.tests , WatchedFileTests.tests diff --git a/ghcide/test/exe/UnitTests.hs b/ghcide/test/exe/UnitTests.hs index 1e8ac4214a..68e6f3e1f0 100644 --- a/ghcide/test/exe/UnitTests.hs +++ b/ghcide/test/exe/UnitTests.hs @@ -10,13 +10,11 @@ import Data.List.Extra import Data.String (IsString (fromString)) import qualified Data.Text as T import Development.IDE.Core.FileStore (getModTime) -import qualified Development.IDE.Main as IDE import qualified Development.IDE.Plugin.HLS.GhcIde as Ghcide import qualified Development.IDE.Types.Diagnostics as Diagnostics import Development.IDE.Types.Location import qualified FuzzySearch -import Ide.Logger (Recorder, WithPriority, - cmapWithPrio) +import Ide.Logger (Recorder, WithPriority) import Ide.PluginUtils (pluginDescToIdePlugins) import Ide.Types import Language.LSP.Protocol.Message @@ -26,7 +24,6 @@ import Language.LSP.Protocol.Types hiding SemanticTokensEdit (..), mkRange) import Language.LSP.Test -import LogType (Log (..)) import Network.URI import qualified Progress import System.IO.Extra hiding (withTempDir) @@ -37,11 +34,10 @@ import Test.Hls (IdeState, def, import Test.Tasty import Test.Tasty.ExpectedFailure import Test.Tasty.HUnit -import TestUtils import Text.Printf (printf) -tests :: Recorder (WithPriority Log) -> TestTree -tests recorder = do +tests :: TestTree +tests = do testGroup "Unit" [ testCase "empty file path does NOT work with the empty String literal" $ uriToFilePath' (fromNormalizedUri $ filePathToUri' "") @?= Just "." From 0b8f3bc2f62b8cf4c450cf3dbc8130d21b38a610 Mon Sep 17 00:00:00 2001 From: Patrick Date: Wed, 29 May 2024 19:07:06 +0800 Subject: [PATCH 2/2] remove extra redundant code --- ghcide/test/exe/Main.hs | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/ghcide/test/exe/Main.hs b/ghcide/test/exe/Main.hs index ba59791293..14363f1aed 100644 --- a/ghcide/test/exe/Main.hs +++ b/ghcide/test/exe/Main.hs @@ -30,13 +30,7 @@ module Main (main) where -- import Test.QuickCheck.Instances () -import Data.Function ((&)) import qualified HieDbRetry -import Ide.Logger (Pretty (pretty), - Priority (Debug), - WithPriority (WithPriority, priority), - cfilter, cmapWithPrio, - makeDefaultStderrRecorder) import Test.Tasty import Test.Tasty.Ingredients.Rerun @@ -48,7 +42,6 @@ import CompletionTests import CPPTests import CradleTests import DependentFileTest -import Development.IDE (LoggingColumn (..)) import DiagnosticTests import ExceptionTests import FindDefinitionAndHoverTests @@ -74,15 +67,6 @@ import WatchedFileTests main :: IO () main = do - docWithPriorityRecorder <- makeDefaultStderrRecorder (Just [ThreadIdColumn, PriorityColumn, DataColumn]) - - let docWithFilteredPriorityRecorder = - docWithPriorityRecorder - & cfilter (\WithPriority{ priority } -> priority >= Debug) - - let recorder = docWithFilteredPriorityRecorder - & cmapWithPrio pretty - -- We mess with env vars so run single-threaded. defaultMainWithRerun $ testGroup "ghcide" [ OpenCloseTest.tests