Delete testUtil from ghcide-tests

ghcide/test/exe/Config.hs

@@ -33,7 +33,6 @@ import           Control.Lens.Setter         ((.~))
 import           Data.Foldable               (traverse_)
 import           Data.Function               ((&))
 import qualified Data.Text                   as T
-import           Development.IDE             (Pretty)
 import           Development.IDE.Test        (canonicalizeUri)
 import           Ide.Types                   (defaultPluginDescriptor)
 import qualified Language.LSP.Protocol.Lens  as L
@@ -90,20 +89,12 @@ testWithExtraFiles testName dirName action = testCase testName $ runWithExtraFil
 runInDir :: FilePath -> Session a -> IO a
 runInDir fs = runSessionWithServer def dummyPlugin fs
 
-testSession' :: TestName -> (FilePath -> Session ()) -> TestTree
-testSession' name = testCase name . run'
-
 run :: Session a -> IO a
 run = runSessionWithTestConfig def
     { testDirLocation = Right (mkIdeTestFs [])
     , testPluginDescriptor = dummyPlugin }
     . const
 
-run' :: (FilePath -> Session a) -> IO a
-run' = runSessionWithTestConfig def
-    { testDirLocation = Right (mkIdeTestFs [])
-    , testPluginDescriptor = dummyPlugin }
-
 pattern R :: UInt -> UInt -> UInt -> UInt -> Range
 pattern R x y x' y' = Range (Position x y) (Position x' y')
 

ghcide/test/exe/CradleTests.hs

@@ -26,7 +26,6 @@ import           System.FilePath
 import           System.IO.Extra                 hiding (withTempDir)
 -- import Test.QuickCheck.Instances ()
 import           Config
-import           Config                          (checkDefs, mkL)
 import           Control.Lens                    ((^.))
 import           Development.IDE.Plugin.Test     (WaitForIdeRuleResult (..))
 import           GHC.TypeLits                    (symbolVal)

ghcide/test/exe/NonLspCommandLine.hs

@@ -1,14 +1,21 @@
 
 module NonLspCommandLine (tests) where
 
+import           Control.Monad                 ((>=>))
+import           Data.Foldable                 (for_)
 import           Development.IDE.Test.Runfiles
+import           Development.Shake             (getDirectoryFilesIO)
+import           System.Directory              (copyFile,
+                                                createDirectoryIfMissing)
+import           System.Directory.Extra        (canonicalizePath)
 import           System.Environment.Blank      (setEnv)
 import           System.Exit                   (ExitCode (ExitSuccess))
+import           System.FilePath               (takeDirectory, (</>))
+import qualified System.IO.Extra
 import           System.Process.Extra          (CreateProcess (cwd), proc,
                                                 readCreateProcessWithExitCode)
 import           Test.Tasty
 import           Test.Tasty.HUnit
-import           TestUtils
 
 
 -- A test to ensure that the command line ghcide workflow stays working
@@ -25,3 +32,18 @@ tests = testGroup "ghcide command line"
 
         ec @?= ExitSuccess
   ]
+
+-- | Version of 'System.IO.Extra.withTempDir' that canonicalizes the path
+-- Which we need to do on macOS since the $TMPDIR can be in @/private/var@ or
+-- @/var@
+withTempDir :: (FilePath -> IO a) -> IO a
+withTempDir f = System.IO.Extra.withTempDir $ canonicalizePath >=> f
+
+
+copyTestDataFiles :: FilePath -> FilePath -> IO ()
+copyTestDataFiles dir prefix = do
+  -- Copy all the test data files to the temporary workspace
+  testDataFiles <- getDirectoryFilesIO ("ghcide/test/data" </> prefix) ["//*"]
+  for_ testDataFiles $ \f -> do
+    createDirectoryIfMissing True $ dir </> takeDirectory f
+    copyFile ("ghcide/test/data" </> prefix </> f) (dir </> f)

haskell-language-server.cabal

@@ -2175,7 +2175,6 @@ test-suite ghcide-tests
     RootUriTests
     SafeTests
     SymlinkTests
-    TestUtils
     THTests
     UnitTests
     WatchedFileTests