TESTS: use hspec-discover

hsfm.cabal

@@ -119,8 +119,9 @@ Test-Suite spec
   Type:                 exitcode-stdio-1.0
   Default-Language:     Haskell2010
   Hs-Source-Dirs:       test
-  Main-Is:              Spec.hs
+  Main-Is:              Main.hs
   other-modules:
+                        Spec
                         FileSystem.FileOperations.CopyDirRecursiveSpec
                         FileSystem.FileOperations.CopyDirRecursiveOverwriteSpec
                         FileSystem.FileOperations.CopyFileSpec

test/FileSystem/FileOperations/CopyDirRecursiveOverwriteSpec.hs

@@ -19,8 +19,8 @@ import Utils
 
 
 
-copyDirRecursiveOverwriteSpec :: Spec
+spec :: Spec
-copyDirRecursiveOverwriteSpec =
+spec =
   describe "HSFM.FileSystem.FileOperations.copyDirRecursiveOverwrite" $ do
 
     -- successes --

test/FileSystem/FileOperations/CopyDirRecursiveSpec.hs

@@ -19,8 +19,8 @@ import Utils
 
 
 
-copyDirRecursiveSpec :: Spec
+spec :: Spec
-copyDirRecursiveSpec =
+spec =
   describe "HSFM.FileSystem.FileOperations.copyDirRecursive" $ do
 
     -- successes --

test/FileSystem/FileOperations/CopyFileOverwriteSpec.hs

@@ -19,8 +19,8 @@ import Utils
 
 
 
-copyFileOverwriteSpec :: Spec
+spec :: Spec
-copyFileOverwriteSpec =
+spec =
   describe "HSFM.FileSystem.FileOperations.copyFileOverwrite" $ do
 
     -- successes --

test/FileSystem/FileOperations/CopyFileSpec.hs

@@ -19,8 +19,8 @@ import Utils
 
 
 
-copyFileSpec :: Spec
+spec :: Spec
-copyFileSpec =
+spec =
   describe "HSFM.FileSystem.FileOperations.copyFile" $ do
 
     -- successes --

test/FileSystem/FileOperations/CreateDirSpec.hs

@@ -15,8 +15,8 @@ import GHC.IO.Exception
 import Utils
 
 
-createDirSpec :: Spec
+spec :: Spec
-createDirSpec =
+spec =
   describe "HSFM.FileSystem.FileOperations.createDir" $ do
 
     -- successes --

test/FileSystem/FileOperations/CreateRegularFileSpec.hs

@@ -15,8 +15,8 @@ import GHC.IO.Exception
 import Utils
 
 
-createRegularFileSpec :: Spec
+spec :: Spec
-createRegularFileSpec =
+spec =
   describe "HSFM.FileSystem.FileOperations.createRegularFile" $ do
 
     -- successes --

test/FileSystem/FileOperations/DeleteDirRecursiveSpec.hs

@@ -20,8 +20,8 @@ import Utils
 
 
 
-deleteDirRecursiveSpec :: Spec
+spec :: Spec
-deleteDirRecursiveSpec =
+spec =
   describe "HSFM.FileSystem.FileOperations.deleteDirRecursive" $ do
 
     -- successes --

test/FileSystem/FileOperations/DeleteDirSpec.hs

@@ -19,8 +19,8 @@ import GHC.IO.Exception
 import Utils
 
 
-deleteDirSpec :: Spec
+spec :: Spec
-deleteDirSpec =
+spec =
   describe "HSFM.FileSystem.FileOperations.deleteDir" $ do
 
     -- successes --

test/FileSystem/FileOperations/DeleteFileSpec.hs

@@ -19,8 +19,8 @@ import GHC.IO.Exception
 import Utils
 
 
-deleteFileSpec :: Spec
+spec :: Spec
-deleteFileSpec =
+spec =
   describe "HSFM.FileSystem.FileOperations.deleteFile" $ do
 
     -- successes --

test/FileSystem/FileOperations/GetDirsFilesSpec.hs

@@ -29,8 +29,8 @@ import Utils
 
 
 
-getDirsFilesSpec :: Spec
+spec :: Spec
-getDirsFilesSpec =
+spec =
   describe "HSFM.FileSystem.FileOperations.getDirsFiles" $ do
 
     -- successes --

test/FileSystem/FileOperations/GetFileTypeSpec.hs

@@ -17,8 +17,8 @@ import Utils
 
 
 
-getFileTypeSpec :: Spec
+spec :: Spec
-getFileTypeSpec =
+spec =
   describe "HSFM.FileSystem.FileOperations.getFileType" $ do
 
     -- successes --

test/FileSystem/FileOperations/MoveFileOverwriteSpec.hs

@@ -16,8 +16,8 @@ import GHC.IO.Exception
 import Utils
 
 
-moveFileOverwriteSpec :: Spec
+spec :: Spec
-moveFileOverwriteSpec =
+spec =
   describe "HSFM.FileSystem.FileOperations.moveFileOverwrite" $ do
 
     -- successes --

test/FileSystem/FileOperations/MoveFileSpec.hs

@@ -16,8 +16,8 @@ import GHC.IO.Exception
 import Utils
 
 
-moveFileSpec :: Spec
+spec :: Spec
-moveFileSpec =
+spec =
   describe "HSFM.FileSystem.FileOperations.moveFile" $ do
 
     -- successes --

test/FileSystem/FileOperations/RecreateSymlinkSpec.hs

@@ -16,8 +16,8 @@ import GHC.IO.Exception
 import Utils
 
 
-recreateSymlinkSpec :: Spec
+spec :: Spec
-recreateSymlinkSpec =
+spec =
   describe "HSFM.FileSystem.FileOperations.recreateSymlink" $ do
 
     -- successes --

test/FileSystem/FileOperations/RenameFileSpec.hs

@@ -16,8 +16,8 @@ import GHC.IO.Exception
 import Utils
 
 
-renameFileSpec :: Spec
+spec :: Spec
-renameFileSpec =
+spec =
   describe "HSFM.FileSystem.FileOperations.renameFile" $ do
 
     -- successes --

test/Main.hs

@@ -0,0 +1,53 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+import Test.Hspec
+import Test.Hspec.Runner
+import Test.Hspec.Formatters
+import qualified Spec
+import Utils
+
+
+-- TODO: chardev, blockdev, namedpipe, socket
+
+
+main :: IO ()
+main =
+  hspecWith
+    defaultConfig { configFormatter = Just progress }
+    $ before_ fixPermissions
+    $ after_ revertPermissions
+    $ Spec.spec >> Spec.spec
+  where
+    noWriteDirs =  ["test/FileSystem/FileOperations/copyFileSpec/outputDirNoWrite"
+                   ,"test/FileSystem/FileOperations/copyFileOverwriteSpec/outputDirNoWrite"
+                   ,"test/FileSystem/FileOperations/copyDirRecursiveSpec/noWritePerm"
+                   ,"test/FileSystem/FileOperations/copyDirRecursiveOverwriteSpec/noWritePerm"
+                   ,"test/FileSystem/FileOperations/createDirSpec/noWritePerms"
+                   ,"test/FileSystem/FileOperations/createRegularFileSpec/noWritePerms"
+                   ,"test/FileSystem/FileOperations/renameFileSpec/noWritePerm"
+                   ,"test/FileSystem/FileOperations/moveFileSpec/noWritePerm"
+                   ,"test/FileSystem/FileOperations/moveFileOverwriteSpec/noWritePerm"
+                   ,"test/FileSystem/FileOperations/recreateSymlinkSpec/noWritePerm"
+                   ]
+    noPermsDirs =  ["test/FileSystem/FileOperations/copyFileSpec/noPerms"
+                   ,"test/FileSystem/FileOperations/copyFileOverwriteSpec/noPerms"
+                   ,"test/FileSystem/FileOperations/copyDirRecursiveSpec/noPerms"
+                   ,"test/FileSystem/FileOperations/copyDirRecursiveOverwriteSpec/noPerms"
+                   ,"test/FileSystem/FileOperations/createDirSpec/noPerms"
+                   ,"test/FileSystem/FileOperations/createRegularFileSpec/noPerms"
+                   ,"test/FileSystem/FileOperations/renameFileSpec/noPerms"
+                   ,"test/FileSystem/FileOperations/moveFileSpec/noPerms"
+                   ,"test/FileSystem/FileOperations/moveFileOverwriteSpec/noPerms"
+                   ,"test/FileSystem/FileOperations/recreateSymlinkSpec/noPerms"
+                   ,"test/FileSystem/FileOperations/getFileTypeSpec/noPerms"
+                   ,"test/FileSystem/FileOperations/getDirsFilesSpec/noPerms"
+                   ,"test/FileSystem/FileOperations/deleteFileSpec/noPerms"
+                   ]
+    fixPermissions = do
+      sequence_ $ fmap noWritableDirPerms noWriteDirs
+      sequence_ $ fmap noPerms noPermsDirs
+    revertPermissions = do
+      sequence_ $ fmap normalDirPerms noWriteDirs
+      sequence_ $ fmap normalDirPerms noPermsDirs
+
+

test/Spec.hs

@@ -1,83 +1,2 @@
-{-# LANGUAGE OverloadedStrings #-}
+-- file test/Spec.hs
-
+{-# OPTIONS_GHC -F -pgmF hspec-discover -optF --module-name=Spec #-}
-import Test.Hspec
-
-import FileSystem.FileOperations.CopyDirRecursiveSpec
-import FileSystem.FileOperations.CopyDirRecursiveOverwriteSpec
-import FileSystem.FileOperations.CopyFileOverwriteSpec
-import FileSystem.FileOperations.CopyFileSpec
-import FileSystem.FileOperations.CreateDirSpec
-import FileSystem.FileOperations.CreateRegularFileSpec
-import FileSystem.FileOperations.DeleteDirRecursiveSpec
-import FileSystem.FileOperations.DeleteDirSpec
-import FileSystem.FileOperations.DeleteFileSpec
-import FileSystem.FileOperations.GetDirsFilesSpec
-import FileSystem.FileOperations.GetFileTypeSpec
-import FileSystem.FileOperations.MoveFileSpec
-import FileSystem.FileOperations.MoveFileOverwriteSpec
-import FileSystem.FileOperations.RecreateSymlinkSpec
-import FileSystem.FileOperations.RenameFileSpec
-import Utils
-
-
--- TODO: chardev, blockdev, namedpipe, socket
-
-
-main :: IO ()
-main = hspec $ before_ fixPermissions $ after_ revertPermissions $ do
-  let tests = [copyFileSpec
-              ,copyFileOverwriteSpec
-              ,copyDirRecursiveSpec
-              ,copyDirRecursiveOverwriteSpec
-              ,createDirSpec
-              ,createRegularFileSpec
-              ,renameFileSpec
-              ,moveFileSpec
-              ,moveFileOverwriteSpec
-              ,recreateSymlinkSpec
-              ,deleteFileSpec
-              ,deleteDirSpec
-              ,deleteDirRecursiveSpec
-              ]
-
-  -- run all stateful tests twice to catch missing cleanups or state skew
-  sequence_ tests
-  sequence_ tests
-
-  -- stateless tests
-  getFileTypeSpec
-  getDirsFilesSpec
-
-  where
-    noWriteDirs =  ["test/FileSystem/FileOperations/copyFileSpec/outputDirNoWrite"
-                   ,"test/FileSystem/FileOperations/copyFileOverwriteSpec/outputDirNoWrite"
-                   ,"test/FileSystem/FileOperations/copyDirRecursiveSpec/noWritePerm"
-                   ,"test/FileSystem/FileOperations/copyDirRecursiveOverwriteSpec/noWritePerm"
-                   ,"test/FileSystem/FileOperations/createDirSpec/noWritePerms"
-                   ,"test/FileSystem/FileOperations/createRegularFileSpec/noWritePerms"
-                   ,"test/FileSystem/FileOperations/renameFileSpec/noWritePerm"
-                   ,"test/FileSystem/FileOperations/moveFileSpec/noWritePerm"
-                   ,"test/FileSystem/FileOperations/moveFileOverwriteSpec/noWritePerm"
-                   ,"test/FileSystem/FileOperations/recreateSymlinkSpec/noWritePerm"
-                   ]
-    noPermsDirs =  ["test/FileSystem/FileOperations/copyFileSpec/noPerms"
-                   ,"test/FileSystem/FileOperations/copyFileOverwriteSpec/noPerms"
-                   ,"test/FileSystem/FileOperations/copyDirRecursiveSpec/noPerms"
-                   ,"test/FileSystem/FileOperations/copyDirRecursiveOverwriteSpec/noPerms"
-                   ,"test/FileSystem/FileOperations/createDirSpec/noPerms"
-                   ,"test/FileSystem/FileOperations/createRegularFileSpec/noPerms"
-                   ,"test/FileSystem/FileOperations/renameFileSpec/noPerms"
-                   ,"test/FileSystem/FileOperations/moveFileSpec/noPerms"
-                   ,"test/FileSystem/FileOperations/moveFileOverwriteSpec/noPerms"
-                   ,"test/FileSystem/FileOperations/recreateSymlinkSpec/noPerms"
-                   ,"test/FileSystem/FileOperations/getFileTypeSpec/noPerms"
-                   ,"test/FileSystem/FileOperations/getDirsFilesSpec/noPerms"
-                   ,"test/FileSystem/FileOperations/deleteFileSpec/noPerms"
-                   ]
-    fixPermissions = do
-      sequence_ $ fmap noWritableDirPerms noWriteDirs
-      sequence_ $ fmap noPerms noPermsDirs
-    revertPermissions = do
-      sequence_ $ fmap normalDirPerms noWriteDirs
-      sequence_ $ fmap normalDirPerms noPermsDirs
-