Remove dependency on rematch (#363)

Author: LaurentRDC

distributed-process-tests/distributed-process-tests.cabal

@@ -36,7 +36,6 @@ library
                      network-transport >= 0.4.1.0 && < 0.6,
                      network >= 2.5 && < 3.2,
                      random >= 1.0 && < 1.3,
-                     rematch >= 0.1.2.1,
                      setenv >= 0.1.1.3,
                      test-framework >= 0.6 && < 0.9,
                      test-framework-hunit >= 0.2.0 && < 0.4,

distributed-process-tests/src/Control/Distributed/Process/Tests/CH.hs

@@ -45,11 +45,9 @@ import Control.Distributed.Process.Node
 import Control.Distributed.Process.Tests.Internal.Utils (pause)
 import Control.Distributed.Process.Serializable (Serializable)
 import Data.Maybe (isNothing, isJust)
-import Test.HUnit (Assertion, assertBool, assertFailure)
+import Test.HUnit (Assertion, assertBool, assertEqual, assertFailure)
 import Test.Framework (Test, testGroup)
 import Test.Framework.Providers.HUnit (testCase)
-import Control.Rematch hiding (match, isNothing, isJust)
-import Control.Rematch.Run (Match(..))
 
 newtype Ping = Ping ProcessId
   deriving (Typeable, Binary, Show)
@@ -61,12 +59,6 @@ newtype Pong = Pong ProcessId
 -- Supporting definitions                                                     --
 --------------------------------------------------------------------------------
 
-expectThat :: a -> Matcher a -> Assertion
-expectThat a matcher = case res of
-  MatchSuccess -> return ()
-  (MatchFailure msg) -> assertFailure msg
-  where res = runMatch matcher a
-
 -- | Like fork, but throw exceptions in the child thread to the parent
 forkTry :: IO () -> IO ThreadId
 forkTry p = do
@@ -1408,7 +1400,7 @@ testHandleMessageIf TestTransport{..} = do
     return ()
 
   result <- takeMVar done
-  expectThat result $ equalTo (5, 10)
+  assertEqual mempty (5, 10) result
 
 testCatches :: TestTransport -> Assertion
 testCatches TestTransport{..} = do
@@ -1436,7 +1428,7 @@ testMaskRestoreScope TestTransport{..} = do
 
   parent <- liftIO $ takeMVar parentPid
   child <- liftIO $ takeMVar spawnedPid
-  expectThat parent $ isNot $ equalTo child
+  assertBool mempty (not $ parent == child)
 
 testDie :: TestTransport -> Assertion
 testDie TestTransport{..} = do

distributed-process-tests/src/Control/Distributed/Process/Tests/Internal/Utils.hs

@@ -21,11 +21,8 @@ module Control.Distributed.Process.Tests.Internal.Utils
   , Ping(Ping)
   , ping
   , pause
-  , shouldBe
-  , shouldMatch
   , shouldContain
   , shouldNotContain
-  , expectThat
   , synchronisedAssertion
   -- test process utilities
   , TestProcessControl
@@ -82,8 +79,6 @@ import Control.Exception (AsyncException(ThreadKilled), SomeException)
 import Control.Monad (forever, void)
 import Control.Monad.Catch (finally, catch)
 import Control.Monad.STM (atomically)
-import Control.Rematch hiding (match)
-import Control.Rematch.Run
 import Data.Binary
 import Data.Typeable (Typeable)
 
@@ -142,23 +137,13 @@ synchronisedAssertion note localNode expected testProc lock = do
 stash :: TestResult a -> a -> Process ()
 stash mvar x = liftIO $ putMVar mvar x
 
-expectThat :: a -> Matcher a -> Process ()
-expectThat a matcher = case res of
-  MatchSuccess -> return ()
-  (MatchFailure msg) -> liftIO $ assertFailure msg
-  where res = runMatch matcher a
-
-shouldBe :: a -> Matcher a -> Process ()
-shouldBe = expectThat
 
 shouldContain :: (Show a, Eq a) => [a] -> a -> Process ()
-shouldContain xs x = expectThat xs $ hasItem (equalTo x)
+shouldContain xs x = liftIO $ assertBool mempty (x `elem` xs)
 
 shouldNotContain :: (Show a, Eq a) => [a] -> a -> Process ()
-shouldNotContain xs x = expectThat xs $ isNot (hasItem (equalTo x))
+shouldNotContain xs x = liftIO $ assertBool mempty (not $ x `elem` xs)
 
-shouldMatch :: a -> Matcher a -> Process ()
-shouldMatch = expectThat
 
 -- | Run the supplied @testProc@ using an @MVar@ to collect and assert
 -- against its result. Uses the supplied @note@ if the assertion fails.

distributed-process-tests/src/Control/Distributed/Process/Tests/Mx.hs

@@ -35,7 +35,6 @@ import Control.Distributed.Process.Management
   )
 import Control.Monad (void, unless)
 import Control.Monad.Catch(finally, bracket, try)
-import Control.Rematch (equalTo)
 import Data.Binary
 import Data.List (find, sort, intercalate)
 import Data.Maybe (isJust, fromJust, isNothing, fromMaybe, catMaybes)
@@ -50,6 +49,7 @@ import Test.Framework
   , testGroup
   )
 import Test.Framework.Providers.HUnit (testCase)
+import Test.HUnit (assertBool, assertEqual)
 
 data Publish = Publish
   deriving (Typeable, Generic, Eq)
@@ -111,7 +111,7 @@ testAgentDualInput result = do
   died <- receiveTimeout 10000000 [
       matchIf (\(ProcessMonitorNotification r _ _) -> r == mRef) (const $ return True)
     ]
-  died `shouldBe` equalTo (Just True)
+  liftIO $ assertEqual mempty (Just True) died
 
 testAgentPrioritisation :: TestResult [String] -> Process ()
 testAgentPrioritisation result = do
@@ -257,22 +257,22 @@ testMxRegEvents result = do
 
     register label p1
     reg1 <- receiveChanTimeout delay regSink
-    reg1 `shouldBe` equalTo (Just (label, p1))
+    liftIO $ assertEqual mempty (Just (label, p1)) reg1
 
     unregister label
     unreg1 <- receiveChanTimeout delay unRegSink
-    unreg1 `shouldBe` equalTo (Just (label, p1))
+    liftIO $ assertEqual mempty (Just (label, p1)) unreg1
 
     register label p2
     reg2 <- receiveChanTimeout delay regSink
-    reg2 `shouldBe` equalTo (Just (label, p2))
+    liftIO $ assertEqual mempty (Just (label, p2)) reg2
 
     reregister label p1
     unreg2 <- receiveChanTimeout delay unRegSink
-    unreg2 `shouldBe` equalTo (Just (label, p2))
+    liftIO $ assertEqual mempty (Just (label, p2)) unreg2 
 
     reg3 <- receiveChanTimeout delay regSink
-    reg3 `shouldBe` equalTo (Just (label, p1))
+    liftIO $ assertEqual mempty (Just (label, p1)) reg3
 
     mapM_ (flip kill $ "test-complete") [agent, p1, p2]
 
@@ -308,17 +308,17 @@ testMxRegMon remoteNode result = do
 
     register label1 p1
     reg1 <- receiveChanTimeout delay regSink
-    reg1 `shouldBe` equalTo (Just (label1, p1))
+    liftIO $ assertEqual mempty (Just (label1, p1)) reg1 
 
     register label2 p1
     reg2 <- receiveChanTimeout delay regSink
-    reg2 `shouldBe` equalTo (Just (label2, p1))
+    liftIO $ assertEqual mempty (Just (label2, p1)) reg2
 
     n1 <- whereis label1
-    n1 `shouldBe` equalTo (Just p1)
+    liftIO $ assertEqual mempty (Just p1) n1
 
     n2 <- whereis label2
-    n2 `shouldBe` equalTo (Just p1)
+    liftIO $ assertEqual mempty (Just p1) n2
 
     kill p1 "goodbye"
 
@@ -448,7 +448,7 @@ testMxSend mNode label test = do
 
   case res of
     Left  (ProcessExitException _ m) -> (liftIO $ putStrLn $ "SomeException-" ++ show m) >> die m
-    Right tr                         -> tr `shouldBe` equalTo True
+    Right tr                         -> liftIO $ assertBool mempty tr
 
 
   where

stack-ghc-8.10.7.yaml

@@ -6,7 +6,6 @@ packages:
 
 extra-deps:
 - distributed-static-0.3.9
-- rematch-0.2.0.0
 - network-transport-tcp-0.8.0
 # This version has its containers dependency bumped
 - git: https://github.com/haskell-distributed/network-transport-inmemory.git

stack-ghc-9.0.2.yaml

@@ -6,7 +6,6 @@ packages:
 
 extra-deps:
 - distributed-static-0.3.9
-- rematch-0.2.0.0
 - network-transport-tcp-0.8.0
 # This version has its containers dependency bumped
 - git: https://github.com/haskell-distributed/network-transport-inmemory.git

stack-ghc-9.2.4.yaml

@@ -11,7 +11,6 @@ extra-deps:
 # Change import of Data.ByteString.Lazy.Builder to Data.ByteString.Builder
 - lib/network-transport-tcp
 - distributed-static-0.3.9
-- rematch-0.2.0.0
 # This version has its containers dependency bumped
 - git: https://github.com/haskell-distributed/network-transport-inmemory.git
   commit: 0ce97924f15a8c1570b2355151834305c9bd2a28

stack-ghc-9.2.7.yaml

@@ -11,7 +11,6 @@ extra-deps:
 # right revisions (4/30/23).
 - distributed-static-0.3.9@sha256:f5e781867eddec660cb3b39805c849e3f096b7da245d43a07d8529e3c92b3a27
 - network-transport-inmemory-0.5.2@sha256:eead1fb207672127ccca1d04ae6a0eb20ee6ec10223eefb4274694dbbf4e9908
-- rematch-0.2.0.0
 - network-transport-tcp-0.8.1
 
 flags:

stack-ghc-9.4.5.yaml

@@ -11,7 +11,6 @@ extra-deps:
 # right revisions (4/30/23).
 - distributed-static-0.3.9@sha256:f5e781867eddec660cb3b39805c849e3f096b7da245d43a07d8529e3c92b3a27
 - network-transport-inmemory-0.5.2@sha256:eead1fb207672127ccca1d04ae6a0eb20ee6ec10223eefb4274694dbbf4e9908
-- rematch-0.2.0.0
 - network-transport-tcp-0.8.1
 
 flags:

stack-ghc-9.8.2.yaml

@@ -6,7 +6,6 @@ packages:
 
 extra-deps:
 - distributed-static-0.3.10
-- rematch-0.2.0.0
 - network-transport-0.5.7
 - network-transport-tcp-0.8.2
 - network-transport-inmemory-0.5.3