Moved constatns accordingly and use parent class methods. (#78)

Author: Kevin Hellemun

tests/model/generated/endpoint/test_attachment_public.py

@@ -1,9 +1,7 @@
 from bunq.sdk.client import ApiClient
-from bunq.sdk.context import BunqContext
 from bunq.sdk.model.generated.endpoint import AttachmentPublic
 from bunq.sdk.model.generated.endpoint import AttachmentPublicContent
 from tests.bunq_test import BunqSdkTestCase
-from tests.config import Config
 
 
 class TestAttachmentPublic(BunqSdkTestCase):
@@ -13,17 +11,6 @@ class TestAttachmentPublic(BunqSdkTestCase):
         AttachmentPublicContent
     """
 
-    @classmethod
-    def setUpClass(cls):
-        # config values
-        cls._PATH_ATTACHMENT = cls._get_directory_test_root() + '/assets/'
-        cls._READ_BYTES = "rb"
-        cls._CONTENT_TYPE = Config.get_attachment_content_type()
-        cls._ATTACHMENT_DESCRIPTION = Config.get_attachment_description()
-        cls._ATTACHMENT_PATH_IN = Config.get_attachment_path_in()
-
-        BunqContext.load_api_context(cls._get_api_context())
-
     def test_file_upload_and_retrieval(self):
         """
         Tests uploading an attachment, retrieves it and compare them to see

tests/model/generated/endpoint/test_avatar.py

@@ -14,16 +14,6 @@ class TestAvatar(BunqSdkTestCase):
         AttachmentPublicContent
     """
 
-    @classmethod
-    def setUpClass(cls):
-        cls._FIRST_INDEX = 0
-        cls._PATH_ATTACHMENT = cls._get_directory_test_root() + '/assets/'
-        cls._READ_FILE_BYTES = 'rb'
-        cls._CONTENT_TYPE = Config.get_attachment_content_type()
-        cls._ATTACHMENT_DESCRIPTION = Config.get_attachment_description()
-        cls._ATTACHMENT_PATH_IN = Config.get_attachment_path_in()
-        cls._API_CONTEXT = cls._get_api_context()
-
     def test_avatar_creation(self):
         """
         Tests the creation of an avatar by uploading a picture via
@@ -54,5 +44,5 @@ def attachment_contents(self):
         """
 
         with open(self._PATH_ATTACHMENT + self._ATTACHMENT_PATH_IN,
-                  self._READ_FILE_BYTES) as f:
+                  self._READ_BYTES) as f:
             return f.read()

tests/model/generated/endpoint/test_card_debit.py

@@ -20,17 +20,11 @@ class TestCardDebit(BunqSdkTestCase):
         CardName
     """
 
-    @classmethod
-    def setUpClass(cls):
-        cls._CARD_PIN_CODE = '4045'
-        cls._FIRST_INDEX = 0
-        cls._SECOND_LINE_LENGTH_MAXIMUM = 20
-        cls._STRING_EMPTY = ''
-        cls._USER_ID = Config.get_user_id()
-        cls._MONETARY_ACCOUNT_ID = Config.get_monetary_account_id_1()
-        cls._PIN_CODE_ASSIGNMENT_TYPE_PRIMARY = 'PRIMARY'
-
-        BunqContext.load_api_context(cls._get_api_context())
+    _CARD_PIN_CODE = '4045'
+    _SECOND_LINE_LENGTH_MAXIMUM = 20
+    _STRING_EMPTY = ''
+    _PIN_CODE_ASSIGNMENT_TYPE_PRIMARY = 'PRIMARY'
+    _CARD_TYPE_MAESTRO = 'MAESTRO'
 
     def test_order_debit_card(self):
         """
@@ -44,33 +38,18 @@ def test_order_debit_card(self):
         pin_code_assignment = CardPinAssignment(
             self._PIN_CODE_ASSIGNMENT_TYPE_PRIMARY,
             self._CARD_PIN_CODE,
-            self._MONETARY_ACCOUNT_ID
+            BunqContext.user_context().primary_monetary_account.id_
         )
 
         card_debit = CardDebit.create(second_line, self.card_name_allowed,
-                                      self.alias_first, 'MAESTRO',
+                                      self.alias_first, self._CARD_TYPE_MAESTRO,
                                       [pin_code_assignment]).value
         card = Card.get(card_debit.id_).value
 
         self.assertEqual(self.card_name_allowed, card.name_on_card)
         self.assertEqual(second_line, card.second_line)
         self.assertEqual(card_debit.created, card.created)
 
-    @property
-    def alias_first(self):
-        """
-        :rtype: Pointer
-        """
-
-        if BunqContext.user_context().is_only_user_company_set():
-            return BunqContext.user_context().user_company.alias[
-                self._FIRST_INDEX]
-
-        if BunqContext.user_context().is_only_user_person_set():
-            return BunqContext.user_context().user_person.alias[
-                self._FIRST_INDEX]
-
-        raise BunqException('Could not determine user alias.')
 
     @property
     def card_name_allowed(self):

tests/model/generated/endpoint/test_draft_share_invite_bank.py

@@ -18,13 +18,9 @@ class TestDraftShareInvite(BunqSdkTestCase):
         DraftShareInviteBankQrCodeContent
     """
 
-    @classmethod
-    def setUpClass(cls):
-        cls._OUT_PUT_FILE_PATH = 'connectQr.png'
-        cls._WRITE_BYTES = 'wb'
-        cls._EXPIRATION_ADDED_TIME = 1
-        cls._USER_ID = Config.get_user_id()
-        BunqContext.load_api_context(cls._get_api_context())
+    _OUT_PUT_FILE_PATH = 'connectQr.png'
+    _WRITE_BYTES = 'wb'
+    _EXPIRATION_ADDED_TIME = 1
 
     def test_draft_share_invite_bank(self):
         """

tests/model/generated/endpoint/test_monetary_account_bank.py

@@ -12,16 +12,12 @@ class TestMonetaryAccount(BunqSdkTestCase):
         MonetaryAccountBank
     """
 
-    @classmethod
-    def setUpClass(cls):
-        cls._STATUS = 'CANCELLED'
-        cls._SUB_STATUS = 'REDEMPTION_VOLUNTARY'
-        cls._REASON = 'OTHER'
-        cls._REASON_DESCRIPTION = 'Because this is a test'
-        cls._CURRENCY = 'EUR'
-        cls._MONETARY_ACCOUNT_PREFIX = 'Python_test'
-        cls._USER_ID = Config.get_user_id()
-        BunqContext.load_api_context(cls._get_api_context())
+    _STATUS = 'CANCELLED'
+    _SUB_STATUS = 'REDEMPTION_VOLUNTARY'
+    _REASON = 'OTHER'
+    _REASON_DESCRIPTION = 'Because this is a test'
+    _CURRENCY = 'EUR'
+    _MONETARY_ACCOUNT_PREFIX = 'Python_test'
 
     def test_create_new_monetary_account(self):
         """
@@ -32,8 +28,10 @@ def test_create_new_monetary_account(self):
         without errors
         """
 
-        monetary_account_id = MonetaryAccountBank.create(self._CURRENCY,
-                                                         self._MONETARY_ACCOUNT_PREFIX + token_hex()).value
+        monetary_account_id = MonetaryAccountBank.create(
+            self._CURRENCY,
+            self._MONETARY_ACCOUNT_PREFIX + token_hex()
+        ).value
 
         MonetaryAccountBank.update(monetary_account_id,
                                    status=self._STATUS,

tests/model/generated/endpoint/test_payment.py

@@ -1,4 +1,3 @@
-from bunq.sdk.context import BunqContext
 from bunq.sdk.model.generated.endpoint import ChatMessageText
 from bunq.sdk.model.generated.endpoint import Payment
 from bunq.sdk.model.generated.endpoint import PaymentChat
@@ -15,18 +14,11 @@ class TestPayment(BunqSdkTestCase):
         ChatMessageText
     """
 
-    @classmethod
-    def setUpClass(cls):
-        cls._PAYMENT_AMOUNT_EUR = '0.01'
-        cls._PAYMENT_CURRENCY = 'EUR'
-        cls._PAYMENT_DESCRIPTION = 'Python unit test'
-        cls._PAYMENT_CHAT_TEXT_MESSAGE = 'send from python test'
-        cls._USER_ID = Config.get_user_id()
-        cls._COUNTER_PARTY_OTHER_USER = Config.get_pointer_counter_party_other()
-        cls._COUNTER_PARTY_SAME_USER = Config.get_pointer_counter_party_self()
-        cls._MONETARY_ACCOUNT_ID = Config.get_monetary_account_id_1()
-
-        BunqContext.load_api_context(cls._get_api_context())
+    _PAYMENT_AMOUNT_EUR = '0.01'
+    _PAYMENT_CURRENCY = 'EUR'
+    _PAYMENT_DESCRIPTION = 'Python unit test'
+    _PAYMENT_CHAT_TEXT_MESSAGE = 'send from python test'
+    _USER_ID = Config.get_user_id()
 
     def test_payment_to_other_user(self):
         """
@@ -38,7 +30,7 @@ def test_payment_to_other_user(self):
 
         Payment.create(
             Amount(self._PAYMENT_AMOUNT_EUR, self._PAYMENT_CURRENCY),
-            self._COUNTER_PARTY_OTHER_USER,
+            self._get_pointer_bravo(),
             self._PAYMENT_DESCRIPTION
         )
 
@@ -52,7 +44,7 @@ def test_payment_to_other_account(self):
 
         Payment.create(
             Amount(self._PAYMENT_AMOUNT_EUR, self._PAYMENT_CURRENCY),
-            self._COUNTER_PARTY_SAME_USER,
+            self._get_alias_second_account(),
             self._PAYMENT_DESCRIPTION
         )
 
@@ -66,7 +58,7 @@ def test_payment_chat(self):
 
         payment_id = Payment.create(
             Amount(self._PAYMENT_AMOUNT_EUR, self._PAYMENT_CURRENCY),
-            self._COUNTER_PARTY_OTHER_USER,
+            self._get_pointer_bravo(),
             self._PAYMENT_DESCRIPTION
         ).value
 

tests/model/generated/endpoint/test_request_inquiry.py

@@ -1,4 +1,3 @@
-from bunq.sdk.context import BunqContext
 from bunq.sdk.model.generated.endpoint import RequestInquiry
 from bunq.sdk.model.generated.endpoint import RequestResponse
 from bunq.sdk.model.generated.object_ import Amount
@@ -13,18 +12,10 @@ class TestRequestEnquiry(BunqSdkTestCase):
         RequestResponse
     """
 
-    @classmethod
-    def setUpClass(cls):
-        cls._REQUEST_AMOUNT_EUR = '0.01'
-        cls._REQUEST_CURRENCY = 'EUR'
-        cls._DESCRIPTION = 'Python unit test request'
-        cls._STATUS = 'ACCEPTED'
-        cls._FIRST_INDEX = 0
-        cls._USER_ID = Config.get_user_id()
-        cls._COUNTER_PARTY_SAME_USER = Config.get_pointer_counter_party_self()
-        cls._MONETARY_ACCOUNT_ID = Config.get_monetary_account_id_1()
-        cls._MONETARY_ACCOUNT_ID2 = Config.get_monetary_account_id_2()
-        BunqContext.load_api_context(cls._get_api_context())
+    _REQUEST_AMOUNT_EUR = '0.01'
+    _REQUEST_CURRENCY = 'EUR'
+    _DESCRIPTION = 'Python unit test request'
+    _STATUS = 'ACCEPTED'
 
     def test_sending_and_accepting_request(self):
         """
@@ -37,8 +28,10 @@ def test_sending_and_accepting_request(self):
 
         self.send_request()
 
-        request_response_id = RequestResponse.list().value[
-            self._FIRST_INDEX].id_
+        request_response_id = \
+            RequestResponse.list(self._second_monetary_account.id_).value[
+                self._FIRST_INDEX
+            ].id_
 
         self.accept_request(request_response_id)
 
@@ -49,7 +42,7 @@ def send_request(self):
 
         RequestInquiry.create(
             Amount(self._REQUEST_AMOUNT_EUR, self._REQUEST_CURRENCY),
-            self._COUNTER_PARTY_SAME_USER,
+            self._get_alias_second_account(),
             self._DESCRIPTION,
             False
         )
@@ -60,4 +53,8 @@ def accept_request(self, response_id):
         :rtype response_id: int
         """
 
-        RequestResponse.update(response_id, status=self._STATUS)
+        RequestResponse.update(
+            response_id,
+            monetary_account_id=self._second_monetary_account.id_,
+            status=self._STATUS
+        )

tests/model/generated/endpoint/test_session.py

@@ -3,7 +3,6 @@
 from bunq.sdk.context import BunqContext
 from bunq.sdk.model.generated.endpoint import Session
 from tests.bunq_test import BunqSdkTestCase
-from tests.config import Config
 
 
 class TestSession(BunqSdkTestCase):
@@ -12,13 +11,9 @@ class TestSession(BunqSdkTestCase):
         Session
     """
 
-    @classmethod
-    def setUpClass(cls):
-        cls._SESSION_ID = 0
-        cls._API_KEY = Config.get_api_key()
-        cls._BUNQ_CONFIG_FILE = "bunq-test.conf"
-        cls._DEVICE_DESCRIPTION = 'Python test device'
-        BunqContext.load_api_context(cls._get_api_context())
+    _SESSION_ID = 0
+    _BUNQ_CONFIG_FILE = "bunq-test.conf"
+    _DEVICE_DESCRIPTION = 'Python test device'
 
     def test_session_delete(self):
         """

tests/model/generated/endpoint/test_tab_usage_single.py

@@ -1,9 +1,10 @@
+import unittest
+
 from bunq.sdk.context import BunqContext
 from bunq.sdk.model.generated.endpoint import TabItemShop
 from bunq.sdk.model.generated.endpoint import TabUsageSingle
 from bunq.sdk.model.generated.object_ import Amount
 from tests.bunq_test import BunqSdkTestCase
-from tests.config import Config
 
 
 class TestTabUsageSingle(BunqSdkTestCase):
@@ -13,18 +14,14 @@ class TestTabUsageSingle(BunqSdkTestCase):
         TabItemShop
     """
 
-    @classmethod
-    def setUpClass(cls):
-        cls._USER_ID = Config.get_user_id()
-        cls._MONETARY_ACCOUNT_ID = Config.get_monetary_account_id_1()
-        cls._CASH_REGISTER_ID = Config.get_cash_register_id()
-        cls._AMOUNT_EUR = '0.02'
-        cls._CURRENCY = 'EUR'
-        cls._STATUS_OPEN = 'OPEN'
-        cls._TAB_ITEM_DESCRIPTION = 'Super expensive python tea'
-        cls._STATUS_WAITING = 'WAITING_FOR_PAYMENT'
-        cls._TAB_DESCRIPTION = 'Pay the tab for Python test please.'
-        BunqContext.load_api_context(cls._get_api_context())
+    _AMOUNT_EUR = '0.02'
+    _CURRENCY = 'EUR'
+    _STATUS_OPEN = 'OPEN'
+    _STATUS_WAITING = 'WAITING_FOR_PAYMENT'
+    _TAB_ITEM_DESCRIPTION = 'Super expensive python tea'
+    _TAB_DESCRIPTION = 'Pay the tab for Python test please.'
+    _ERROR_ONLY_USER_COMPANY_CAN_CREATE_TAB =\
+        'Only user company can create/use cash registers.'
 
     def test_create_and_update_tab(self):
         """
@@ -34,7 +31,12 @@ def test_create_and_update_tab(self):
         without errors
         """
 
-        tab_uuid = TabUsageSingle.create(self._CASH_REGISTER_ID,
+        if BunqContext.user_context().is_only_user_person_set():
+            return unittest.skip(
+                self._ERROR_ONLY_USER_COMPANY_CAN_CREATE_TAB
+            )
+
+        tab_uuid = TabUsageSingle.create(self._get_cash_register_id(),
                                          self._TAB_DESCRIPTION,
                                          self._STATUS_OPEN,
                                          Amount(self._AMOUNT_EUR,
@@ -50,7 +52,7 @@ def _add_item_to_tab(self, tab_uuid):
         """
 
         TabItemShop.create(
-            self._CASH_REGISTER_ID, tab_uuid,
+            self._get_cash_register_id(), tab_uuid,
             self._TAB_ITEM_DESCRIPTION
         )
 
@@ -61,6 +63,6 @@ def _update_tab(self, tab_uuid):
         """
 
         TabUsageSingle.update(
-            self._CASH_REGISTER_ID,
+            self._get_cash_register_id(),
             tab_uuid
         )