2 files changed, 31 insertions, 13 deletions

diff --git a/tests/Data/Torrent/LayoutSpec.hs b/tests/Data/Torrent/LayoutSpec.hs
new file mode 100644
index 00000000..d3966b3f
--- /dev/null
+++ b/tests/Data/Torrent/LayoutSpec.hs
@@ -0,0 +1,30 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE StandaloneDeriving         #-}
+module Data.Torrent.LayoutSpec (spec) where
+
+import Control.Applicative
+import Test.Hspec
+import Test.QuickCheck
+import System.Posix.Types
+
+import Data.Torrent.Layout
+
+
+instance Arbitrary COff where
+  arbitrary = fromIntegral <$> (arbitrary :: Gen Int)
+
+instance Arbitrary a => Arbitrary (FileInfo a) where
+  arbitrary = FileInfo <$> arbitrary <*> arbitrary <*> arbitrary
+
+instance Arbitrary LayoutInfo where
+  arbitrary = oneof
+    [ SingleFile <$> arbitrary
+    , MultiFile  <$> arbitrary <*> arbitrary
+    ]
+
+spec :: Spec
+spec = do
+  describe "accumPosition" $ do
+    it "" $ property $ \ p1 p2 p3 s1 s2 s3 ->
+      accumPositions [(p1, s1), (p2, s2), (p3, s3)]
+        `shouldBe`   [(p1, (0, s1)), (p2, (s1, s2)), (p3, (s1 + s2, s3))]
\ No newline at end of file
diff --git a/tests/Data/Torrent/MetainfoSpec.hs b/tests/Data/Torrent/MetainfoSpec.hs
index 636bb6b1..b5716e07 100644
--- a/tests/Data/Torrent/MetainfoSpec.hs
+++ b/tests/Data/Torrent/MetainfoSpec.hs
@@ -16,7 +16,7 @@ import Test.QuickCheck.Instances ()
 import Data.Torrent.Piece
 import Data.Torrent.Layout
 import Data.Torrent
-
+import Data.Torrent.LayoutSpec ()
 
 {-----------------------------------------------------------------------
 --  Common
@@ -38,18 +38,6 @@ instance Arbitrary URI where
 --  Instances
 -----------------------------------------------------------------------}
 
-instance Arbitrary FileSize where
-  arbitrary = fromIntegral <$> (arbitrary :: Gen Int)
-
-instance Arbitrary a => Arbitrary (FileInfo a) where
-  arbitrary = FileInfo <$> arbitrary <*> arbitrary <*> arbitrary
-
-instance Arbitrary LayoutInfo where
-  arbitrary = oneof
-    [ SingleFile <$> arbitrary
-    , MultiFile  <$> arbitrary <*> arbitrary
-    ]
-
 instance Arbitrary HashArray where
   arbitrary = HashArray <$> arbitrary