Skip to content

Commit 3979b27

Browse files
authored
Migrate UnitTests (#4268)
* Migrate UnitTests
1 parent 52d7423 commit 3979b27

File tree

2 files changed

+4
-24
lines changed

2 files changed

+4
-24
lines changed

Diff for: ghcide/test/exe/Main.hs

+1-17
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,7 @@
3030

3131
module Main (main) where
3232
-- import Test.QuickCheck.Instances ()
33-
import Data.Function ((&))
3433
import qualified HieDbRetry
35-
import Ide.Logger (Pretty (pretty),
36-
Priority (Debug),
37-
WithPriority (WithPriority, priority),
38-
cfilter, cmapWithPrio,
39-
makeDefaultStderrRecorder)
4034
import Test.Tasty
4135
import Test.Tasty.Ingredients.Rerun
4236

@@ -48,7 +42,6 @@ import CompletionTests
4842
import CPPTests
4943
import CradleTests
5044
import DependentFileTest
51-
import Development.IDE (LoggingColumn (..))
5245
import DiagnosticTests
5346
import ExceptionTests
5447
import FindDefinitionAndHoverTests
@@ -74,15 +67,6 @@ import WatchedFileTests
7467

7568
main :: IO ()
7669
main = do
77-
docWithPriorityRecorder <- makeDefaultStderrRecorder (Just [ThreadIdColumn, PriorityColumn, DataColumn])
78-
79-
let docWithFilteredPriorityRecorder =
80-
docWithPriorityRecorder
81-
& cfilter (\WithPriority{ priority } -> priority >= Debug)
82-
83-
let recorder = docWithFilteredPriorityRecorder
84-
& cmapWithPrio pretty
85-
8670
-- We mess with env vars so run single-threaded.
8771
defaultMainWithRerun $ testGroup "ghcide"
8872
[ OpenCloseTest.tests
@@ -99,7 +83,7 @@ main = do
9983
, THTests.tests
10084
, SymlinkTests.tests
10185
, SafeTests.tests
102-
, UnitTests.tests recorder
86+
, UnitTests.tests
10387
, HaddockTests.tests
10488
, PositionMappingTests.tests
10589
, WatchedFileTests.tests

Diff for: ghcide/test/exe/UnitTests.hs

+3-7
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@ import Data.List.Extra
1010
import Data.String (IsString (fromString))
1111
import qualified Data.Text as T
1212
import Development.IDE.Core.FileStore (getModTime)
13-
import qualified Development.IDE.Main as IDE
1413
import qualified Development.IDE.Plugin.HLS.GhcIde as Ghcide
1514
import qualified Development.IDE.Types.Diagnostics as Diagnostics
1615
import Development.IDE.Types.Location
1716
import qualified FuzzySearch
18-
import Ide.Logger (Recorder, WithPriority,
19-
cmapWithPrio)
17+
import Ide.Logger (Recorder, WithPriority)
2018
import Ide.PluginUtils (pluginDescToIdePlugins)
2119
import Ide.Types
2220
import Language.LSP.Protocol.Message
@@ -26,7 +24,6 @@ import Language.LSP.Protocol.Types hiding
2624
SemanticTokensEdit (..),
2725
mkRange)
2826
import Language.LSP.Test
29-
import LogType (Log (..))
3027
import Network.URI
3128
import qualified Progress
3229
import System.IO.Extra hiding (withTempDir)
@@ -37,11 +34,10 @@ import Test.Hls (IdeState, def,
3734
import Test.Tasty
3835
import Test.Tasty.ExpectedFailure
3936
import Test.Tasty.HUnit
40-
import TestUtils
4137
import Text.Printf (printf)
4238

43-
tests :: Recorder (WithPriority Log) -> TestTree
44-
tests recorder = do
39+
tests :: TestTree
40+
tests = do
4541
testGroup "Unit"
4642
[ testCase "empty file path does NOT work with the empty String literal" $
4743
uriToFilePath' (fromNormalizedUri $ filePathToUri' "") @?= Just "."

0 commit comments

Comments
 (0)