cleanup tests; fix api client

Author: dnl-blkv

bunq/sdk/client.py

@@ -101,6 +101,8 @@ def _request(self, method, uri_relative, request_bytes, custom_headers):
             headers=all_headers
         )
 
+        self._assert_response_success(response)
+
         if self._api_context.installation_context is not None:
             security.validate_response(
                 self._api_context.installation_context.public_key_server,
@@ -109,8 +111,6 @@ def _request(self, method, uri_relative, request_bytes, custom_headers):
                 response.headers
             )
 
-        self._assert_response_success(response)
-
         return response
 
     def _get_all_headers(self, method, endpoint, request_bytes, custom_headers):

tests/api_context_handler.py

@@ -0,0 +1,49 @@
+import os
+import unittest
+
+from tests.config import Config
+from bunq.sdk.context import ApiContext
+from bunq.sdk.context import ApiEnvironmentType
+from bunq.sdk.model.generated import endpoint
+from bunq.sdk.exception import ApiException
+
+
+class BunqSdkTestCase(unittest.TestCase):
+    # Config values
+    _API_KEY = Config.get_api_key()
+
+    # Name of bunq config file
+    _FILENAME_BUNQ_CONFIG = "/bunq-test.conf"
+
+    # Device description used for python tests
+    _DEVICE_DESCRIPTION = 'Python test device'
+
+    @classmethod
+    def get_api_context(cls):
+        """
+        Calls IsSessionActive to check if the session token is still active
+        and returns the ApiContext.
+
+        Catches ApiException if the session is inactive.
+        Catches BunqException if the conf file does not exist.
+
+        :rtype: ApiContext
+        """
+
+        filename_bunq_config_full = (cls._get_directory_test_root() +
+                                     cls._FILENAME_BUNQ_CONFIG)
+
+        try:
+            api_context = ApiContext.restore(filename_bunq_config_full)
+            endpoint.User.list(api_context)
+        except (ApiException, FileNotFoundError):
+            api_context = ApiContext(ApiEnvironmentType.SANDBOX, cls._API_KEY,
+                                     cls._DEVICE_DESCRIPTION, [])
+
+        api_context.save(filename_bunq_config_full)
+
+        return api_context
+
+    @staticmethod
+    def _get_directory_test_root():
+        return os.path.dirname(os.path.abspath(__file__))

tests/bunq_test.py

@@ -1,13 +1,11 @@
-import unittest
-
-from tests.api_context_handler import ApiContextHandler
-from tests.config import Config
+from bunq.sdk.client import ApiClient
 from bunq.sdk.model.generated.endpoint import AttachmentPublic
 from bunq.sdk.model.generated.endpoint import AttachmentPublicContent
-from bunq.sdk.client import ApiClient
+from tests.bunq_test import BunqSdkTestCase
+from tests.config import Config
 
 
-class TestAttachmentPublic(unittest.TestCase):
+class TestAttachmentPublic(BunqSdkTestCase):
     """
     Tests:
         AttachmentPublic
@@ -17,13 +15,12 @@ class TestAttachmentPublic(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         # config values
-        cls._PATH_TO_ATTACHMENT = '/Users/khellemun/bunq/sdk_python/tests/' \
-                                  'assets'
+        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()
-        cls._API_CONTEXT = ApiContextHandler.get_api_context()
+        cls._API_CONTEXT = cls.get_api_context()
 
     def test_file_upload_and_retrieval(self):
         """
@@ -53,6 +50,6 @@ def attachment_contents(self):
         :rtype: bytes
         """
 
-        with open(self._PATH_TO_ATTACHMENT + self._ATTACHMENT_PATH_IN,
+        with open(self._PATH_ATTACHMENT + self._ATTACHMENT_PATH_IN,
                   self._READ_BYTES) as f:
             return f.read()

tests/model/generated/test_attachment_public.py

@@ -1,14 +1,12 @@
-import unittest
-
 from bunq.sdk.client import ApiClient
 from bunq.sdk.model.generated.endpoint import Avatar
 from bunq.sdk.model.generated.endpoint import AttachmentPublic
 from bunq.sdk.model.generated.endpoint import AttachmentPublicContent
-from tests.api_context_handler import ApiContextHandler
+from tests.bunq_test import BunqSdkTestCase
 from tests.config import Config
 
 
-class AvatarTest(unittest.TestCase):
+class AvatarTest(BunqSdkTestCase):
     """
     Tests:
         Avatar
@@ -19,13 +17,12 @@ class AvatarTest(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls._FIRST_INDEX = 0
-        cls._PATH_TO_ATTACHMENT = '/Users/khellemun/bunq/sdk_python/tests' \
-                                  '/assets'
+        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 = ApiContextHandler.get_api_context()
+        cls._API_CONTEXT = cls.get_api_context()
 
     def test_avatar_creation(self):
         """
@@ -59,6 +56,6 @@ def attachment_contents(self):
         :rtype: bytes
         """
 
-        with open(self._PATH_TO_ATTACHMENT + self._ATTACHMENT_PATH_IN,
+        with open(self._PATH_ATTACHMENT + self._ATTACHMENT_PATH_IN,
                   self._READ_FILE_BYTES) as f:
             return f.read()

tests/model/generated/test_avatar.py

@@ -1,17 +1,16 @@
 import random
 import string
-import unittest
 
 from bunq.sdk.model.generated.endpoint import User
 from bunq.sdk.model.generated.endpoint import CardName
 from bunq.sdk.model.generated.endpoint import Card
 from bunq.sdk.model.generated.endpoint import CardDebit
 from bunq.sdk.model.generated.object_ import Pointer
-from tests.api_context_handler import ApiContextHandler
+from tests.bunq_test import BunqSdkTestCase
 from tests.config import Config
 
 
-class TestCardDebit(unittest.TestCase):
+class TestCardDebit(BunqSdkTestCase):
     """
     Tests:
         Card
@@ -24,9 +23,9 @@ def setUpClass(cls):
         cls._CARD_PIN_CODE = '4045'
         cls._FIRST_INDEX = 0
         cls._SECOND_LINE_LENGTH_MAXIMUM = 20
-        cls._EMPTY_STRING = ''
+        cls._STRING_EMPTY = ''
         cls._USER_ID = Config.get_user_id()
-        cls._API_CONTEXT = ApiContextHandler.get_api_context()
+        cls._API_CONTEXT = cls.get_api_context()
 
     def test_order_debit_card(self):
         """
@@ -81,4 +80,4 @@ def second_line_random(self):
             next_char = random.choice(string.ascii_uppercase)
             second_line_characters.append(next_char)
 
-        return self._EMPTY_STRING.join(second_line_characters)
+        return self._STRING_EMPTY.join(second_line_characters)

tests/model/generated/test_card_debit.py

@@ -1,4 +1,3 @@
-import unittest
 from datetime import datetime
 from datetime import timedelta
 
@@ -7,11 +6,11 @@
 from bunq.sdk.model.generated.object_ import DraftShareInviteBankEntry
 from bunq.sdk.model.generated.endpoint import DraftShareInviteBank
 from bunq.sdk.model.generated.endpoint import DraftShareInviteBankQrCodeContent
-from tests.api_context_handler import ApiContextHandler
+from tests.bunq_test import BunqSdkTestCase
 from tests.config import Config
 
 
-class TestDraftShareInvite(unittest.TestCase):
+class TestDraftShareInvite(BunqSdkTestCase):
     """
     Tests:
         DraftShareInviteBankEntry
@@ -24,7 +23,7 @@ def setUpClass(cls):
         cls._WRITE_BYTES = 'wb'
         cls._EXPIRATION_ADDED_TIME = 1
         cls._USER_ID = Config.get_user_id()
-        cls._API_CONTEXT = ApiContextHandler.get_api_context()
+        cls._API_CONTEXT = cls.get_api_context()
 
     def test_draft_share_invite_bank(self):
         """

tests/model/generated/test_draft_share_invite_bank.py

@@ -1,12 +1,11 @@
-import unittest
 from secrets import token_hex
 
 from bunq.sdk.model.generated.endpoint import MonetaryAccountBank
-from tests.api_context_handler import ApiContextHandler
+from tests.bunq_test import BunqSdkTestCase
 from tests.config import Config
 
 
-class TestMonetaryAccount(unittest.TestCase):
+class TestMonetaryAccount(BunqSdkTestCase):
     """
     Tests:
         MonetaryAccountBank
@@ -21,7 +20,7 @@ def setUpClass(cls):
         cls._FIELD_CURRENCY = 'EUR'
         cls._MONETARY_ACCOUNT_PREFIX = 'Python_test'
         cls._USER_ID = Config.get_user_id()
-        cls._API_CONTEXT = ApiContextHandler.get_api_context()
+        cls._API_CONTEXT = cls.get_api_context()
 
     def test_create_new_monetary_account(self):
         """

tests/model/generated/test_monetary_account_bank.py

@@ -1,14 +1,12 @@
-import unittest
-
 from bunq.sdk.model.generated.endpoint import Payment
 from bunq.sdk.model.generated.endpoint import PaymentChat
 from bunq.sdk.model.generated.endpoint import ChatMessageText
 from bunq.sdk.model.generated.object_ import Amount
-from tests.api_context_handler import ApiContextHandler
+from tests.bunq_test import BunqSdkTestCase
 from tests.config import Config
 
 
-class TestPayment(unittest.TestCase):
+class TestPayment(BunqSdkTestCase):
     """
     Tests:
         Payment
@@ -26,7 +24,7 @@ def setUpClass(cls):
         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()
-        cls._API_CONTEXT = ApiContextHandler.get_api_context()
+        cls._API_CONTEXT = cls.get_api_context()
 
     def test_payment_to_other_user(self):
         """

tests/model/generated/test_payment.py

@@ -1,13 +1,11 @@
-import unittest
-
 from bunq.sdk.model.generated.object_ import Amount
-from tests.api_context_handler import ApiContextHandler
+from tests.bunq_test import BunqSdkTestCase
 from tests.config import Config
 from bunq.sdk.model.generated.endpoint import RequestInquiry
 from bunq.sdk.model.generated.endpoint import RequestResponse
 
 
-class TestRequestEnquiry(unittest.TestCase):
+class TestRequestEnquiry(BunqSdkTestCase):
     """
     Tests:
         RequestInquiry
@@ -25,12 +23,12 @@ def setUpClass(cls):
         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()
-        cls._API_CONTEXT = ApiContextHandler.get_api_context()
+        cls._API_CONTEXT = cls.get_api_context()
 
     def test_sending_and_accepting_request(self):
         """
-        Tests sending a request from monetary account 1 to monetary account 2 and accepting this
-        request
+        Tests sending a request from monetary account 1 to monetary account 2
+        and accepting this request
 
         This test has no assertion as of its testing to see if the code runs
         without errors