More laziness.

1 files changed, 26 insertions, 13 deletions

diff --git a/tests/suite.hs b/tests/suite.hs
index ffe8b50..ffcbc17 100644
--- a/tests/suite.hs
+++ b/tests/suite.hs
@@ -3,7 +3,7 @@ import Test.Framework.Providers.HUnit
 
 import Test.HUnit
 
-import Codec.Encryption.OpenPGP.ASCIIArmor (encode, decode, multipartMerge)
+import Codec.Encryption.OpenPGP.ASCIIArmor (decode, decodeLazy, encode, encodeLazy, multipartMerge)
 import Codec.Encryption.OpenPGP.ASCIIArmor.Types
 import Codec.Encryption.OpenPGP.ASCIIArmor.Utils
 
@@ -20,9 +20,9 @@ testCRC24 bs crc = assertEqual "crc24" crc (crc24 bs)
 
 testArmorDecode :: FilePath -> [FilePath] -> Assertion
 testArmorDecode fp targets = do
-    bs <- B.readFile $ "tests/data/" ++ fp
+    bs <- BL.readFile $ "tests/data/" ++ fp
     tbss <- mapM (\target -> BL.readFile $ "tests/data/" ++ target) targets
-    case decode bs of
+    case decodeLazy bs of
         Left e -> assertFailure $ "Decode failed (" ++ e ++ ") on " ++ fp
         Right as -> assertEqual ("for " ++ fp) tbss (map getPayload as)
     where
@@ -30,9 +30,9 @@ testArmorDecode fp targets = do
 
 testArmorMultipartDecode :: FilePath -> FilePath -> Assertion
 testArmorMultipartDecode fp target = do
-    bs <- B.readFile $ "tests/data/" ++ fp
+    bs <- BL.readFile $ "tests/data/" ++ fp
     tbs <- BL.readFile $ "tests/data/" ++ target
-    case decode bs of
+    case decodeLazy bs of
         Left e -> assertFailure $ "Decode failed (" ++ e ++ ") on " ++ fp
         Right as -> assertEqual ("for " ++ fp) tbs (getPayload (multipartMerge as))
     where
@@ -40,9 +40,9 @@ testArmorMultipartDecode fp target = do
 
 testClearsignedDecodeBody :: FilePath -> FilePath -> Assertion
 testClearsignedDecodeBody fp target = do
-    bs <- B.readFile $ "tests/data/" ++ fp
+    bs <- BL.readFile $ "tests/data/" ++ fp
     tbs <- BL.readFile $ "tests/data/" ++ target
-    case decode bs of
+    case decodeLazy bs of
         Left e -> assertFailure $ "Decode failed (" ++ e ++ ") on " ++ fp
         Right [a] -> assertEqual ("for " ++ fp) (convertEndings tbs) (getBody a)
     where
@@ -51,9 +51,9 @@ testClearsignedDecodeBody fp target = do
 
 testClearsignedDecodeSig :: FilePath -> FilePath -> Assertion
 testClearsignedDecodeSig fp target = do
-    bs <- B.readFile $ "tests/data/" ++ fp
+    bs <- BL.readFile $ "tests/data/" ++ fp
     tbs <- BL.readFile $ "tests/data/" ++ target
-    case decode bs of
+    case decodeLazy bs of
         Left e -> assertFailure $ "Decode failed (" ++ e ++ ") on " ++ fp
         Right [a] -> assertEqual ("for " ++ fp) tbs (getSig a)
     where
@@ -62,15 +62,26 @@ testClearsignedDecodeSig fp target = do
 testArmorEncode :: [FilePath] -> FilePath -> Assertion
 testArmorEncode fps target = do
     bss <- mapM (\fp -> BL.readFile $ "tests/data/" ++ fp) fps
-    tbs <- B.readFile $ "tests/data/" ++ target
-    assertEqual ("literaldata") tbs (encode (map (\bs -> Armor ArmorMessage [("Version","OpenPrivacy 0.99")] bs) bss))
+    tbs <- BL.readFile $ "tests/data/" ++ target
+    assertEqual ("literaldata") tbs (encodeLazy (map (\bs -> Armor ArmorMessage [("Version","OpenPrivacy 0.99")] bs) bss))
 
 testClearsignedEncode :: FilePath -> FilePath -> FilePath -> Assertion
 testClearsignedEncode ftxt fsig ftarget = do
     txt <- BL.readFile $ "tests/data/" ++ ftxt
     sig <- BL.readFile $ "tests/data/" ++ fsig
-    target <- B.readFile $ "tests/data/" ++ ftarget
-    assertEqual ("clearsigned encode") target (encode [ClearSigned [("Hash","SHA1")] txt (Armor ArmorSignature [("Version","OpenPrivacy 0.99")] sig)])
+    target <- BL.readFile $ "tests/data/" ++ ftarget
+    assertEqual ("clearsigned encode") target (encodeLazy [ClearSigned [("Hash","SHA1")] txt (Armor ArmorSignature [("Version","OpenPrivacy 0.99")] sig)])
+
+testStrictDecode :: FilePath -> Assertion
+testStrictDecode fp = do
+    bs <- BL.readFile $ "tests/data/" ++ fp
+    assertEqual ("strict decode") (decodeLazy bs :: Either String [Armor]) (decode (B.concat . BL.toChunks $ bs) :: Either String [Armor])
+
+testStrictEncode :: FilePath -> Assertion
+testStrictEncode fp = do
+    bs <- BL.readFile $ "tests/data/" ++ fp
+    let fakearmors = [Armor ArmorMessage [("Version","OpenPrivacy 0.99")] bs, ClearSigned [("Hash","SHA1")] bs (Armor ArmorSignature [("Version","OpenPrivacy 0.99")] bs)]
+    assertEqual ("strict encode") (encodeLazy fakearmors) (BL.fromChunks [(encode fakearmors)])
 
 tests = [
    testGroup "CRC24" [
@@ -89,6 +100,8 @@ tests = [
     , testCase "Encode sample armor" (testArmorEncode ["msg1.gpg"] "msg1.asc")
     , testCase "Encode multiple sample armors" (testArmorEncode ["msg1.gpg","msg1.gpg","msg1.gpg"] "msg1c.asc")
     , testCase "Encode clear-signed sig" (testClearsignedEncode "msg3" "msg3.sig" "msg3.asc")
+    , testCase "Decode from strict ByteString" (testStrictDecode "msg1.asc")
+    , testCase "Encode to strict ByteString" (testStrictEncode "msg1.gpg")
     ]
  ]