Migrate from Microspec to Hspec

.github/workflows/ci.yml

@@ -77,29 +77,23 @@ jobs:
 
       - name: test
         run: cabal v2-test ${{ matrix.versions.args }} --enable-tests --enable-benchmarks all
-ormolu:
-  runs-on: ubuntu-latest
-  steps:
-    - uses: actions/checkout@v4
 
-    - name: Detect and switch to current branch
-      run: |
-        BRANCH_NAME=$(git branch --show-current || echo "${{ github.ref_name }}")
-        git checkout "$BRANCH_NAME"
-
-    - uses: haskell-actions/run-ormolu@v17
-      with:
-        mode: inplace
-        pattern: |
-          src/**/*.hs
-          tidal-core/src/**/*.hs
-          tidal-link/src/**/*.hs
-          tidal-parse/src/**/*.hs
-          tidal-listener/src/**/*.hs
-
-    - name: apply ormolu formatting
-      uses: stefanzweifel/git-auto-commit-action@v4
-      if: ${{ always() }}
-      with:
-        commit_message: automated ormolu reformatting
-        branch: ${{ github.head_ref || github.ref_name }}
+  ormolu:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: haskell-actions/run-ormolu@v17
+        with:
+          mode: inplace
+          pattern: |
+            src/**/*.hs
+            tidal-core/src/**/*.hs
+            tidal-link/src/**/*.hs
+            tidal-parse/src/**/*.hs
+            tidal-listener/src/**/*.hs
+      - name: apply ormolu formatting
+        uses: stefanzweifel/git-auto-commit-action@v4
+        if: ${{ always() }}
+        with:
+          commit_message: automated ormolu reformatting
+          branch: ${{ github.head_ref || github.ref_name }}

src/Sound/Tidal/Stream/Types.hs

@@ -80,4 +80,4 @@ type PlayMap = Map.Map PatId PlayState
 --                     tickArc   :: Arc,
 --                     tickNudge :: Double
 --                    }
---   deriving Show
+--   deriving Show

stack.yaml

@@ -10,3 +10,6 @@ packages:
 extra-deps:
   - hosc-0.21
   - haskellish-0.3.2.2
+  - hspec-2.11.9
+  - hspec-core-2.11.9
+  - hspec-discover-2.11.9

test/Sound/Tidal/StreamTest.hs

@@ -6,9 +6,9 @@ import qualified Data.Map.Strict as M
 import qualified Sound.Osc.Fd as O
 import Sound.Tidal.Pattern
 import Sound.Tidal.Stream
-import Test.Microspec
+import Test.Hspec
 
-run :: Microspec ()
+run :: Spec
 run =
   describe "Sound.Tidal.Stream" $ do
     describe "toDatum" $ do

test/Test.hs

@@ -1,8 +1,8 @@
 {-# LANGUAGE OverloadedStrings #-}
 
 import Sound.Tidal.StreamTest
-import Test.Microspec
+import Test.Hspec
 
 main :: IO ()
-main = microspec $ do
+main = hspec $ do
   Sound.Tidal.StreamTest.run

test/TestUtils.hs

@@ -6,17 +6,17 @@
 
 import Data.List (sort)
 import qualified Data.Map.Strict as Map
 import Sound.Tidal.Context
-import Test.Microspec
+import Test.Hspec
 import Prelude hiding ((*>), (<*))
 
 class TolerantEq a where
   (~==) :: a -> a -> Bool
 
 instance TolerantEq Double where
   a ~== b = abs (a - b) < 0.000001
 
 instance TolerantEq Value where
   (VS a) ~== (VS b) = a == b
   (VI a) ~== (VI b) = a == b
   (VR a) ~== (VR b) = a == b
@@ -33,13 +33,13 @@
   (Event _ w p x) ~== (Event _ w' p' x') = w == w' && p == p' && x ~== x'
 
 -- | Compare the events of two patterns using the given arc
-compareP :: (Ord a, Show a) => Arc -> Pattern a -> Pattern a -> Property
+compareP :: (Ord a, Show a) => Arc -> Pattern a -> Pattern a -> Expectation
 compareP a p p' =
   sort (queryArc (stripContext p) a)
     `shouldBe` sort (queryArc (stripContext p') a)
 
 -- | Like @compareP@, but tries to 'defragment' the events
-comparePD :: (Ord a, Show a) => Arc -> Pattern a -> Pattern a -> Property
+comparePD :: (Ord a, Show a) => Arc -> Pattern a -> Pattern a -> Expectation
 comparePD a p p' =
   sort (defragParts $ queryArc (stripContext p) a)
     `shouldBe` sort (defragParts $ queryArc (stripContext p') a)
@@ -56,4 +56,4 @@
 stripContext = setContext $ Context []
 
 firstCycleValues :: Pattern a -> [a]
-firstCycleValues pat = map value $ queryArc pat (Arc 0 1)
+firstCycleValues pat = map value $ queryArc pat (Arc 0 1)

tidal-core/src/Sound/Tidal/Scales.hs

@@ -308,7 +308,7 @@ getScale table sp p =
       noteInScale (fromMaybe [0] $ lookup scaleName table) n
   )
     <$> p
-    <* sp
+      <* sp
   where
     octave s x = x `div` length s
     noteInScale s x = (s !!! x) + fromIntegral (12 * octave s x)
@@ -337,7 +337,7 @@ getScaleMod table sp f p =
       noteInScale (uniq $ f $ fromMaybe [0] $ lookup scaleName table) n
   )
     <$> p
-    <* sp
+      <* sp
   where
     octave s x = x `div` length s
     noteInScale s x = (s !!! x) + fromIntegral (12 * octave s x)

tidal-core/test/Sound/Tidal/ChordsTest.hs

@@ -3,11 +3,11 @@
 module Sound.Tidal.ChordsTest where
 
 import Sound.Tidal.Pattern
-import Test.Microspec
+import Test.Hspec
 import TestUtils
 import Prelude hiding ((*>), (<*))
 
-run :: Microspec ()
+run :: Spec
 run =
   describe "Sound.Tidal.Chords" $ do
     describe "chord" $ do

tidal-core/test/Sound/Tidal/ControlTest.hs

@@ -6,11 +6,11 @@ import Sound.Tidal.Control
 import Sound.Tidal.Core
 import Sound.Tidal.Params
 import Sound.Tidal.Pattern
-import Test.Microspec
+import Test.Hspec
 import TestUtils
 import Prelude hiding ((*>), (<*))
 
-run :: Microspec ()
+run :: Spec
 run =
   describe "Sound.Tidal.Control" $ do
     describe "echo" $ do