Merge pull request #6 from mattsb42-aws/test-helpers

Test helpers

Author: mattsb42-aws

test/functional/functional_test_utils.py

@@ -238,10 +238,7 @@ def diverse_item():
 _reserved_attributes = set([attr.value for attr in ReservedAttributes])
 
 
-def cycle_item_check(plaintext_item, crypto_config):
-    """Common logic for cycled item (plaintext->encrypted->decrypted) tests: used by many test suites."""
-    ciphertext_item = encrypt_python_item(plaintext_item, crypto_config)
-
+def check_encrypted_item(plaintext_item, ciphertext_item, attribute_actions):
     # Verify that all expected attributes are present
     ciphertext_attributes = set(ciphertext_item.keys())
     plaintext_attributes = set(plaintext_item.keys())
@@ -256,12 +253,19 @@ def cycle_item_check(plaintext_item, crypto_config):
             continue
 
         # If the attribute should have been encrypted, verify that it is Binary and different from the original
-        if crypto_config.attribute_actions.action(name) is ItemAction.ENCRYPT_AND_SIGN:
+        if attribute_actions.action(name) is ItemAction.ENCRYPT_AND_SIGN:
             assert isinstance(value, Binary)
             assert value != plaintext_item[name]
         # Otherwise, verify that it is the same as the original
         else:
             assert value == plaintext_item[name]
 
+
+def cycle_item_check(plaintext_item, crypto_config):
+    """Common logic for cycled item (plaintext->encrypted->decrypted) tests: used by many test suites."""
+    ciphertext_item = encrypt_python_item(plaintext_item, crypto_config)
+
+    check_encrypted_item(plaintext_item, ciphertext_item, crypto_config.attribute_actions)
+
     cycled_item = decrypt_python_item(ciphertext_item, crypto_config)
     assert cycled_item == plaintext_item

test/functional/test_f_encrypted_item.py

@@ -45,61 +45,48 @@ def test_unsigned_item():
     exc_info.match(r'No signature attribute found in item')
 
 
-def test_ephemeral_item_cycle(some_cmps, parametrized_actions, parametrized_item):
-    """Test a small number of curated CMPs against a small number of curated items."""
+def _item_cycle_check(materials_provider, attribute_actions, item):
     crypto_config = CryptoConfig(
-        materials_provider=some_cmps,
+        materials_provider=materials_provider,
         encryption_context=EncryptionContext(),
-        attribute_actions=parametrized_actions
+        attribute_actions=attribute_actions
     )
-    cycle_item_check(parametrized_item, crypto_config)
+    cycle_item_check(item, crypto_config)
+
+
+def test_ephemeral_item_cycle(some_cmps, parametrized_actions, parametrized_item):
+    """Test a small number of curated CMPs against a small number of curated items."""
+    _item_cycle_check(some_cmps, parametrized_actions, parametrized_item)
 
 
 @pytest.mark.slow
 def test_ephemeral_item_cycle_slow(all_the_cmps, parametrized_actions, parametrized_item):
     """Test ALL THE CMPS against a small number of curated items."""
-    crypto_config = CryptoConfig(
-        materials_provider=all_the_cmps,
-        encryption_context=EncryptionContext(),
-        attribute_actions=parametrized_actions
-    )
-    cycle_item_check(parametrized_item, crypto_config)
+    _item_cycle_check(all_the_cmps, parametrized_actions, parametrized_item)
 
 
 @pytest.mark.slow
+@pytest.mark.hypothesis
 @SLOW_SETTINGS
 @hypothesis.given(item=ddb_items)
 def test_ephemeral_item_cycle_hypothesis_slow(some_cmps, parametrized_actions, item):
     """Test a small number of curated CMPs against a large number of items."""
-    crypto_config = CryptoConfig(
-        materials_provider=some_cmps,
-        encryption_context=EncryptionContext(),
-        attribute_actions=parametrized_actions
-    )
-    cycle_item_check(item, crypto_config)
+    _item_cycle_check(some_cmps, parametrized_actions, item)
 
 
 @pytest.mark.veryslow
+@pytest.mark.hypothesis
 @VERY_SLOW_SETTINGS
 @hypothesis.given(item=ddb_items)
 def test_ephemeral_item_cycle_hypothesis_veryslow(some_cmps, parametrized_actions, item):
     """Test a small number of curated CMPs against ALL THE ITEMS."""
-    crypto_config = CryptoConfig(
-        materials_provider=some_cmps,
-        encryption_context=EncryptionContext(),
-        attribute_actions=parametrized_actions
-    )
-    cycle_item_check(item, crypto_config)
+    _item_cycle_check(some_cmps, parametrized_actions, item)
 
 
 @pytest.mark.nope
+@pytest.mark.hypothesis
 @VERY_SLOW_SETTINGS
 @hypothesis.given(item=ddb_items)
 def test_ephemeral_item_cycle_hypothesis_nope(all_the_cmps, parametrized_actions, item):
     """Test ALL THE CMPs against ALL THE ITEMS."""
-    crypto_config = CryptoConfig(
-        materials_provider=all_the_cmps,
-        encryption_context=EncryptionContext(),
-        attribute_actions=parametrized_actions
-    )
-    cycle_item_check(item, crypto_config)
+    _item_cycle_check(all_the_cmps, parametrized_actions, item)