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

fixes for loan refund test cases

Browse Source
This commit is contained in:
Vishwas Babu A J
2015-04-07 18:06:10 -07:00
parent e6e0af7885
commit 69150fc7ad
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/ClientLoanIntegrationTest.java
+4 -3
View File
@@ -22,6 +22,7 @@ import org.joda.time.LocalDate;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mifosplatform.infrastructure.core.service.DateUtils;
import org.mifosplatform.integrationtests.common.ClientHelper;
import org.mifosplatform.integrationtests.common.SchedulerJobHelper;
import org.mifosplatform.integrationtests.common.Utils;
@@ -4259,7 +4260,7 @@ public class ClientLoanIntegrationTest {
public void testLoanRefundByCashCashBasedAccounting() {
this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
Calendar fourMonthsfromNowCalendar = Calendar.getInstance();
Calendar fourMonthsfromNowCalendar = Calendar.getInstance(Utils.getTimeZoneOfTenant());
fourMonthsfromNowCalendar.add(Calendar.MONTH, -4);
String fourMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
@@ -4414,7 +4415,7 @@ public class ClientLoanIntegrationTest {
public void testLoanRefundByCashAccrualBasedAccounting() {
this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
Calendar fourMonthsfromNowCalendar = Calendar.getInstance();
Calendar fourMonthsfromNowCalendar = Calendar.getInstance(Utils.getTimeZoneOfTenant());
fourMonthsfromNowCalendar.add(Calendar.MONTH, -4);
String fourMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
@@ -4572,7 +4573,7 @@ public class ClientLoanIntegrationTest {
this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);
this.accountTransferHelper = new AccountTransferHelper(this.requestSpec, this.responseSpec);
Calendar fourMonthsfromNowCalendar = Calendar.getInstance();
Calendar fourMonthsfromNowCalendar = Calendar.getInstance(Utils.getTimeZoneOfTenant());
fourMonthsfromNowCalendar.add(Calendar.MONTH, -4);
String fourMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/Utils.java
+5 -1
View File
@@ -11,6 +11,7 @@ import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -22,6 +23,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.http.conn.HttpHostConnectException;
import org.joda.time.DateTimeZone;
import org.joda.time.LocalDate;
import org.mifosplatform.infrastructure.core.service.DateUtils;
import com.jayway.restassured.RestAssured;
import com.jayway.restassured.path.json.JsonPath;
@@ -122,7 +124,9 @@ public class Utils {
}
public static String convertDateToURLFormat(final Calendar dateToBeConvert) {
return new SimpleDateFormat("dd MMMMMM yyyy").format(dateToBeConvert.getTime());
DateFormat dateFormat = new SimpleDateFormat("dd MMMMMM yyyy");
dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
return dateFormat.format(dateToBeConvert.getTime());
}
public static LocalDate getLocalDateOfTenant() {