1 files changed, 34 insertions, 0 deletions
diff --git a/src/mailman_pgp/pgp/tests/test_mime_multisig.py b/src/mailman_pgp/pgp/tests/test_mime_multisig.py
index fe08e5b..46b0705 100644
--- a/src/mailman_pgp/pgp/tests/test_mime_multisig.py
+++ b/src/mailman_pgp/pgp/tests/test_mime_multisig.py
@@ -94,3 +94,37 @@ class TestSigning(MultiSigWrapperTestCase):
     ])
     def test_verify(self, message, key, valid):
         self.verify(message, key, valid)
+
+
+class TestCombined(MultiSigWrapperTestCase):
+    @parameterized.expand([
+        (load_message('clear.eml'),
+         load_key('rsa_1024.priv.asc'),
+         load_key('ecc_p256.priv.asc')),
+        (load_message('clear_multipart.eml'),
+         load_key('rsa_1024.priv.asc'),
+         load_key('ecc_p256.priv.asc'))
+    ])
+    def test_sign_encrypt_decrypt_verify(self, message, sign_key, encrypt_key):
+        self.sign_encrypt_decrypt_verify(message, sign_key, encrypt_key)
+
+    @parameterized.expand([
+        (load_message('clear.eml'),
+         load_key('rsa_1024.priv.asc'),
+         load_key('ecc_p256.priv.asc')),
+        (load_message('clear_multipart.eml'),
+         load_key('rsa_1024.priv.asc'),
+         load_key('ecc_p256.priv.asc'))
+    ])
+    def test_sign_then_encrypt_decrypt_verify(self, message, sign_key,
+                                              encrypt_key):
+        self.sign_then_encrypt_decrypt_verify(message, sign_key, encrypt_key)
+
+    @parameterized.expand([
+        (load_message('mime_encrypted_signed.eml'),
+         load_key('rsa_1024.priv.asc'),
+         load_key('rsa_1024.pub.asc'),
+         True)
+    ])
+    def test_decrypt_verify(self, message, decrypt_key, verify_key, valid):
+        self.decrypt_verify(message, decrypt_key, verify_key, valid)