From 04fa5a641af00c0af0b9b5c64202879a34fbb52e Mon Sep 17 00:00:00 2001 From: "SECURENET\\fzirbo-endv" Date: Tue, 22 Nov 2016 06:16:10 -0600 Subject: [PATCH 1/7] GGEN-13 Soft Descriptor through Java SDK Transactions, GGEN-39 Soft Descriptor through Java SDK Auto Bill Transactions --- .../Api/Models/ExtendedInformation.java | 12 +++ .../Api/Models/InstallmentPaymentPlan.java | 10 ++ .../Api/Models/RecurringPaymentPlan.java | 10 ++ .../Models/StoredInstallmentPaymentPlan.java | 8 ++ .../Models/StoredRecurringPaymentPlan.java | 9 ++ .../Api/Models/StoredVariablePaymentPlan.java | 17 +++- .../Api/Models/Transaction.java | 9 ++ .../Api/Models/VariablePaymentPlan.java | 4 +- .../Api/Requests/CreditRequest.java | 15 +++ .../UpdateVariablePaymentPlanRequest.java | 9 +- .../UpdateVariablePaymentPlanResponse.java | 27 +++++ .../controllers/CustomersControllerTest.java | 98 +++++++++++++++++-- .../controllers/PaymentsControllerTest.java | 96 ++++++++++-------- .../controllers/PrevaultControllerTest.java | 6 ++ .../TransactionsControllerTest.java | 8 +- 15 files changed, 271 insertions(+), 67 deletions(-) diff --git a/src/main/java/SecureNetRestApiSDK/Api/Models/ExtendedInformation.java b/src/main/java/SecureNetRestApiSDK/Api/Models/ExtendedInformation.java index 8400161..5127458 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Models/ExtendedInformation.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Models/ExtendedInformation.java @@ -154,6 +154,18 @@ public String getInvoiceDescription() { public void setInvoiceDescription(String value) { invoiceDescription = value; + } + + /** + * Displays a description in addition to the merchants DBA. + */ + private String softDescriptor = new String(); + public String getSoftDescriptor() { + return softDescriptor; + } + + public void setSoftDescriptor(String value) { + softDescriptor = value; } } diff --git a/src/main/java/SecureNetRestApiSDK/Api/Models/InstallmentPaymentPlan.java b/src/main/java/SecureNetRestApiSDK/Api/Models/InstallmentPaymentPlan.java index deb0c5a..b28056d 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Models/InstallmentPaymentPlan.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Models/InstallmentPaymentPlan.java @@ -219,6 +219,16 @@ public void setUserDefinedFields(List value) { userDefinedFields = value; } + private String softDescriptor = new String(); + + public String getSoftDescriptor() { + return softDescriptor; + } + + public void setSoftDescriptor(String value) { + softDescriptor = value; + } + } diff --git a/src/main/java/SecureNetRestApiSDK/Api/Models/RecurringPaymentPlan.java b/src/main/java/SecureNetRestApiSDK/Api/Models/RecurringPaymentPlan.java index fa34aba..0859747 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Models/RecurringPaymentPlan.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Models/RecurringPaymentPlan.java @@ -154,6 +154,16 @@ public void setUserDefinedFields(List value) { userDefinedFields = value; } + + private String softDescriptor = new String(); + public String getSoftDescriptor() { + return softDescriptor; + } + + public void setSoftDescriptor(String value) { + softDescriptor = value; + } + } diff --git a/src/main/java/SecureNetRestApiSDK/Api/Models/StoredInstallmentPaymentPlan.java b/src/main/java/SecureNetRestApiSDK/Api/Models/StoredInstallmentPaymentPlan.java index 6307441..1580305 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Models/StoredInstallmentPaymentPlan.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Models/StoredInstallmentPaymentPlan.java @@ -7,6 +7,14 @@ public class StoredInstallmentPaymentPlan { + private String softDescriptor = new String(); + public String getSoftDescriptor() { + return softDescriptor; + } + + public void setSoftDescriptor(String value) { + softDescriptor = value; + } } diff --git a/src/main/java/SecureNetRestApiSDK/Api/Models/StoredRecurringPaymentPlan.java b/src/main/java/SecureNetRestApiSDK/Api/Models/StoredRecurringPaymentPlan.java index 4e36681..fd20b66 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Models/StoredRecurringPaymentPlan.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Models/StoredRecurringPaymentPlan.java @@ -161,6 +161,15 @@ public List getSchedules() { public void setSchedules(List value) { schedules = value; } + + private String softDescriptor = new String(); + public String getSoftDescriptor() { + return softDescriptor; + } + + public void setSoftDescriptor(String value) { + softDescriptor = value; + } } diff --git a/src/main/java/SecureNetRestApiSDK/Api/Models/StoredVariablePaymentPlan.java b/src/main/java/SecureNetRestApiSDK/Api/Models/StoredVariablePaymentPlan.java index c1301b5..8a3da7b 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Models/StoredVariablePaymentPlan.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Models/StoredVariablePaymentPlan.java @@ -4,17 +4,15 @@ package SecureNetRestApiSDK.Api.Models; -import java.util.Date; - public class StoredVariablePaymentPlan { - private Date planStartDate = new Date(); - public Date getPlanStartDate() { + private Object planStartDate = new Object(); + public Object getPlanStartDate() { return planStartDate; } - public void setPlanStartDate(Date value) { + public void setPlanStartDate(Object value) { planStartDate = value; } @@ -43,6 +41,15 @@ public String getNotes() { public void setNotes(String value) { notes = value; + } + + private String softDescriptor = new String(); + public String getSoftDescriptor() { + return softDescriptor; + } + + public void setSoftDescriptor(String value) { + softDescriptor = value; } } diff --git a/src/main/java/SecureNetRestApiSDK/Api/Models/Transaction.java b/src/main/java/SecureNetRestApiSDK/Api/Models/Transaction.java index a171213..f2b4ef7 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Models/Transaction.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Models/Transaction.java @@ -447,6 +447,15 @@ public Object getImageResult() { public void setImageResult(Object value) { imageResult = value; } + + private String softDescriptor = new String(); + public String getSoftDescriptor() { + return softDescriptor; + } + + public void setSoftDescriptor(String value) { + softDescriptor = value; + } } diff --git a/src/main/java/SecureNetRestApiSDK/Api/Models/VariablePaymentPlan.java b/src/main/java/SecureNetRestApiSDK/Api/Models/VariablePaymentPlan.java index 4cb32b6..dedcc47 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Models/VariablePaymentPlan.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Models/VariablePaymentPlan.java @@ -7,8 +7,8 @@ public class VariablePaymentPlan extends StoredVariablePaymentPlan { - private Date planEndDate = new Date(); - public Date getPlanEndDate() { + private Object planEndDate = new Object(); + public Object getPlanEndDate() { return planEndDate; } diff --git a/src/main/java/SecureNetRestApiSDK/Api/Requests/CreditRequest.java b/src/main/java/SecureNetRestApiSDK/Api/Requests/CreditRequest.java index a6af07b..e710859 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Requests/CreditRequest.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Requests/CreditRequest.java @@ -6,6 +6,7 @@ import SNET.Core.HttpMethodEnum; import SecureNetRestApiSDK.Api.Models.Card; +import SecureNetRestApiSDK.Api.Models.ExtendedInformation; public class CreditRequest extends SecureNetRequest { @@ -27,6 +28,20 @@ public void setCard(Card value) { card = value; } + + /** + * Additional data to assist in reporting, ecommerce or moto transactions, + * and level 2 or level 3 processing. Includes user-defined fields and + * invoice-related information. + */ + private ExtendedInformation extendedInformation; + public ExtendedInformation getExtendedInformation(){ + return extendedInformation; + } + + public void setExtendedInformation(ExtendedInformation value) { + extendedInformation = value; + } public String getUri() throws Exception { return "api/Payments/Credit"; diff --git a/src/main/java/SecureNetRestApiSDK/Api/Requests/UpdateVariablePaymentPlanRequest.java b/src/main/java/SecureNetRestApiSDK/Api/Requests/UpdateVariablePaymentPlanRequest.java index 4b43554..6df0f7c 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Requests/UpdateVariablePaymentPlanRequest.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Requests/UpdateVariablePaymentPlanRequest.java @@ -3,6 +3,7 @@ // package SecureNetRestApiSDK.Api.Requests; +import SecureNetRestApiSDK.Api.Models.VariablePaymentPlan; import SNET.Core.HttpMethodEnum; @@ -26,17 +27,17 @@ public void setPlanId(String value) { planId = value; } - private Object plan = new Object(); - public Object getPlan() { + private VariablePaymentPlan plan = new VariablePaymentPlan(); + public VariablePaymentPlan getPlan() { return plan; } - public void setPlan(Object value) { + public void setPlan(VariablePaymentPlan value) { plan = value; } public String getUri() throws Exception { - return String.format("api/Customers/%s/PaymentSchedules/variable/%s", getCustomerId(), getPlan().toString()); + return String.format("api/Customers/%s/PaymentSchedules/variable/%s", getCustomerId(), getPlanId().toString()); } public HttpMethodEnum getMethod() throws Exception { diff --git a/src/main/java/SecureNetRestApiSDK/Api/Responses/UpdateVariablePaymentPlanResponse.java b/src/main/java/SecureNetRestApiSDK/Api/Responses/UpdateVariablePaymentPlanResponse.java index 2a5b6a2..c033817 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Responses/UpdateVariablePaymentPlanResponse.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Responses/UpdateVariablePaymentPlanResponse.java @@ -4,10 +4,37 @@ package SecureNetRestApiSDK.Api.Responses; +import SecureNetRestApiSDK.Api.Models.StoredVariablePaymentPlan; import SecureNetRestApiSDK.Api.Responses.SecureNetResponse; public class UpdateVariablePaymentPlanResponse extends SecureNetResponse { + private Object storedInstallmentPaymentPlan = new Object(); + public Object getStoredInstallmentPaymentPlan() { + return storedInstallmentPaymentPlan; + } + + public void setStoredInstallmentPaymentPlan(Object value) { + storedInstallmentPaymentPlan = value; + } + + private Object storedRecurringPaymentPlan; + public Object getStoredRecurringPaymentPlan() { + return storedRecurringPaymentPlan; + } + + public void setStoredRecurringPaymentPlan(Object value) { + storedRecurringPaymentPlan = value; + } + + private StoredVariablePaymentPlan storedVariablePaymentPlan = new StoredVariablePaymentPlan(); + public StoredVariablePaymentPlan getStoredVariablePaymentPlan() { + return storedVariablePaymentPlan; + } + + public void setStoredVariablePaymentPlan(StoredVariablePaymentPlan value) { + storedVariablePaymentPlan = value; + } } diff --git a/src/test/java/test/controllers/CustomersControllerTest.java b/src/test/java/test/controllers/CustomersControllerTest.java index 2540156..c3c85b0 100755 --- a/src/test/java/test/controllers/CustomersControllerTest.java +++ b/src/test/java/test/controllers/CustomersControllerTest.java @@ -4,6 +4,8 @@ package test.controllers; import java.io.InputStream; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -23,6 +25,8 @@ import SecureNetRestApiSDK.Api.Models.PaymentVaultToken; import SecureNetRestApiSDK.Api.Models.RecurringPaymentPlan; import SecureNetRestApiSDK.Api.Models.UserDefinedField; +import SecureNetRestApiSDK.Api.Models.VariablePaymentPlan; +import SecureNetRestApiSDK.Api.Models.Schedule; import SecureNetRestApiSDK.Api.Requests.AddInstallmentPaymentPlanRequest; import SecureNetRestApiSDK.Api.Requests.AddPaymentMethodRequest; import SecureNetRestApiSDK.Api.Requests.AddRecurringPaymentPlanRequest; @@ -129,8 +133,8 @@ public void secureNetVaultCreateCustomerAndPaymentAccountRequestReturnsSuccessfu // Act /* [UNSUPPORTED] 'var' as type is unsupported "var" */ VaultCustomerAndPaymentMethodResponse response = (VaultCustomerAndPaymentMethodResponse) controller.processRequest(apiContext, request,VaultCustomerAndPaymentMethodResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert + Assert.assertTrue(response.toResponseString(), response.getSuccess()); } /** @@ -151,8 +155,8 @@ public void secureNetVaultStoreAccountAfterChargeRequestReturnsSuccessfully() // Act /* [UNSUPPORTED] 'var' as type is unsupported "var" */ ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); - Assert.assertTrue(response.toResponseString(),response.getSuccess()); // Assert + Assert.assertTrue(response.toResponseString(),response.getSuccess()); } /** @@ -176,8 +180,8 @@ public void recurringBillingCreateRetrieveUpdateAndDeleteInstallmentPlanRequests recurringBillingRetrievePaymentPlanRequestReturnsSuccessfully( customerId, planId); // Update the Installment Plan - /*recurringBillingUpdateInstallmentPlanRequestReturnsSuccessfully( - customerId, planId);*/ + recurringBillingUpdateInstallmentPlanrequestReturnsSuccessfully( + customerId, planId); // Delete the Payment Account /*secureNetVaultDeletePaymentAccountRequestReturnsSuccessfully( customerId, paymentMethodId);*/ @@ -210,6 +214,34 @@ public void recurringBillingCreateRetrieveUpdateAndDeleteRecurringPaymentPlanReq /*secureNetVaultDeletePaymentAccountRequestReturnsSuccessfully( customerId, paymentMethodId);*/ } + + /** + * Unit Tests for Creating a Payment Account, Creating a Variable Payment + * Plan, Updating the Variable Payment Plan, Retrieving the Variable + * Payment Plan, and deleting the Variable Payment Plan requests. Tests + * combined in one method to pass the required payment method identifier, + * the plan identifier and to guaranteee the order of operation. + */ + @Test + public void recurringBillingCreateRetrieveUpdateAndDeleteVariablePaymentPlanRequestsReturnsSuccessfully() + throws Exception { + // Create the Customer + String customerId = secureNetVaultCreateCustomerRequestReturnsSuccessfully(); + // Create the Payment Account + String paymentMethodId = secureNetVaultCreatePaymentAccountRequestReturnsSuccessfully(customerId); + // Create the Variable Payment Plan + String planId = recurringBillingCreateVariablePaymentPlanRequestReturnsSuccessfully( + customerId, paymentMethodId); + // Retrieve the Variable Payment Plan + recurringBillingRetrievePaymentPlanRequestReturnsSuccessfully( + customerId, planId); + // Update the Variable Payment Plan + recurringBillingUpdateVariablePaymentPlanRequestReturnsSuccessfully( + customerId, planId); + // Delete the Payment Account + /*secureNetVaultDeletePaymentAccountRequestReturnsSuccessfully( + customerId, paymentMethodId);*/ + } /** * Successful response returned from a Create Customer request. @@ -383,8 +415,8 @@ private void secureNetVaultDeletePaymentAccountRequestReturnsSuccessfully( // Act /* [UNSUPPORTED] 'var' as type is unsupported "var" */ RemovePaymentMethodResponse response = (RemovePaymentMethodResponse) controller.processRequest(apiContext, request,RemovePaymentMethodResponse.class); - Assert.assertTrue(response.toResponseString(),response.getSuccess()); // Assert + Assert.assertTrue(response.toResponseString(),response.getSuccess()); } // Delete the Customer @@ -409,8 +441,10 @@ private String recurringBillingCreateRecurringPaymentPlanRequestReturnsSuccessfu AddRecurringPaymentPlanResponse response = (AddRecurringPaymentPlanResponse) controller .processRequest(apiContext, request, AddRecurringPaymentPlanResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert + Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getStoredRecurringPaymentPlan().getSoftDescriptor(), request.getPlan().getSoftDescriptor()); + return response.getPlanId(); } @@ -428,6 +462,7 @@ private RecurringPaymentPlan getRecurringPaymentPlan(String paymentMethodId) { plan.setPrimaryPaymentMethodId(paymentMethodId); plan.setNotes("This is a recurring plan"); plan.setActive(true); + plan.setSoftDescriptor("Rec Plan SoftDesc"); return plan; } @@ -452,8 +487,9 @@ private void recurringBillingUpdateRecurringPaymentPlanRequestReturnsSuccessfull // Act /* [UNSUPPORTED] 'var' as type is unsupported "var" */ UpdateRecurringPaymentPlanResponse response = (UpdateRecurringPaymentPlanResponse) controller.processRequest(apiContext, request,UpdateRecurringPaymentPlanResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert + Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getStoredRecurringPaymentPlan().getSoftDescriptor(), request.getPlan().getSoftDescriptor()); } // Delete the Customer @@ -478,6 +514,9 @@ private String recurringBillingCreateInstallmentPlanRequestReturnsSuccessfully( .processRequest(apiContext, request, AddInstallmentPaymentPlanResponse.class); // Assert + Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getStoredInstallmentPaymentPlan().getSoftDescriptor(), request.getPlan().getSoftDescriptor()); + return response.getPlanId(); } @@ -495,6 +534,24 @@ private InstallmentPaymentPlan getInstallmentPlan(String paymentMethodId) { plan.setNotes("This is a installment plan"); plan.setActive(true); plan.setPrimaryPaymentMethodId(paymentMethodId); + plan.setSoftDescriptor("Inst Plan SoftDesc"); + return plan; + } + + private VariablePaymentPlan getVariablePaymentPlan(String paymentMethodId) { + VariablePaymentPlan plan = new VariablePaymentPlan(); + SimpleDateFormat format = new SimpleDateFormat("MM/dd/yyyy"); + try { + plan.setPlanStartDate(format.parse("07/02/2017")); + plan.setPlanEndDate(format.parse("08/05/2018")); + } catch (ParseException e) { + e.printStackTrace(); + } + plan.setMaxRetries(4); + plan.setPrimaryPaymentMethodId(paymentMethodId); + plan.setNotes("This is a variable plan"); + plan.setSoftDescriptor("Var Plan SoftDesc"); + plan.setScheduledPayments(getSchedule()); return plan; } @@ -516,8 +573,9 @@ private void recurringBillingUpdateInstallmentPlanrequestReturnsSuccessfully( // Act /* [UNSUPPORTED] 'var' as type is unsupported "var" */ UpdateInstallmentPaymentPlanResponse response = (UpdateInstallmentPaymentPlanResponse) controller.processRequest(apiContext, request,UpdateInstallmentPaymentPlanResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert + Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getStoredInstallmentPaymentPlan().getSoftDescriptor(), request.getPlan().getSoftDescriptor()); } /** @@ -532,6 +590,7 @@ private String recurringBillingCreateVariablePaymentPlanRequestReturnsSuccessful AddVariablePaymentPlanRequest request = new AddVariablePaymentPlanRequest(); request.setCustomerId(customerId); request.setDeveloperApplication(getDeveloperApplication()); + request.setPlan(getVariablePaymentPlan(paymentMethodId)); APIContext apiContext = new APIContext(); CustomersController controller = new CustomersController(); // Act @@ -540,6 +599,9 @@ private String recurringBillingCreateVariablePaymentPlanRequestReturnsSuccessful .processRequest(apiContext, request, AddVariablePaymentPlanResponse.class); // Assert + Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getStoredVariablePaymentPlan().getSoftDescriptor(), request.getPlan().getSoftDescriptor()); + return response.getPlanId(); } @@ -556,13 +618,15 @@ private void recurringBillingUpdateVariablePaymentPlanRequestReturnsSuccessfully request.setCustomerId(customerId); request.setPlanId(planId); request.setDeveloperApplication(getDeveloperApplication()); + request.setPlan(getVariablePaymentPlan("1")); APIContext apiContext = new APIContext(); CustomersController controller = new CustomersController(); // Act /* [UNSUPPORTED] 'var' as type is unsupported "var" */ UpdateVariablePaymentPlanResponse response = (UpdateVariablePaymentPlanResponse) controller.processRequest(apiContext, request,UpdateVariablePaymentPlanResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert + Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getStoredVariablePaymentPlan().getSoftDescriptor(), request.getPlan().getSoftDescriptor()); } /** @@ -666,4 +730,20 @@ private PaymentVaultToken getPaymentVaultToken(String customerId, String payment return paymentVaultToken; } + private List getSchedule() { + SimpleDateFormat format = new SimpleDateFormat("MM/dd/yyyy"); + List list = new ArrayList(); + Schedule schedule = new Schedule(); + schedule.setInstallmentDate("08/05/2017"); + schedule.setAmount(4); + try { + schedule.setPaymentdate(format.parse("08/06/2017")); + } catch (ParseException e) { + e.printStackTrace(); + } + schedule.setScheduleId(1093920); + list.add(schedule); + return list; + } + } diff --git a/src/test/java/test/controllers/PaymentsControllerTest.java b/src/test/java/test/controllers/PaymentsControllerTest.java index 5b2b937..e287dc0 100755 --- a/src/test/java/test/controllers/PaymentsControllerTest.java +++ b/src/test/java/test/controllers/PaymentsControllerTest.java @@ -49,6 +49,7 @@ public void before() throws Exception{ @Test public void creditCardPresentAuthorizationOnlyAndPriorAuthCaptureRequestsReturnsSuccessfully() throws Exception { + // Arrange int transactionId = creditCardPresentAuthorizationOnlyRequestReturnsSuccessfully(); PriorAuthCaptureRequest request = new PriorAuthCaptureRequest(); request.setAmount(20d); @@ -56,7 +57,9 @@ public void creditCardPresentAuthorizationOnlyAndPriorAuthCaptureRequestsReturns request.setDeveloperApplication(getDeveloperApplication()); APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); + // Act PriorAuthCaptureResponse response = (PriorAuthCaptureResponse) controller.processRequest(apiContext, request, PriorAuthCaptureResponse.class); + // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); } @@ -74,12 +77,15 @@ private int creditCardPresentAuthorizationOnlyRequestReturnsSuccessfully() request.setAddToVault(true); request.setAmount(20d); request.setDeveloperApplication(getDeveloperApplication()); + request.setExtendedInformation(getExtendedInformation()); APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act AuthorizeResponse response = (AuthorizeResponse) controller.processRequest(apiContext, request,AuthorizeResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); + return response.getTransaction().getTransactionId(); } @@ -98,14 +104,14 @@ public void creditCardPresentChargeRequestReturnsSuccessfully() request.setAmount(20d); request.setCard(getCard()); request.setDeveloperApplication(getDeveloperApplication()); + request.setExtendedInformation(getExtendedInformation()); APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert - + Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); } /** @@ -125,8 +131,8 @@ public void creditCardPresentIncludeTipAuthorizationOnlyAndPriorAuthCaptureReque APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - PriorAuthCaptureResponse response = (PriorAuthCaptureResponse) controller.processRequest(apiContext, request,PriorAuthCaptureResponse.class); + // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); } @@ -143,13 +149,15 @@ private int creditCardPresentIncludeTipAuthorizationOnlyRequestReturnsSuccessful request.setCard(getCard()); request.setAmount(20d); request.setDeveloperApplication(getDeveloperApplication()); + request.setExtendedInformation(getExtendedInformation()); APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - AuthorizeResponse response = (AuthorizeResponse) controller.processRequest(apiContext, request,AuthorizeResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert + Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); + return response.getTransaction().getTransactionId(); } @@ -168,14 +176,14 @@ public void creditCardPresentChargeRequestIncludingAddressReturnsSuccessfully() request.setCard(getCard()); request.setDeveloperApplication(getDeveloperApplication()); request.setAmount(20d); + request.setExtendedInformation(getExtendedInformation()); APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert - + Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); } /** @@ -186,6 +194,7 @@ public void creditCardPresentChargeRequestIncludingAddressReturnsSuccessfully() @Test public void creditCardNotPresentAuthorizationOnlyAndPriorAuthCaptureRequestsReturnsSuccessfully() throws Exception { + // Arrange int transactionId = creditCardNotPresentAuthorizationOnlyRequestReturnsSuccessfully(); PriorAuthCaptureRequest request = new PriorAuthCaptureRequest(); request.setAmount(10d); @@ -194,8 +203,8 @@ public void creditCardNotPresentAuthorizationOnlyAndPriorAuthCaptureRequestsRetu APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - PriorAuthCaptureResponse response = (PriorAuthCaptureResponse) controller.processRequest(apiContext, request,PriorAuthCaptureResponse.class); + // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); } @@ -213,13 +222,15 @@ private int creditCardNotPresentAuthorizationOnlyRequestReturnsSuccessfully() request.setCard(getCard()); request.setAddToVault(true); request.setAmount(20d); + request.setExtendedInformation(getExtendedInformation()); APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - AuthorizeResponse response = (AuthorizeResponse) controller.processRequest(apiContext, request,AuthorizeResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); + return response.getTransaction().getTransactionId(); } @@ -239,17 +250,16 @@ public void creditCardNotPresentChargeAuthorizationAndCaptureRequestReturnsSucce request.setAddToVault(true); request.setAmount(100d); request.setDeveloperApplication(getDeveloperApplication()); - ExtendedInformation extendedInfo = new ExtendedInformation(); + ExtendedInformation extendedInfo = getExtendedInformation(); extendedInfo.setTypeOfGoods("PHYSICAL"); request.setExtendedInformation(extendedInfo); APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert - + Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); } /** @@ -265,17 +275,16 @@ public void creditCardNotPresentIncludeAddresRequestReturnsSuccessfully() request.setCard(getCard()); request.setAmount(80d); request.setDeveloperApplication(getDeveloperApplication()); - ExtendedInformation extendedInfo = new ExtendedInformation(); + ExtendedInformation extendedInfo = getExtendedInformation(); extendedInfo.setTypeOfGoods("PHYSICAL"); request.setExtendedInformation(extendedInfo); APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert - + Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); } /** @@ -290,17 +299,16 @@ private void creditCardNotPresentChargeUsingTokenizationRequestReturnsSuccessful request.setCard(getCard()); request.setAmount(80d); request.setDeveloperApplication(getDeveloperApplication()); - ExtendedInformation extendedInfo = new ExtendedInformation(); + ExtendedInformation extendedInfo = getExtendedInformation(); extendedInfo.setTypeOfGoods("PHYSICAL"); request.setExtendedInformation(extendedInfo); APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert - + Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); } /** @@ -318,11 +326,9 @@ public void achPayByCheckChargeRequestReturnsSuccessfully() APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert - + Assert.assertTrue(response.toResponseString(), response.getSuccess()); } /** @@ -356,9 +362,9 @@ public void achChargeAccountUsingPOSRequestReturnsSuccessfully() PaymentsController controller = new PaymentsController(); // Act ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert - + Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); } /** @@ -381,11 +387,9 @@ public void achAddBillingAddressChargeRequestReturnsSuccessfully() APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert - + Assert.assertTrue(response.toResponseString(), response.getSuccess()); } /** @@ -408,11 +412,9 @@ public void achPayingByCheckWithVerificationChargeRequestReturnsSuccessfully() APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert - + Assert.assertTrue(response.toResponseString(), response.getSuccess()); } /** @@ -427,14 +429,14 @@ public void creditsCreditAnAccountRequestReturnsSuccessfully() request.setCard(getCard()); request.setAmount(1.05d); request.setDeveloperApplication(getDeveloperApplication()); + request.setExtendedInformation(getExtendedInformation()); APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - CreditResponse response = (CreditResponse) controller.processRequest(apiContext, request,CreditResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert - + Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); } /** @@ -452,8 +454,8 @@ public void refundsChargeAndRefundRequestsReturnsSuccessfully() APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - RefundResponse response = (RefundResponse) controller.processRequest(apiContext, request,RefundResponse.class); + // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); } @@ -468,13 +470,14 @@ private int refundsChargeRequestReturnsSuccessfully() throws Exception { request.setCard(getCard()); request.setAmount(10d); request.setDeveloperApplication(getDeveloperApplication()); + request.setExtendedInformation(getExtendedInformation()); APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert + Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); return response.getTransaction().getTransactionId(); } @@ -494,8 +497,8 @@ public void voidChargeAndVoidRequestsReturnsSuccessfully() APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - VoidResponse response = (VoidResponse) controller.processRequest(apiContext, request,VoidResponse.class); + // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); } @@ -510,13 +513,14 @@ private int voidChargeRequestReturnsSuccessfully() throws Exception { request.setCard(getCard()); request.setAmount(10d); request.setDeveloperApplication(getDeveloperApplication()); + request.setExtendedInformation(getExtendedInformation()); APIContext apiContext = new APIContext(); PaymentsController controller = new PaymentsController(); // Act - ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert + Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); return response.getTransaction().getTransactionId(); } @@ -556,4 +560,10 @@ private Check getCheck() { check.setAccountNumber("123456"); return check; } + + private ExtendedInformation getExtendedInformation() { + ExtendedInformation extendedInfo = new ExtendedInformation(); + extendedInfo.setSoftDescriptor("Soft Descriptor"); + return extendedInfo; + } } diff --git a/src/test/java/test/controllers/PrevaultControllerTest.java b/src/test/java/test/controllers/PrevaultControllerTest.java index 89de9b5..8a65773 100755 --- a/src/test/java/test/controllers/PrevaultControllerTest.java +++ b/src/test/java/test/controllers/PrevaultControllerTest.java @@ -41,6 +41,7 @@ public void before() throws Exception{ @Test public void tokenizationCreateTokenUsingCreditCardRequest() throws Exception { + // Arrange TokenCardRequest request = new TokenCardRequest(); request.setDeveloperApplication(getDeveloperApplication()); request.setCard(getCard()); @@ -48,12 +49,15 @@ public void tokenizationCreateTokenUsingCreditCardRequest() throws Exception { APIContext apiContext = new APIContext(); apiContext.setHTTPHeaders(getOrigin()); PreVaultController controller = new PreVaultController(); + // Act TokenCardResponse response = (TokenCardResponse) controller.processRequest(apiContext,request,TokenCardResponse.class); + // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); } @Test public void tokenizationCreateTokenUsingCheckingInformationRequestReturnsSuccessfully() throws Exception { + // Arrange TokenCheckRequest request = new TokenCheckRequest(); request.setCheck(getCheck()); request.setDeveloperApplication(getDeveloperApplication()); @@ -61,7 +65,9 @@ public void tokenizationCreateTokenUsingCheckingInformationRequestReturnsSuccess APIContext apiContext = new APIContext(); apiContext.setHTTPHeaders(getOrigin()); PreVaultController controller = new PreVaultController(); + // Act TokenCheckResponse response = (TokenCheckResponse) controller.processRequest(apiContext,request,TokenCheckResponse.class); + // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); } diff --git a/src/test/java/test/controllers/TransactionsControllerTest.java b/src/test/java/test/controllers/TransactionsControllerTest.java index 080a03d..4e26e4b 100755 --- a/src/test/java/test/controllers/TransactionsControllerTest.java +++ b/src/test/java/test/controllers/TransactionsControllerTest.java @@ -43,7 +43,7 @@ public void before() throws Exception{ */ @Test public void transactionReportingAndManagementSearchTransactionRequestReturnsSuccessfully() throws Exception { - // Arramge + // Arrange TransactionSearchRequest request = new TransactionSearchRequest(); request.setDeveloperApplication(getDeveloperApplication()); request.setTransactionId(createTransaction()); @@ -51,8 +51,8 @@ public void transactionReportingAndManagementSearchTransactionRequestReturnsSucc TransactionsController controller = new TransactionsController(); // Act TransactionSearchResponse response = (TransactionSearchResponse) controller.processRequest(apiContext,request,TransactionSearchResponse.class); + // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - // Assert } /** @@ -69,8 +69,8 @@ public void transactionReportingAndManagementRetrieveTransactionRequestReturnsSu TransactionsController controller = new TransactionsController(); // Act TransactionRetrieveResponse response = (TransactionRetrieveResponse) controller.processRequest(apiContext,request,TransactionRetrieveResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert + Assert.assertTrue(response.toResponseString(), response.getSuccess()); } /** @@ -87,8 +87,8 @@ public void transactionReportingAndManagementUpdateTransactionRequestReturnsSucc TransactionsController controller = new TransactionsController(); // Act TransactionUpdateResponse response = (TransactionUpdateResponse) controller.processRequest(apiContext,request,TransactionUpdateResponse.class); - Assert.assertTrue(response.toResponseString(), response.getSuccess()); // Assert + Assert.assertTrue(response.toResponseString(), response.getSuccess()); } private DeveloperApplication getDeveloperApplication() { From 87e2c9d5d1166d31277506afe5511f83446a9d8b Mon Sep 17 00:00:00 2001 From: "SECURENET\\fzirbo-endv" Date: Tue, 22 Nov 2016 06:35:30 -0600 Subject: [PATCH 2/7] fix code indentation --- .../Api/Models/RecurringPaymentPlan.java | 2 +- .../test/controllers/CustomersControllerTest.java | 2 +- .../test/controllers/PrevaultControllerTest.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/SecureNetRestApiSDK/Api/Models/RecurringPaymentPlan.java b/src/main/java/SecureNetRestApiSDK/Api/Models/RecurringPaymentPlan.java index 0859747..1f9e861 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Models/RecurringPaymentPlan.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Models/RecurringPaymentPlan.java @@ -155,7 +155,7 @@ public void setUserDefinedFields(List value) { } - private String softDescriptor = new String(); + private String softDescriptor = new String(); public String getSoftDescriptor() { return softDescriptor; } diff --git a/src/test/java/test/controllers/CustomersControllerTest.java b/src/test/java/test/controllers/CustomersControllerTest.java index c3c85b0..b69f6cb 100755 --- a/src/test/java/test/controllers/CustomersControllerTest.java +++ b/src/test/java/test/controllers/CustomersControllerTest.java @@ -718,7 +718,7 @@ private Card getCard(){ card.setAddress(getAddress()); card.setCvv("123"); card.setExpirationDate("07/2018"); - card.setNumber("4111111111111111"); + card.setNumber("5555111111111111"); return card; } diff --git a/src/test/java/test/controllers/PrevaultControllerTest.java b/src/test/java/test/controllers/PrevaultControllerTest.java index 8a65773..21d33e0 100755 --- a/src/test/java/test/controllers/PrevaultControllerTest.java +++ b/src/test/java/test/controllers/PrevaultControllerTest.java @@ -41,7 +41,7 @@ public void before() throws Exception{ @Test public void tokenizationCreateTokenUsingCreditCardRequest() throws Exception { - // Arrange + // Arrange TokenCardRequest request = new TokenCardRequest(); request.setDeveloperApplication(getDeveloperApplication()); request.setCard(getCard()); @@ -49,15 +49,15 @@ public void tokenizationCreateTokenUsingCreditCardRequest() throws Exception { APIContext apiContext = new APIContext(); apiContext.setHTTPHeaders(getOrigin()); PreVaultController controller = new PreVaultController(); - // Act + // Act TokenCardResponse response = (TokenCardResponse) controller.processRequest(apiContext,request,TokenCardResponse.class); - // Assert + // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); } @Test public void tokenizationCreateTokenUsingCheckingInformationRequestReturnsSuccessfully() throws Exception { - // Arrange + // Arrange TokenCheckRequest request = new TokenCheckRequest(); request.setCheck(getCheck()); request.setDeveloperApplication(getDeveloperApplication()); @@ -65,9 +65,9 @@ public void tokenizationCreateTokenUsingCheckingInformationRequestReturnsSuccess APIContext apiContext = new APIContext(); apiContext.setHTTPHeaders(getOrigin()); PreVaultController controller = new PreVaultController(); - // Act + // Act TokenCheckResponse response = (TokenCheckResponse) controller.processRequest(apiContext,request,TokenCheckResponse.class); - // Assert + // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); } From 8b0988619a47844353134d00e920d620ad2c4103 Mon Sep 17 00:00:00 2001 From: "SECURENET\\fzirbo-endv" Date: Tue, 22 Nov 2016 07:42:15 -0600 Subject: [PATCH 3/7] Fix Code Indentation --- .../java/test/controllers/TransactionsControllerTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/test/controllers/TransactionsControllerTest.java b/src/test/java/test/controllers/TransactionsControllerTest.java index 4e26e4b..1b1a8d6 100755 --- a/src/test/java/test/controllers/TransactionsControllerTest.java +++ b/src/test/java/test/controllers/TransactionsControllerTest.java @@ -51,7 +51,7 @@ public void transactionReportingAndManagementSearchTransactionRequestReturnsSucc TransactionsController controller = new TransactionsController(); // Act TransactionSearchResponse response = (TransactionSearchResponse) controller.processRequest(apiContext,request,TransactionSearchResponse.class); - // Assert + // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); } @@ -70,7 +70,7 @@ public void transactionReportingAndManagementRetrieveTransactionRequestReturnsSu // Act TransactionRetrieveResponse response = (TransactionRetrieveResponse) controller.processRequest(apiContext,request,TransactionRetrieveResponse.class); // Assert - Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertTrue(response.toResponseString(), response.getSuccess()); } /** @@ -88,7 +88,7 @@ public void transactionReportingAndManagementUpdateTransactionRequestReturnsSucc // Act TransactionUpdateResponse response = (TransactionUpdateResponse) controller.processRequest(apiContext,request,TransactionUpdateResponse.class); // Assert - Assert.assertTrue(response.toResponseString(), response.getSuccess()); + Assert.assertTrue(response.toResponseString(), response.getSuccess()); } private DeveloperApplication getDeveloperApplication() { From 2a76ffc4c3132da29428502f3c993f8f74f7676f Mon Sep 17 00:00:00 2001 From: "SECURENET\\fzirbo-endv" Date: Tue, 22 Nov 2016 07:43:50 -0600 Subject: [PATCH 4/7] Change Card Number --- src/test/java/test/controllers/CustomersControllerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/test/controllers/CustomersControllerTest.java b/src/test/java/test/controllers/CustomersControllerTest.java index b69f6cb..c3c85b0 100755 --- a/src/test/java/test/controllers/CustomersControllerTest.java +++ b/src/test/java/test/controllers/CustomersControllerTest.java @@ -718,7 +718,7 @@ private Card getCard(){ card.setAddress(getAddress()); card.setCvv("123"); card.setExpirationDate("07/2018"); - card.setNumber("5555111111111111"); + card.setNumber("4111111111111111"); return card; } From cc9c48eb01c9e05507b66e2ca460c6690ca0fa08 Mon Sep 17 00:00:00 2001 From: "SECURENET\\fzirbo-endv" Date: Thu, 24 Nov 2016 01:56:57 -0600 Subject: [PATCH 5/7] Enable/Disable SoftDescriptor in config --- src/main/resources/config.properties | 1 + src/test/java/test/HelperTest.java | 34 +++++++++++++++++++ .../controllers/CustomersControllerTest.java | 22 +++++++----- .../controllers/PaymentsControllerTest.java | 30 +++++++++------- 4 files changed, 65 insertions(+), 22 deletions(-) create mode 100644 src/test/java/test/HelperTest.java diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties index 48e796b..2ffc3d8 100755 --- a/src/main/resources/config.properties +++ b/src/main/resources/config.properties @@ -8,3 +8,4 @@ developerId=12345678 versionId=1.2 publicKey=2c28646f-abc4-48f9-af60-6060e5f533d8 origin=testing.com +isSoftDescriptorEnabled=true \ No newline at end of file diff --git a/src/test/java/test/HelperTest.java b/src/test/java/test/HelperTest.java new file mode 100644 index 0000000..33014e6 --- /dev/null +++ b/src/test/java/test/HelperTest.java @@ -0,0 +1,34 @@ +package test; + +import org.junit.Before; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +public class HelperTest { + private Boolean _isSoftDescriptorEnabled ; + private final String SoftDescriptorValue = "Valid Soft Descriptor"; + private Properties config ; + private String _requestSoftDescriptor; + private String _responseSoftDescriptor; + + public HelperTest() throws IOException { + InputStream stream = this.getClass().getResourceAsStream("/config.properties"); + config = new Properties(); + config.load(stream); + _isSoftDescriptorEnabled = Boolean.parseBoolean(config.getProperty("isSoftDescriptorEnabled")); + _requestSoftDescriptor = _isSoftDescriptorEnabled ? SoftDescriptorValue : null; + _responseSoftDescriptor = _isSoftDescriptorEnabled ? SoftDescriptorValue : ""; + } + + public String getRequestSoftDescriptor() + { + return _requestSoftDescriptor; + } + + public String getResponseSoftDescriptor() + { + return _responseSoftDescriptor; + } +} \ No newline at end of file diff --git a/src/test/java/test/controllers/CustomersControllerTest.java b/src/test/java/test/controllers/CustomersControllerTest.java index c3c85b0..1304636 100755 --- a/src/test/java/test/controllers/CustomersControllerTest.java +++ b/src/test/java/test/controllers/CustomersControllerTest.java @@ -3,6 +3,7 @@ package test.controllers; +import java.io.IOException; import java.io.InputStream; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -59,16 +60,19 @@ import SecureNetRestApiSDK.Api.Responses.UpdateRecurringPaymentPlanResponse; import SecureNetRestApiSDK.Api.Responses.UpdateVariablePaymentPlanResponse; import SecureNetRestApiSDK.Api.Responses.VaultCustomerAndPaymentMethodResponse; +import test.HelperTest; public class CustomersControllerTest { Properties config ; + HelperTest helper; @Before public void before() throws Exception{ InputStream stream = this.getClass().getResourceAsStream("/config.properties"); config = new Properties(); config.load(stream); + helper = new HelperTest(); } @@ -443,7 +447,7 @@ private String recurringBillingCreateRecurringPaymentPlanRequestReturnsSuccessfu AddRecurringPaymentPlanResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getStoredRecurringPaymentPlan().getSoftDescriptor(), request.getPlan().getSoftDescriptor()); + Assert.assertEquals(response.getStoredRecurringPaymentPlan().getSoftDescriptor(), helper.getResponseSoftDescriptor()); return response.getPlanId(); } @@ -462,7 +466,7 @@ private RecurringPaymentPlan getRecurringPaymentPlan(String paymentMethodId) { plan.setPrimaryPaymentMethodId(paymentMethodId); plan.setNotes("This is a recurring plan"); plan.setActive(true); - plan.setSoftDescriptor("Rec Plan SoftDesc"); + plan.setSoftDescriptor(helper.getRequestSoftDescriptor()); return plan; } @@ -489,7 +493,7 @@ private void recurringBillingUpdateRecurringPaymentPlanRequestReturnsSuccessfull UpdateRecurringPaymentPlanResponse response = (UpdateRecurringPaymentPlanResponse) controller.processRequest(apiContext, request,UpdateRecurringPaymentPlanResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getStoredRecurringPaymentPlan().getSoftDescriptor(), request.getPlan().getSoftDescriptor()); + Assert.assertEquals(response.getStoredRecurringPaymentPlan().getSoftDescriptor(), helper.getResponseSoftDescriptor()); } // Delete the Customer @@ -515,7 +519,7 @@ private String recurringBillingCreateInstallmentPlanRequestReturnsSuccessfully( AddInstallmentPaymentPlanResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getStoredInstallmentPaymentPlan().getSoftDescriptor(), request.getPlan().getSoftDescriptor()); + Assert.assertEquals(response.getStoredInstallmentPaymentPlan().getSoftDescriptor(), helper.getResponseSoftDescriptor()); return response.getPlanId(); } @@ -534,7 +538,7 @@ private InstallmentPaymentPlan getInstallmentPlan(String paymentMethodId) { plan.setNotes("This is a installment plan"); plan.setActive(true); plan.setPrimaryPaymentMethodId(paymentMethodId); - plan.setSoftDescriptor("Inst Plan SoftDesc"); + plan.setSoftDescriptor(helper.getRequestSoftDescriptor()); return plan; } @@ -550,7 +554,7 @@ private VariablePaymentPlan getVariablePaymentPlan(String paymentMethodId) { plan.setMaxRetries(4); plan.setPrimaryPaymentMethodId(paymentMethodId); plan.setNotes("This is a variable plan"); - plan.setSoftDescriptor("Var Plan SoftDesc"); + plan.setSoftDescriptor(helper.getRequestSoftDescriptor()); plan.setScheduledPayments(getSchedule()); return plan; } @@ -575,7 +579,7 @@ private void recurringBillingUpdateInstallmentPlanrequestReturnsSuccessfully( UpdateInstallmentPaymentPlanResponse response = (UpdateInstallmentPaymentPlanResponse) controller.processRequest(apiContext, request,UpdateInstallmentPaymentPlanResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getStoredInstallmentPaymentPlan().getSoftDescriptor(), request.getPlan().getSoftDescriptor()); + Assert.assertEquals(response.getStoredInstallmentPaymentPlan().getSoftDescriptor(), helper.getResponseSoftDescriptor()); } /** @@ -600,7 +604,7 @@ private String recurringBillingCreateVariablePaymentPlanRequestReturnsSuccessful AddVariablePaymentPlanResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getStoredVariablePaymentPlan().getSoftDescriptor(), request.getPlan().getSoftDescriptor()); + Assert.assertEquals(response.getStoredVariablePaymentPlan().getSoftDescriptor(), helper.getResponseSoftDescriptor()); return response.getPlanId(); } @@ -626,7 +630,7 @@ private void recurringBillingUpdateVariablePaymentPlanRequestReturnsSuccessfully UpdateVariablePaymentPlanResponse response = (UpdateVariablePaymentPlanResponse) controller.processRequest(apiContext, request,UpdateVariablePaymentPlanResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getStoredVariablePaymentPlan().getSoftDescriptor(), request.getPlan().getSoftDescriptor()); + Assert.assertEquals(response.getStoredVariablePaymentPlan().getSoftDescriptor(), helper.getResponseSoftDescriptor()); } /** diff --git a/src/test/java/test/controllers/PaymentsControllerTest.java b/src/test/java/test/controllers/PaymentsControllerTest.java index e287dc0..5712f92 100755 --- a/src/test/java/test/controllers/PaymentsControllerTest.java +++ b/src/test/java/test/controllers/PaymentsControllerTest.java @@ -3,6 +3,7 @@ package test.controllers; +import java.io.IOException; import java.io.InputStream; import java.util.Properties; @@ -30,16 +31,19 @@ import SecureNetRestApiSDK.Api.Responses.PriorAuthCaptureResponse; import SecureNetRestApiSDK.Api.Responses.RefundResponse; import SecureNetRestApiSDK.Api.Responses.VoidResponse; +import test.HelperTest; public class PaymentsControllerTest { Properties config ; + HelperTest helper; @Before public void before() throws Exception{ InputStream stream = this.getClass().getResourceAsStream("/config.properties"); config = new Properties(); config.load(stream); + helper = new HelperTest(); } /** * Unit Tests for an AuthorizationOnly request and a subsequent @@ -84,7 +88,7 @@ private int creditCardPresentAuthorizationOnlyRequestReturnsSuccessfully() AuthorizeResponse response = (AuthorizeResponse) controller.processRequest(apiContext, request,AuthorizeResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); return response.getTransaction().getTransactionId(); } @@ -111,7 +115,7 @@ public void creditCardPresentChargeRequestReturnsSuccessfully() ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); } /** @@ -156,7 +160,7 @@ private int creditCardPresentIncludeTipAuthorizationOnlyRequestReturnsSuccessful AuthorizeResponse response = (AuthorizeResponse) controller.processRequest(apiContext, request,AuthorizeResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); return response.getTransaction().getTransactionId(); } @@ -183,7 +187,7 @@ public void creditCardPresentChargeRequestIncludingAddressReturnsSuccessfully() ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); } /** @@ -229,7 +233,7 @@ private int creditCardNotPresentAuthorizationOnlyRequestReturnsSuccessfully() AuthorizeResponse response = (AuthorizeResponse) controller.processRequest(apiContext, request,AuthorizeResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); return response.getTransaction().getTransactionId(); } @@ -259,7 +263,7 @@ public void creditCardNotPresentChargeAuthorizationAndCaptureRequestReturnsSucce ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); } /** @@ -284,7 +288,7 @@ public void creditCardNotPresentIncludeAddresRequestReturnsSuccessfully() ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); } /** @@ -308,7 +312,7 @@ private void creditCardNotPresentChargeUsingTokenizationRequestReturnsSuccessful ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); } /** @@ -364,7 +368,7 @@ public void achChargeAccountUsingPOSRequestReturnsSuccessfully() ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); } /** @@ -436,7 +440,7 @@ public void creditsCreditAnAccountRequestReturnsSuccessfully() CreditResponse response = (CreditResponse) controller.processRequest(apiContext, request,CreditResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); } /** @@ -477,7 +481,7 @@ private int refundsChargeRequestReturnsSuccessfully() throws Exception { ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); return response.getTransaction().getTransactionId(); } @@ -520,7 +524,7 @@ private int voidChargeRequestReturnsSuccessfully() throws Exception { ChargeResponse response = (ChargeResponse) controller.processRequest(apiContext, request,ChargeResponse.class); // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); - Assert.assertEquals(response.getTransaction().getSoftDescriptor(), request.getExtendedInformation().getSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); return response.getTransaction().getTransactionId(); } @@ -563,7 +567,7 @@ private Check getCheck() { private ExtendedInformation getExtendedInformation() { ExtendedInformation extendedInfo = new ExtendedInformation(); - extendedInfo.setSoftDescriptor("Soft Descriptor"); + extendedInfo.setSoftDescriptor(helper.getRequestSoftDescriptor()); return extendedInfo; } } From 8b775e9d2dd4229a47c63a50436ec20b4dd07f9b Mon Sep 17 00:00:00 2001 From: "SECURENET\\fzirbo-endv" Date: Thu, 24 Nov 2016 02:53:36 -0600 Subject: [PATCH 6/7] HelperTest field type change --- src/test/java/test/HelperTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/test/HelperTest.java b/src/test/java/test/HelperTest.java index 33014e6..2602311 100644 --- a/src/test/java/test/HelperTest.java +++ b/src/test/java/test/HelperTest.java @@ -8,7 +8,7 @@ public class HelperTest { private Boolean _isSoftDescriptorEnabled ; - private final String SoftDescriptorValue = "Valid Soft Descriptor"; + private String SoftDescriptorValue = "Valid Soft Descriptor"; private Properties config ; private String _requestSoftDescriptor; private String _responseSoftDescriptor; From 62921e81e422e22e74d8b475890d918232b0f822 Mon Sep 17 00:00:00 2001 From: "SECURENET\\fzirbo-endv" Date: Fri, 16 Dec 2016 04:35:19 -0600 Subject: [PATCH 7/7] GGEN-27 MCC through Java SDK As a WorldPay Total merchant, I want to supply MCC data through Requests using the Java SDK so that I can specify a different descriptor for each authorization. --- .../Api/Models/ExtendedInformation.java | 12 ++++++++++++ .../Api/Models/InstallmentPaymentPlan.java | 9 +++++++++ .../Api/Models/RecurringPaymentPlan.java | 15 +++++++++++---- .../Models/StoredInstallmentPaymentPlan.java | 9 +++++++++ .../Api/Models/StoredRecurringPaymentPlan.java | 17 +++++++++++++---- .../Api/Models/StoredVariablePaymentPlan.java | 9 +++++++++ .../Api/Models/Transaction.java | 17 +++++++++++++---- src/main/resources/config.properties | 3 ++- src/test/java/test/HelperTest.java | 17 +++++++++++++++++ .../controllers/CustomersControllerTest.java | 9 +++++++++ .../controllers/PaymentsControllerTest.java | 15 ++++++++++++++- 11 files changed, 118 insertions(+), 14 deletions(-) diff --git a/src/main/java/SecureNetRestApiSDK/Api/Models/ExtendedInformation.java b/src/main/java/SecureNetRestApiSDK/Api/Models/ExtendedInformation.java index 5127458..acdc564 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Models/ExtendedInformation.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Models/ExtendedInformation.java @@ -168,6 +168,18 @@ public void setSoftDescriptor(String value) { softDescriptor = value; } + /** + * Displays a 4 characters dynamic merchant category code. + */ + private String dynamicMCC = new String(); + public String getDynamicMCC() { + return dynamicMCC; + } + + public void setDynamicMCC(String value) { + dynamicMCC = value; + } + } diff --git a/src/main/java/SecureNetRestApiSDK/Api/Models/InstallmentPaymentPlan.java b/src/main/java/SecureNetRestApiSDK/Api/Models/InstallmentPaymentPlan.java index b28056d..722df7f 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Models/InstallmentPaymentPlan.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Models/InstallmentPaymentPlan.java @@ -229,6 +229,15 @@ public void setSoftDescriptor(String value) { softDescriptor = value; } + private String dynamicMCC = new String(); + public String getDynamicMCC() { + return dynamicMCC; + } + + public void setDynamicMCC(String value) { + dynamicMCC = value; + } + } diff --git a/src/main/java/SecureNetRestApiSDK/Api/Models/RecurringPaymentPlan.java b/src/main/java/SecureNetRestApiSDK/Api/Models/RecurringPaymentPlan.java index 1f9e861..1136201 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Models/RecurringPaymentPlan.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Models/RecurringPaymentPlan.java @@ -163,7 +163,14 @@ public String getSoftDescriptor() { public void setSoftDescriptor(String value) { softDescriptor = value; } - -} - - + + private String dynamicMCC = new String(); + public String getDynamicMCC() { + return dynamicMCC; + } + + public void setDynamicMCC(String value) { + dynamicMCC = value; + } + +} diff --git a/src/main/java/SecureNetRestApiSDK/Api/Models/StoredInstallmentPaymentPlan.java b/src/main/java/SecureNetRestApiSDK/Api/Models/StoredInstallmentPaymentPlan.java index 1580305..2b69126 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Models/StoredInstallmentPaymentPlan.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Models/StoredInstallmentPaymentPlan.java @@ -15,6 +15,15 @@ public String getSoftDescriptor() { public void setSoftDescriptor(String value) { softDescriptor = value; } + + private String dynamicMCC = new String(); + public String getDynamicMCC() { + return dynamicMCC; + } + + public void setDynamicMCC(String value) { + dynamicMCC = value; + } } diff --git a/src/main/java/SecureNetRestApiSDK/Api/Models/StoredRecurringPaymentPlan.java b/src/main/java/SecureNetRestApiSDK/Api/Models/StoredRecurringPaymentPlan.java index fd20b66..0e98951 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Models/StoredRecurringPaymentPlan.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Models/StoredRecurringPaymentPlan.java @@ -170,7 +170,16 @@ public String getSoftDescriptor() { public void setSoftDescriptor(String value) { softDescriptor = value; } - -} - - + + private String dynamicMCC = new String(); + public String getDynamicMCC() { + return dynamicMCC; + } + + public void setDynamicMCC(String value) { + dynamicMCC = value; + } + +} + + diff --git a/src/main/java/SecureNetRestApiSDK/Api/Models/StoredVariablePaymentPlan.java b/src/main/java/SecureNetRestApiSDK/Api/Models/StoredVariablePaymentPlan.java index 8a3da7b..cd36f43 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Models/StoredVariablePaymentPlan.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Models/StoredVariablePaymentPlan.java @@ -52,6 +52,15 @@ public void setSoftDescriptor(String value) { softDescriptor = value; } + private String dynamicMCC = new String(); + public String getDynamicMCC() { + return dynamicMCC; + } + + public void setDynamicMCC(String value) { + dynamicMCC = value; + } + } diff --git a/src/main/java/SecureNetRestApiSDK/Api/Models/Transaction.java b/src/main/java/SecureNetRestApiSDK/Api/Models/Transaction.java index f2b4ef7..2ec7d4a 100755 --- a/src/main/java/SecureNetRestApiSDK/Api/Models/Transaction.java +++ b/src/main/java/SecureNetRestApiSDK/Api/Models/Transaction.java @@ -456,7 +456,16 @@ public String getSoftDescriptor() { public void setSoftDescriptor(String value) { softDescriptor = value; } - -} - - + + private String dynamicMCC = new String(); + public String getDynamicMCC() { + return dynamicMCC; + } + + public void setDynamicMCC(String value) { + dynamicMCC = value; + } + +} + + diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties index 2ffc3d8..8c726e5 100755 --- a/src/main/resources/config.properties +++ b/src/main/resources/config.properties @@ -8,4 +8,5 @@ developerId=12345678 versionId=1.2 publicKey=2c28646f-abc4-48f9-af60-6060e5f533d8 origin=testing.com -isSoftDescriptorEnabled=true \ No newline at end of file +isSoftDescriptorEnabled=true +isDynamicMCCEnabled=true \ No newline at end of file diff --git a/src/test/java/test/HelperTest.java b/src/test/java/test/HelperTest.java index 2602311..6c14d8e 100644 --- a/src/test/java/test/HelperTest.java +++ b/src/test/java/test/HelperTest.java @@ -8,10 +8,14 @@ public class HelperTest { private Boolean _isSoftDescriptorEnabled ; + private Boolean _isDynamicMCCEnabled ; private String SoftDescriptorValue = "Valid Soft Descriptor"; + private String DynamicMCCValue = "2047"; private Properties config ; private String _requestSoftDescriptor; private String _responseSoftDescriptor; + private String _requestDynamicMCC; + private String _responseDynamicMCC; public HelperTest() throws IOException { InputStream stream = this.getClass().getResourceAsStream("/config.properties"); @@ -20,6 +24,9 @@ public HelperTest() throws IOException { _isSoftDescriptorEnabled = Boolean.parseBoolean(config.getProperty("isSoftDescriptorEnabled")); _requestSoftDescriptor = _isSoftDescriptorEnabled ? SoftDescriptorValue : null; _responseSoftDescriptor = _isSoftDescriptorEnabled ? SoftDescriptorValue : ""; + _isDynamicMCCEnabled = Boolean.parseBoolean(config.getProperty("isDynamicMCCEnabled")); + _requestDynamicMCC = _isDynamicMCCEnabled ? DynamicMCCValue : null; + _responseDynamicMCC = _isDynamicMCCEnabled ? DynamicMCCValue : ""; } public String getRequestSoftDescriptor() @@ -31,4 +38,14 @@ public String getResponseSoftDescriptor() { return _responseSoftDescriptor; } + + public String getRequestDynamicMCC() + { + return _requestDynamicMCC; + } + + public String getResponseDynamicMCC() + { + return _responseDynamicMCC; + } } \ No newline at end of file diff --git a/src/test/java/test/controllers/CustomersControllerTest.java b/src/test/java/test/controllers/CustomersControllerTest.java index 1304636..b743af2 100755 --- a/src/test/java/test/controllers/CustomersControllerTest.java +++ b/src/test/java/test/controllers/CustomersControllerTest.java @@ -448,6 +448,7 @@ private String recurringBillingCreateRecurringPaymentPlanRequestReturnsSuccessfu // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getStoredRecurringPaymentPlan().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getStoredRecurringPaymentPlan().getDynamicMCC(), helper.getResponseDynamicMCC()); return response.getPlanId(); } @@ -467,6 +468,7 @@ private RecurringPaymentPlan getRecurringPaymentPlan(String paymentMethodId) { plan.setNotes("This is a recurring plan"); plan.setActive(true); plan.setSoftDescriptor(helper.getRequestSoftDescriptor()); + plan.setDynamicMCC(helper.getRequestDynamicMCC()); return plan; } @@ -494,6 +496,7 @@ private void recurringBillingUpdateRecurringPaymentPlanRequestReturnsSuccessfull // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getStoredRecurringPaymentPlan().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getStoredRecurringPaymentPlan().getDynamicMCC(), helper.getResponseDynamicMCC()); } // Delete the Customer @@ -520,6 +523,7 @@ private String recurringBillingCreateInstallmentPlanRequestReturnsSuccessfully( // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getStoredInstallmentPaymentPlan().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getStoredInstallmentPaymentPlan().getDynamicMCC(), helper.getResponseDynamicMCC()); return response.getPlanId(); } @@ -539,6 +543,7 @@ private InstallmentPaymentPlan getInstallmentPlan(String paymentMethodId) { plan.setActive(true); plan.setPrimaryPaymentMethodId(paymentMethodId); plan.setSoftDescriptor(helper.getRequestSoftDescriptor()); + plan.setDynamicMCC(helper.getRequestDynamicMCC()); return plan; } @@ -555,6 +560,7 @@ private VariablePaymentPlan getVariablePaymentPlan(String paymentMethodId) { plan.setPrimaryPaymentMethodId(paymentMethodId); plan.setNotes("This is a variable plan"); plan.setSoftDescriptor(helper.getRequestSoftDescriptor()); + plan.setDynamicMCC(helper.getRequestDynamicMCC()); plan.setScheduledPayments(getSchedule()); return plan; } @@ -580,6 +586,7 @@ private void recurringBillingUpdateInstallmentPlanrequestReturnsSuccessfully( // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getStoredInstallmentPaymentPlan().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getStoredInstallmentPaymentPlan().getDynamicMCC(), helper.getResponseDynamicMCC()); } /** @@ -605,6 +612,7 @@ private String recurringBillingCreateVariablePaymentPlanRequestReturnsSuccessful // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getStoredVariablePaymentPlan().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getStoredVariablePaymentPlan().getDynamicMCC(), helper.getResponseDynamicMCC()); return response.getPlanId(); } @@ -631,6 +639,7 @@ private void recurringBillingUpdateVariablePaymentPlanRequestReturnsSuccessfully // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getStoredVariablePaymentPlan().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getStoredVariablePaymentPlan().getDynamicMCC(), helper.getResponseDynamicMCC()); } /** diff --git a/src/test/java/test/controllers/PaymentsControllerTest.java b/src/test/java/test/controllers/PaymentsControllerTest.java index 5712f92..cbeab9a 100755 --- a/src/test/java/test/controllers/PaymentsControllerTest.java +++ b/src/test/java/test/controllers/PaymentsControllerTest.java @@ -87,9 +87,10 @@ private int creditCardPresentAuthorizationOnlyRequestReturnsSuccessfully() // Act AuthorizeResponse response = (AuthorizeResponse) controller.processRequest(apiContext, request,AuthorizeResponse.class); // Assert + Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); - + Assert.assertEquals(response.getTransaction().getDynamicMCC(), helper.getResponseDynamicMCC()); return response.getTransaction().getTransactionId(); } @@ -116,6 +117,7 @@ public void creditCardPresentChargeRequestReturnsSuccessfully() // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getDynamicMCC(), helper.getResponseDynamicMCC()); } /** @@ -161,6 +163,7 @@ private int creditCardPresentIncludeTipAuthorizationOnlyRequestReturnsSuccessful // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getDynamicMCC(), helper.getResponseDynamicMCC()); return response.getTransaction().getTransactionId(); } @@ -188,6 +191,7 @@ public void creditCardPresentChargeRequestIncludingAddressReturnsSuccessfully() // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getDynamicMCC(), helper.getResponseDynamicMCC()); } /** @@ -234,6 +238,7 @@ private int creditCardNotPresentAuthorizationOnlyRequestReturnsSuccessfully() // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getDynamicMCC(), helper.getResponseDynamicMCC()); return response.getTransaction().getTransactionId(); } @@ -264,6 +269,7 @@ public void creditCardNotPresentChargeAuthorizationAndCaptureRequestReturnsSucce // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getDynamicMCC(), helper.getResponseDynamicMCC()); } /** @@ -289,6 +295,7 @@ public void creditCardNotPresentIncludeAddresRequestReturnsSuccessfully() // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getDynamicMCC(), helper.getResponseDynamicMCC()); } /** @@ -313,6 +320,7 @@ private void creditCardNotPresentChargeUsingTokenizationRequestReturnsSuccessful // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getDynamicMCC(), helper.getResponseDynamicMCC()); } /** @@ -369,6 +377,7 @@ public void achChargeAccountUsingPOSRequestReturnsSuccessfully() // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getDynamicMCC(), helper.getResponseDynamicMCC()); } /** @@ -441,6 +450,7 @@ public void creditsCreditAnAccountRequestReturnsSuccessfully() // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getDynamicMCC(), helper.getResponseDynamicMCC()); } /** @@ -482,6 +492,7 @@ private int refundsChargeRequestReturnsSuccessfully() throws Exception { // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getDynamicMCC(), helper.getResponseDynamicMCC()); return response.getTransaction().getTransactionId(); } @@ -525,6 +536,7 @@ private int voidChargeRequestReturnsSuccessfully() throws Exception { // Assert Assert.assertTrue(response.toResponseString(), response.getSuccess()); Assert.assertEquals(response.getTransaction().getSoftDescriptor(), helper.getResponseSoftDescriptor()); + Assert.assertEquals(response.getTransaction().getDynamicMCC(), helper.getResponseDynamicMCC()); return response.getTransaction().getTransactionId(); } @@ -568,6 +580,7 @@ private Check getCheck() { private ExtendedInformation getExtendedInformation() { ExtendedInformation extendedInfo = new ExtendedInformation(); extendedInfo.setSoftDescriptor(helper.getRequestSoftDescriptor()); + extendedInfo.setDynamicMCC(helper.getRequestDynamicMCC()); return extendedInfo; } }