run bencode tests as well

diff --git a/functorrent.cabal b/functorrent.cabal
index b85e8368c54cc9442eafbda1c5d94a205f39bbbe..ba04b123aec3e335ce5cbfdb105ec6537edfe484 100644 (file)
--- a/functorrent.cabal
+++ b/functorrent.cabal
@@ -82,5 +82,7 @@ test-suite functorrent-test
   main-is:           Main.hs
   other-modules:     MagneturiTests
   build-depends:     base
+                   , bytestring
                    , functorrent
                    , hspec
+                   , QuickCheck

diff --git a/test/BencodeTests.hs b/test/BencodeTests.hs
index c83e9cc0dcd903078d52cb00954e2f7f277e4bfa..d8896437f9c0efc4a051b6536f94077866d8e419 100644 (file)
--- a/test/BencodeTests.hs
+++ b/test/BencodeTests.hs
@@ -2,16 +2,31 @@ module BencodeTests (tests) where
 
 import FuncTorrent.Bencode (encode, decode, BVal(..))
 
-import Test.Tasty (TestTree, testGroup)
-import Test.Tasty.QuickCheck (testProperty)
+import Test.Hspec
+import Test.QuickCheck
+import Data.ByteString.Char8 (unpack, pack)
 
 propEncodeDecode :: BVal -> Bool
 propEncodeDecode bval = let encoded = encode bval
                             decoded = decode encoded
                         in Right bval == decoded
 
-qcTests :: TestTree
-qcTests = testGroup "QuickCheck tests" [ testProperty "encode/decode" propEncodeDecode ]
-
-tests :: TestTree
-tests = testGroup "Tests" [qcTests]
+tests :: IO ()
+tests = hspec $ do
+  describe "BVal tests" $ do
+    it "encode/decode bstr tests" $ do
+      property $ \s ->
+        let encoded = encode (Bstr s)
+            decoded = decode encoded
+        in Right (Bstr s) == decoded
+    it "encode/decode bint tests" $ do
+      property $ \i ->
+        let encoded = encode (Bint i)
+            decoded = decode encoded
+        in Right (Bint i) == decoded
+  -- describe "Bencode property tests" $ do
+  --   it "encode/decode" $ do
+  --     property $ \bval ->
+  --       let encoded = encode bval
+  --           decoded = decode encoded
+  --       in Right bval == decoded

diff --git a/test/Main.hs b/test/Main.hs
index 09d3e988f4e60d2e3f3dd3f1f161f00b316e3346..974ec54443638dde5572817eee2e90794afc3318 100644 (file)
--- a/test/Main.hs
+++ b/test/Main.hs
@@ -2,8 +2,11 @@
 
 module Main where
 
-import MagneturiTests
+import qualified MagneturiTests as Muri
+import qualified BencodeTests as Benc
 
 main :: IO ()
-main = tests
+main = do
+  Muri.tests
+  Benc.tests