Fix up test suite to include encoding and show instances.

Author: Thomas M. DuBuisson

Test/main.hs

@@ -1,3 +1,36 @@
+module Main where
+
+import Test.Framework
+import Test.Framework.Providers.QuickCheck2 (testProperty)
 import Test.MD5
+import Data.Digest.Pure.MD5
+import Data.Char (isSpace)
+import Data.ByteString.Lazy (toStrict, ByteString)
+import qualified Data.Binary as B
+import qualified Data.Serialize as S
+import Hexdump
+
+main :: IO ()
+main = defaultMain
+  [ testGroup "MD5 functional correctness tests" base_tests
+  , testGroup "Serialization order correctness tests" serialization_tests
+  ]
+
+-- | Use the crypto-api-tests, piddly as they are, to give evidence of
+-- functional correctness.
+base_tests :: [Test]
+base_tests = makeMD5Tests (undefined :: MD5Digest)
 
-main = test
+-- | Ensure the output of `show`, `Serialize`, `Binary`, and `md5DigestBytes`
+-- are all consistent.
+serialization_tests :: [Test]
+serialization_tests =
+  [ testProperty "show == simple_hex . Serialize.encode"
+      (\bs -> let d = hsh bs in show d == filter (not . isSpace) (simpleHex (S.encode d)))
+  , testProperty "Serialize.encode == toStrict . Binary.encode"
+      (\bs -> let d = hsh bs in toStrict (B.encode d) == S.encode d)
+  , testProperty "Serialize.encode == md5DigestBytes"
+      (\bs -> let d = hsh bs in S.encode d == md5DigestBytes d)
+  ]
+ where
+ hsh = hash :: ByteString -> MD5Digest

pureMD5.cabal

@@ -10,8 +10,8 @@ synopsis:	A Haskell-only implementation of the MD5 digest (hash) algorithm.
 category:	Data, Cryptography
 stability:	stable
 build-type:	Simple
-cabal-version:	>= 1.6
-tested-with:	GHC == 6.12.1
+cabal-version:	>= 1.10
+tested-with:	GHC == 7.10.3
 extra-source-files: Test/MD5.hs
 
 flag test
@@ -26,6 +26,21 @@ Library
   if arch(i386) || arch(x86_64)
     cpp-options: -DFastWordExtract
 
+Test-Suite MD5Tests
+    type:               exitcode-stdio-1.0
+    default-language:   Haskell2010
+    build-depends:      base >=4.6 && < 5,
+                        pureMD5,
+                        crypto-api-tests,
+                        QuickCheck,
+                        test-framework >= 0.8,
+                        test-framework-quickcheck2,
+                        binary, cereal, pretty-hex,
+                        bytestring
+    ghc-options:        -Wall
+    hs-source-dirs:     Test
+    main-is:            main.hs
+
 source-repository head
   type:     git
   location: https://github.com/TomMD/pureMD5