1 files changed, 34 insertions, 1 deletions

diff --git a/tests/suite.hs b/tests/suite.hs
index 6fdd816..838a5f3 100644
--- a/tests/suite.hs
+++ b/tests/suite.hs
@@ -5,6 +5,7 @@ import Test.HUnit
 
 import Codec.Encryption.OpenPGP.ASCIIArmor (encode, decode, multipartMerge)
 import Codec.Encryption.OpenPGP.ASCIIArmor.Types
+import Codec.Encryption.OpenPGP.ASCIIArmor.Utils
 
 import Data.ByteString (ByteString)
 import qualified Data.ByteString as B
@@ -35,11 +36,39 @@ testArmorMultipartDecode fp target = do
     where
         getPayload (Armor _ _ pl) = pl
 
+testClearsignedDecodeBody :: FilePath -> FilePath -> Assertion
+testClearsignedDecodeBody fp target = do
+    bs <- B.readFile $ "tests/data/" ++ fp
+    tbs <- B.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
+
+testClearsignedDecodeSig :: FilePath -> FilePath -> Assertion
+testClearsignedDecodeSig fp target = do
+    bs <- B.readFile $ "tests/data/" ++ fp
+    tbs <- B.readFile $ "tests/data/" ++ target
+    case decode bs of
+        Left e -> assertFailure $ "Decode failed (" ++ e ++ ") on " ++ fp
+        Right [a] -> assertEqual ("for " ++ fp) tbs (getSig a)
+    where
+        getSig (ClearSigned _ _ (Armor _ _ sig)) = sig
+
 testArmorEncode :: [FilePath] -> FilePath -> Assertion
 testArmorEncode fps target = do
     bss <- mapM (\fp -> B.readFile $ "tests/data/" ++ fp) fps
     tbs <- B.readFile $ "tests/data/" ++ target
-    assertEqual ("literaldata") (encode (map (\bs -> Armor ArmorMessage [("Version","OpenPrivacy 0.99")] bs) bss)) tbs
+    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
+    target <- B.readFile $ "tests/data/" ++ ftarget
+    assertEqual ("clearsigned encode") target (encode [ClearSigned [("Hash","SHA1")] txt (Armor ArmorSignature [("Version","OpenPrivacy 0.99")] sig)])
 
 tests = [
    testGroup "CRC24" [
@@ -51,9 +80,13 @@ tests = [
       testCase "Decode sample armor" (testArmorDecode "msg1.asc" ["msg1.gpg"])
     , testCase "Decode sample armor with cruft" (testArmorDecode "msg1a.asc" ["msg1.gpg"])
     , testCase "Decode multiple sample armors" (testArmorDecode "msg1b.asc" ["msg1.gpg","msg1.gpg","msg1.gpg"])
+    , testCase "Decode detached signature" (testArmorDecode "msg4.asc" ["msg4.sig"])
     , testCase "Decode multi-part armor" (testArmorMultipartDecode "msg2.asc" "msg2.pgp")
+    , testCase "Decode body of clear-signed" (testClearsignedDecodeBody "msg3.asc" "msg3")
+    , testCase "Decode sig of clear-signed" (testClearsignedDecodeSig "msg3.asc" "msg3.sig")
     , 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")
     ]
  ]