Refactor tests, add tests for combined wrapper.

1 files changed, 12 insertions, 25 deletions

diff --git a/src/mailman_pgp/pgp/tests/test_mime.py b/src/mailman_pgp/pgp/tests/test_mime.py
index 8e00e9c..0ef5f0a 100644
--- a/src/mailman_pgp/pgp/tests/test_mime.py
+++ b/src/mailman_pgp/pgp/tests/test_mime.py
@@ -15,19 +15,19 @@
 # You should have received a copy of the GNU General Public License along with
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
-""""""
-import unittest
+"""Tests for the MIME wrapper."""
 
 from parameterized import parameterized
 
 from mailman_pgp.pgp.mime import MIMEWrapper
-from mailman_pgp.pgp.tests.base import load_key, load_message, PGPTestCase
+from mailman_pgp.pgp.tests.base import load_key, load_message, WrapperTestCase
 
 
-class TestSigning(PGPTestCase, unittest.TestCase):
-    def setUp(self):
-        self.wrapper = MIMEWrapper
+class MIMEWrapperTestCase(WrapperTestCase):
+    wrapper = MIMEWrapper
 
+
+class TestSigning(MIMEWrapperTestCase):
     @parameterized.expand([
         (load_message('data/mime_signed.eml'),
          True),
@@ -37,8 +37,7 @@ class TestSigning(PGPTestCase, unittest.TestCase):
          False)
     ])
     def test_is_signed(self, message, signed):
-        wrapped = self.wrapper(message)
-        self.assertEqual(wrapped.is_signed(), signed)
+        super().is_signed(message, signed)
 
     def test_sign(self):
         pass
@@ -52,11 +51,10 @@ class TestSigning(PGPTestCase, unittest.TestCase):
          False)
     ])
     def test_verify(self, message, key, valid):
-        wrapped = self.wrapper(message)
-        self.assertEqual(bool(wrapped.verify(key)), valid)
+        super().verify(message, key, valid)
 
 
-class TestEncryption(PGPTestCase, unittest.TestCase):
+class TestEncryption(MIMEWrapperTestCase):
     def test_is_encrypted(self):
         pass
 
@@ -67,10 +65,7 @@ class TestEncryption(PGPTestCase, unittest.TestCase):
         pass
 
 
-class TestKeys(PGPTestCase, unittest.TestCase):
-    def setUp(self):
-        self.wrapper = MIMEWrapper
-
+class TestKeys(MIMEWrapperTestCase):
     @parameterized.expand([
         (load_message('data/mime_privkey.eml'),
          True),
@@ -82,8 +77,7 @@ class TestKeys(PGPTestCase, unittest.TestCase):
          False)
     ])
     def test_has_keys(self, message, has_keys):
-        wrapped = self.wrapper(message)
-        self.assertEqual(wrapped.has_keys(), has_keys)
+        super().has_keys(message, has_keys)
 
     @parameterized.expand([
         (load_message('data/mime_privkey.eml'),
@@ -92,11 +86,4 @@ class TestKeys(PGPTestCase, unittest.TestCase):
          [load_key('data/rsa_1024.pub.asc')])
     ])
     def test_keys(self, message, keys):
-        wrapped = self.wrapper(message)
-        loaded = list(wrapped.keys())
-        loaded_fingerprints = list(map(lambda key: key.fingerprint, loaded))
-
-        self.assertEqual(len(loaded), len(keys))
-
-        fingerprints = list(map(lambda key: key.fingerprint, keys))
-        self.assertListEqual(loaded_fingerprints, fingerprints)
+        super().keys(message, keys)