Requested PR changes

Author: milancermak

ask-sdk-core/ask_sdk_core/serialize.py

@@ -67,8 +67,8 @@ def serialize(self, obj):
         If obj is list, serialize each element in the list.
         If obj is dict, return the dict with serialized values.
         If obj is ask sdk model, return the dict with keys resolved
-        from model's ``attribute_map`` and values serialized
-        based on ``deserialized_types``.
+        from the union of model's ``attribute_map`` and ``deserialized_types``
+        and values serialized based on ``deserialized_types``.
 
         :param obj: The data to serialize.
         :type obj: object

ask-sdk-core/tests/unit/data/__init__.py

@@ -15,9 +15,12 @@
 # specific language governing permissions and limitations under the
 # License.
 #
+
 from .model_enum_object import ModelEnumObject
 from .model_test_object_1 import ModelTestObject1
 from .model_test_object_2 import ModelTestObject2
+from .model_test_object_3 import ModelTestObject3
+from .model_test_object_4 import ModelTestObject4
 from .invalid_model_object import InvalidModelObject
 from .model_abstract_parent_object import ModelAbstractParentObject
 from .model_child_objects import ModelChildObject1

ask-sdk-core/tests/unit/data/model_test_object_3.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights
+# Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License").
+# You may not use this file except in compliance with the License.
+# A copy of the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+# OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the
+# License.
+#
+
+
+class ModelTestObject3(object):
+    deserialized_types = {
+        'str_var': 'str',
+        'int_var': 'int'
+    }
+
+    def __init__(self, str_var=None, int_var=None):
+        self.str_var = str_var
+        self.int_var = int_var
+
+    def __eq__(self, other):
+        return self.__dict__ == other.__dict__

ask-sdk-core/tests/unit/data/model_test_object_4.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights
+# Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License").
+# You may not use this file except in compliance with the License.
+# A copy of the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+# OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the
+# License.
+#
+
+
+class ModelTestObject4(object):
+    deserialized_types = {
+        'str_var': 'str',
+        'float_var': 'float'
+    }
+
+    attribute_map = {
+        'float_var': 'floatingValue'
+    }
+
+    def __init__(self, str_var=None, float_var=None):
+        self.str_var = str_var
+        self.float_var = float_var
+
+    def __eq__(self, other):
+        return self.__dict__ == other.__dict__

ask-sdk-core/tests/unit/test_serialize.py

@@ -132,6 +132,24 @@ def test_model_obj_serialization(self):
         assert self.test_serializer.serialize(test_model_obj_1) == expected_serialized_obj, \
             "Default Serializer serialized model object incorrectly"
 
+    def test_model_obj_without_attrmap_serialization(self):
+        test_obj_inst = data.ModelTestObject3(str_var="test", int_var=123)
+        expected_dict = {
+            "str_var": "test",
+            "int_var": 123
+        }
+        assert self.test_serializer.serialize(test_obj_inst) == expected_dict, \
+            "Default Serializer serialized object without attribute_map incorrectly"
+
+    def test_model_obj_with_incomplete_attrmap_serialization(self):
+        test_obj_inst = data.ModelTestObject4(str_var="test", float_var=3.14)
+        expected_dict = {
+            "str_var": "test",
+            "floatingValue": 3.14
+        }
+        assert self.test_serializer.serialize(test_obj_inst) == expected_dict, \
+            "Default Serializer serialized object with incomplete attribute map incorrectly"
+
     def test_enum_obj_serialization(self):
         test_model_obj_2 = data.ModelTestObject2(int_var=123)
         test_enum_obj = data.ModelEnumObject("ENUM_VAL_1")
@@ -406,6 +424,34 @@ def test_model_obj_with_additional_params_in_payload_deserialization(self):
                 test_payload, test_obj_type) == expected_obj, (
                 "Default Serializer deserialized model object incorrectly when payload has additional parameters")
 
+    def test_model_obj_without_attrmap_deserialization(self):
+        test_payload = {
+            "str_var": "Test",
+            "int_var": 123
+        }
+        test_obj_type = data.ModelTestObject3
+        expected_obj = data.ModelTestObject3(str_var="Test", int_var=123)
+
+        with patch("json.loads") as mock_json_loader:
+            mock_json_loader.return_value = test_payload
+            assert self.test_serializer.deserialize(
+                test_payload, test_obj_type) == expected_obj, (
+                "Default Serializer deserialized model object without attribute map incorrectly")
+
+    def test_model_obj_with_incomplete_attrmap_deserialization(self):
+        test_payload = {
+            "str_var": "Test",
+            "floatingValue": 3.14
+        }
+        test_obj_type = data.ModelTestObject4
+        expected_obj = data.ModelTestObject4(str_var="Test", float_var=3.14)
+
+        with patch("json.loads") as mock_json_loader:
+            mock_json_loader.return_value = test_payload
+            assert self.test_serializer.deserialize(
+                test_payload, test_obj_type) == expected_obj, (
+                "Default Serializer deserialized model object with incomplete attribute map incorrectly")
+
     def test_invalid_model_obj_deserialization(self):
         test_payload = {
             "var_1": "some value"