FINERACT-1971: Align dates and dateformat in tests

fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResourceSwagger.java

@@ -402,7 +402,7 @@ final class ClientsApiResourceSwagger {
 
         @Schema(example = "03 August 2021")
         public String activationDate;
-        @Schema(example = "dd MMM yyyy")
+        @Schema(example = "dd MMMM yyyy")
         public String dateFormat;
         @Schema(example = "en")
         public String locale;

integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java

@@ -2541,7 +2541,9 @@ public class ClientLoanIntegrationTest {
      */
     @Test
     public void loanWithChargesOfTypeAmountPercentageAndPeriodicAccrualAccountingEnabled() throws InterruptedException {
-
+        try {
+            GlobalConfigurationHelper.manageConfigurations(REQUEST_SPEC, RESPONSE_SPEC,
+                    GlobalConfigurationHelper.ENABLE_AUTOGENERATED_EXTERNAL_ID, true);
             final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
             ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
 
@@ -2605,16 +2607,16 @@ public class ClientLoanIntegrationTest {
             LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
 
             LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        GlobalConfigurationHelper.manageConfigurations(REQUEST_SPEC, RESPONSE_SPEC,
-                GlobalConfigurationHelper.ENABLE_AUTOGENERATED_EXTERNAL_ID, true);
             String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
             loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
                     JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
             LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
 
-        ArrayList<HashMap> loanTransactionDetails = LOAN_TRANSACTION_HELPER.getLoanTransactionDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+            ArrayList<HashMap> loanTransactionDetails = LOAN_TRANSACTION_HELPER.getLoanTransactionDetails(REQUEST_SPEC, RESPONSE_SPEC,
+                    loanID);
             validateAccrualTransactionForDisbursementCharge(loanTransactionDetails);
-        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.DEBIT),
+            final JournalEntry[] assetAccountInitialEntry = {
+                    new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.DEBIT),
                     new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
                     new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
             JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
@@ -2739,6 +2741,10 @@ public class ClientLoanIntegrationTest {
                     new JournalEntry(Float.parseFloat("3120.58"), JournalEntry.TransactionType.CREDIT));
             loanStatusHashMap = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "status");
             LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
+        } finally {
+            GlobalConfigurationHelper.manageConfigurations(REQUEST_SPEC, RESPONSE_SPEC,
+                    GlobalConfigurationHelper.ENABLE_AUTOGENERATED_EXTERNAL_ID, false);
+        }
     }
 
     /***
@@ -3434,7 +3440,7 @@ public class ClientLoanIntegrationTest {
 
     @Test
     public void testInteroperationLoanRepaymentAPI() {
-
+        try {
             DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
             dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
             GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(REQUEST_SPEC, RESPONSE_SPEC, "42", true);
@@ -3443,7 +3449,8 @@ public class ClientLoanIntegrationTest {
 
             Calendar firstRepaymentDate = (Calendar) startDate.clone();
             firstRepaymentDate.add(Calendar.MONTH, 1);
-        firstRepaymentDate.add(Calendar.DAY_OF_MONTH, firstRepaymentDate.getActualMaximum(Calendar.DAY_OF_MONTH) - Calendar.DAY_OF_MONTH);
+            firstRepaymentDate.add(Calendar.DAY_OF_MONTH,
+                    firstRepaymentDate.getActualMaximum(Calendar.DAY_OF_MONTH) - Calendar.DAY_OF_MONTH);
             String firstRepayment = dateFormat.format(firstRepaymentDate.getTime());
 
             final String loanDisbursementDate = dateFormat.format(startDate.getTime());
@@ -3484,6 +3491,9 @@ public class ClientLoanIntegrationTest {
 
             HashMap loanRepayment = LOAN_TRANSACTION_HELPER.makeRepaymentWithAccountNo(loanFirstRepaymentDate, earlyPayment, accountNo);
             assertNotNull(loanRepayment);
+        } finally {
+            GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(REQUEST_SPEC, RESPONSE_SPEC, "42", false);
+        }
     }
 
     @Test
@@ -4917,7 +4927,7 @@ public class ClientLoanIntegrationTest {
 
     @Test
     public void testLoanScheduleWithInterestRecalculationMakePrepaymentAfterRepayment() {
-
+        try {
             DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
             dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
             GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(REQUEST_SPEC, RESPONSE_SPEC, "42", true);
@@ -4927,7 +4937,8 @@ public class ClientLoanIntegrationTest {
 
             Calendar firstRepaymentDate = (Calendar) startDate.clone();
             firstRepaymentDate.add(Calendar.MONTH, 1);
-        firstRepaymentDate.add(Calendar.DAY_OF_MONTH, firstRepaymentDate.getActualMaximum(Calendar.DAY_OF_MONTH) - Calendar.DAY_OF_MONTH);
+            firstRepaymentDate.add(Calendar.DAY_OF_MONTH,
+                    firstRepaymentDate.getActualMaximum(Calendar.DAY_OF_MONTH) - Calendar.DAY_OF_MONTH);
             String firstRepayment = dateFormat.format(firstRepaymentDate.getTime());
 
             final String loanDisbursementDate = dateFormat.format(startDate.getTime());
@@ -4972,12 +4983,14 @@ public class ClientLoanIntegrationTest {
             LOAN_TRANSACTION_HELPER.makeRepayment(loanPrepaymentDate, Float.parseFloat(prepayAmount), loanID);
             loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
             LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
+        } finally {
             GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(REQUEST_SPEC, RESPONSE_SPEC, "42", false);
         }
+    }
 
     @Test
     public void testLoanScheduleWithInterestRecalculationMakeAdvancePaymentTillSettlement() {
-
+        try {
             final ResponseSpecification errorResponse = new ResponseSpecBuilder().expectStatusCode(403).build();
             final LoanTransactionHelper validationErrorHelper = new LoanTransactionHelper(REQUEST_SPEC, errorResponse);
             DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
@@ -4989,7 +5002,8 @@ public class ClientLoanIntegrationTest {
 
             Calendar firstRepaymentDate = (Calendar) startDate.clone();
             firstRepaymentDate.add(Calendar.MONTH, 1);
-        firstRepaymentDate.add(Calendar.DAY_OF_MONTH, firstRepaymentDate.getActualMaximum(Calendar.DAY_OF_MONTH) - Calendar.DAY_OF_MONTH);
+            firstRepaymentDate.add(Calendar.DAY_OF_MONTH,
+                    firstRepaymentDate.getActualMaximum(Calendar.DAY_OF_MONTH) - Calendar.DAY_OF_MONTH);
             String firstRepayment = dateFormat.format(firstRepaymentDate.getTime());
 
             final String loanDisbursementDate = dateFormat.format(startDate.getTime());
@@ -5044,8 +5058,10 @@ public class ClientLoanIntegrationTest {
             HashMap savingsAccountErrorData = validationErrorHelper.makeRepayment(retrieveDueDate, amount, loanID);
             ArrayList<HashMap> error = (ArrayList<HashMap>) savingsAccountErrorData.get("errors");
             assertEquals("error.msg.loan.transaction.cannot.be.a.future.date", error.get(0).get("userMessageGlobalisationCode"));
+        } finally {
             GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(REQUEST_SPEC, RESPONSE_SPEC, "42", false);
         }
+    }
 
     @Test
     public void testCollateralDataIsAvailableWhenRequested() {
@@ -5722,6 +5738,8 @@ public class ClientLoanIntegrationTest {
             assertTrue(loanDetails.getStatus().getOverpaid());
         } finally {
             GlobalConfigurationHelper.updateIsBusinessDateEnabled(REQUEST_SPEC, RESPONSE_SPEC, Boolean.FALSE);
+            GlobalConfigurationHelper.manageConfigurations(REQUEST_SPEC, RESPONSE_SPEC,
+                    GlobalConfigurationHelper.ENABLE_AUTOGENERATED_EXTERNAL_ID, false);
         }
     }
 
@@ -6256,19 +6274,21 @@ public class ClientLoanIntegrationTest {
                     .dateFormat(DATETIME_PATTERN).transactionDate("08 September 2022").locale("en").transactionAmount(3007.0));
         } finally {
             GlobalConfigurationHelper.updateIsBusinessDateEnabled(REQUEST_SPEC, RESPONSE_SPEC, Boolean.FALSE);
+            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(REQUEST_SPEC, RESPONSE_SPEC, false);
         }
     }
 
     @Test
     public void testCloseOpenMaturityDate() {
+        try {
             GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(REQUEST_SPEC, RESPONSE_SPEC, true);
             final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
             final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
             final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
             final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
 
-        final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount, expenseAccount,
+            final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount,
-                overpaymentAccount);
+                    expenseAccount, overpaymentAccount);
 
             final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC, "01 January 2011");
 
@@ -6314,7 +6334,9 @@ public class ClientLoanIntegrationTest {
             assertNotNull(actualMaturityDate);
 
             assertTrue(expectedMaturityDate.isEqual(actualMaturityDate));
-
+        } finally {
+            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(REQUEST_SPEC, RESPONSE_SPEC, false);
+        }
     }
 
     @Test

integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java

@@ -2235,7 +2235,7 @@ public class ClientSavingsIntegrationTest {
         Integer releaseTransactionId = this.savingsAccountHelper.releaseAmount(savingsId, holdTransactionId);
         Date today = Date.from(Utils.getLocalDateOfTenant().atStartOfDay(Utils.getZoneIdOfTenant()).toInstant());
         String todayDate = today.toString();
-        SimpleDateFormat dt1 = new SimpleDateFormat("dd MMM yyyy");
+        SimpleDateFormat dt1 = new SimpleDateFormat("dd MMMM yyyy");
         todayDate = dt1.format(today).toString();
         withdrawTransactionId = (Integer) this.savingsAccountHelper.withdrawalFromSavingsAccount(savingsId, "300", todayDate,
                 CommonConstants.RESPONSE_RESOURCE_ID);

integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsAccountTransactionTest.java

@@ -50,7 +50,7 @@ import org.junit.jupiter.api.Test;
 public class SavingsAccountTransactionTest {
 
     public static final String ACCOUNT_TYPE_INDIVIDUAL = "INDIVIDUAL";
-    public static final String DEFAULT_DATE_FORMAT = "dd MMM yyyy";
+    public static final String DEFAULT_DATE_FORMAT = "dd MMMM yyyy";
     final String startDateString = "03 June 2023";
     final String depositDateString = "05 June 2023";
     final String withdrawDateString = "10 June 2023";

integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsAccountTransactionsSearchIntegrationTest.java

@@ -62,7 +62,7 @@ import org.springframework.data.domain.Sort;
 public class SavingsAccountTransactionsSearchIntegrationTest {
 
     public static final String ACCOUNT_TYPE_INDIVIDUAL = "INDIVIDUAL";
-    public static final String DEFAULT_DATE_FORMAT = "dd MMM yyyy";
+    public static final String DEFAULT_DATE_FORMAT = "dd MMMM yyyy";
     public static final Locale DEFAULT_LOCALE = Locale.ENGLISH;
     final String startDate = "01 May 2023";
     final String firstDepositDate = "05 May 2023";

integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsAccountsExternalIdTest.java

@@ -44,8 +44,7 @@ public class SavingsAccountsExternalIdTest extends IntegrationTest {
     public static final String EXTERNAL_ID = UUID.randomUUID().toString();
     private final String dateFormat = "dd MMMM yyyy";
     private final String locale = "en";
-    private final String formattedDate = LocalDate.now(ZoneId.systemDefault()).minusDays(5)
+    private final String formattedDate = LocalDate.now(ZoneId.systemDefault()).minusDays(5).format(DateTimeFormatter.ofPattern(dateFormat));
-            .format(DateTimeFormatter.ofPattern("dd MMM yyyy"));
 
     @Test
     @Order(1)

integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsAccountsTest.java

@@ -42,7 +42,7 @@ public class SavingsAccountsTest extends IntegrationTest {
     private static final Logger LOG = LoggerFactory.getLogger(SavingsAccountsTest.class);
     private final String dateFormat = "dd MMMM yyyy";
     private final String locale = "en";
-    private final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMM yyyy");
+    private final SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormat);
     private final String formattedDate = simpleDateFormat.format(new Date());
     private int savingId = 1;
 

integration-tests/src/test/java/org/apache/fineract/integrationtests/common/CenterDomain.java

@@ -150,7 +150,7 @@ public class CenterDomain implements Comparable<CenterDomain> {
         if (active) {
             map.put("active", "true");
             map.put("locale", "en");
-            map.put("dateFormat", "dd MMM yyyy");
+            map.put("dateFormat", "dd MMMM yyyy");
             map.put("activationDate", activationDate);
         } else {
             map.put("active", "false");

integration-tests/src/test/java/org/apache/fineract/integrationtests/common/CenterHelper.java

@@ -113,7 +113,7 @@ public final class CenterHelper {
         if (activationDate != null) {
             hm.put("active", true);
             hm.put("locale", "en");
-            hm.put("dateFormat", "dd MMM yyyy");
+            hm.put("dateFormat", "dd MMMM yyyy");
             hm.put("activationDate", activationDate);
         }
 

integration-tests/src/test/java/org/apache/fineract/integrationtests/common/shares/DividendsIntegrationTests.java

@@ -58,7 +58,7 @@ public class DividendsIntegrationTests {
     @SuppressWarnings("unchecked")
     @Test
     public void testCreateDividends() {
-        DateFormat simple = new SimpleDateFormat("dd MMM yyyy");
+        DateFormat simple = new SimpleDateFormat("dd MMMM yyyy");
         final Integer productId = createShareProduct();
         ArrayList<Integer> shareAccounts = new ArrayList<>();
         for (int i = 0; i < 5; i++) {
@@ -109,12 +109,12 @@ public class DividendsIntegrationTests {
         Calendar cal = Calendar.getInstance();
         cal.set(startdateList.get(0), startdateList.get(1) - 1, startdateList.get(2));
         Date startDate = cal.getTime();
-        Assertions.assertEquals("01 Jan 2015", simple.format(startDate));
+        Assertions.assertEquals("01 January 2015", simple.format(startDate));
         List<Integer> enddateList = (List<Integer>) dividend.get("dividendPeriodEndDate");
         cal = Calendar.getInstance();
         cal.set(enddateList.get(0), enddateList.get(1) - 1, enddateList.get(2));
         Date endDate = cal.getTime();
-        Assertions.assertEquals("01 Apr 2016", simple.format(endDate));
+        Assertions.assertEquals("01 April 2016", simple.format(endDate));
 
         Map<String, Object> dividenddetails = ShareDividendsTransactionHelper.retrieveDividendDetails(productId, dividendId, requestSpec,
                 responseSpec);
@@ -151,12 +151,12 @@ public class DividendsIntegrationTests {
         cal = Calendar.getInstance();
         cal.set(startdateList.get(0), startdateList.get(1) - 1, startdateList.get(2));
         startDate = cal.getTime();
-        Assertions.assertEquals("01 Jan 2015", simple.format(startDate));
+        Assertions.assertEquals("01 January 2015", simple.format(startDate));
         enddateList = (List<Integer>) dividend.get("dividendPeriodEndDate");
         cal = Calendar.getInstance();
         cal.set(enddateList.get(0), enddateList.get(1) - 1, enddateList.get(2));
         endDate = cal.getTime();
-        Assertions.assertEquals("01 Apr 2016", simple.format(endDate));
+        Assertions.assertEquals("01 April 2016", simple.format(endDate));
 
         dividenddetails = ShareDividendsTransactionHelper.retrieveDividendDetails(productId, dividendId, requestSpec, responseSpec);
         Assertions.assertEquals("5", String.valueOf(dividenddetails.get("totalFilteredRecords")));

integration-tests/src/test/java/org/apache/fineract/integrationtests/common/shares/ShareAccountIntegrationTests.java

@@ -383,7 +383,7 @@ public class ShareAccountIntegrationTests {
 
         Map<String, Object> shareAccountDataForUpdate = new HashMap<>();
         shareAccountDataForUpdate.put("requestedShares", 30);
-        shareAccountDataForUpdate.put("applicationDate", "02 Mar 2016");
+        shareAccountDataForUpdate.put("applicationDate", "02 March 2016");
         shareAccountDataForUpdate.put("dateFormat", "dd MMMM yyyy");
         shareAccountDataForUpdate.put("locale", "en_GB");
         shareAccountDataForUpdate.put("charges", charges);
@@ -394,7 +394,7 @@ public class ShareAccountIntegrationTests {
         List<Map<String, Object>> transactions = (List<Map<String, Object>>) shareAccountData.get("purchasedShares");
         Assertions.assertNotNull(transactions);
         Assertions.assertEquals(2, transactions.size());
-        DateFormat simple = new SimpleDateFormat("dd MMM yyyy");
+        DateFormat simple = new SimpleDateFormat("dd MMMM yyyy");
         for (int i = 0; i < transactions.size(); i++) {
             Map<String, Object> transaction = transactions.get(i);
             Map<String, Object> transactionTypeMap = (Map<String, Object>) transaction.get("type");
@@ -409,7 +409,7 @@ public class ShareAccountIntegrationTests {
                 Assertions.assertEquals("60.0", String.valueOf(transaction.get("amountPaid")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("chargeAmount")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("purchasedPrice")));
-                Assertions.assertEquals("02 Mar 2016", simple.format(date));
+                Assertions.assertEquals("02 March 2016", simple.format(date));
             } else if (transactionType.equals("charge.payment")) {
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("amount")));
                 Assertions.assertEquals("0", String.valueOf(transaction.get("amountPaid")));
@@ -444,7 +444,7 @@ public class ShareAccountIntegrationTests {
         Map<String, Object> approveMap = new HashMap<>();
         approveMap.put("note", "Share Account Approval Note");
         approveMap.put("dateFormat", "dd MMMM yyyy");
-        approveMap.put("approvedDate", "01 Jan 2016");
+        approveMap.put("approvedDate", "01 January 2016");
         approveMap.put("locale", "en");
         String approve = new Gson().toJson(approveMap);
         ShareAccountTransactionHelper.postCommand("approve", shareAccountId, approve, requestSpec, responseSpec);
@@ -456,7 +456,7 @@ public class ShareAccountIntegrationTests {
         Calendar cal = Calendar.getInstance();
         cal.set(dateList.get(0), dateList.get(1) - 1, dateList.get(2));
         Date approvedDate = cal.getTime();
-        Assertions.assertEquals("01 Jan 2016", simple.format(approvedDate));
+        Assertions.assertEquals("01 January 2016", simple.format(approvedDate));
 
         // charges verification
         chargesList = (List<Map<String, Object>>) shareAccountData.get("charges");
@@ -483,7 +483,7 @@ public class ShareAccountIntegrationTests {
 
         Map<String, Object> activateMap = new HashMap<>();
         activateMap.put("dateFormat", "dd MMMM yyyy");
-        activateMap.put("activatedDate", "01 Jan 2016");
+        activateMap.put("activatedDate", "01 January 2016");
         activateMap.put("locale", "en");
         String activateJson = new Gson().toJson(activateMap);
         ShareAccountTransactionHelper.postCommand("activate", shareAccountId, activateJson, requestSpec, responseSpec);
@@ -495,7 +495,7 @@ public class ShareAccountIntegrationTests {
         cal = Calendar.getInstance();
         cal.set(dateList.get(0), dateList.get(1) - 1, dateList.get(2));
         Date activatedDate = cal.getTime();
-        Assertions.assertEquals("01 Jan 2016", simple.format(activatedDate));
+        Assertions.assertEquals("01 January 2016", simple.format(activatedDate));
 
         transactions = (List<Map<String, Object>>) shareAccountData.get("purchasedShares");
         Assertions.assertNotNull(transactions);
@@ -514,12 +514,12 @@ public class ShareAccountIntegrationTests {
                 Assertions.assertEquals("62.0", String.valueOf(transaction.get("amountPaid")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("chargeAmount")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("purchasedPrice")));
-                Assertions.assertEquals("02 Mar 2016", simple.format(date));
+                Assertions.assertEquals("02 March 2016", simple.format(date));
             } else if (transactionType.equals("charge.payment")) {
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("amount")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("amountPaid")));
                 Assertions.assertEquals("0", String.valueOf(transaction.get("chargeAmount")));
-                Assertions.assertEquals("01 Jan 2016", simple.format(date));
+                Assertions.assertEquals("01 January 2016", simple.format(date));
             }
         }
 
@@ -552,7 +552,7 @@ public class ShareAccountIntegrationTests {
 
         // apply additional shares
         Map<String, Object> additionalSharesRequestMap = new HashMap<>();
-        additionalSharesRequestMap.put("requestedDate", "01 Apr 2016");
+        additionalSharesRequestMap.put("requestedDate", "01 April 2016");
         additionalSharesRequestMap.put("dateFormat", "dd MMMM yyyy");
         additionalSharesRequestMap.put("locale", "en");
         additionalSharesRequestMap.put("requestedShares", "15");
@@ -573,13 +573,13 @@ public class ShareAccountIntegrationTests {
             Date date = cal.getTime();
             String transactionType = (String) transactionTypeMap.get("code");
             String transactionDate = simple.format(date);
-            if (transactionType.equals("purchasedSharesType.purchased") && transactionDate.equals("02 Mar 2016")) {
+            if (transactionType.equals("purchasedSharesType.purchased") && transactionDate.equals("02 March 2016")) {
                 Assertions.assertEquals("30", String.valueOf(transaction.get("numberOfShares")));
                 Assertions.assertEquals("62.0", String.valueOf(transaction.get("amount")));
                 Assertions.assertEquals("62.0", String.valueOf(transaction.get("amountPaid")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("chargeAmount")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("purchasedPrice")));
-            } else if (transactionType.equals("purchasedSharesType.purchased") && transactionDate.equals("01 Apr 2016")) {
+            } else if (transactionType.equals("purchasedSharesType.purchased") && transactionDate.equals("01 April 2016")) {
                 addtionalSharesRequestId = String.valueOf(transaction.get("id"));
                 Assertions.assertEquals("15", String.valueOf(transaction.get("numberOfShares")));
                 Assertions.assertEquals("32.0", String.valueOf(transaction.get("amount")));
@@ -593,7 +593,7 @@ public class ShareAccountIntegrationTests {
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("amount")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("amountPaid")));
                 Assertions.assertEquals("0", String.valueOf(transaction.get("chargeAmount")));
-                Assertions.assertEquals("01 Jan 2016", transactionDate);
+                Assertions.assertEquals("01 January 2016", transactionDate);
             }
         }
 
@@ -648,13 +648,13 @@ public class ShareAccountIntegrationTests {
             Date date = cal.getTime();
             String transactionType = (String) transactionTypeMap.get("code");
             String transactionDate = simple.format(date);
-            if (transactionType.equals("purchasedSharesType.purchased") && transactionDate.equals("02 Mar 2016")) {
+            if (transactionType.equals("purchasedSharesType.purchased") && transactionDate.equals("02 March 2016")) {
                 Assertions.assertEquals("30", String.valueOf(transaction.get("numberOfShares")));
                 Assertions.assertEquals("62.0", String.valueOf(transaction.get("amount")));
                 Assertions.assertEquals("62.0", String.valueOf(transaction.get("amountPaid")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("chargeAmount")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("purchasedPrice")));
-            } else if (transactionType.equals("purchasedSharesType.purchased") && transactionDate.equals("01 Apr 2016")) {
+            } else if (transactionType.equals("purchasedSharesType.purchased") && transactionDate.equals("01 April 2016")) {
                 Assertions.assertEquals("15", String.valueOf(transaction.get("numberOfShares")));
                 Assertions.assertEquals("32.0", String.valueOf(transaction.get("amount")));
                 Assertions.assertEquals("32.0", String.valueOf(transaction.get("amountPaid")));
@@ -667,7 +667,7 @@ public class ShareAccountIntegrationTests {
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("amount")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("amountPaid")));
                 Assertions.assertEquals("0", String.valueOf(transaction.get("chargeAmount")));
-                Assertions.assertEquals("01 Jan 2016", transactionDate);
+                Assertions.assertEquals("01 January 2016", transactionDate);
             }
         }
 
@@ -843,13 +843,13 @@ public class ShareAccountIntegrationTests {
             Date date = cal.getTime();
             String transactionType = (String) transactionTypeMap.get("code");
             String transactionDate = simple.format(date);
-            if (transactionType.equals("purchasedSharesType.purchased") && transactionDate.equals("02 Mar 2016")) {
+            if (transactionType.equals("purchasedSharesType.purchased") && transactionDate.equals("02 March 2016")) {
                 Assertions.assertEquals("30", String.valueOf(transaction.get("numberOfShares")));
                 Assertions.assertEquals("62.0", String.valueOf(transaction.get("amount")));
                 Assertions.assertEquals("62.0", String.valueOf(transaction.get("amountPaid")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("chargeAmount")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("purchasedPrice")));
-            } else if (transactionType.equals("purchasedSharesType.purchased") && transactionDate.equals("01 Apr 2016")) {
+            } else if (transactionType.equals("purchasedSharesType.purchased") && transactionDate.equals("01 April 2016")) {
                 Assertions.assertEquals("15", String.valueOf(transaction.get("numberOfShares")));
                 Assertions.assertEquals("32.0", String.valueOf(transaction.get("amount")));
                 Assertions.assertEquals("32.0", String.valueOf(transaction.get("amountPaid")));
@@ -868,7 +868,7 @@ public class ShareAccountIntegrationTests {
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("amount")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("amountPaid")));
                 Assertions.assertEquals("0", String.valueOf(transaction.get("chargeAmount")));
-                Assertions.assertEquals("01 Jan 2016", transactionDate);
+                Assertions.assertEquals("01 January 2016", transactionDate);
             }
         }
 
@@ -921,13 +921,13 @@ public class ShareAccountIntegrationTests {
             Date date = cal.getTime();
             String transactionType = (String) transactionTypeMap.get("code");
             String transactionDate = simple.format(date);
-            if (transactionType.equals("purchasedSharesType.purchased") && transactionDate.equals("02 Mar 2016")) {
+            if (transactionType.equals("purchasedSharesType.purchased") && transactionDate.equals("02 March 2016")) {
                 Assertions.assertEquals("30", String.valueOf(transaction.get("numberOfShares")));
                 Assertions.assertEquals("62.0", String.valueOf(transaction.get("amount")));
                 Assertions.assertEquals("62.0", String.valueOf(transaction.get("amountPaid")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("chargeAmount")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("purchasedPrice")));
-            } else if (transactionType.equals("purchasedSharesType.purchased") && transactionDate.equals("01 Apr 2016")) {
+            } else if (transactionType.equals("purchasedSharesType.purchased") && transactionDate.equals("01 April 2016")) {
                 Assertions.assertEquals("15", String.valueOf(transaction.get("numberOfShares")));
                 Assertions.assertEquals("32.0", String.valueOf(transaction.get("amount")));
                 Assertions.assertEquals("32.0", String.valueOf(transaction.get("amountPaid")));
@@ -953,7 +953,7 @@ public class ShareAccountIntegrationTests {
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("amount")));
                 Assertions.assertEquals("2.0", String.valueOf(transaction.get("amountPaid")));
                 Assertions.assertEquals("0", String.valueOf(transaction.get("chargeAmount")));
-                Assertions.assertEquals("01 Jan 2016", transactionDate);
+                Assertions.assertEquals("01 January 2016", transactionDate);
             }
         }
         // charges verification
@@ -990,16 +990,16 @@ public class ShareAccountIntegrationTests {
 
     private Integer createShareAccount(final Integer clientId, final Integer productId, final Integer savingsAccountId) {
         String josn = new ShareAccountHelper().withClientId(String.valueOf(clientId)).withProductId(String.valueOf(productId))
-                .withExternalId("External1").withSavingsAccountId(String.valueOf(savingsAccountId)).withSubmittedDate("01 Jan 2016")
+                .withExternalId("External1").withSavingsAccountId(String.valueOf(savingsAccountId)).withSubmittedDate("01 January 2016")
-                .withApplicationDate("01 Jan 2016").withRequestedShares("25").build();
+                .withApplicationDate("01 January 2016").withRequestedShares("25").build();
         return ShareAccountTransactionHelper.createShareAccount(josn, requestSpec, responseSpec);
     }
 
     private Integer createShareAccount(final Integer clientId, final Integer productId, final Integer savingsAccountId,
             List<Map<String, Object>> charges) {
         String josn = new ShareAccountHelper().withClientId(String.valueOf(clientId)).withProductId(String.valueOf(productId))
-                .withExternalId("External1").withSavingsAccountId(String.valueOf(savingsAccountId)).withSubmittedDate("01 Jan 2016")
+                .withExternalId("External1").withSavingsAccountId(String.valueOf(savingsAccountId)).withSubmittedDate("01 January 2016")
-                .withApplicationDate("01 Jan 2016").withRequestedShares("25").withCharges(charges).build();
+                .withApplicationDate("01 January 2016").withRequestedShares("25").withCharges(charges).build();
         return ShareAccountTransactionHelper.createShareAccount(josn, requestSpec, responseSpec);
     }