Fixed failing tests.

Author: Kevin Hellemun

BunqSdk.Tests/BunqSdkTestBase.cs

@@ -29,7 +29,7 @@ public class BunqSdkTestBase
         /// <summary>
         /// Gets an Api Context, re-creates if needed and returns it.
         /// </summary>
-        protected static ApiContext GetApiContext()
+        protected static ApiContext SetUpApiContext()
         {
             ApiContext apiContext;
 
@@ -44,6 +44,8 @@ protected static ApiContext GetApiContext()
 
             apiContext.EnsureSessionActive();
             apiContext.Save(FILENAME_CONTEXT_CONF);
+            
+            BunqContext.LoadApiContext(apiContext);
 
             return apiContext;
         }

BunqSdk.Tests/Context/ApiContextTest.cs

@@ -18,7 +18,7 @@ public class ApiContextTest : BunqSdkTestBase, IClassFixture<ApiContextTest>
 
         public ApiContextTest()
         {
-            if (apiContext == null) apiContext = GetApiContext();
+            if (apiContext == null) apiContext = SetUpApiContext();
         }
 
         /// <summary>
@@ -27,7 +27,7 @@ public ApiContextTest()
         [Fact]
         public void TestApiContextSerializeDeserialize()
         {
-            var apiContextJson = apiContext.ToJson();
+            var apiContextJson = BunqContext.ApiContext.ToJson();
             var apiContextDeSerialised = ApiContext.FromJson(apiContextJson);
 
             Assert.Equal(apiContextJson, apiContextDeSerialised.ToJson());

BunqSdk.Tests/Http/PaginationScenarioTest.cs

@@ -38,7 +38,7 @@ public class PaginationScenarioTest : BunqSdkTestBase
         /// <summary>
         /// API context to use for the test API calls.
         /// </summary>
-        private static readonly ApiContext API_CONTEXT = GetApiContext();
+        private static readonly ApiContext API_CONTEXT = SetUpApiContext();
 
         [Fact]
         public void TestApiScenarioPaymentListingWithPagination()
@@ -90,19 +90,12 @@ private static IList<Payment> GetPaymentsRequired()
 
         private static BunqResponse<List<Payment>> ListPayments(IDictionary<string, string> urlParams)
         {
-            return Payment.List(API_CONTEXT, USER_ID, MONETARY_ACCOUNT_ID, urlParams);
+            return Payment.List(urlParams: urlParams);
         }
 
         private static void CreatePayment()
         {
-            var requestMap = new Dictionary<string, object>
-            {
-                {Payment.FIELD_AMOUNT, new Amount(PAYMENT_AMOUNT_EUR, PAYMENT_CURRENCY)},
-                {Payment.FIELD_DESCRIPTION, PAYMENT_DESCRIPTION},
-                {Payment.FIELD_COUNTERPARTY_ALIAS, COUNTER_PARTY_OTHER}
-            };
-
-            Payment.Create(API_CONTEXT, requestMap, USER_ID, MONETARY_ACCOUNT_ID);
+            Payment.Create(new Amount(PAYMENT_AMOUNT_EUR, PAYMENT_CURRENCY), COUNTER_PARTY_OTHER, PAYMENT_DESCRIPTION);
         }
     }
 }

BunqSdk.Tests/Http/ResponseIdOnBadRequestTest.cs

@@ -11,7 +11,7 @@ public class ResponseIdOnBadRequestTest : BunqSdkTestBase
         /// <summary>
         /// API context to use for the test API calls.
         /// </summary>
-        private static readonly ApiContext API_CONTEXT = GetApiContext();
+        private static readonly ApiContext API_CONTEXT = SetUpApiContext();
 
         /// <summary>
         /// Invalid user id to trigger BadRequestException
@@ -22,7 +22,7 @@ public class ResponseIdOnBadRequestTest : BunqSdkTestBase
         public void TestBadRequestWithResponseId()
         {
             var caughtException = Assert.Throws<BadRequestException>(
-                () => UserPerson.Get(API_CONTEXT, INVALID_USER_PERSON_ID)
+                () => UserPerson.Get()
             );
 
             Assert.NotNull(caughtException.ResponseId);

BunqSdk.Tests/Model/Generated/Endpoint/AttachmentPublicTest.cs

@@ -26,7 +26,7 @@ public class AttachmentPublicTest : BunqSdkTestBase
         /// <summary>
         /// API context to use for the test API calls.
         /// </summary>
-        private static readonly ApiContext API_CONTEXT = GetApiContext();
+        private static readonly ApiContext API_CONTEXT = SetUpApiContext();
 
         /// <summary>
         /// Tests if the file we upload is the file we are getting back once successfully uploaded does.
@@ -42,8 +42,8 @@ public void TestAttachmentUploadAndRetrieval()
                 {ApiClient.HEADER_ATTACHMENT_DESCRIPTION, ATTACHMENT_DESCRIPTION}
             };
 
-            var attachmentUuid = AttachmentPublic.Create(API_CONTEXT, fileContentBytes, customHeaders).Value;
-            var responseBytes = AttachmentPublicContent.List(API_CONTEXT, attachmentUuid).Value;
+            var attachmentUuid = AttachmentPublic.Create(fileContentBytes, customHeaders).Value;
+            var responseBytes = AttachmentPublicContent.List(attachmentUuid).Value;
 
             Assert.Equal(fileContentBytes, responseBytes);
         }

BunqSdk.Tests/Model/Generated/Endpoint/AvatarTest.cs

@@ -28,7 +28,7 @@ public class AvatarTest : BunqSdkTestBase
         /// <summary>
         /// API context to use for the test API calls.
         /// </summary>
-        private static readonly ApiContext API_CONTEXT = GetApiContext();
+        private static readonly ApiContext API_CONTEXT = SetUpApiContext();
 
         /// <summary>
         /// Tests the creation of an avatar by uploading a picture via AttachmentPublic and setting it as avatar
@@ -44,11 +44,11 @@ public void TestCreateAvatarAndRetrieval()
             {
                 {Avatar.FIELD_ATTACHMENT_PUBLIC_UUID, attachmentUuid}
             };
-            var avatarUuid = Avatar.Create(API_CONTEXT, avatarMap).Value;
+            var avatarUuid = Avatar.Create(attachmentUuid).Value;
 
-            var attachmentUuidFromAvatar = Avatar.Get(API_CONTEXT, avatarUuid).Value
+            var attachmentUuidFromAvatar = Avatar.Get(avatarUuid).Value
                 .Image[INDEX_FIRST].AttachmentPublicUuid;
-            var revievedFileContentByte = AttachmentPublicContent.List(API_CONTEXT, attachmentUuidFromAvatar).Value;
+            var revievedFileContentByte = AttachmentPublicContent.List(attachmentUuidFromAvatar).Value;
 
             Assert.Equal(attachmentUuid, attachmentUuidFromAvatar);
             Assert.Equal(fileContentByte, revievedFileContentByte);
@@ -61,8 +61,8 @@ private static string UploadAvatarAndGetUuid(byte[] fileContentByte)
                 {ApiClient.HEADER_ATTACHMENT_DESCRIPTION, ATTACHMENT_DECSRIPTION},
                 {ApiClient.HEADER_CONTENT_TYPE, CONTEN_TYPE},
             };
-
-            return AttachmentPublic.Create(API_CONTEXT, fileContentByte, customHeaders).Value;
+ 
+            return AttachmentPublic.Create(fileContentByte, customHeaders).Value;
         }
     }
 }

BunqSdk.Tests/Model/Generated/Endpoint/CardDebitTest.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using Bunq.Sdk.Context;
 using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Model.Generated.Object;
@@ -25,13 +26,14 @@ public class CardDebitTest : BunqSdkTestBase
         private const int BASE_DECIMAL = 10;
         private const int CARD_SECOND_LINE_LENGTH_MAXIMUM = 20;
         private const int NUMBER_ONE = 1;
+        private const string CardTypeMaestro = "MAESTRO";
 
         private static readonly int USER_ID = Config.GetUserId();
 
         /// <summary>
         /// API context used to for the test API calls.
         /// </summary>
-        private static readonly ApiContext API_CONTEXT = GetApiContext();
+        private static readonly ApiContext API_CONTEXT = SetUpApiContext();
 
         /// <summary>
         /// Tests ordering a new card and checks if the fields we have entered are indeed correct by.
@@ -40,20 +42,16 @@ public class CardDebitTest : BunqSdkTestBase
         public void TestOrderNewMaestroCard()
         {
             var cardPinAssignment = new CardPinAssignment(
-                CARD_PIN_ASSIGNMENT_TYPE_PRIMARY, 
+                CARD_PIN_ASSIGNMENT_TYPE_PRIMARY,
                 PIN_CODE,
                 Config.GetMonetarytAccountId());
             var allCardPinAssignments = new List<CardPinAssignment> {cardPinAssignment};
-            var cardDebitMap = new Dictionary<string, object>
-            {
-                {CardDebit.FIELD_ALIAS, GetAlias()},
-                {CardDebit.FIELD_NAME_ON_CARD, GetAnAllowedName()},
-                {CardDebit.FIELD_PIN_CODE_ASSIGNMENT, allCardPinAssignments},
-                {CardDebit.FIELD_SECOND_LINE, GenerateRandomSecondLine()}
-            };
-            var cardDebit = CardDebit.Create(API_CONTEXT, cardDebitMap, USER_ID).Value;
+            var cardDebit = CardDebit.Create(GenerateRandomSecondLine(), GetAnAllowedName(), GetAlias(), CardTypeMaestro,
+                allCardPinAssignments).Value;
 
-            var cardFromCardEndpoint = Card.Get(API_CONTEXT, USER_ID, cardDebit.Id.Value).Value;
+            Assert.True(cardDebit.Id != null);
+            
+            var cardFromCardEndpoint = Card.Get(cardDebit.Id.Value).Value;
 
             Assert.Equal(cardDebit.SecondLine, cardFromCardEndpoint.SecondLine);
             Assert.Equal(cardDebit.Created, cardFromCardEndpoint.Created);
@@ -62,7 +60,7 @@ public void TestOrderNewMaestroCard()
 
         private static string GetAnAllowedName()
         {
-            return CardName.List(API_CONTEXT, USER_ID).Value[INDEX_FIRST].PossibleCardNameArray[INDEX_FIRST];
+            return CardName.List().Value[INDEX_FIRST].PossibleCardNameArray[INDEX_FIRST];
         }
 
         private static string GenerateRandomSecondLine()
@@ -77,7 +75,7 @@ private static string GenerateRandomSecondLine()
 
         private static Pointer GetAlias()
         {
-            return User.Get(API_CONTEXT, USER_ID).Value.UserCompany.Alias[INDEX_FIRST];
+            return User.Get().Value.UserCompany.Alias[INDEX_FIRST];
         }
     }
 }

BunqSdk.Tests/Model/Generated/Endpoint/DraftShareInviteBankQrCodeContentTest.cs

@@ -28,7 +28,7 @@ public class DraftShareInviteBankQrCodeContentTest : BunqSdkTestBase
         /// <summary>
         /// API context to use for the test API calls
         /// </summary>
-        private static readonly ApiContext API_CONTEXT = GetApiContext();
+        private static readonly ApiContext API_CONTEXT = SetUpApiContext();
 
         /// <summary>
         /// Tests the creation of a connect and getting the qr code related to this connect.
@@ -40,7 +40,7 @@ public void TestCreateInviteBankAndGetQrCode()
         {
             var draftId = GetShareInviteId();
 
-            var qrContent = DraftShareInviteBankQrCodeContent.List(API_CONTEXT, USER_ID, draftId).Value;
+            var qrContent = DraftShareInviteBankQrCodeContent.List(draftId).Value;
 
             var fileOut = new FileInfo(FILENAME_QR_CODE_IMAGE);
             fileOut.Directory.Create();
@@ -53,16 +53,10 @@ private static int GetShareInviteId()
             var addTime = new TimeSpan(TIME_UNIT_AMOUNT_ZERO, TIME_UNIT_AMOUNT_ONE, TIME_UNIT_AMOUNT_ZERO);
             var expirationTime = currentDate.Add(addTime).ToString(FORMAT_DATE);
 
-            var draftShareInviteBankEntry = new DraftShareInviteBankEntry(new ShareDetail
+            var draftShareInviteEntry = new DraftShareInviteEntry(new ShareDetail
                 {Payment = new ShareDetailPayment(true, true, true, true)});
 
-            var requestMap = new Dictionary<string, object>
-            {
-                {DraftShareInviteBank.FIELD_DRAFT_SHARE_SETTINGS, draftShareInviteBankEntry},
-                {DraftShareInviteBank.FIELD_EXPIRATION, expirationTime}
-            };
-
-            return DraftShareInviteBank.Create(API_CONTEXT, requestMap, USER_ID).Value;
+            return DraftShareInviteBank.Create(expirationTime, draftShareInviteEntry).Value;
         }
     }
 }

BunqSdk.Tests/Model/Generated/Endpoint/MonetaryAccountBankTest.cs

@@ -15,6 +15,7 @@ public class MonetaryAccountBankTest : BunqSdkTestBase
         /// Config values
         /// </summary>
         private const string STATUS = "CANCELLED";
+
         private const string SUBS_STATUS = "REDEMPTION_VOLUNTARY";
         private const string REASON = "OTHER";
         private const string REASON_DESCRIPTION = "Because this is a test";
@@ -26,34 +27,23 @@ public class MonetaryAccountBankTest : BunqSdkTestBase
         /// <summary>
         /// API context used for the test API calls.
         /// </summary>
-        private static readonly ApiContext API_CONTEXT = GetApiContext();
+        private static readonly ApiContext API_CONTEXT = SetUpApiContext();
 
         /// <summary>
         /// Tests the creation of a new monetary account. This accoult will then be removed afterwards.
         /// </summary>
         [Fact]
         public void TestCreationNewMonetaryAccount()
         {
-            var requestMap = new Dictionary<string, object>
-            {
-                {MonetaryAccountBank.FIELD_CURRENCY, CURRENCY},
-                {MonetaryAccountBank.FIELD_DESCRIPTION, MONETARY_ACCOUNT_DESCRIPTION}
-            };
-            var monetaryAccountToCloseId = MonetaryAccountBank.Create(API_CONTEXT, requestMap, USER_ID).Value;
+            var monetaryAccountToCloseId = MonetaryAccountBank.Create(CURRENCY, MONETARY_ACCOUNT_DESCRIPTION).Value;
 
             DeleteMonetaryAccount(monetaryAccountToCloseId);
         }
 
         private static void DeleteMonetaryAccount(int idToClose)
         {
-            var requestMap = new Dictionary<string, object>
-            {
-                {MonetaryAccountBank.FIELD_STATUS, STATUS},
-                {MonetaryAccountBank.FIELD_SUB_STATUS, SUBS_STATUS},
-                {MonetaryAccountBank.FIELD_REASON, REASON},
-                {MonetaryAccountBank.FIELD_REASON_DESCRIPTION, REASON_DESCRIPTION}
-            };
-            MonetaryAccountBank.Update(API_CONTEXT, requestMap, USER_ID, idToClose);
+            MonetaryAccountBank.Update(idToClose, status: STATUS, subStatus: SUBS_STATUS, reason: REASON,
+                reasonDescription: REASON_DESCRIPTION);
         }
     }
-}
+}

BunqSdk.Tests/Model/Generated/Endpoint/PaymentChatTest.cs

@@ -29,35 +29,22 @@ public class PaymentChatTest : BunqSdkTestBase
         /// <summary>
         /// API context used for the test API calls.
         /// </summary>
-        private static readonly ApiContext API_CONTEXT = GetApiContext();
+        private static readonly ApiContext API_CONTEXT = SetUpApiContext();
 
         /// <summary>
         /// Tests sending a chat message in a newly created payment.
         /// </summary>
         [Fact]
         public void TestSendPaymentChat()
         {
-            var paymentChatMap = new Dictionary<string, object>();
-            var chatId = PaymentChat.Create(API_CONTEXT, paymentChatMap, USER_ID, MONETARTY_ACCOUNT_ID,
-                CreatePaymentAndGetId()).Value;
+            var chatId = PaymentChat.Create(CreatePaymentAndGetId()).Value;
 
-            var chatMessageMap = new Dictionary<string, object>
-            {
-                {ChatMessageText.FIELD_TEXT, MESSAGE_TEXT}
-            };
-            ChatMessageText.Create(API_CONTEXT, chatMessageMap, USER_ID, chatId);
+            ChatMessageText.Create(chatId, MESSAGE_TEXT);
         }
 
         private static int CreatePaymentAndGetId()
         {
-            var requestMap = new Dictionary<string, object>
-            {
-                {Payment.FIELD_AMOUNT, new Amount(AMOUNT_EUR, CURRENCY)},
-                {Payment.FIELD_COUNTERPARTY_ALIAS, COUNTER_PARTY_ALIAS},
-                {Payment.FIELD_DESCRIPTION, PAYMENT_DESCRIPTION},
-            };
-
-            return Payment.Create(API_CONTEXT, requestMap, USER_ID, MONETARTY_ACCOUNT_ID).Value;
+            return Payment.Create(new Amount(AMOUNT_EUR, CURRENCY), COUNTER_PARTY_ALIAS, PAYMENT_DESCRIPTION).Value;
         }
     }
 }