SDK-1229: Remove SimpleNamespace fixtures

Use Protobuf objects for all testing in test_extra_data, without relying
on SimpleNamespace mocks.

Author: emmas-yoti

yoti_python_sdk/issuance_details.py

@@ -1,23 +1,17 @@
 # -*- coding: utf-8 -*-
 
-from yoti_python_sdk.protobuf.protobuf import Protobuf
-
 
 class IssuanceDetails(object):
     def __init__(self, data_entry):
-        if isinstance(data_entry.value, bytes):
-            value = Protobuf.thirdparty_attribute(data_entry.value)
-        else:
-            value = data_entry.value
-        self.__token = value.issuance_token.decode()
+        self.__token = data_entry.issuance_token.decode()
         if (
-            value.issuing_attributes.expiry_date != ""
-            and value.issuing_attributes.expiry_date is not None
+            data_entry.issuing_attributes.expiry_date != ""
+            and data_entry.issuing_attributes.expiry_date is not None
         ):
-            self.__expiry_date = value.issuing_attributes.expiry_date
+            self.__expiry_date = data_entry.issuing_attributes.expiry_date
         else:
             self.__expiry_date = None
-        self.__attributes = value.issuing_attributes.definitions
+        self.__attributes = data_entry.issuing_attributes.definitions
 
     @property
     def token(self):

yoti_python_sdk/share/extra_data.py

@@ -1,20 +1,24 @@
 # -*- coding: utf-8 -*-
 
 from yoti_python_sdk.issuance_details import IssuanceDetails
+from yoti_python_sdk.protobuf.share_public_api import ThirdPartyAttribute_pb2
 
 
 class ExtraData(object):
     THIRD_PARTY_ATTRIBUTE = 6
 
-    def __init__(self, data_entries_list):
+    def __init__(self, proto):
         self.__attribute_issuance_details = None
+        data_entries_list = proto.list
 
         for data_entry in data_entries_list:
             if (
                 data_entry.type == self.THIRD_PARTY_ATTRIBUTE
                 and self.__attribute_issuance_details is None
             ):
-                self.__attribute_issuance_details = IssuanceDetails(data_entry)
+                attribute = ThirdPartyAttribute_pb2.ThirdPartyAttribute()
+                attribute.MergeFromString(data_entry.value)
+                self.__attribute_issuance_details = IssuanceDetails(attribute)
 
     @property
     def attribute_issuance_details(self):

yoti_python_sdk/tests/share/test_extra_data.py

@@ -1,37 +1,54 @@
 # -*- coding: utf-8 -*-
 
 from datetime import datetime
-from types import SimpleNamespace
 import os.path
-import pytest
 
 from yoti_python_sdk.share.extra_data import ExtraData
 from yoti_python_sdk.tests import file_helper
 from yoti_python_sdk.protobuf import protobuf
 
+from yoti_python_sdk.protobuf.share_public_api import IssuingAttributes_pb2
+from yoti_python_sdk.protobuf.share_public_api import ThirdPartyAttribute_pb2
+from yoti_python_sdk.protobuf.share_public_api import ExtraData_pb2
+from yoti_python_sdk.protobuf.share_public_api import DataEntry_pb2
+
 FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "fixtures")
 EXTRADATA = os.path.join(FIXTURES_DIR, "testextradata.txt")
 
 
 def create_third_party_test_data(token_value, expiry_date, *definitions):
-    attribute = SimpleNamespace(
-        issuance_token=bytes(token_value, "utf-8"),
-        issuing_attributes=SimpleNamespace(
-            expiry_date=expiry_date,
-            definitions=[SimpleNamespace(name=s) for s in definitions],
-        ),
-    )
-    return SimpleNamespace(type=ExtraData.THIRD_PARTY_ATTRIBUTE, value=attribute)
+    issuing_attributes = IssuingAttributes_pb2.IssuingAttributes()
+    issuing_attributes.expiry_date = expiry_date
+    for s in definitions:
+        name = IssuingAttributes_pb2.Definition()
+        name.name = s
+        issuing_attributes.definitions.extend([name])
+
+    attribute = ThirdPartyAttribute_pb2.ThirdPartyAttribute()
+    attribute.issuance_token = bytes(token_value, "utf-8")
+    attribute.issuing_attributes.MergeFrom(issuing_attributes)
+
+    data_entry = DataEntry_pb2.DataEntry()
+    data_entry.type = ExtraData.THIRD_PARTY_ATTRIBUTE
+    data_entry.value = attribute.SerializeToString()
+
+    return data_entry
+
+
+def create_extra_data(data_entry_list):
+    extra_data = ExtraData_pb2.ExtraData()
+    extra_data.list.extend(data_entry_list)
+    return extra_data
 
 
 def get_extra_data_from_base64(filepath):
     extra_data_bytes = file_helper.get_file_bytes(filepath)
     protobuf_extra_data = protobuf.Protobuf.extra_data(extra_data_bytes)
-    return ExtraData(protobuf_extra_data.list)
+    return ExtraData(protobuf_extra_data)
 
 
 def test_attribute_issuance_details_should_return_nil_when_no_data_entries():
-    extra_data = ExtraData([])
+    extra_data = ExtraData(create_extra_data([]))
 
     assert extra_data.attribute_issuance_details is None
 
@@ -46,7 +63,9 @@ def test_should_return_first_matching_third_party_attribute():
         "tokenValue2", expiry_date, "attributeName2"
     )
 
-    parsed_extra_data = ExtraData([thirdparty_attribute1, thirdparty_attribute2])
+    parsed_extra_data = ExtraData(
+        create_extra_data([thirdparty_attribute1, thirdparty_attribute2])
+    )
 
     assert parsed_extra_data.attribute_issuance_details.token == "tokenValue1"
     assert (
@@ -58,32 +77,32 @@ def test_should_return_first_matching_third_party_attribute():
 
 def test_should_parse_multiple_issuing_attributes():
     extra_data = get_extra_data_from_base64(EXTRADATA)
+
     result = extra_data.attribute_issuance_details
     assert result is not None
-
     assert result.token == "someIssuanceToken"
     assert result.expiry_date == "2019-10-15T22:04:05.123Z"
     assert result.attributes[0].name == "com.thirdparty.id"
     assert result.attributes[1].name == "com.thirdparty.other_id"
 
 
-@pytest.mark.parametrize("no_expiry", ["", None])
-def test_should_handle_no_expiry_date(no_expiry):
+def test_should_handle_no_expiry_date():
     tokenValue = "tokenValue"
+    no_expiry = ""
     thirdparty_attribute = create_third_party_test_data(
         tokenValue, no_expiry, "attribute.name"
     )
-    extra_data = ExtraData([thirdparty_attribute])
+    extra_data = ExtraData(create_extra_data([thirdparty_attribute]))
 
     result = extra_data.attribute_issuance_details
-
     assert result.expiry_date is None
 
 
 def test_should_handle_no_issuing_attributes():
     tokenValue = "tokenValue"
-    thirdparty_attribute = create_third_party_test_data(tokenValue, None)
-    extra_data = ExtraData([thirdparty_attribute])
+    thirdparty_attribute = create_third_party_test_data(tokenValue, "")
+    extra_data = ExtraData(create_extra_data([thirdparty_attribute]))
+
     result = extra_data.attribute_issuance_details
     assert result.token == "tokenValue"
     assert len(result.attributes) == 0
@@ -93,8 +112,8 @@ def test_should_handle_no_issuing_attribute_definitions():
     tokenValue = "tokenValue"
     expiry_date = datetime.now().isoformat()
     thirdparty_attribute = create_third_party_test_data(tokenValue, expiry_date)
+    extra_data = ExtraData(create_extra_data([thirdparty_attribute]))
 
-    extra_data = ExtraData([thirdparty_attribute])
     result = extra_data.attribute_issuance_details
     assert result.token == tokenValue
     assert result.expiry_date == expiry_date