3 files changed, 29 insertions, 14 deletions

diff --git a/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs b/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs
index eb549516..81c4fae0 100644
--- a/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs
+++ b/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs
@@ -24,11 +24,13 @@ spec = do
     context (show uri) $ do
       describe "announce" $ do
         it "have valid response" $ do
-          q    <- arbitrarySample
-          info <- runResourceT $ connect uri >>= announce q
-          validateInfo q info
+          withManager def $ \ mgr -> do
+            q    <- arbitrarySample
+            info <- runResourceT $ announce mgr uri q
+            validateInfo q info
 
       describe "scrape" $ do
         it "have valid response" $ do
-          xs <- runResourceT $ connect uri >>= scrape [def]
-          L.length xs `shouldSatisfy` (>= 1)
+          withManager def $ \ mgr -> do
+            xs <- runResourceT $ scrape mgr uri [def]
+            L.length xs `shouldSatisfy` (>= 1)
diff --git a/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs b/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
index e46f15b6..f3dcec88 100644
--- a/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
+++ b/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
@@ -24,10 +24,12 @@ spec = do
     context (show uri) $ do
       describe "announce" $ do
         it "have valid response" $ do
-          q <- arbitrarySample
-          connect uri >>= announce q >>= validateInfo q
+          withManager def $ \ mgr -> do
+            q <- arbitrarySample
+            announce mgr uri q >>= validateInfo q
 
       describe "scrape" $ do
         it "have valid response" $ do
-          xs <- connect uri >>= scrape [def]
-          L.length xs `shouldSatisfy` (>= 1)
+          withManager def $ \ mgr -> do
+            xs <- scrape mgr uri [def]
+            L.length xs `shouldSatisfy` (>= 1)
diff --git a/tests/Network/BitTorrent/Tracker/RPCSpec.hs b/tests/Network/BitTorrent/Tracker/RPCSpec.hs
index 6bc72e86..340754d3 100644
--- a/tests/Network/BitTorrent/Tracker/RPCSpec.hs
+++ b/tests/Network/BitTorrent/Tracker/RPCSpec.hs
@@ -1,9 +1,11 @@
 module Network.BitTorrent.Tracker.RPCSpec (spec) where
+import Control.Applicative
 import Control.Monad
 import Data.Default
 import Data.List as L
 import Network.URI
 import Test.Hspec
+import Test.QuickCheck
 
 import Network.BitTorrent.Tracker.MessageSpec hiding (spec)
 import Network.BitTorrent.Tracker.RPC.HTTPSpec as HTTP hiding (spec)
@@ -13,17 +15,26 @@ import Network.BitTorrent.Tracker.RPC as RPC
 uris :: [URI]
 uris = UDP.trackerURIs ++ HTTP.trackerURIs
 
+pinfo :: PeerInfo
+pinfo = PeerInfo "-HS0003-203534.37422" 6000 Nothing
+
+instance Arbitrary SAnnounceQuery where
+  arbitrary = SAnnounceQuery <$> arbitrary <*> arbitrary
+                             <*> arbitrary <*> arbitrary
+
 spec :: Spec
 spec = do
   forM_ uris $ \ uri ->
     context (show uri) $ do
       describe "announce" $ do
         it "have valid response" $ do
-          q    <- arbitrarySample
-          info <- connect uri >>= announce q
-          validateInfo q info
+          withManager def pinfo $ \ mgr -> do
+            q    <- arbitrarySample
+            info <- announce mgr uri q
+            return ()
 
       describe "scrape" $ do
         it "have valid response" $ do
-          xs <- connect uri >>= scrape [def]
-          L.length xs `shouldSatisfy` (>= 1)
+          withManager def pinfo $ \ mgr -> do
+            xs <- scrape mgr uri [def]
+            L.length xs `shouldSatisfy` (>= 1)