3 files changed, 62 insertions, 22 deletions

diff --git a/bench/Main.hs b/bench/Main.hs
index 87d39f14..f9650d97 100644
--- a/bench/Main.hs
+++ b/bench/Main.hs
@@ -19,4 +19,9 @@ main = defaultMain $ map (mkbench 1)   [1, 10, 100, 1000, 32 * 1024]
                  ++  map (mkbench 10)  [1, 10, 100, 1000]
   where
     mkbench r n = bench (show r ++ "/" ++ show n) $ nfIO $
-                  replicateM r $ call addr echo (B.replicate n 0)
\ No newline at end of file
+                  replicateM r $ call addr echo (B.replicate n 0)
+
+{-
+  forM_ [1..] $ const $ do
+    async addr myconcat (replicate 100 [1..10])
+-}
diff --git a/krpc.cabal b/krpc.cabal
index b9bd0f1a..bb3fdea6 100644
--- a/krpc.cabal
+++ b/krpc.cabal
@@ -42,18 +42,28 @@ library
 
 
 
-
-executable exsample-client
+test-suite test-client
+  type:                exitcode-stdio-1.0
   main-is:             Client.hs
   other-modules:       Shared
-  build-depends:       base        == 4.*, krpc, bytestring
-  hs-source-dirs:      examples
+  build-depends:       base        == 4.*
+                     , bytestring
+                     , krpc
+
+                     , HUnit
+                     , test-framework
+                     , test-framework-hunit
 
-executable exsample-server
+  hs-source-dirs:      tests
+
+executable test-server
   main-is:             Server.hs
   other-modules:       Shared
-  build-depends:       base        == 4.*, krpc, bytestring
-  hs-source-dirs:      examples
+  build-depends:       base        == 4.*
+                     , bytestring
+                     , krpc
+
+  hs-source-dirs:      tests
 
 
 
diff --git a/tests/Client.hs b/tests/Client.hs
index ec86639e..c2ac6d01 100644
--- a/tests/Client.hs
+++ b/tests/Client.hs
@@ -3,6 +3,11 @@ module Main (main) where
 
 import qualified Data.ByteString as B
 import System.Environment
+
+import Test.HUnit hiding (Test)
+import Test.Framework
+import Test.Framework.Providers.HUnit
+
 import Remote.KRPC
 import Shared
 
@@ -11,17 +16,37 @@ addr :: RemoteAddr
 addr = (0, 6000)
 
 main :: IO ()
-main = do
-  print =<< call addr unitM ()
-  print =<< call addr echoM 0
-  call addr reverseM [1..1000]
-  print =<< call addr swapM (0, 1)
-  print =<< call addr shiftR ((), 1, [2..10])
-  let bs = B.replicate (32 * 1024) 0
-  bs' <- call addr echoBytes bs
-  print (bs == bs')
-
-{-
-  forM_ [1..] $ const $ do
-    async addr myconcat (replicate 100 [1..10])
--}
+main = defaultMain tests
+
+(==?) :: (Eq a, Show a) => a -> IO a -> Assertion
+expected ==? action = do
+  actual <- action
+  expected @=? actual
+
+tests :: [Test]
+tests =
+  [ testCase "unit" $
+      () ==? call addr unitM ()
+
+  , testCase "echo int" $
+      1234 ==? call addr echoM 1234
+
+  , testCase "reverse 1..100" $
+      reverse [1..100] ==? call addr reverseM [1..100]
+
+  , testCase "reverse empty list" $
+      reverse [] ==? call addr reverseM []
+
+  , testCase "reverse singleton list" $
+      reverse [1] ==? call addr reverseM [1]
+
+  , testCase "swap pair" $
+      (1, 0) ==? call addr swapM (0, 1)
+
+  , testCase "shift triple" $
+      ([2..10], (), 1) ==? call addr shiftR ((), 1, [2..10])
+
+  , testCase "echo bytestring" $
+      let bs = B.replicate 400 0 in
+      bs ==? call addr echoBytes bs
+  ]