feature/workflows

1 files changed, 35 insertions, 11 deletions

diff --git a/src/mailman_pgp/pgp/tests/test_inline.py b/src/mailman_pgp/pgp/tests/test_inline.py
index cd18209..a89963a 100644
--- a/src/mailman_pgp/pgp/tests/test_inline.py
+++ b/src/mailman_pgp/pgp/tests/test_inline.py
@@ -18,6 +18,7 @@
 """Tests for the inline wrapper."""
 
 from parameterized import parameterized
+from public import public
 
 from mailman_pgp.pgp.inline import InlineWrapper
 from mailman_pgp.pgp.tests.base import load_key, load_message, WrapperTestCase
@@ -27,6 +28,7 @@ class InlineWrapperTestCase(WrapperTestCase):
     wrapper = InlineWrapper
 
 
+@public
 class TestSigning(InlineWrapperTestCase):
     @parameterized.expand([
         (load_message('inline_cleartext_signed.eml'),
@@ -43,7 +45,7 @@ class TestSigning(InlineWrapperTestCase):
          False)
     ])
     def test_is_signed(self, message, signed):
-        super().is_signed(message, signed)
+        self.is_signed(message, signed)
 
     @parameterized.expand([
         (load_message('clear.eml'),
@@ -52,7 +54,7 @@ class TestSigning(InlineWrapperTestCase):
          load_key('ecc_p256.priv.asc'))
     ])
     def test_sign(self, message, key):
-        super().sign(message, key)
+        self.sign(message, key)
 
     @parameterized.expand([
         (load_message('clear.eml'),
@@ -63,7 +65,7 @@ class TestSigning(InlineWrapperTestCase):
          load_key('ecc_p256.pub.asc'))
     ])
     def test_sign_verify(self, message, priv, pub):
-        super().sign_verify(message, priv, pub)
+        self.sign_verify(message, priv, pub)
 
     @parameterized.expand([
         (load_message('inline_cleartext_signed.eml'),
@@ -80,9 +82,10 @@ class TestSigning(InlineWrapperTestCase):
          False),
     ])
     def test_verify(self, message, key, valid):
-        super().verify(message, key, valid)
+        self.verify(message, key, valid)
 
 
+@public
 class TestEncryption(InlineWrapperTestCase):
     @parameterized.expand([
         (load_message('inline_encrypted.eml'),
@@ -99,7 +102,7 @@ class TestEncryption(InlineWrapperTestCase):
          False)
     ])
     def test_is_encrypted(self, message, encrypted):
-        super().is_encrypted(message, encrypted)
+        self.is_encrypted(message, encrypted)
 
     @parameterized.expand([
         (load_message('clear.eml'),
@@ -110,9 +113,9 @@ class TestEncryption(InlineWrapperTestCase):
     ])
     def test_encrypt(self, message, keys, **kwargs):
         if isinstance(keys, tuple):
-            super().encrypt(message, *keys, **kwargs)
+            self.encrypt(message, *keys, **kwargs)
         else:
-            super().encrypt(message, keys, **kwargs)
+            self.encrypt(message, keys, **kwargs)
 
     @parameterized.expand([
         (load_message('clear.eml'),
@@ -123,7 +126,7 @@ class TestEncryption(InlineWrapperTestCase):
          load_key('ecc_p256.priv.asc'))
     ])
     def test_encrypt_decrypt(self, message, pub, priv):
-        super().encrypt_decrypt(message, pub, priv)
+        self.encrypt_decrypt(message, pub, priv)
 
     @parameterized.expand([
         (load_message('inline_encrypted.eml'),
@@ -131,9 +134,10 @@ class TestEncryption(InlineWrapperTestCase):
          'Some encrypted text.\n\n')
     ])
     def test_decrypt(self, message, key, clear):
-        super().decrypt(message, key, clear)
+        self.decrypt(message, key, clear)
 
 
+@public
 class TestKeys(InlineWrapperTestCase):
     @parameterized.expand([
         (load_message('inline_privkey.eml'),
@@ -146,7 +150,7 @@ class TestKeys(InlineWrapperTestCase):
          False)
     ])
     def test_has_keys(self, message, has_keys):
-        super().has_keys(message, has_keys)
+        self.has_keys(message, has_keys)
 
     @parameterized.expand([
         (load_message('inline_privkey.eml'),
@@ -155,4 +159,24 @@ class TestKeys(InlineWrapperTestCase):
          [load_key('rsa_1024.pub.asc')])
     ])
     def test_keys(self, message, keys):
-        super().keys(message, keys)
+        self.keys(message, keys)
+
+
+@public
+class TestCombined(InlineWrapperTestCase):
+    @parameterized.expand([
+        (load_message('clear.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'))
+    ])
+    def test_sign_then_encrypt_decrypt_verify(self, message, sign_key,
+                                              encrypt_key):
+        self.sign_then_encrypt_decrypt_verify(message, sign_key, encrypt_key)