fix rename plugin concurrent test suite

pepeiborra · pepeiborra · commit 951ce92d9906 · 2021-10-03T10:04:50.000+01:00
The tests run all in parallel on the same workspace, and most of the modules have the same module name Main.
Result: parallel writes to the same .hie files in the local tmp folder that lead to IO errors in Windows
diff --git a/plugins/hls-rename-plugin/test/Main.hs b/plugins/hls-rename-plugin/test/Main.hs
@@ -15,41 +15,41 @@ renamePlugin = Rename.descriptor "rename"
 tests :: TestTree
 tests = testGroup "Rename"
     [ goldenWithRename "Data constructor" "DataConstructor" $ \doc -> do
-        rename doc (Position 0 15) "Op"
+        rename doc (Position 1 15) "Op"
     , goldenWithRename "Exported function" "ExportedFunction" $ \doc -> do
         rename doc (Position 2 1) "quux"
     , goldenWithRename "Function argument" "FunctionArgument" $ \doc -> do
         rename doc (Position 3 4) "y"
     , goldenWithRename "Function name" "FunctionName" $ \doc -> do
-        rename doc (Position 3 1) "baz"
+        rename doc (Position 4 1) "baz"
     , goldenWithRename "GADT" "Gadt" $ \doc -> do
         rename doc (Position 6 37) "Expr"
     , goldenWithRename "Hidden function" "HiddenFunction" $ \doc -> do
-        rename doc (Position 0 32) "quux"
+        rename doc (Position 1 32) "quux"
     , goldenWithRename "Imported function" "ImportedFunction" $ \doc -> do
-        rename doc (Position 3 8) "baz"
+        rename doc (Position 4 8) "baz"
     , goldenWithRename "Import hiding" "ImportHiding" $ \doc -> do
-        rename doc (Position 0 22) "hiddenFoo"
+        rename doc (Position 1 22) "hiddenFoo"
     , goldenWithRename "Let expression" "LetExpression" $ \doc -> do
         rename doc (Position 5 11) "foobar"
     , goldenWithRename "Qualified as" "QualifiedAs" $ \doc -> do
-        rename doc (Position 3 10) "baz"
+        rename doc (Position 4 10) "baz"
     , goldenWithRename "Qualified shadowing" "QualifiedShadowing" $ \doc -> do
-        rename doc (Position 3 12) "foobar"
+        rename doc (Position 4 12) "foobar"
     , goldenWithRename "Qualified function" "QualifiedFunction" $ \doc -> do
-        rename doc (Position 3 12) "baz"
+        rename doc (Position 4 12) "baz"
     , goldenWithRename "Realigns do block indentation" "RealignDo" $ \doc -> do
-        rename doc (Position 0 2) "fooBarQuux"
+        rename doc (Position 1 2) "fooBarQuux"
     , goldenWithRename "Record field" "RecordField" $ \doc -> do
-        rename doc (Position 6 9) "number"
+        rename doc (Position 7 9) "number"
     , goldenWithRename "Shadowed name" "ShadowedName" $ \doc -> do
         rename doc (Position 1 1) "baz"
     , goldenWithRename "Typeclass" "Typeclass" $ \doc -> do
         rename doc (Position 8 15) "Equal"
     , goldenWithRename "Type constructor" "TypeConstructor" $ \doc -> do
-        rename doc (Position 2 17) "BinaryTree"
+        rename doc (Position 3 17) "BinaryTree"
     , goldenWithRename "Type variable" "TypeVariable" $ \doc -> do
-        rename doc (Position 0 13) "b"
+        rename doc (Position 1 13) "b"
     ]
 
 goldenWithRename :: TestName -> FilePath -> (TextDocumentIdentifier -> Session ()) -> TestTree
diff --git a/plugins/hls-rename-plugin/test/testdata/DataConstructor.expected.hs b/plugins/hls-rename-plugin/test/testdata/DataConstructor.expected.hs
@@ -1,3 +1,4 @@
+module DataConstructor where
 data Expr = Op Int Int
 
 plus :: Expr -> Expr
diff --git a/plugins/hls-rename-plugin/test/testdata/DataConstructor.hs b/plugins/hls-rename-plugin/test/testdata/DataConstructor.hs
@@ -1,3 +1,4 @@
+module DataConstructor where
 data Expr = Apply Int Int
 
 plus :: Expr -> Expr
diff --git a/plugins/hls-rename-plugin/test/testdata/FunctionName.expected.hs b/plugins/hls-rename-plugin/test/testdata/FunctionName.expected.hs
@@ -1,3 +1,4 @@
+module FunctionName where
 main = do
     x <- return $ baz 42
     return (baz x)
diff --git a/plugins/hls-rename-plugin/test/testdata/FunctionName.hs b/plugins/hls-rename-plugin/test/testdata/FunctionName.hs
@@ -1,3 +1,4 @@
+module FunctionName where
 main = do
     x <- return $ foo 42
     return (foo x)
diff --git a/plugins/hls-rename-plugin/test/testdata/Gadt.expected.hs b/plugins/hls-rename-plugin/test/testdata/Gadt.expected.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE GADTs #-}
+module Gadt where
 
 data Expr a where
     Number  :: Int -> Expr Int
diff --git a/plugins/hls-rename-plugin/test/testdata/Gadt.hs b/plugins/hls-rename-plugin/test/testdata/Gadt.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE GADTs #-}
+module Gadt where
 
 data Expression a where
     Number  :: Int -> Expression Int
diff --git a/plugins/hls-rename-plugin/test/testdata/HiddenFunction.expected.hs b/plugins/hls-rename-plugin/test/testdata/HiddenFunction.expected.hs
@@ -1,3 +1,4 @@
+module HiddenFunction where
 import           Foo hiding (quux)
 
 foo :: Int -> Int
diff --git a/plugins/hls-rename-plugin/test/testdata/HiddenFunction.hs b/plugins/hls-rename-plugin/test/testdata/HiddenFunction.hs
@@ -1,3 +1,4 @@
+module HiddenFunction where
 import           Foo hiding (foo)
 
 foo :: Int -> Int
diff --git a/plugins/hls-rename-plugin/test/testdata/ImportHiding.expected.hs b/plugins/hls-rename-plugin/test/testdata/ImportHiding.expected.hs
@@ -1,3 +1,4 @@
+module ImportHiding where
 import Foo hiding (hiddenFoo)
 
 foo :: Int -> Int
diff --git a/plugins/hls-rename-plugin/test/testdata/ImportHiding.hs b/plugins/hls-rename-plugin/test/testdata/ImportHiding.hs
@@ -1,3 +1,4 @@
+module ImportHiding where
 import Foo hiding (foo)
 
 foo :: Int -> Int
diff --git a/plugins/hls-rename-plugin/test/testdata/ImportedFunction.expected.hs b/plugins/hls-rename-plugin/test/testdata/ImportedFunction.expected.hs
@@ -1,3 +1,4 @@
+module ImportedFunction where
 import           Foo (baz)
 
 bar :: Int -> Int
diff --git a/plugins/hls-rename-plugin/test/testdata/ImportedFunction.hs b/plugins/hls-rename-plugin/test/testdata/ImportedFunction.hs
@@ -1,3 +1,4 @@
+module ImportedFunction where
 import           Foo (foo)
 
 bar :: Int -> Int
diff --git a/plugins/hls-rename-plugin/test/testdata/QualifiedAs.expected.hs b/plugins/hls-rename-plugin/test/testdata/QualifiedAs.expected.hs
@@ -1,3 +1,4 @@
+module QualifiedAs where
 import qualified Foo as F
 
 bar :: Int -> Int
diff --git a/plugins/hls-rename-plugin/test/testdata/QualifiedAs.hs b/plugins/hls-rename-plugin/test/testdata/QualifiedAs.hs
@@ -1,3 +1,4 @@
+module QualifiedAs where
 import qualified Foo as F
 
 bar :: Int -> Int
diff --git a/plugins/hls-rename-plugin/test/testdata/QualifiedFunction.expected.hs b/plugins/hls-rename-plugin/test/testdata/QualifiedFunction.expected.hs
@@ -1,3 +1,4 @@
+module QualifiedFunction where
 import qualified Foo
 
 bar :: Int -> Int
diff --git a/plugins/hls-rename-plugin/test/testdata/QualifiedFunction.hs b/plugins/hls-rename-plugin/test/testdata/QualifiedFunction.hs
@@ -1,3 +1,4 @@
+module QualifiedFunction where
 import qualified Foo
 
 bar :: Int -> Int
diff --git a/plugins/hls-rename-plugin/test/testdata/QualifiedShadowing.expected.hs b/plugins/hls-rename-plugin/test/testdata/QualifiedShadowing.expected.hs
@@ -1,3 +1,4 @@
+module QualifiedShadowing where
 import qualified Foo as F
 
 bar :: Int -> Int
diff --git a/plugins/hls-rename-plugin/test/testdata/QualifiedShadowing.hs b/plugins/hls-rename-plugin/test/testdata/QualifiedShadowing.hs
@@ -1,3 +1,4 @@
+module QualifiedShadowing where
 import qualified Foo as F
 
 bar :: Int -> Int
diff --git a/plugins/hls-rename-plugin/test/testdata/RealignDo.expected.hs b/plugins/hls-rename-plugin/test/testdata/RealignDo.expected.hs
@@ -1,3 +1,4 @@
+module RealignDo where
 fooBarQuux :: Maybe Integer
 fooBarQuux = do x <- Just 5
                 t <- Just 10
diff --git a/plugins/hls-rename-plugin/test/testdata/RealignDo.hs b/plugins/hls-rename-plugin/test/testdata/RealignDo.hs
@@ -1,3 +1,4 @@
+module RealignDo where
 foo :: Maybe Integer
 foo = do x <- Just 5
          t <- Just 10
diff --git a/plugins/hls-rename-plugin/test/testdata/RecordField.expected.hs b/plugins/hls-rename-plugin/test/testdata/RecordField.expected.hs
@@ -1,3 +1,4 @@
+module RecordField where
 data Bam = Bam {
     number :: Int,
     s :: String
diff --git a/plugins/hls-rename-plugin/test/testdata/RecordField.hs b/plugins/hls-rename-plugin/test/testdata/RecordField.hs
@@ -1,3 +1,4 @@
+module RecordField where
 data Bam = Bam {
     n :: Int,
     s :: String
diff --git a/plugins/hls-rename-plugin/test/testdata/ShadowedName.expected.hs b/plugins/hls-rename-plugin/test/testdata/ShadowedName.expected.hs
@@ -1,3 +1,4 @@
+module ShadowedName where
 baz :: Int -> Int
 baz x = foo + 10
     where
diff --git a/plugins/hls-rename-plugin/test/testdata/ShadowedName.hs b/plugins/hls-rename-plugin/test/testdata/ShadowedName.hs
@@ -1,3 +1,4 @@
+module ShadowedName where
 foo :: Int -> Int
 foo x = foo + 10
     where
diff --git a/plugins/hls-rename-plugin/test/testdata/TypeConstructor.expected.hs b/plugins/hls-rename-plugin/test/testdata/TypeConstructor.expected.hs
@@ -1,3 +1,4 @@
+module TypeConstructor where
 data BinaryTree a = Node a (BinaryTree a) (BinaryTree a) | Leaf a
 
 rotateRight :: BinaryTree a -> BinaryTree a
diff --git a/plugins/hls-rename-plugin/test/testdata/TypeConstructor.hs b/plugins/hls-rename-plugin/test/testdata/TypeConstructor.hs
@@ -1,3 +1,4 @@
+module TypeConstructor where
 data Tree a = Node a (Tree a) (Tree a) | Leaf a
 
 rotateRight :: Tree a -> Tree a
diff --git a/plugins/hls-rename-plugin/test/testdata/TypeVariable.expected.hs b/plugins/hls-rename-plugin/test/testdata/TypeVariable.expected.hs
@@ -1,2 +1,3 @@
+module TypeVariable where
 bar :: Maybe b -> Maybe b
 bar a = a
diff --git a/plugins/hls-rename-plugin/test/testdata/TypeVariable.hs b/plugins/hls-rename-plugin/test/testdata/TypeVariable.hs
@@ -1,2 +1,3 @@
+module TypeVariable where
 bar :: Maybe a -> Maybe a
 bar a = a

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+module DataConstructor where`
`1`	`2`	`data Expr = Op Int Int`
`2`	`3`
`3`	`4`	`plus :: Expr -> Expr`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+module DataConstructor where`
`1`	`2`	`data Expr = Apply Int Int`
`2`	`3`
`3`	`4`	`plus :: Expr -> Expr`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+module FunctionName where`
`1`	`2`	`main = do`
`2`	`3`	`x <- return $ baz 42`
`3`	`4`	`return (baz x)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{-# LANGUAGE GADTs #-}`
	`2`	`+module Gadt where`
`2`	`3`
`3`	`4`	`data Expr a where`
`4`	`5`	`Number :: Int -> Expr Int`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+module HiddenFunction where`
`1`	`2`	`import Foo hiding (quux)`
`2`	`3`
`3`	`4`	`foo :: Int -> Int`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+module HiddenFunction where`
`1`	`2`	`import Foo hiding (foo)`
`2`	`3`
`3`	`4`	`foo :: Int -> Int`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+module ImportHiding where`
`1`	`2`	`import Foo hiding (hiddenFoo)`
`2`	`3`
`3`	`4`	`foo :: Int -> Int`