Introduce some lazy bytestrings internally.

1 files changed, 10 insertions, 8 deletions

diff --git a/tests/suite.hs b/tests/suite.hs
index 838a5f3..ffe8b50 100644
--- a/tests/suite.hs
+++ b/tests/suite.hs
@@ -9,7 +9,9 @@ import Codec.Encryption.OpenPGP.ASCIIArmor.Utils
 
 import Data.ByteString (ByteString)
 import qualified Data.ByteString as B
+import qualified Data.ByteString.Lazy as BL
 import qualified Data.ByteString.Char8 as BC8
+import qualified Data.ByteString.Lazy.Char8 as BLC8
 import Data.Digest.CRC24 (crc24)
 import Data.Word (Word32)
 
@@ -19,7 +21,7 @@ testCRC24 bs crc = assertEqual "crc24" crc (crc24 bs)
 testArmorDecode :: FilePath -> [FilePath] -> Assertion
 testArmorDecode fp targets = do
     bs <- B.readFile $ "tests/data/" ++ fp
-    tbss <- mapM (\target -> B.readFile $ "tests/data/" ++ target) targets
+    tbss <- mapM (\target -> BL.readFile $ "tests/data/" ++ target) targets
     case decode bs of
         Left e -> assertFailure $ "Decode failed (" ++ e ++ ") on " ++ fp
         Right as -> assertEqual ("for " ++ fp) tbss (map getPayload as)
@@ -29,7 +31,7 @@ testArmorDecode fp targets = do
 testArmorMultipartDecode :: FilePath -> FilePath -> Assertion
 testArmorMultipartDecode fp target = do
     bs <- B.readFile $ "tests/data/" ++ fp
-    tbs <- B.readFile $ "tests/data/" ++ target
+    tbs <- BL.readFile $ "tests/data/" ++ target
     case decode bs of
         Left e -> assertFailure $ "Decode failed (" ++ e ++ ") on " ++ fp
         Right as -> assertEqual ("for " ++ fp) tbs (getPayload (multipartMerge as))
@@ -39,18 +41,18 @@ testArmorMultipartDecode fp target = do
 testClearsignedDecodeBody :: FilePath -> FilePath -> Assertion
 testClearsignedDecodeBody fp target = do
     bs <- B.readFile $ "tests/data/" ++ fp
-    tbs <- B.readFile $ "tests/data/" ++ target
+    tbs <- BL.readFile $ "tests/data/" ++ target
     case decode bs of
         Left e -> assertFailure $ "Decode failed (" ++ e ++ ") on " ++ fp
         Right [a] -> assertEqual ("for " ++ fp) (convertEndings tbs) (getBody a)
     where
         getBody (ClearSigned _ txt _) = txt
-        convertEndings = crlfUnlines . BC8.lines
+        convertEndings = crlfUnlinesLazy . BLC8.lines
 
 testClearsignedDecodeSig :: FilePath -> FilePath -> Assertion
 testClearsignedDecodeSig fp target = do
     bs <- B.readFile $ "tests/data/" ++ fp
-    tbs <- B.readFile $ "tests/data/" ++ target
+    tbs <- BL.readFile $ "tests/data/" ++ target
     case decode bs of
         Left e -> assertFailure $ "Decode failed (" ++ e ++ ") on " ++ fp
         Right [a] -> assertEqual ("for " ++ fp) tbs (getSig a)
@@ -59,14 +61,14 @@ testClearsignedDecodeSig fp target = do
 
 testArmorEncode :: [FilePath] -> FilePath -> Assertion
 testArmorEncode fps target = do
-    bss <- mapM (\fp -> B.readFile $ "tests/data/" ++ fp) fps
+    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))
 
 testClearsignedEncode :: FilePath -> FilePath -> FilePath -> Assertion
 testClearsignedEncode ftxt fsig ftarget = do
-    txt <- B.readFile $ "tests/data/" ++ ftxt
-    sig <- B.readFile $ "tests/data/" ++ fsig
+    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)])