1 files changed, 5 insertions, 137 deletions

diff --git a/tests/Main.hs b/tests/Main.hs
index 1a758cb2..a968c487 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -18,7 +18,6 @@ import           Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Lazy as Lazy
 import Data.List as L
-import Data.Ord
 import Data.Maybe
 import Data.Word
 import Data.Serialize as S
@@ -27,27 +26,20 @@ import Data.Text as T
 import Network
 import Network.URI
 
-import System.Directory
-import System.FilePath
-
 import Test.QuickCheck as QC
-import Test.HUnit as HU
 import Test.Framework as Framework (Test, defaultMain)
 import Test.Framework.Providers.QuickCheck2 (testProperty)
-import Test.Framework.Providers.HUnit (testCase)
 
 import Data.Aeson as JSON
 import Data.BEncode as BE
-import Data.Bitfield as BF
-import Data.Torrent
-import Network.BitTorrent as BT
+import Data.Torrent.Block
+import Data.Torrent.Bitfield as BF
+import Data.Torrent.Metainfo
 import Network.BitTorrent.Exchange.Protocol
 import Network.BitTorrent.Tracker
 import Network.BitTorrent.Tracker.Protocol
 import Network.BitTorrent.Tracker.HTTP
 import Network.BitTorrent.Peer
-import System.IO.MMap.Fixed hiding (empty, interval)
-import qualified System.IO.MMap.Fixed as Fixed
 
 -- import Debug.Trace
 
@@ -73,71 +65,6 @@ instance Arbitrary Text where
   arbitrary = T.pack <$> arbitrary
 
 {-----------------------------------------------------------------------
-    Bitfield
------------------------------------------------------------------------}
--- other properties are tested in IntervalSet
-
-prop_completenessRange :: Bitfield -> Bool
-prop_completenessRange bf = 0 <= c && c <= 1
-  where
-    c = completeness bf
-
-prop_minMax :: Bitfield -> Bool
-prop_minMax bf
-  | BF.null bf = True
-  | otherwise  = BF.findMin bf <= BF.findMax bf
-
-prop_rarestInRange :: [Bitfield] -> Bool
-prop_rarestInRange xs = case rarest xs of
-  Just r  -> 0 <= r
-          && r < totalCount (maximumBy (comparing totalCount) xs)
-  Nothing -> True
-
-{- this one should give pretty good coverage -}
-prop_differenceDeMorgan :: Bitfield -> Bitfield -> Bitfield -> Bool
-prop_differenceDeMorgan a b c =
-  (a `BF.difference` (b `BF.intersection` c))
-     == ((a `BF.difference` b) `BF.union` (a `BF.difference` c))
-  &&
-  (a `BF.difference` (b `BF.union` c))
-     == ((a `BF.difference` b) `BF.intersection` (a `BF.difference` c))
-
-
-{-----------------------------------------------------------------------
-    Torrent
------------------------------------------------------------------------}
-
--- TODO tests for torrent: encoding <-> decoding
-instance Arbitrary FileInfo where
-  arbitrary = FileInfo <$> arbitrary <*> arbitrary <*> arbitrary
-
-instance Arbitrary ContentInfo where
-  arbitrary = oneof
-    [ SingleFile <$> arbitrary <*> arbitrary <*> arbitrary
-                 <*> arbitrary <*> arbitrary <*> arbitrary
-    , MultiFile  <$> arbitrary <*> arbitrary <*> arbitrary
-                 <*> arbitrary <*> arbitrary
-    ]
-
-instance Arbitrary Torrent where
-  arbitrary = mktorrent <$> arbitrary
-                 <*> arbitrary <*> arbitrary <*> arbitrary
-                 <*> arbitrary <*> arbitrary <*> arbitrary
-                 <*> arbitrary <*> pure Nothing <*> arbitrary
-
--- TODO add a few more torrents here
-torrentList :: [(FilePath, String)]
-torrentList =
-  [ ( "res" </> "dapper-dvd-amd64.iso.torrent"
-    , "0221caf96aa3cb94f0f58d458e78b0fc344ad8bf")
-  ]
-
-checkInfoHash :: (FilePath, String) -> Assertion
-checkInfoHash (path, expectedHash) = check =<< fromFile path
-  where
-    check t = expectedHash @=? show (ppInfoHash (tInfoHash t))
-
-{-----------------------------------------------------------------------
     Handshake
 -----------------------------------------------------------------------}
 
@@ -211,10 +138,6 @@ instance Arbitrary BlockIx where
 instance Arbitrary Block where
   arbitrary = Block <$> positive <*> positive <*> arbitrary
 
-instance Arbitrary Bitfield where
-  arbitrary = mkBitfield <$> (succ . min 1000 <$> positive)
-                         <*> arbitrary
-
 instance Arbitrary PortNumber where
   arbitrary = fromIntegral <$> (arbitrary :: Gen Word16)
 
@@ -226,7 +149,7 @@ instance Arbitrary Message where
     , pure Interested
     , pure NotInterested
     , Have     <$> positive
-    , Bitfield <$> arbitrary
+    , pure $ Bitfield $ BF.haveNone 0
     , Request  <$> arbitrary
     , Piece    <$> arbitrary
     , Cancel   <$> arbitrary
@@ -243,68 +166,15 @@ prop_messageEncoding msg
   = S.decode (S.encode msg) == Right msg
 
 {-----------------------------------------------------------------------
-    MemMap
------------------------------------------------------------------------}
-
-tmpdir :: FilePath
-tmpdir = "tmp"
-
-boundaryTest :: Assertion
-boundaryTest = do
-  f <- mallocTo (Fixed.interval 0 1) Fixed.empty
-  f <- mallocTo (Fixed.interval 1 2) f
-  writeElem f 0 (1 :: Word8)
-  writeElem f 1 (2 :: Word8)
-  bs <- readBytes (Fixed.interval 0 2) f
-  "\x1\x2" @=? bs
-
-mmapSingle :: Assertion
-mmapSingle = do
-  f  <- mmapTo (tmpdir </> "single.test") (10, 5) 5 Fixed.empty
-  writeBytes (Fixed.interval 5 5) "abcde" f
-  bs <- readBytes (Fixed.interval 5 5) f
-  "abcde" @=? bs
-
-coalesceTest :: Assertion
-coalesceTest = do
-  f <- mmapTo (tmpdir </> "a.test")  (0, 1) 10 Fixed.empty
-  f <- mmapTo (tmpdir </> "bc.test") (0, 2) 12 f
-  f <- mmapTo (tmpdir </> "c.test")  (0, 1) 13 f
-  writeBytes (Fixed.interval 10 4) "abcd" f
-  bs <- readBytes  (Fixed.interval 10 4) f
-  "abcd" @=? bs
-
-{-----------------------------------------------------------------------
     Main
 -----------------------------------------------------------------------}
 
 allTests :: [Framework.Test]
 allTests =
-  [ -- bitfield module
-    testProperty "completeness range"      prop_completenessRange
-  , testProperty "rarest in range"         prop_rarestInRange
-  , testProperty "min less that max"       prop_minMax
-  , testProperty "difference de morgan"    prop_differenceDeMorgan
-
-     -- torrent module
-  , testProperty "file info encoding"      $
-      prop_properBEncode (T :: T FileInfo)
-  , testProperty "content info encoding"   $
-      prop_properBEncode (T :: T ContentInfo)
-  , testProperty "torrent encoding" $
-      prop_properBEncode (T :: T Torrent)
-  ] ++
-    fmap (testCase "info hash" . checkInfoHash) torrentList
-    ++
   [ -- handshake module
     testProperty "handshake encoding" $
       prop_cerealEncoding  (T :: T Handshake)
   , testProperty "message encoding" prop_messageEncoding
-
-    -- mem map
-  , testCase "boudary"  boundaryTest
-  , testCase "single"   mmapSingle
-  , testCase "coalesce" coalesceTest
   ] ++ test_scrape_url
     ++
   [ testProperty "scrape bencode" $
@@ -312,6 +182,4 @@ allTests =
   ]
 
 main :: IO ()
-main = do
-  createDirectoryIfMissing True tmpdir
-  defaultMain allTests
+main = defaultMain allTests