From c3e66a6bff89d0e6516022735fbf1a80ec527832 Mon Sep 17 00:00:00 2001 From: Pramod Nuthakki Date: Fri, 7 Nov 2014 15:58:38 +0530 Subject: [PATCH] Corrected test cases --- .../FinancialActivityAccountsTest.java | 2 +- ...mDaysBetweenDisbursalAndFirstRepaymentTest.java | 4 +--- .../common/loans/LoanProductTestBuilder.java | 14 ++++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/FinancialActivityAccountsTest.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/FinancialActivityAccountsTest.java index 40e414c73..63d6dae1a 100755 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/FinancialActivityAccountsTest.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/FinancialActivityAccountsTest.java @@ -10,7 +10,7 @@ import static org.junit.Assert.assertEquals; import java.util.HashMap; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.After; import org.junit.Before; diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/MinimumDaysBetweenDisbursalAndFirstRepaymentTest.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/MinimumDaysBetweenDisbursalAndFirstRepaymentTest.java index fbeb274b5..5f1248e6d 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/MinimumDaysBetweenDisbursalAndFirstRepaymentTest.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/MinimumDaysBetweenDisbursalAndFirstRepaymentTest.java @@ -6,7 +6,6 @@ package org.mifosplatform.integrationtests; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import java.util.HashMap; import java.util.List; @@ -23,7 +22,6 @@ import org.mifosplatform.integrationtests.common.loans.LoanApplicationTestBuilde import org.mifosplatform.integrationtests.common.loans.LoanProductTestBuilder; import org.mifosplatform.integrationtests.common.loans.LoanStatusChecker; import org.mifosplatform.integrationtests.common.loans.LoanTransactionHelper; -import org.mifosplatform.integrationtests.common.savings.SavingsAccountHelper; import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.builder.ResponseSpecBuilder; @@ -136,7 +134,7 @@ public class MinimumDaysBetweenDisbursalAndFirstRepaymentTest { List error = (List) this.loanTransactionHelper.createLoanAccount(loanApplicationJSON, CommonConstants.RESPONSE_ERROR); - assertEquals("validation.msg.loan.days.between.first.repayment.and.disbursal.are.less than.minimum.number.of.days.required", error + assertEquals("error.msg.loan.days.between.first.repayment.and.disbursal.are.less.than.minimum.allowed.numbers", error .get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE)); } diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/loans/LoanProductTestBuilder.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/loans/LoanProductTestBuilder.java index 113a5da30..23fc74f10 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/loans/LoanProductTestBuilder.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/loans/LoanProductTestBuilder.java @@ -42,7 +42,7 @@ public class LoanProductTestBuilder { public static final String RECALCULATION_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS = "2"; public static final String RECALCULATION_STRATEGY_REDUCE_EMI_AMOUN = "3"; - public static final String RECALCULATION_COMPOUNDING_METHOD_NONE= "0"; + public static final String RECALCULATION_COMPOUNDING_METHOD_NONE = "0"; public static final String RECALCULATION_COMPOUNDING_METHOD_INTEREST = "1"; public static final String RECALCULATION_COMPOUNDING_METHOD_FEE = "2"; public static final String RECALCULATION_COMPOUNDING_METHOD_INTEREST_AND_FEE = "3"; @@ -87,7 +87,7 @@ public class LoanProductTestBuilder { private String recalculationRestFrequencyType = "1"; private String recalculationRestFrequencyInterval = "0"; private String recalculationRestFrequencyDate = null; - private String minimumDaysBetweenDisbursalAndFirstRepayment = "0"; + private String minimumDaysBetweenDisbursalAndFirstRepayment = null; public String build(final String chargeId) { final HashMap map = new HashMap<>(); @@ -121,7 +121,9 @@ public class LoanProductTestBuilder { map.put("minPrincipal", this.minPrincipal); map.put("maxPrincipal", this.maxPrincipal); map.put("overdueDaysForNPA", this.overdueDaysForNPA); - map.put("minimumDaysBetweenDisbursalAndFirstRepayment", this.minimumDaysBetweenDisbursalAndFirstRepayment); + if (this.minimumDaysBetweenDisbursalAndFirstRepayment != null) { + map.put("minimumDaysBetweenDisbursalAndFirstRepayment", this.minimumDaysBetweenDisbursalAndFirstRepayment); + } if (multiDisburseLoan) { map.put("multiDisburseLoan", this.multiDisburseLoan); map.put("maxTrancheCount", this.maxTrancheCount); @@ -379,8 +381,8 @@ public class LoanProductTestBuilder { return this; } - public LoanProductTestBuilder withMinimumDaysBetweenDisbursalAndFirstRepayment(final String minimumDaysBetweenDisbursalAndFirstRepayment){ - this.minimumDaysBetweenDisbursalAndFirstRepayment = minimumDaysBetweenDisbursalAndFirstRepayment; - return this; + public LoanProductTestBuilder withMinimumDaysBetweenDisbursalAndFirstRepayment(final String minimumDaysBetweenDisbursalAndFirstRepayment) { + this.minimumDaysBetweenDisbursalAndFirstRepayment = minimumDaysBetweenDisbursalAndFirstRepayment; + return this; } }