Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor test suite #47

Merged
merged 1 commit into from
Jan 23, 2023
Merged

Refactor test suite #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion io-sim/bench/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
module Main (main) where

import Control.Concurrent.Class.MonadSTM
import Control.Monad (replicateM, forever)
import Control.Monad (forever, replicateM)
import Control.Monad.Class.MonadAsync
import Control.Monad.Class.MonadFork
import Control.Monad.Class.MonadSay
Expand Down
5 changes: 3 additions & 2 deletions io-sim/io-sim.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@ test-suite test
type: exitcode-stdio-1.0
hs-source-dirs: test
main-is: Main.hs
other-modules: Test.IOSim
Test.STM
other-modules: Test.Control.Monad.STM
Test.Control.Monad.Utils
Test.Control.Monad.IOSim
Test.Control.Monad.IOSimPOR
Test.Control.Monad.Class.MonadMVar
default-language: Haskell2010
Expand Down
32 changes: 16 additions & 16 deletions io-sim/src/Control/Monad/IOSim/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{-# LANGUAGE BangPatterns #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE DerivingVia #-}
{-# LANGUAGE ExistentialQuantification #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GADTSyntax #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE NamedFieldPuns #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE BangPatterns #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE DerivingVia #-}
{-# LANGUAGE ExistentialQuantification #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GADTSyntax #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE NamedFieldPuns #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeFamilies #-}

{-# OPTIONS_GHC -Wno-orphans #-}
-- incomplete uni patterns in 'schedule' (when interpreting 'StmTxCommitted')
Expand Down Expand Up @@ -49,9 +49,7 @@ module Control.Monad.IOSim.Internal
import Prelude hiding (read)

import Data.Dynamic
import Data.Foldable (toList, traverse_, foldlM)
import Deque.Strict (Deque)
import qualified Deque.Strict as Deque
import Data.Foldable (foldlM, toList, traverse_)
import qualified Data.List as List
import qualified Data.List.Trace as Trace
import Data.Map.Strict (Map)
Expand All @@ -62,12 +60,14 @@ import qualified Data.OrdPSQ as PSQ
import Data.Set (Set)
import qualified Data.Set as Set
import Data.Time (UTCTime (..), fromGregorian)
import Deque.Strict (Deque)
import qualified Deque.Strict as Deque

import GHC.Exts (fromList)
import GHC.Conc (ThreadStatus(..), BlockReason(..))

import Control.Exception
(NonTermination (..), assert, throw, AsyncException (..))
import Control.Exception (AsyncException (..), NonTermination (..),
assert, throw)
import Control.Monad (join, when)
import Control.Monad.ST.Lazy
import Control.Monad.ST.Lazy.Unsafe (unsafeIOToST, unsafeInterleaveST)
Expand Down
2 changes: 1 addition & 1 deletion io-sim/src/Control/Monad/IOSim/InternalTypes.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ module Control.Monad.IOSim.InternalTypes
, IsLocked (..)
) where

import Data.STRef.Lazy (STRef)
import Control.Exception (Exception)
import Control.Monad.Class.MonadThrow (MaskingState (..))
import Data.STRef.Lazy (STRef)

import Control.Monad.IOSim.Types (SimA, ThreadId, TimeoutId)

Expand Down
24 changes: 12 additions & 12 deletions io-sim/src/Control/Monad/IOSim/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE DeriveFunctor #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DerivingVia #-}
{-# LANGUAGE ExistentialQuantification #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GADTSyntax #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE NamedFieldPuns #-}
{-# LANGUAGE PatternSynonyms #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE DeriveFunctor #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DerivingVia #-}
{-# LANGUAGE ExistentialQuantification #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GADTSyntax #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE NamedFieldPuns #-}
{-# LANGUAGE PatternSynonyms #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE TypeFamilies #-}

{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
{-# OPTIONS_GHC -Wno-partial-fields #-}
Expand Down
32 changes: 16 additions & 16 deletions io-sim/src/Control/Monad/IOSimPOR/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{-# LANGUAGE BangPatterns #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE DerivingVia #-}
{-# LANGUAGE ExistentialQuantification #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GADTSyntax #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE NamedFieldPuns #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE BangPatterns #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE DerivingVia #-}
{-# LANGUAGE ExistentialQuantification #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GADTSyntax #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE NamedFieldPuns #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeFamilies #-}

{-# OPTIONS_GHC -Wno-orphans #-}
-- incomplete uni patterns in 'schedule' (when interpreting 'StmTxCommitted')
Expand Down Expand Up @@ -50,7 +50,7 @@ module Control.Monad.IOSimPOR.Internal
import Prelude hiding (read)

import Data.Dynamic
import Data.Foldable (traverse_, foldlM)
import Data.Foldable (foldlM, traverse_)
import qualified Data.List as List
import qualified Data.List.Trace as Trace
import Data.Map.Strict (Map)
Expand All @@ -63,9 +63,9 @@ import Data.Set (Set)
import qualified Data.Set as Set
import Data.Time (UTCTime (..), fromGregorian)

import Control.Exception
(NonTermination (..), assert, throw, AsyncException (..))
import Control.Monad ( join, when )
import Control.Exception (AsyncException (..), NonTermination (..),
assert, throw)
import Control.Monad (join, when)
import Control.Monad.ST.Lazy
import Control.Monad.ST.Lazy.Unsafe (unsafeIOToST, unsafeInterleaveST)
import Data.STRef.Lazy
Expand Down
8 changes: 5 additions & 3 deletions io-sim/test/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ module Main (main) where
import Test.Tasty

import qualified Test.Control.Monad.Class.MonadMVar (tests)
import qualified Test.IOSim (tests)
import qualified Test.Control.Monad.IOSim (tests)
import qualified Test.Control.Monad.IOSimPOR (tests)

main :: IO ()
main = defaultMain tests

tests :: TestTree
tests =
testGroup "IO Sim"
[ Test.IOSim.tests
, Test.Control.Monad.Class.MonadMVar.tests
[ Test.Control.Monad.Class.MonadMVar.tests
, Test.Control.Monad.IOSim.tests
, Test.Control.Monad.IOSimPOR.tests
]