extracting the common pattern for udpTest.

Author: kazu-yamamoto

tests/Network/Socket/ByteStringSpec.hs

@@ -48,37 +48,27 @@ spec = do
     describe "sendTo" $ do
         it "works well" $ do
             let server sock = recv sock 1024 `shouldReturn` testMsg
-                client sock serverPort = do
-                    let hints = defaultHints { addrFlags = [AI_NUMERICHOST], addrSocketType = Datagram }
-                    addr:_ <- getAddrInfo (Just hints) (Just serverAddr) (Just $ show serverPort)
-                    sendTo sock testMsg $ addrAddress addr
+                client sock addr = sendTo sock testMsg addr
             udpTest client server
 
         it "throws when closed" $ do
             let server _ = return ()
-                client sock serverPort = do
-                    let hints = defaultHints { addrFlags = [AI_NUMERICHOST], addrSocketType = Datagram }
-                    addr:_ <- getAddrInfo (Just hints) (Just serverAddr) (Just $ show serverPort)
+                client sock addr = do
                     close sock
-                    sendTo sock testMsg (addrAddress addr) `shouldThrow` anyException
+                    sendTo sock testMsg addr `shouldThrow` anyException
             udpTest client server
 
     describe "sendAllTo" $ do
         it "works well" $ do
             let server sock = recv sock 1024 `shouldReturn` testMsg
-                client sock serverPort = do
-                    let hints = defaultHints { addrFlags = [AI_NUMERICHOST], addrSocketType = Datagram }
-                    addr:_ <- getAddrInfo (Just hints) (Just serverAddr) (Just $ show serverPort)
-                    sendAllTo sock testMsg $ addrAddress addr
+                client sock addr = sendAllTo sock testMsg addr
             udpTest client server
 
         it "throws when closed" $ do
             let server _ = return ()
-                client sock serverPort = do
-                    let hints = defaultHints { addrFlags = [AI_NUMERICHOST], addrSocketType = Datagram }
-                    addr:_ <- getAddrInfo (Just hints) (Just serverAddr) (Just $ show serverPort)
+                client sock addr = do
                     close sock
-                    sendAllTo sock testMsg (addrAddress addr) `shouldThrow` anyException
+                    sendAllTo sock testMsg addr `shouldThrow` anyException
             udpTest client server
 
     describe "sendMany" $ do
@@ -103,22 +93,17 @@ spec = do
     describe "sendManyTo" $ do
         it "works well" $ do
             let server sock = recv sock 1024 `shouldReturn` S.append seg1 seg2
-                client sock serverPort = do
-                    let hints = defaultHints { addrFlags = [AI_NUMERICHOST], addrSocketType = Datagram }
-                    addr:_ <- getAddrInfo (Just hints) (Just serverAddr) (Just $ show serverPort)
-                    sendManyTo sock [seg1, seg2] $ addrAddress addr
+                client sock addr = sendManyTo sock [seg1, seg2] addr
 
                 seg1 = C.pack "This is a "
                 seg2 = C.pack "test message."
             udpTest client server
 
         it "throws when closed" $ do
             let server _ = return ()
-                client sock serverPort = do
-                    let hints = defaultHints { addrFlags = [AI_NUMERICHOST], addrSocketType = Datagram }
-                    addr:_ <- getAddrInfo (Just hints) (Just serverAddr) (Just $ show serverPort)
+                client sock addr = do
                     close sock
-                    sendManyTo sock [seg1, seg2] (addrAddress addr) `shouldThrow` anyException
+                    sendManyTo sock [seg1, seg2] addr `shouldThrow` anyException
 
                 seg1 = C.pack "This is a "
                 seg2 = C.pack "test message."

tests/Network/Test/Common.hs

@@ -145,19 +145,21 @@ tcp serverAct portVar = defaultClientServer
 
 -- | Create an unconnected 'Socket' for sending UDP and receiving
 -- datagrams and then run 'clientAct' and 'serverAct'.
-udpTest :: (Socket -> PortNumber -> IO a) -> (Socket -> IO b) -> IO ()
+udpTest :: (Socket -> SockAddr -> IO a) -> (Socket -> IO b) -> IO ()
 udpTest client server =
     withPort $ test . setServerAction server . udp client
 
 udp
-    :: (Socket -> PortNumber -> IO a)
+    :: (Socket -> SockAddr -> IO a)
     -> MVar PortNumber
     -> ClientServer a Socket
 udp clientAct portVar = defaultClientServer
     { clientSetup = socket AF_INET Datagram defaultProtocol
     , clientAction = \sock -> do
         serverPort <- readMVar portVar
-        clientAct sock serverPort
+        let hints = defaultHints { addrFlags = [AI_NUMERICHOST], addrSocketType = Datagram }
+        addr:_ <- getAddrInfo (Just hints) (Just serverAddr) (Just $ show serverPort)
+        clientAct sock $ addrAddress addr
     , serverSetup = do
         let hints = defaultHints {
                 addrFlags = [AI_PASSIVE]