Minor consistency refactors to test case declaration code

tests/LowLevelTests.hs

@@ -37,26 +37,30 @@ lowLevelTests = testGroup "Unit tests of low-level Haskell library"
 dummyMeta :: M.Map ByteString ByteString
 dummyMeta = M.fromList [("foo","bar")]
 
+-- | Boilerplate for naming a GRPC unit test
+gtc :: TestName -> (GRPC -> IO ()) -> TestTree
+gtc nm = testCase nm . withGRPC
+
+nop :: Monad m => a -> m ()
+nop = const (return ())
+
 testGRPCBracket :: TestTree
-testGRPCBracket = testCase "Start/stop GRPC" $
+testGRPCBracket = gtc "Start/stop GRPC" nop
-  withGRPC $ const $ return ()
 
 testCompletionQueueCreateDestroy :: TestTree
 testCompletionQueueCreateDestroy =
-  testCase "Create/destroy completion queue" $ withGRPC $ \grpc ->
+  gtc "Create/destroy completion queue" $ \grpc -> do
-    withCompletionQueue grpc $ const (return ())
+  withCompletionQueue grpc nop
 
 testServerCreateDestroy :: TestTree
 testServerCreateDestroy =
-  testCase "Server - start/stop" $
+  gtc "Server - start/stop" $ \grpc -> do
-  withGRPC $ \grpc -> withServer grpc (ServerConfig "localhost" 50051 [])
+  withServer grpc (ServerConfig "localhost" 50051 []) nop
-                                 (const $ return ())
 
 testClientCreateDestroy :: TestTree
 testClientCreateDestroy =
-  testCase "Client - start/stop" $
+  gtc "Client - start/stop" $ \grpc -> do
-  withGRPC $ \grpc -> withClient grpc (ClientConfig "localhost" 50051)
+  withClient grpc (ClientConfig "localhost" 50051) nop
-                                 (const $ return ())
 
 testPayloadLowLevelServer :: GRPC -> IO ()
 testPayloadLowLevelServer grpc = do
@@ -108,8 +112,7 @@ testPayloadLowLevelServerUnregistered grpc = do
 
 testClientRequestNoServer :: TestTree
 testClientRequestNoServer =
-  testCase "Client - request timeout when server DNE" $
+  gtc "Client - request timeout when server DNE" $ \grpc -> do
-  withGRPC $ \grpc -> do
   withClient grpc (ClientConfig "localhost" 50051) $ \client -> do
     method <- clientRegisterMethod client "/foo" "localhost" Normal
     reqResult <- clientRegisteredRequest client method 1 "Hello" M.empty
@@ -117,8 +120,7 @@ testClientRequestNoServer =
 
 testServerAwaitNoClient :: TestTree
 testServerAwaitNoClient =
-  testCase "Server - registered call handler timeout" $
+  gtc "Server - registered call handler timeout" $ \grpc -> do
-  withGRPC $ \grpc -> do
   let conf = (ServerConfig "localhost" 50051 [("/foo", "localhost", Normal)])
   withServer grpc conf $ \server -> do
     let method = head (registeredMethods server)
@@ -128,8 +130,7 @@ testServerAwaitNoClient =
 
 testServerUnregisteredAwaitNoClient :: TestTree
 testServerUnregisteredAwaitNoClient =
-  testCase "Server - unregistered call handler timeout" $
+  gtc "Server - unregistered call handler timeout" $ \grpc -> do
-    withGRPC $ \grpc -> do
     let conf = ServerConfig "localhost" 50051 []
     withServer grpc conf $ \server -> do
       result <- serverHandleNormalCall server 10 M.empty $
@@ -140,8 +141,7 @@ testServerUnregisteredAwaitNoClient =
 
 testPayloadLowLevel :: TestTree
 testPayloadLowLevel =
-  testCase "Client/Server - low-level (registered) request/response" $
+  gtc "Client/Server - low-level (registered) request/response" $ \grpc -> do
-    withGRPC $ \grpc -> do
   withAsync (testPayloadLowLevelServer grpc) $ \a1 -> do
     withAsync (testPayloadLowLevelClient grpc) $ \a2 -> do
       wait a1
@@ -149,8 +149,7 @@ testPayloadLowLevel =
 
 testPayloadLowLevelUnregistered :: TestTree
 testPayloadLowLevelUnregistered =
-  testCase "Client/Server - low-level unregistered request/response" $ do
+  gtc "Client/Server - low-level unregistered request/response" $ \grpc -> do
-    withGRPC $ \grpc -> do
   withAsync (testPayloadLowLevelServerUnregistered grpc) $ \a1 ->
     withAsync (testPayloadLowLevelClientUnregistered grpc) $ \a2 -> do
       wait a1
@@ -158,8 +157,7 @@ testPayloadLowLevelUnregistered =
 
 testWithServerCall :: TestTree
 testWithServerCall =
-  testCase "Server - Create/destroy call" $
+  gtc "Server - Create/destroy call" $ \grpc -> do
-    withGRPC $ \grpc -> do
   let conf = ServerConfig "localhost" 50051 []
   withServer grpc conf $ \server -> do
     result <- withServerCall server 1 $ const $ return $ Right ()
@@ -167,8 +165,7 @@ testWithServerCall =
 
 testWithClientCall :: TestTree
 testWithClientCall =
-  testCase "Client - Create/destroy call" $
+  gtc "Client - Create/destroy call" $ \grpc -> do
-    withGRPC $ \grpc -> do
   let conf = ClientConfig "localhost" 50051
   withClient grpc conf $ \client -> do
     result <- withClientCall client "foo" "localhost" 10 $
@@ -302,11 +299,9 @@ testPayloadServer = do
 -- This is intended to test the low-level C bindings, so we use only a few
 -- minimal abstractions on top of it.
 testPayload :: TestTree
-testPayload = testCase "Client/Server - End-to-end request/response" $ do
+testPayload =
-  grpcInit
+  gtc "Client/Server - End-to-end request/response" $ \_ ->
   withAsync testPayloadServer $ \a1 -> do
     withAsync testPayloadClient $ \a2 -> do
       wait a1
       wait a2
-  grpcShutdown
-  putStrLn "Done."