5 files changed, 63 insertions, 1 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 2f83c77b..c1ffd12d 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -159,6 +159,7 @@ test-suite spec
                        Data.Torrent.LayoutSpec
                        Data.Torrent.MagnetSpec
                        Data.Torrent.MetainfoSpec
+                       Data.Torrent.PieceSpec
                        Data.Torrent.ProgressSpec
                        Network.BitTorrent.CoreSpec
                        Network.BitTorrent.Core.PeerIdSpec
@@ -168,6 +169,7 @@ test-suite spec
                        Network.BitTorrent.Tracker.RPC.HTTPSpec
                        Network.BitTorrent.Tracker.RPC.UDPSpec
                        Network.BitTorrent.Exchange.MessageSpec
+                       System.Torrent.StorageSpec
                        System.Torrent.FileMapSpec
   build-depends:       base == 4.*
                      , bytestring
diff --git a/src/System/Torrent/Storage.hs b/src/System/Torrent/Storage.hs
index 71e0616b..bf44d7bf 100644
--- a/src/System/Torrent/Storage.hs
+++ b/src/System/Torrent/Storage.hs
@@ -25,6 +25,7 @@ module System.Torrent.Storage
        , def
        , open
        , close
+       , withStorage
 
          -- * Query
        , genPieceInfo
@@ -58,7 +59,7 @@ data StorageFailure
     -- | Piece size do not match with one passed to the 'open'
     -- function.
   | InvalidSize  PieceSize
-    deriving (Show, Typeable)
+    deriving (Show, Eq, Typeable)
 
 instance Exception StorageFailure
 
@@ -76,6 +77,10 @@ open mode s l = Storage mode s <$> mmapFiles mode l
 close :: Storage -> IO ()
 close Storage {..} = unmapFiles fileMap
 
+withStorage :: Mode -> PieceSize -> FileLayout FileSize
+            -> (Storage -> IO ()) -> IO ()
+withStorage m s l = bracket (open m s l) close
+
 isValidIx :: PieceIx -> Storage -> Bool
 isValidIx i s = 0 <= i && i < undefined s
 
diff --git a/sub/bencoding b/sub/bencoding
-Subproject 04d5e90177f9edbc49c5392f471950ebd0bfea4
+Subproject fa7861cc092fb3d423d6e3c05df36d3651068de
diff --git a/tests/Data/Torrent/PieceSpec.hs b/tests/Data/Torrent/PieceSpec.hs
new file mode 100644
index 00000000..ef1f2938
--- /dev/null
+++ b/tests/Data/Torrent/PieceSpec.hs
@@ -0,0 +1,13 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+module Data.Torrent.PieceSpec (spec) where
+import Control.Applicative
+import Test.Hspec
+import Test.QuickCheck
+import Data.Torrent.Piece
+
+
+instance Arbitrary a => Arbitrary (Piece a) where
+  arbitrary = Piece <$> arbitrary <*> arbitrary
+
+spec :: Spec
+spec = return ()
\ No newline at end of file
diff --git a/tests/System/Torrent/StorageSpec.hs b/tests/System/Torrent/StorageSpec.hs
new file mode 100644
index 00000000..8d9dfd8f
--- /dev/null
+++ b/tests/System/Torrent/StorageSpec.hs
@@ -0,0 +1,42 @@
+module System.Torrent.StorageSpec (spec) where
+import Control.Exception
+import System.FilePath
+import System.Directory
+import System.IO.Unsafe
+import Test.Hspec
+
+import Data.Torrent.Layout
+import Data.Torrent.Piece
+import System.Torrent.Storage
+
+
+layout :: FileLayout FileSize
+layout =
+  [ (dir </> "_a", 20)
+  , (dir </> "_b", 50)
+  , (dir </> "_c", 100)
+  , (dir </> "_d", 5)
+  ]
+  where
+    dir = unsafePerformIO $ getTemporaryDirectory
+
+createLayout :: IO ()
+createLayout =
+  bracket (open ReadWriteEx 0 layout) close (const (return ()))
+
+spec :: Spec
+spec = before createLayout $ do
+  describe "writePiece" $ do
+    it "should fail gracefully on write operation in RO mode" $ do
+      s <- open ReadOnly 0 layout
+      writePiece (Piece 0 "") s `shouldThrow` (== StorageIsRO)
+      close s
+
+    it "should fail on negative index" $ do
+      withStorage ReadWrite 0 layout $ \ s ->
+        writePiece (Piece (-1) "") s `shouldThrow` (== InvalidIndex (-1))
+
+  describe "readPiece" $ do
+    it "should fail on negative index" $
+      withStorage ReadOnly 0 layout $ \ s ->
+        readPiece (-1) s `shouldThrow` (== InvalidIndex (-1))