m

Author: Lucas McDonald

DynamoDbEncryption/runtimes/python/test/unit/internal/test_client_to_resource.py

@@ -587,11 +587,11 @@ def test_GIVEN_test_update_item_response_WHEN_client_to_resource_THEN_returns_di
     test_update_item_response, test_ddb_item, test_dict_item
 ):
     # Given: Update item response
-    response = {"Some": "Response"}
+    response = test_update_item_response(test_ddb_item)
     # When: Converting to resource format
     dict_item = client_to_resource_converter.update_item_response(response)
     # Then: Returns dict value
-    assert dict_item == response
+    assert dict_item == test_update_item_response(test_dict_item)
 
 
 @pytest.fixture

DynamoDbEncryption/runtimes/python/test/unit/internal/test_resource_to_client.py

@@ -15,8 +15,7 @@
     simple_key_dict,
 )
 from ...requests import (
-    basic_batch_execute_statement_request_ddb,
-    basic_batch_execute_statement_request_dict,
+    basic_batch_execute_statement_request,
     basic_batch_get_item_request_ddb,
     basic_batch_get_item_request_dict,
     basic_batch_write_item_delete_request_ddb,
@@ -25,10 +24,8 @@
     basic_batch_write_item_put_request_dict,
     basic_delete_item_request_ddb,
     basic_delete_item_request_dict,
-    basic_execute_statement_request_ddb,
-    basic_execute_statement_request_dict,
-    basic_execute_transaction_request_ddb,
-    basic_execute_transaction_request_dict,
+    basic_execute_statement_request,
+    basic_execute_transaction_request,
     basic_get_item_request_ddb,
     basic_get_item_request_dict,
     basic_put_item_request_ddb,
@@ -45,8 +42,10 @@
     basic_transact_write_item_delete_request_dict,
     basic_transact_write_item_put_request_ddb,
     basic_transact_write_item_put_request_dict,
-    basic_update_item_request_ddb,
-    basic_update_item_request_dict,
+    basic_update_item_request_ddb_signed_attribute,
+    basic_update_item_request_dict_signed_attribute,
+    basic_update_item_request_ddb_unsigned_attribute,
+    basic_update_item_request_dict_unsigned_attribute,
     exhaustive_get_item_request_ddb,
     exhaustive_get_item_request_dict,
     exhaustive_put_item_request_ddb,
@@ -64,6 +63,7 @@
     basic_put_item_response,
     basic_query_response,
     basic_scan_response,
+    basic_update_item_response,
     basic_transact_get_items_response,
     basic_transact_write_items_response,
     exhaustive_batch_get_item_response,
@@ -808,12 +808,18 @@ def test_GIVEN_test_transact_get_items_response_WHEN_resource_to_client_THEN_ret
 
 @pytest.fixture
 def test_update_item_request_ddb():
-    return basic_update_item_request_ddb
+    # Select unsigned attribute without loss of generality;
+    # resource/client logic doesn't care about signed attributes
+    # TODO: Add exhaustive request
+    return basic_update_item_request_ddb_unsigned_attribute
 
 
 @pytest.fixture
 def test_update_item_request_dict():
-    return basic_update_item_request_dict
+    # Select unsigned attribute without loss of generality;
+    # resource/client logic doesn't care about signed attributes
+    # TODO: Add exhaustive request
+    return basic_update_item_request_dict_unsigned_attribute
 
 
 def test_GIVEN_test_update_item_request_WHEN_resource_to_client_THEN_returns_ddb_value(
@@ -843,35 +849,42 @@ def test_GIVEN_update_item_request_without_table_name_WHEN_resource_to_client_TH
         # When: Converting to resource format
         resource_to_client_converter_without_table_name.update_item_request(test_update_item_request_dict)
 
+@pytest.fixture
+def test_update_item_response():
+    # TODO: Add exhaustive response
+    return basic_update_item_response
+
 
-def test_GIVEN_update_item_response_WHEN_resource_to_client_THEN_raises_NotImplementedError():
+def test_GIVEN_update_item_response_WHEN_resource_to_client_THEN_returns_dict_value(
+    test_update_item_response, test_ddb_item, test_dict_item
+):
     # Given: Update item response
-    response = {"Some": "Response"}
-    # Then: Raises NotImplementedError
-    with pytest.raises(NotImplementedError):
-        # When: Converting to resource format
-        resource_to_client_converter.update_item_response(response)
+    response = test_update_item_response(test_dict_item)
+    # When: Converting to resource format
+    actual_ddb_response = resource_to_client_converter.update_item_response(response)
+    # Then: Returns dict value
+    expected_ddb_response = test_update_item_response(test_ddb_item)
 
+    actual_ddb_response = sort_dynamodb_json_lists(actual_ddb_response["Attributes"])
+    expected_ddb_response = sort_dynamodb_json_lists(expected_ddb_response["Attributes"])
 
-@pytest.fixture
-def test_execute_statement_request_ddb():
-    return basic_execute_statement_request_ddb()
+    assert actual_ddb_response == expected_ddb_response
 
 
 @pytest.fixture
-def test_execute_statement_request_dict():
-    return basic_execute_statement_request_dict()
+def test_execute_statement_request():
+    return basic_execute_statement_request
 
 
 def test_GIVEN_test_execute_statement_request_WHEN_resource_to_client_THEN_returns_ddb_value(
-    test_execute_statement_request_ddb, test_execute_statement_request_dict, test_ddb_item, test_dict_item
+    test_execute_statement_request, test_ddb_item, test_dict_item
 ):
     # Given: Execute statement request
-    request = test_execute_statement_request_dict
+    request = test_execute_statement_request()
     # When: Converting to resource format
     actual_ddb_request = resource_to_client_converter.execute_statement_request(request)
-    # Then: Returns dict value
-    assert actual_ddb_request == test_execute_statement_request_ddb
+    # Then: Returns dict value (here, request is not modified)
+    assert actual_ddb_request == test_execute_statement_request()
 
 
 def test_GIVEN_execute_statement_response_WHEN_resource_to_client_THEN_raises_NotImplementedError():
@@ -884,24 +897,19 @@ def test_GIVEN_execute_statement_response_WHEN_resource_to_client_THEN_raises_No
 
 
 @pytest.fixture
-def test_execute_transaction_request_ddb():
-    return basic_execute_transaction_request_ddb()
-
-
-@pytest.fixture
-def test_execute_transaction_request_dict():
-    return basic_execute_transaction_request_dict()
+def test_execute_transaction_request():
+    return basic_execute_transaction_request
 
 
 def test_GIVEN_test_execute_transaction_request_WHEN_resource_to_client_THEN_returns_ddb_value(
-    test_execute_transaction_request_ddb, test_execute_transaction_request_dict, test_ddb_item, test_dict_item
+    test_execute_transaction_request, test_ddb_item, test_dict_item
 ):
     # Given: Execute transaction request
-    request = test_execute_transaction_request_dict
+    request = test_execute_transaction_request()
     # When: Converting to resource format
     actual_ddb_request = resource_to_client_converter.execute_transaction_request(request)
-    # Then: Returns dict value
-    assert actual_ddb_request == test_execute_transaction_request_ddb
+    # Then: Returns dict value (here, request is not modified)
+    assert actual_ddb_request == test_execute_transaction_request()
 
 
 def test_GIVEN_execute_transaction_response_WHEN_resource_to_client_THEN_raises_NotImplementedError():
@@ -914,24 +922,19 @@ def test_GIVEN_execute_transaction_response_WHEN_resource_to_client_THEN_raises_
 
 
 @pytest.fixture
-def test_batch_execute_statement_request_ddb():
-    return basic_batch_execute_statement_request_ddb()
-
-
-@pytest.fixture
-def test_batch_execute_statement_request_dict():
-    return basic_batch_execute_statement_request_dict()
+def test_batch_execute_statement_request():
+    return basic_batch_execute_statement_request
 
 
 def test_GIVEN_test_batch_execute_statement_request_WHEN_resource_to_client_THEN_returns_ddb_value(
-    test_batch_execute_statement_request_ddb, test_batch_execute_statement_request_dict, test_ddb_item, test_dict_item
+    test_batch_execute_statement_request, test_ddb_item, test_dict_item
 ):
     # Given: Batch execute statement request
-    request = test_batch_execute_statement_request_dict
+    request = test_batch_execute_statement_request()
     # When: Converting to resource format
     actual_ddb_request = resource_to_client_converter.batch_execute_statement_request(request)
-    # Then: Returns dict value
-    assert actual_ddb_request == test_batch_execute_statement_request_ddb
+    # Then: Returns dict value (here, request is not modified)
+    assert actual_ddb_request == test_batch_execute_statement_request()
 
 
 def test_GIVEN_batch_execute_statement_response_WHEN_resource_to_client_THEN_raises_NotImplementedError():