From ff7ac75cc766b0483c7de25986f1c59d496ba68c Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Thu, 31 Oct 2013 13:29:05 -0500
Subject: simplify some test class structure

---
 tests/hazmat/primitives/test_aes.py      | 14 +-------------
 tests/hazmat/primitives/test_camellia.py | 12 +-----------
 2 files changed, 2 insertions(+), 24 deletions(-)

(limited to 'tests/hazmat/primitives')

diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py
index 0caac3b8..192da648 100644
--- a/tests/hazmat/primitives/test_aes.py
+++ b/tests/hazmat/primitives/test_aes.py
@@ -11,10 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""
-Test using the NIST Test Vectors
-"""
-
 from __future__ import absolute_import, division, print_function
 
 import binascii
@@ -28,7 +24,7 @@ from ...utils import (
 )
 
 
-class TestAES_CBC(object):
+class TestAES(object):
     test_CBC = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
         os.path.join("ciphers", "AES", "CBC"),
@@ -53,8 +49,6 @@ class TestAES_CBC(object):
         lambda key, iv: modes.CBC(binascii.unhexlify(iv)),
     )
 
-
-class TestAES_ECB(object):
     test_ECB = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
         os.path.join("ciphers", "AES", "ECB"),
@@ -79,8 +73,6 @@ class TestAES_ECB(object):
         lambda key: modes.ECB(),
     )
 
-
-class TestAES_OFB(object):
     test_OFB = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
         os.path.join("ciphers", "AES", "OFB"),
@@ -105,8 +97,6 @@ class TestAES_OFB(object):
         lambda key, iv: modes.OFB(binascii.unhexlify(iv)),
     )
 
-
-class TestAES_CFB(object):
     test_CFB = generate_encrypt_test(
         lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
         os.path.join("ciphers", "AES", "CFB"),
@@ -131,8 +121,6 @@ class TestAES_CFB(object):
         lambda key, iv: modes.CFB(binascii.unhexlify(iv)),
     )
 
-
-class TestAES_CTR(object):
     test_CTR = generate_encrypt_test(
         load_openssl_vectors_from_file,
         os.path.join("ciphers", "AES", "CTR"),
diff --git a/tests/hazmat/primitives/test_camellia.py b/tests/hazmat/primitives/test_camellia.py
index 46e724bb..605c18d5 100644
--- a/tests/hazmat/primitives/test_camellia.py
+++ b/tests/hazmat/primitives/test_camellia.py
@@ -11,10 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""
-Tests using the CRYPTREC (Camellia) Test Vectors
-"""
-
 from __future__ import absolute_import, division, print_function
 
 import binascii
@@ -28,7 +24,7 @@ from ...utils import (
 )
 
 
-class TestCamelliaECB(object):
+class TestCamellia(object):
     test_ECB = generate_encrypt_test(
         load_cryptrec_vectors_from_file,
         os.path.join("ciphers", "Camellia"),
@@ -45,8 +41,6 @@ class TestCamelliaECB(object):
         skip_message="Does not support Camellia ECB",
     )
 
-
-class TestCamelliaCBC(object):
     test_CBC = generate_encrypt_test(
         load_openssl_vectors_from_file,
         os.path.join("ciphers", "Camellia"),
@@ -59,8 +53,6 @@ class TestCamelliaCBC(object):
         skip_message="Does not support Camellia CBC",
     )
 
-
-class TestCamelliaOFB(object):
     test_OFB = generate_encrypt_test(
         load_openssl_vectors_from_file,
         os.path.join("ciphers", "Camellia"),
@@ -73,8 +65,6 @@ class TestCamelliaOFB(object):
         skip_message="Does not support Camellia OFB",
     )
 
-
-class TestCamelliaCFB(object):
     test_CFB = generate_encrypt_test(
         load_openssl_vectors_from_file,
         os.path.join("ciphers", "Camellia"),
-- 
cgit v1.2.3