fix tests to use new module structure

Author: galesky-a

test/BinLookupTest.py

@@ -21,7 +21,7 @@ class TestBinLookup(unittest.TestCase):
     client.username = "YourWSUser"
     client.password = "YourWSPassword"
     client.platform = "test"
-    binLookup_version = ady.binlookup.baseUrl.split('/')[-1]
+    binLookup_version = ady.binlookup.bin_lookup_api.baseUrl.split('/')[-1]
 
     def test_get_cost_estimate_success(self):
         self.ady.client.http_client.request.reset_mock()
@@ -49,7 +49,7 @@ def test_get_cost_estimate_success(self):
             filename='test/mocks/binlookup/getcostestimate-success.json'
         )
 
-        result = self.ady.binlookup.get_cost_estimate(REQUEST_KWARGS)
+        result = self.ady.binlookup.bin_lookup_api.get_cost_estimate(REQUEST_KWARGS)
         self.assertEqual(expected, result.message)
         self.ady.client.http_client.request.assert_called_once_with(
             'POST',
@@ -74,7 +74,7 @@ def test_get_cost_estimate_error_mocked(self):
             )
         )
 
-        result = self.ady.binlookup.get_cost_estimate(REQUEST_KWARGS)
+        result = self.ady.binlookup.bin_lookup_api.get_cost_estimate(REQUEST_KWARGS)
         self.assertEqual(422, result.message['status'])
         self.assertEqual("101", result.message['errorCode'])
         self.assertEqual("Invalid card number", result.message['message'])

test/DataProtectionTest.py

@@ -15,7 +15,7 @@ class TestCheckout(unittest.TestCase):
     test = BaseTest(adyen)
     client.xapikey = "YourXapikey"
     client.platform = "test"
-    data_protection_url = adyen.dataProtection.baseUrl
+    data_protection_url = adyen.dataProtection.data_protection_api.baseUrl
     lib_version = settings.LIB_VERSION
 
     def test_data_erasure(self):
@@ -26,7 +26,7 @@ def test_data_erasure(self):
         }
         self.adyen.client = self.test.create_client_from_file(200, request,
                                                               "test/mocks/dataProtection/erasure-response.json")
-        result = self.adyen.dataProtection.request_subject_erasure(request)
+        result = self.adyen.dataProtection.data_protection_api.request_subject_erasure(request)
         self.adyen.client.http_client.request.assert_called_once_with(
             'POST',
             f'{self.data_protection_url}'

test/DetermineEndpointTest.py

@@ -21,7 +21,7 @@ class TestDetermineUrl(unittest.TestCase):
     checkout_version = checkout_url.split('/')[-1]
     payment_url = adyen.payment.payments_api.baseUrl
     payment_version = payment_url.split('/')[-1]
-    binlookup_url = adyen.binlookup.baseUrl
+    binlookup_url = adyen.binlookup.bin_lookup_api.baseUrl
     management_url = adyen.management.account_merchant_level_api.baseUrl
 
     def test_checkout_api_url_custom(self):
@@ -32,8 +32,8 @@ def test_checkout_api_url_custom(self):
 
     def test_pos_mobile_api_url_live(self):
         self.client.live_endpoint_prefix = "1797a841fbb37ca7-AdyenDemo"
-        pos_mobile_api = AdyenPosMobileApi(self.client)
-        pos_mobile_url = pos_mobile_api.baseUrl
+        pos_mobile = AdyenPosMobileApi(self.client)
+        pos_mobile_url = pos_mobile.pos_mobile_api.baseUrl
         pos_mobile_version = pos_mobile_url.split('/')[-1]
         url = self.adyen.client._determine_api_url("live", pos_mobile_url + "/sessions")
         self.assertEqual("https://1797a841fbb37ca7-AdyenDemo-checkout-"

test/DisputesTest.py

@@ -15,7 +15,7 @@ class TestDisputes(unittest.TestCase):
     test = BaseTest(adyen)
     client.xapikey = "YourXapikey"
     client.platform = "test"
-    disputes_url = adyen.disputes.baseUrl
+    disputes_url = adyen.disputes.disputes_api.baseUrl
 
     def test_accept_dispute(self):
         request = {
@@ -25,7 +25,7 @@ def test_accept_dispute(self):
         self.adyen.client = self.test.create_client_from_file(200, request,
                                                               "test/mocks/disputes/"
                                                               "post-acceptDispute-accept-dispute-200.json")
-        result = self.adyen.disputes.accept_dispute(request)
+        result = self.adyen.disputes.disputes_api.accept_dispute(request)
 
         self.adyen.client.http_client.request.assert_called_once_with(
             'POST',
@@ -44,7 +44,7 @@ def test_defend_dispute(self):
         self.adyen.client = self.test.create_client_from_file(200, request,
                                                               "test/mocks/disputes/"
                                                               "post-defendDispute-defend-dispute-200.json")
-        result = self.adyen.disputes.defend_dispute(request)
+        result = self.adyen.disputes.disputes_api.defend_dispute(request)
 
         self.adyen.client.http_client.request.assert_called_once_with(
             'POST',
@@ -63,7 +63,7 @@ def test_delete_defense_dispute_document(self):
         self.adyen.client = self.test.create_client_from_file(200, request,
                                                               "test/mocks/disputes/"
                                                               "post-deleteDisputeDefenseDocument-delete-dispute-defense-document-200.json")
-        result = self.adyen.disputes.delete_dispute_defense_document(request)
+        result = self.adyen.disputes.disputes_api.delete_dispute_defense_document(request)
 
         self.adyen.client.http_client.request.assert_called_once_with(
             'POST',
@@ -81,7 +81,7 @@ def test_download_dispute_defense_document(self):
         self.adyen.client = self.test.create_client_from_file(200, request,
                                                               "test/mocks/disputes/"
                                                               "post-downloadDisputeDefenseDocument-download-dispute-defense-document-200.json")
-        result = self.adyen.disputes.delete_dispute_defense_document(request)
+        result = self.adyen.disputes.disputes_api.delete_dispute_defense_document(request)
 
         self.adyen.client.http_client.request.assert_called_once_with(
             'POST',
@@ -99,7 +99,7 @@ def test_retrieve_applicable_defense_reasons(self):
         self.adyen.client = self.test.create_client_from_file(200, request,
                                                               "test/mocks/disputes/"
                                                               "post-retrieveApplicableDefenseReasons-retrieve-defense-reasons-200.json")
-        result = self.adyen.disputes.retrieve_applicable_defense_reasons(request)
+        result = self.adyen.disputes.disputes_api.retrieve_applicable_defense_reasons(request)
 
         self.adyen.client.http_client.request.assert_called_once_with(
             'POST',
@@ -124,7 +124,7 @@ def test_supply_defense_document(self):
         self.adyen.client = self.test.create_client_from_file(200, request,
                                                               "test/mocks/disputes/"
                                                               "post-supplyDefenseDocument-supply-defense-document-200.json")
-        result = self.adyen.disputes.supply_defense_document(request)
+        result = self.adyen.disputes.disputes_api.supply_defense_document(request)
 
         self.adyen.client.http_client.request.assert_called_once_with(
             'POST',

test/RecurringTest.py

@@ -14,7 +14,7 @@ class TestRecurring(unittest.TestCase):
     client.username = "YourWSUser"
     client.password = "YourWSPassword"
     client.platform = "test"
-    baseUrl = adyen.recurring.baseUrl
+    baseUrl = adyen.recurring.recurring_api.baseUrl
 
     def test_list_recurring_details(self):
         request = {}
@@ -30,7 +30,7 @@ def test_list_recurring_details(self):
                                                             'listRecurring'
                                                             'Details-'
                                                             'success.json')
-        result = self.adyen.recurring.list_recurring_details(request)
+        result = self.adyen.recurring.recurring_api.list_recurring_details(request)
         self.adyen.client.http_client.request.assert_called_once_with(
             'POST',
             f'{self.baseUrl}/listRecurringDetails',
@@ -57,7 +57,7 @@ def test_disable(self):
                                                             'recurring/'
                                                             'disable-success'
                                                             '.json')
-        result = self.adyen.recurring.disable(request)
+        result = self.adyen.recurring.recurring_api.disable(request)
         self.adyen.client.http_client.request.assert_called_once_with(
             'POST',
             f'{self.baseUrl}/disable',
@@ -83,7 +83,7 @@ def test_disable_803(self):
         self.assertRaisesRegex(
             Adyen.AdyenAPIUnprocessableEntity,
             "AdyenAPIUnprocessableEntity:{'status': 422, 'errorCode': '803', 'message': 'PaymentDetail not found', 'errorType': 'validation'}",
-            self.adyen.recurring.disable,
+            self.adyen.recurring.recurring_api.disable,
             request
         )
 

test/StoredValueTest.py

@@ -15,7 +15,7 @@ class TestManagement(unittest.TestCase):
     test = BaseTest(adyen)
     client.xapikey = "YourXapikey"
     client.platform = "test"
-    stored_value_url = adyen.storedValue.baseUrl
+    stored_value_url = adyen.storedValue.stored_value_api.baseUrl
 
     def issue(self):
         request = {
@@ -30,7 +30,7 @@ def issue(self):
 
         self.adyen.client = self.test.create_client_from_file(200, request,
                                                               "test/mocks/storedValue/issue-giftcard.json")
-        result = self.adyen.storedValue.issue(request)
+        result = self.adyen.storedValue.stored_value_api.issue(request)
         self.assertEqual(result.message['paymentMethod']['type'], 'givex')
         self.adyen.client.http_client.request.assert_called_once_with(
             'POST',
@@ -58,7 +58,7 @@ def test_activate_giftcard(self):
         }
         self.adyen.client = self.test.create_client_from_file(200, request,
                                                               "test/mocks/storedValue/activate-giftcards.json")
-        result = self.adyen.storedValue.change_status(request)
+        result = self.adyen.storedValue.stored_value_api.change_status(request)
         self.assertEqual(result.message['currentBalance']['value'], 1000)
         self.adyen.client.http_client.request.assert_called_once_with(
             'POST',
@@ -85,7 +85,7 @@ def test_load_funds(self):
             "reference": "YOUR_REFERENCE"
         }
         self.adyen.client = self.test.create_client_from_file(200, request, "test/mocks/storedValue/load-funds.json")
-        result = self.adyen.storedValue.load(request)
+        result = self.adyen.storedValue.stored_value_api.load(request)
         self.assertEqual(result.message['resultCode'], 'Success')
         self.adyen.client.http_client.request.assert_called_once_with(
             'POST',
@@ -107,7 +107,7 @@ def test_check_balance(self):
             "reference": "YOUR_REFERENCE"
         }
         self.adyen.client = self.test.create_client_from_file(200, request, "test/mocks/storedValue/check-balance.json")
-        result = self.adyen.storedValue.check_balance(request)
+        result = self.adyen.storedValue.stored_value_api.check_balance(request)
         self.assertEqual(result.message['currentBalance']['value'], 5600)
         self.adyen.client.http_client.request.assert_called_once_with(
             'POST',
@@ -133,7 +133,7 @@ def test_merge_balance(self):
             "reference": "YOUR_REFERENCE"
         }
         self.adyen.client = self.test.create_client_from_file(200, request, "test/mocks/storedValue/merge-balance.json")
-        result = self.adyen.storedValue.merge_balance(request)
+        result = self.adyen.storedValue.stored_value_api.merge_balance(request)
         self.assertEqual(result.message['pspReference'], "881564657480267D")
         self.adyen.client.http_client.request.assert_called_once_with(
             'POST',
@@ -151,7 +151,7 @@ def test_void_transaction(self):
         }
         self.adyen.client = self.test.create_client_from_file(200, request,
                                                               "test/mocks/storedValue/undo-transaction.json")
-        result = self.adyen.storedValue.void_transaction(request)
+        result = self.adyen.storedValue.stored_value_api.void_transaction(request)
         self.adyen.client.http_client.request.assert_called_once_with(
             'POST',
             f'{self.stored_value_url}/voidTransaction',