CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

FINERACT-1724: Fix date handling of testRecurringDepositAccountWithClosureTypeTransferToSavings_WITH_HOLD_TAX

Browse Source
This commit is contained in:
Adam Saghy
2023-08-01 12:59:24 +02:00
parent a9b73aa9f6
commit 70b14e601e
1 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/src/test/java/org/apache/fineract/integrationtests/RecurringDepositTest.java
+16 -32
View File
@@ -704,32 +704,18 @@ public class RecurringDepositTest {
final Account liabilityAccount = this.accountHelper.createLiabilityAccount(); final Account liabilityAccount = this.accountHelper.createLiabilityAccount();
final Account liabilityAccountForTax = this.accountHelper.createLiabilityAccount(); final Account liabilityAccountForTax = this.accountHelper.createLiabilityAccount();
DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); LocalDate todaysDate = Utils.getLocalDateOfTenant();
DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); LocalDate minus20MonthFromTodaysDate = todaysDate.minusMonths(20);
DateFormat currentDateFormat = new SimpleDateFormat("dd"); final String VALID_FROM = Utils.dateFormatter.format(minus20MonthFromTodaysDate);
LocalDate todaysDatePlus10Years = todaysDate.plusYears(10);
final String VALID_TO = Utils.dateFormatter.format(todaysDatePlus10Years);
Calendar todaysDate = Calendar.getInstance(); final String SUBMITTED_ON_DATE = Utils.dateFormatter.format(minus20MonthFromTodaysDate);
todaysDate.add(Calendar.MONTH, -20); final String APPROVED_ON_DATE = SUBMITTED_ON_DATE;
final String VALID_FROM = dateFormat.format(todaysDate.getTime()); final String ACTIVATION_DATE = SUBMITTED_ON_DATE;
todaysDate.add(Calendar.YEAR, 10); final String expectedFirstDepositOnDate = SUBMITTED_ON_DATE;
final String VALID_TO = dateFormat.format(todaysDate.getTime()); LocalDate closedOnDate = minus20MonthFromTodaysDate.plusMonths(14);
final String CLOSED_ON_DATE = Utils.dateFormatter.format(closedOnDate);
todaysDate = Calendar.getInstance();
todaysDate.add(Calendar.MONTH, -20);
final String SUBMITTED_ON_DATE = dateFormat.format(todaysDate.getTime());
final String APPROVED_ON_DATE = dateFormat.format(todaysDate.getTime());
final String ACTIVATION_DATE = dateFormat.format(todaysDate.getTime());
final String expectedFirstDepositOnDate = dateFormat.format(todaysDate.getTime());
final String MONTH_DAY = monthDayFormat.format(todaysDate.getTime());
Integer currentDate = Integer.valueOf(currentDateFormat.format(todaysDate.getTime()));
Integer daysInMonth = todaysDate.getActualMaximum(Calendar.DATE);
Integer numberOfDaysLeft = daysInMonth - currentDate + 1;
todaysDate.add(Calendar.DATE, numberOfDaysLeft);
final String INTEREST_POSTED_DATE = dateFormat.format(todaysDate.getTime());
Calendar closedOn = Calendar.getInstance();
closedOn.add(Calendar.MONTH, -6);
final String CLOSED_ON_DATE = dateFormat.format(closedOn.getTime());
/*** /***
* Create client for applying Deposit and Savings accounts * Create client for applying Deposit and Savings accounts
@@ -806,19 +792,17 @@ public class RecurringDepositTest {
/*** /***
* Perform Deposit transaction and verify journal entries are posted for the transaction * Perform Deposit transaction and verify journal entries are posted for the transaction
*/ */
todaysDate = Calendar.getInstance(); LocalDate startDate = minus20MonthFromTodaysDate;
todaysDate.add(Calendar.MONTH, -20);
for (int i = 0; i < 14; i++) { for (int i = 0; i < 14; i++) {
Integer depositTransactionId = this.recurringDepositAccountHelper.depositToRecurringDepositAccount(recurringDepositAccountId, Integer depositTransactionId = this.recurringDepositAccountHelper.depositToRecurringDepositAccount(recurringDepositAccountId,
depositAmount, dateFormat.format(todaysDate.getTime())); depositAmount, Utils.dateFormatter.format(startDate));
Assertions.assertNotNull(depositTransactionId); Assertions.assertNotNull(depositTransactionId);
this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, dateFormat.format(todaysDate.getTime()), this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, Utils.dateFormatter.format(startDate),
new JournalEntry(depositAmount, JournalEntry.TransactionType.DEBIT)); new JournalEntry(depositAmount, JournalEntry.TransactionType.DEBIT));
this.journalEntryHelper.checkJournalEntryForLiabilityAccount(liabilityAccount, dateFormat.format(todaysDate.getTime()), this.journalEntryHelper.checkJournalEntryForLiabilityAccount(liabilityAccount, Utils.dateFormatter.format(startDate),
new JournalEntry(depositAmount, JournalEntry.TransactionType.CREDIT)); new JournalEntry(depositAmount, JournalEntry.TransactionType.CREDIT));
todaysDate.add(Calendar.MONTH, 1); startDate = startDate.plusMonths(1);
} }
/*** /***