From e6e0af78855e09eea0ba57d2c2d1c973e1ef0891 Mon Sep 17 00:00:00 2001 From: Vishwas Babu A J Date: Tue, 7 Apr 2015 17:11:46 -0700 Subject: [PATCH] fix for failing test case testSavingsInterestPostingAtPeriodEnd --- ...SavingsInterestPostingIntegrationTest.java | 107 ++++++++---------- 1 file changed, 50 insertions(+), 57 deletions(-) diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java index 688443f85..9713cb763 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java @@ -31,14 +31,14 @@ import com.jayway.restassured.specification.ResponseSpecification; @SuppressWarnings({ "rawtypes", "unused", "unchecked" }) public class FlexibleSavingsInterestPostingIntegrationTest { - - public static final String ACCOUNT_TYPE_INDIVIDUAL = "INDIVIDUAL"; - - private ResponseSpecification responseSpec; + + public static final String ACCOUNT_TYPE_INDIVIDUAL = "INDIVIDUAL"; + + private ResponseSpecification responseSpec; private RequestSpecification requestSpec; private SavingsProductHelper savingsProductHelper; private SavingsAccountHelper savingsAccountHelper; - + @Before public void setup() { Utils.initializeRESTAssured(); @@ -47,47 +47,46 @@ public class FlexibleSavingsInterestPostingIntegrationTest { this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build(); this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.savingsProductHelper = new SavingsProductHelper(); - } - + } + @Test public void testSavingsInterestPostingAtPeriodEnd() { - //client activation, savings activation and 1st transaction date - final String startDate = "01 December 2013"; - final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec, startDate); + // client activation, savings activation and 1st transaction date + final String startDate = "01 December 2013"; + final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec, startDate); Assert.assertNotNull(clientID); - + // Configuring global config flags configureInterestPosting(true, 4); - + final Integer savingsId = createSavingsAccount(clientID, startDate); - - Integer depositTransactionId = (Integer) this.savingsAccountHelper.depositToSavingsAccount(savingsId, "1000", - startDate, CommonConstants.RESPONSE_RESOURCE_ID); - + + Integer depositTransactionId = (Integer) this.savingsAccountHelper.depositToSavingsAccount(savingsId, "1000", startDate, + CommonConstants.RESPONSE_RESOURCE_ID); + /*** - * Perform Post interest transaction and verify the posted transaction date + * Perform Post interest transaction and verify the posted transaction + * date */ this.savingsAccountHelper.postInterestForSavings(savingsId); HashMap accountDetails = this.savingsAccountHelper.getSavingsDetails(savingsId); - ArrayList> transactions = (ArrayList>) - accountDetails.get("transactions"); - HashMap interestPostingTransaction = transactions.get(0); - for(Entry entry : interestPostingTransaction.entrySet()) - System.out.println(entry.getKey() + "-" + entry.getValue().toString()); - //1st Dec 13 to 31st March 14 - 365 days, daily compounding using daily balance - //33.7016 obtained from formula in excel provided by Subramanya - assertEquals("Equality check for interest posted amount", - "33.7016", interestPostingTransaction.get("amount").toString()); - assertEquals("Date check for Interest Posting transaction", - "[2014, 3, 31]", interestPostingTransaction.get("date").toString()); - + ArrayList> transactions = (ArrayList>) accountDetails.get("transactions"); + HashMap interestPostingTransaction = transactions.get(transactions.size() - 2); + for (Entry entry : interestPostingTransaction.entrySet()) + System.out.println(entry.getKey() + "-" + entry.getValue().toString()); + // 1st Dec 13 to 31st March 14 - 365 days, daily compounding using daily + // balance + // 33.7016 obtained from formula in excel provided by Subramanya + assertEquals("Equality check for interest posted amount", "33.7016", interestPostingTransaction.get("amount").toString()); + assertEquals("Date check for Interest Posting transaction", "[2014, 3, 31]", interestPostingTransaction.get("date").toString()); + } - + private Integer createSavingsAccount(final Integer clientID, final String startDate) { - final Integer savingsProductID = createSavingsProduct(); + final Integer savingsProductID = createSavingsProduct(); Assert.assertNotNull(savingsProductID); - final Integer savingsId = this.savingsAccountHelper.applyForSavingsApplicationOnDate(clientID, - savingsProductID, ACCOUNT_TYPE_INDIVIDUAL, startDate); + final Integer savingsId = this.savingsAccountHelper.applyForSavingsApplicationOnDate(clientID, savingsProductID, + ACCOUNT_TYPE_INDIVIDUAL, startDate); Assert.assertNotNull(savingsId); HashMap savingsStatusHashMap = this.savingsAccountHelper.approveSavingsOnDate(savingsId, startDate); SavingsStatusChecker.verifySavingsIsApproved(savingsStatusHashMap); @@ -95,54 +94,48 @@ public class FlexibleSavingsInterestPostingIntegrationTest { SavingsStatusChecker.verifySavingsIsActive(savingsStatusHashMap); return savingsId; } - - private void configureInterestPosting(final Boolean periodEndEnable, - final Integer financialYearBeginningMonth) { - final ArrayList globalConfig = GlobalConfigurationHelper.getAllGlobalConfigurations(this.requestSpec, - this.responseSpec); + + private void configureInterestPosting(final Boolean periodEndEnable, final Integer financialYearBeginningMonth) { + final ArrayList globalConfig = GlobalConfigurationHelper.getAllGlobalConfigurations(this.requestSpec, this.responseSpec); Assert.assertNotNull(globalConfig); - + // Updating flag for interest posting at period end Integer periodEndConfigId = (Integer) globalConfig.get(10).get("id"); Assert.assertNotNull(periodEndConfigId); HashMap periodEndConfigData = GlobalConfigurationHelper.getGlobalConfigurationById(this.requestSpec, this.responseSpec, - periodEndConfigId.toString()); + periodEndConfigId.toString()); Assert.assertNotNull(periodEndConfigData); Boolean enabled = (Boolean) globalConfig.get(10).get("enabled"); - if (enabled != periodEndEnable) + if (enabled != periodEndEnable) periodEndConfigId = GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(this.requestSpec, this.responseSpec, - periodEndConfigId.toString(), periodEndEnable); - - - //Updating value for financial year beginning month + periodEndConfigId.toString(), periodEndEnable); + + // Updating value for financial year beginning month Integer financialYearBeginningConfigId = (Integer) globalConfig.get(11).get("id"); Assert.assertNotNull(financialYearBeginningConfigId); - HashMap financialYearBeginningConfigData = GlobalConfigurationHelper.getGlobalConfigurationById(this.requestSpec, this.responseSpec, - financialYearBeginningConfigId.toString()); + HashMap financialYearBeginningConfigData = GlobalConfigurationHelper.getGlobalConfigurationById(this.requestSpec, + this.responseSpec, financialYearBeginningConfigId.toString()); Assert.assertNotNull(financialYearBeginningConfigData); financialYearBeginningConfigId = GlobalConfigurationHelper.updateValueForGlobalConfiguration(this.requestSpec, this.responseSpec, - financialYearBeginningConfigId.toString(), financialYearBeginningMonth.toString()); + financialYearBeginningConfigId.toString(), financialYearBeginningMonth.toString()); Assert.assertNotNull(financialYearBeginningConfigId); } - + private Integer createSavingsProduct() { - final String savingsProductJSON = this.savingsProductHelper - .withInterestCompoundingPeriodTypeAsDaily() - .withInterestPostingPeriodTypeAsAnnual() - .withInterestCalculationPeriodTypeAsDailyBalance() - .build(); + final String savingsProductJSON = this.savingsProductHelper.withInterestCompoundingPeriodTypeAsDaily() + .withInterestPostingPeriodTypeAsAnnual().withInterestCalculationPeriodTypeAsDailyBalance().build(); return SavingsProductHelper.createSavingsProduct(savingsProductJSON, requestSpec, responseSpec); } - - //Reset configuration fields + + // Reset configuration fields @After public void tearDown() { - configureInterestPosting(false, 1); + configureInterestPosting(false, 1); } }