From b3b72b063485d32db3e69801bd0cc02c1182fc43 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Mon, 13 Apr 2020 20:02:28 +0200 Subject: [PATCH 1/3] auto-format for mechanical clean-up on ClientSavingsIntegrationTest prompted by FINERACT-852, and also made me raise FINERACT-891 --- .../ClientSavingsIntegrationTest.java | 111 +++++++++--------- 1 file changed, 54 insertions(+), 57 deletions(-) diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java index 3ca12bc150e..8d136029982 100755 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java @@ -121,8 +121,7 @@ public void testSavingsAccount() { summary = this.savingsAccountHelper.getSavingsSummary(savingsId); Assert.assertFalse(summaryBefore.equals(summary)); - final Object savingsInterest = this.savingsAccountHelper.getSavingsInterest(savingsId); - // verifySavingsInterest(savingsInterest); + this.savingsAccountHelper.getSavingsInterest(savingsId); } @Test @@ -612,7 +611,7 @@ public void testSavingsAccountCharges() { this.savingsAccountHelper.waiveCharge((Integer) savingsChargeForWaive.get("id"), savingsId); waiveCharge = this.savingsAccountHelper.getSavingsCharge(savingsId, (Integer) savingsChargeForWaive.get("id")); - BigDecimal totalWaiveAmount = BigDecimal.valueOf(Double.valueOf((Float) savingsChargeForWaive.get("amount"))); + BigDecimal totalWaiveAmount = BigDecimal.valueOf((Float) savingsChargeForWaive.get("amount")); totalWaiveAmount = totalWaiveAmount.add(totalWaiveAmount); assertEquals(totalWaiveAmount.floatValue(), waiveCharge.get("amountWaived")); @@ -798,7 +797,6 @@ public void testSavingsAccountWithOverdraft() { savingsAccountErrorData.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE)); } - @SuppressWarnings("unchecked") @Test public void testSavingsAccountPostInterestOnLastDayWithOverdraft() { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, @@ -971,7 +969,7 @@ public void testSavingsAccountPostInterestOnLastDayWithOverdraft() { assertEquals("Verifying interest posted", interestPosted, accountDetailsPostInterestPosted); System.out - .println("-----Post Interest As on Successfully Worked----------"); + .println("-----Post Interest As on Successfully Worked----------"); transactionDate.set(Calendar.DAY_OF_MONTH, 3); TRANSACTION_DATE = dateFormat.format(transactionDate.getTime()); @@ -981,7 +979,7 @@ public void testSavingsAccountPostInterestOnLastDayWithOverdraft() { accountTransactionDetails = this.savingsAccountHelper .getSavingsDetails(savingsId); summary = (HashMap) accountDetails.get("summary"); - accountDetailsPostInterest = Float.valueOf(summary.get( + Float.valueOf(summary.get( "totalInterestPosted").toString()); nominalAnnualInterest = Float.valueOf(accountDetails.get( @@ -1008,14 +1006,14 @@ public void testSavingsAccountPostInterestOnLastDayWithOverdraft() { assertEquals("Verifying interest posted", interestPosted, accountDetailsPostInterestPosted); System.out - .println("-----Post Interest As on Successfully Worked-------"); + .println("-----Post Interest As on Successfully Worked-------"); //DateFormat transactionFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); Calendar transactionCalendarDateFormat = Calendar.getInstance(); transactionCalendarDateFormat.add(Calendar.DAY_OF_MONTH, 0); transactionDate.set(Calendar.DAY_OF_MONTH, 22); TRANSACTION_DATE = dateFormat.format(transactionDate.getTime()); - if (Calendar.DAY_OF_MONTH >= 22) { + if (Calendar.DAY_OF_MONTH >= 22) { // TODO FINERACT-891 Dead Code.. this.savingsAccountHelper.postInterestAsOnSavings(savingsId, TRANSACTION_DATE); accountTransactionDetails = this.savingsAccountHelper @@ -1048,7 +1046,7 @@ public void testSavingsAccountPostInterestOnLastDayWithOverdraft() { assertEquals("Verifying interest posted", interestPosted, accountDetailsPostInterestPosted); System.out - .println("-----Post Interest As on Successfully Worked----------"); + .println("-----Post Interest As on Successfully Worked----------"); } DateFormat lastTransactionDateFormat = new SimpleDateFormat( "dd MMMM yyyy", Locale.US); @@ -1092,7 +1090,7 @@ public void testSavingsAccountPostInterestOnLastDayWithOverdraft() { assertEquals("Verifying interest posted", interestPosted, accountDetailsPostInterestPosted); System.out - .println("-----Post Interest As on Successfully Worked----------"); + .println("-----Post Interest As on Successfully Worked----------"); } transactionDate.set(Calendar.DAY_OF_MONTH, 1); @@ -1102,7 +1100,7 @@ public void testSavingsAccountPostInterestOnLastDayWithOverdraft() { accountTransactionDetails = this.savingsAccountHelper .getSavingsDetails(savingsId); summary = (HashMap) accountTransactionDetails.get("summary"); - accountDetailsPostInterest = Float.valueOf(summary.get( + Float.valueOf(summary.get( "totalInterestPosted").toString()); nominalAnnualInterest = Float.valueOf(accountDetails.get( @@ -1129,11 +1127,10 @@ public void testSavingsAccountPostInterestOnLastDayWithOverdraft() { assertEquals("Verifying interest posted", interestPosted, accountDetailsPostInterestPosted); System.out - .println("-----Post Interest As on Successfully Worked----------"); + .println("-----Post Interest As on Successfully Worked----------"); } - @SuppressWarnings("unchecked") @Test public void testSavingsAccountPostInterestOnLastDayWithdrawalWithOverdraft() { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, @@ -1220,7 +1217,7 @@ public void testSavingsAccountPostInterestOnLastDayWithdrawalWithOverdraft() { transactionDate.set(Calendar.DAY_OF_MONTH, 2); String TRANSACTION_DATE = dateFormat.format(transactionDate.getTime()); - /*** + /*** * Perform withdraw transaction, verify account balance(account balance * will go to negative as no deposits are there prior to this * transaction) @@ -1287,7 +1284,7 @@ public void testSavingsAccountPostInterestOnLastDayWithdrawalWithOverdraft() { HashMap accountTransactionDetails = this.savingsAccountHelper .getSavingsDetails(savingsId); summary = (HashMap) accountDetails.get("summary"); - Float accountDetailsPostInterest = Float.valueOf(summary.get( + Float.valueOf(summary.get( "totalInterestPosted").toString()); nominalAnnualInterest = Float.valueOf(accountDetails.get( @@ -1314,7 +1311,7 @@ public void testSavingsAccountPostInterestOnLastDayWithdrawalWithOverdraft() { assertEquals("Verifying interest posted", interestPosted, accountDetailsPostInterestPosted); System.out - .println("-----Post Interest As on Successfully Worked----------"); + .println("-----Post Interest As on Successfully Worked----------"); transactionDate.set(Calendar.DAY_OF_MONTH, 3); TRANSACTION_DATE = dateFormat.format(transactionDate.getTime()); @@ -1324,7 +1321,7 @@ public void testSavingsAccountPostInterestOnLastDayWithdrawalWithOverdraft() { accountTransactionDetails = this.savingsAccountHelper .getSavingsDetails(savingsId); summary = (HashMap) accountDetails.get("summary"); - accountDetailsPostInterest = Float.valueOf(summary.get( + Float.valueOf(summary.get( "totalInterestPosted").toString()); nominalAnnualInterest = Float.valueOf(accountDetails.get( @@ -1351,20 +1348,20 @@ public void testSavingsAccountPostInterestOnLastDayWithdrawalWithOverdraft() { assertEquals("Verifying interest posted", interestPosted, accountDetailsPostInterestPosted); System.out - .println("-----Post Interest As on Successfully Worked-------"); + .println("-----Post Interest As on Successfully Worked-------"); //DateFormat transactionFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); Calendar transactionCalendarDateFormat = Calendar.getInstance(); transactionCalendarDateFormat.add(Calendar.DAY_OF_MONTH, 0); transactionDate.set(Calendar.DAY_OF_MONTH, 22); TRANSACTION_DATE = dateFormat.format(transactionDate.getTime()); - if (Calendar.DAY_OF_MONTH >= 22) { + if (Calendar.DAY_OF_MONTH >= 22) { // TODO FINERACT-891 Dead Code.. this.savingsAccountHelper.postInterestAsOnSavings(savingsId, TRANSACTION_DATE); accountTransactionDetails = this.savingsAccountHelper .getSavingsDetails(savingsId); summary = (HashMap) accountTransactionDetails.get("summary"); - accountDetailsPostInterest = Float.valueOf(summary.get( + Float.valueOf(summary.get( "totalInterestPosted").toString()); nominalAnnualInterest = Float.valueOf(accountDetails.get( @@ -1391,7 +1388,7 @@ public void testSavingsAccountPostInterestOnLastDayWithdrawalWithOverdraft() { assertEquals("Verifying interest posted", interestPosted, accountDetailsPostInterestPosted); System.out - .println("-----Post Interest As on Successfully Worked----------"); + .println("-----Post Interest As on Successfully Worked----------"); } DateFormat lastTransactionDateFormat = new SimpleDateFormat( "dd MMMM yyyy", Locale.US); @@ -1408,7 +1405,7 @@ public void testSavingsAccountPostInterestOnLastDayWithdrawalWithOverdraft() { accountTransactionDetails = this.savingsAccountHelper .getSavingsDetails(savingsId); summary = (HashMap) accountTransactionDetails.get("summary"); - accountDetailsPostInterest = Float.valueOf(summary.get( + Float.valueOf(summary.get( "totalInterestPosted").toString()); nominalAnnualInterest = Float.valueOf(accountDetails.get( @@ -1435,7 +1432,7 @@ public void testSavingsAccountPostInterestOnLastDayWithdrawalWithOverdraft() { assertEquals("Verifying interest posted", interestPosted, accountDetailsPostInterestPosted); System.out - .println("-----Post Interest As on Successfully Worked----------"); + .println("-----Post Interest As on Successfully Worked----------"); } transactionDate.set(Calendar.DAY_OF_MONTH, 1); @@ -1445,7 +1442,7 @@ public void testSavingsAccountPostInterestOnLastDayWithdrawalWithOverdraft() { accountTransactionDetails = this.savingsAccountHelper .getSavingsDetails(savingsId); summary = (HashMap) accountTransactionDetails.get("summary"); - accountDetailsPostInterest = Float.valueOf(summary.get( + Float.valueOf(summary.get( "totalInterestPosted").toString()); nominalAnnualInterest = Float.valueOf(accountDetails.get( @@ -1472,7 +1469,7 @@ public void testSavingsAccountPostInterestOnLastDayWithdrawalWithOverdraft() { assertEquals("Verifying interest posted", interestPosted, accountDetailsPostInterestPosted); System.out - .println("-----Post Interest As on Successfully Worked----------"); + .println("-----Post Interest As on Successfully Worked----------"); } @SuppressWarnings("unchecked") @@ -1584,7 +1581,7 @@ public void testSavingsAccountPostInterestWithOverdraft() { this.savingsAccountHelper.postInterestForSavings(savingsId); HashMap accountDetails = this.savingsAccountHelper.getSavingsDetails(savingsId); summary = (HashMap) accountDetails.get("summary"); - Float actualInterestPosted = Float.valueOf(summary.get("totalInterestPosted").toString()); + Float.valueOf(summary.get("totalInterestPosted").toString()); /*** * Calculate expected interest to be posted, interest should be posted @@ -1592,7 +1589,7 @@ public void testSavingsAccountPostInterestWithOverdraft() { * month before this account balance is negative. */ this.savingsAccountHelper.postInterestAsOnSavings(savingsId, POSTED_TRANSACTION_DATE); - HashMap accountDetailsPostInterest = this.savingsAccountHelper.getSavingsDetails(savingsId); + this.savingsAccountHelper.getSavingsDetails(savingsId); summary = (HashMap) accountDetails.get("summary"); ArrayList interestPostingTransaction = (ArrayList) ((HashMap) ((ArrayList) accountDetails.get("transactions")).get(0)).get("date"); Float accountDetailsPostInterestPosted = Float.valueOf(summary.get("totalInterestPosted").toString()); @@ -1785,28 +1782,28 @@ public void testPostInterestAsOnSavingsAccountWithOverdraft() { decimalFormat.applyPattern("#.###"); interestPosted = new Float(decimalFormat.format(interestPosted)); actualInterestPosted = new Float(decimalFormat.format(actualInterestPosted)); - assertEquals("Verifying interest posted", interestPosted, actualInterestPosted); - System.out.println("------Post Interest As On Successful Worked--------"); - - this.savingsAccountHelper.postInterestAsOnSavings(savingsId, POSTED_LAST_TRANSACTION_DATE); - HashMap accountLastDetails = this.savingsAccountHelper.getSavingsDetails(savingsId); - summary = (HashMap) accountLastDetails.get("summary"); - Float actualLastInterestPosted = Float.valueOf(summary.get("totalInterestPosted").toString()); - - final Float nominalLastAnnualInterest = Float.valueOf(accountDetails.get("nominalAnnualInterestRate").toString()); - final HashMap interestLastCalculationDaysInYearType = (HashMap) accountDetails.get("interestCalculationDaysInYearType"); - final Integer daysLastInYear = Integer.valueOf(interestCalculationDaysInYearType.get("id").toString()); - double interestLastRateInFraction = (nominalAnnualInterest / 100); - double perLastDay = (double) 1 / (daysInYear); - double interestLastPerDay = interestLastRateInFraction * perLastDay; - Float interestLastPosted = (float) (interestLastPerDay * balance * 1); - - DecimalFormat decimalLastFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); - decimalLastFormat.applyPattern("#.###"); - interestLastPosted = new Float(decimalLastFormat.format(interestLastPosted)); - actualInterestPosted = new Float(decimalFormat.format(actualInterestPosted)); - assertEquals("Verifying interest posted", interestLastPosted, actualInterestPosted); - System.out.println("------Post Interest As On Successful Worked--------"); + assertEquals("Verifying interest posted", interestPosted, actualInterestPosted); + System.out.println("------Post Interest As On Successful Worked--------"); + + this.savingsAccountHelper.postInterestAsOnSavings(savingsId, POSTED_LAST_TRANSACTION_DATE); + HashMap accountLastDetails = this.savingsAccountHelper.getSavingsDetails(savingsId); + summary = (HashMap) accountLastDetails.get("summary"); + Float.valueOf(summary.get("totalInterestPosted").toString()); + + Float.valueOf(accountDetails.get("nominalAnnualInterestRate").toString()); + accountDetails.get("interestCalculationDaysInYearType"); + Integer.valueOf(interestCalculationDaysInYearType.get("id").toString()); + double interestLastRateInFraction = (nominalAnnualInterest / 100); + double perLastDay = (double) 1 / (daysInYear); + double interestLastPerDay = interestLastRateInFraction * perLastDay; + Float interestLastPosted = (float) (interestLastPerDay * balance * 1); + + DecimalFormat decimalLastFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); + decimalLastFormat.applyPattern("#.###"); + interestLastPosted = new Float(decimalLastFormat.format(interestLastPosted)); + actualInterestPosted = new Float(decimalFormat.format(actualInterestPosted)); + assertEquals("Verifying interest posted", interestLastPosted, actualInterestPosted); + System.out.println("------Post Interest As On Successful Worked--------"); } @@ -1854,7 +1851,7 @@ public void testSavingsAccount_WITH_WITHHOLD_TAX() { Assert.assertFalse(summaryBefore.equals(summary)); Assert.assertNotNull(summary.get("totalWithholdTax")); Float expected = (Float) summary.get("totalDeposits") + (Float) summary.get("totalInterestPosted") - - (Float) summary.get("totalWithholdTax"); + - (Float) summary.get("totalWithholdTax"); Float actual = (Float) summary.get("accountBalance"); Assert.assertEquals(expected, actual, 1); @@ -1970,7 +1967,7 @@ public void testSavingsAccount_DormancyTracking() throws InterruptedException { LocalDate transactionDate = new LocalDate(); for(int i=0; i< 4; i++){ String TRANSACTION_DATE = formatter.print(transactionDate); - Integer depositTransactionId = (Integer) this.savingsAccountHelper.depositToSavingsAccount(savingsList.get(i), DEPOSIT_AMOUNT, + this.savingsAccountHelper.depositToSavingsAccount(savingsList.get(i), DEPOSIT_AMOUNT, TRANSACTION_DATE, CommonConstants.RESPONSE_RESOURCE_ID); transactionDate = transactionDate.minusDays(30); } @@ -2002,7 +1999,7 @@ public void testSavingsAccount_DormancyTracking() throws InterruptedException { assertEquals("Verifying account Balance", balance, summary.get("accountBalance")); String TRANSACTION_DATE = formatter.print(new LocalDate()); - Integer depositTransactionId = (Integer) this.savingsAccountHelper.depositToSavingsAccount(savingsList.get(1), DEPOSIT_AMOUNT, + this.savingsAccountHelper.depositToSavingsAccount(savingsList.get(1), DEPOSIT_AMOUNT, TRANSACTION_DATE, CommonConstants.RESPONSE_RESOURCE_ID); savingsStatusHashMap = SavingsStatusChecker.getStatusOfSavings(this.requestSpec, this.responseSpec, savingsList.get(1)); SavingsStatusChecker.verifySavingsIsActive(savingsStatusHashMap); @@ -2021,7 +2018,7 @@ public void testSavingsAccount_DormancyTracking() throws InterruptedException { assertEquals("Verifying account Balance", balance, summary.get("accountBalance")); TRANSACTION_DATE = formatter.print(new LocalDate()); - depositTransactionId = (Integer) this.savingsAccountHelper.depositToSavingsAccount(savingsList.get(2), DEPOSIT_AMOUNT, + this.savingsAccountHelper.depositToSavingsAccount(savingsList.get(2), DEPOSIT_AMOUNT, TRANSACTION_DATE, CommonConstants.RESPONSE_RESOURCE_ID); savingsStatusHashMap = SavingsStatusChecker.getStatusOfSavings(this.requestSpec, this.responseSpec, savingsList.get(2)); SavingsStatusChecker.verifySavingsIsActive(savingsStatusHashMap); @@ -2141,7 +2138,7 @@ public void testSavingsAccountBlockStatus() { savingsStatusHashMap = this.savingsAccountHelper.activateSavings(savingsId); SavingsStatusChecker.verifySavingsIsActive(savingsStatusHashMap); - HashMap summary = this.savingsAccountHelper.getSavingsSummary(savingsId); + this.savingsAccountHelper.getSavingsSummary(savingsId); Float balance = new Float(MINIMUM_OPENING_BALANCE); savingsStatusHashMap = this.savingsAccountHelper.blockSavings(savingsId); @@ -2214,7 +2211,7 @@ public void testSavingsAccountBlockStatus() { assertEquals("error.msg.savingsaccount.transaction.insufficient.account.balance", error.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE)); - Integer releaseTransactionId = this.savingsAccountHelper.releaseAmount(savingsId, holdTransactionId); + this.savingsAccountHelper.releaseAmount(savingsId, holdTransactionId); Date today = DateUtils.getDateOfTenant(); String todayDate = today.toString(); SimpleDateFormat dt1 = new SimpleDateFormat("dd MMM yyyy"); @@ -2281,10 +2278,10 @@ public void testAccountBalanceAfterTransactionReversal() { Assert.assertNotNull(chargeId); - final Integer payChargeId = this.savingsAccountHelper.payCharge(chargeId, savingsId, chargeAmount, SavingsAccountHelper.TRANSACTION_DATE); + this.savingsAccountHelper.payCharge(chargeId, savingsId, chargeAmount, SavingsAccountHelper.TRANSACTION_DATE); - final Integer undoSavingsTransaction = this.savingsAccountHelper.undoSavingsAccountTransaction(savingsId, depositTransactionId); + this.savingsAccountHelper.undoSavingsAccountTransaction(savingsId, depositTransactionId); HashMap reversedDepositTransaction = this.savingsAccountHelper.getSavingsTransaction(savingsId, depositTransactionId); Assert.assertTrue((Boolean) reversedDepositTransaction.get("reversed")); From 8e78265a538b5631c814af948edb940bc01b032c Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Mon, 13 Apr 2020 20:03:22 +0200 Subject: [PATCH 2/3] comment out accountDetailsPostInterest in ClientSavingsIntegrationTest prompted by FINERACT-852, and also made me raise FINERACT-891 --- .../integrationtests/ClientSavingsIntegrationTest.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java index 8d136029982..f23b422a924 100755 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java @@ -942,8 +942,7 @@ public void testSavingsAccountPostInterestOnLastDayWithOverdraft() { HashMap accountTransactionDetails = this.savingsAccountHelper .getSavingsDetails(savingsId); summary = (HashMap) accountDetails.get("summary"); - Float accountDetailsPostInterest = Float.valueOf(summary.get( - "totalInterestPosted").toString()); + // Float accountDetailsPostInterest = Float.valueOf(summary.get("totalInterestPosted").toString()); nominalAnnualInterest = Float.valueOf(accountDetails.get( "nominalAnnualInterestRate").toString()); @@ -1019,8 +1018,7 @@ public void testSavingsAccountPostInterestOnLastDayWithOverdraft() { accountTransactionDetails = this.savingsAccountHelper .getSavingsDetails(savingsId); summary = (HashMap) accountTransactionDetails.get("summary"); - accountDetailsPostInterest = Float.valueOf(summary.get( - "totalInterestPosted").toString()); + // accountDetailsPostInterest = Float.valueOf(summary.get("totalInterestPosted").toString()); nominalAnnualInterest = Float.valueOf(accountDetails.get( "nominalAnnualInterestRate").toString()); @@ -1063,8 +1061,7 @@ public void testSavingsAccountPostInterestOnLastDayWithOverdraft() { accountTransactionDetails = this.savingsAccountHelper .getSavingsDetails(savingsId); summary = (HashMap) accountTransactionDetails.get("summary"); - accountDetailsPostInterest = Float.valueOf(summary.get( - "totalInterestPosted").toString()); + // accountDetailsPostInterest = Float.valueOf(summary.get("totalInterestPosted").toString()); nominalAnnualInterest = Float.valueOf(accountDetails.get( "nominalAnnualInterestRate").toString()); From af1eafc986a42bc0f34f05c00dad8596b8421d64 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Mon, 13 Apr 2020 20:05:41 +0200 Subject: [PATCH 3/3] fix Dead Code bug in ClientSavingsIntegrationTest (fixes FINERACT-891) --- .../integrationtests/ClientSavingsIntegrationTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java index f23b422a924..7bbfc412605 100755 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java @@ -1012,7 +1012,7 @@ public void testSavingsAccountPostInterestOnLastDayWithOverdraft() { transactionCalendarDateFormat.add(Calendar.DAY_OF_MONTH, 0); transactionDate.set(Calendar.DAY_OF_MONTH, 22); TRANSACTION_DATE = dateFormat.format(transactionDate.getTime()); - if (Calendar.DAY_OF_MONTH >= 22) { // TODO FINERACT-891 Dead Code.. + if (transactionDate.get(Calendar.DAY_OF_MONTH) >= 22) { this.savingsAccountHelper.postInterestAsOnSavings(savingsId, TRANSACTION_DATE); accountTransactionDetails = this.savingsAccountHelper @@ -1352,7 +1352,7 @@ public void testSavingsAccountPostInterestOnLastDayWithdrawalWithOverdraft() { transactionCalendarDateFormat.add(Calendar.DAY_OF_MONTH, 0); transactionDate.set(Calendar.DAY_OF_MONTH, 22); TRANSACTION_DATE = dateFormat.format(transactionDate.getTime()); - if (Calendar.DAY_OF_MONTH >= 22) { // TODO FINERACT-891 Dead Code.. + if (transactionDate.get(Calendar.DAY_OF_MONTH) >= 22) { this.savingsAccountHelper.postInterestAsOnSavings(savingsId, TRANSACTION_DATE); accountTransactionDetails = this.savingsAccountHelper