diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java index a9b216769..c6aede494 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java @@ -5070,7 +5070,14 @@ public class ClientLoanIntegrationTest { } public Integer getDayOfWeek(Calendar date) { - return Utils.getDayOfWeek(date) ; + int dayOfWeek = 0; + if (null != date) { + dayOfWeek = date.get(Calendar.DAY_OF_WEEK) - 1; + if (dayOfWeek == 0) { + dayOfWeek = 7; + } + } + return Integer.valueOf(dayOfWeek); } public Integer getDayOfMonth(Calendar date) { diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java index dc3b97cc7..24d1f9558 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java @@ -175,7 +175,7 @@ public class LoanReschedulingWithinCenterTest { final String startDate = dateFormat.format(today.getTime()); final String frequency = "2"; // 2:Weekly final String interval = "2"; // Every one week - final Integer repeatsOnDay = Utils.getDayOfWeek(today) ; + final Integer repeatsOnDay = today.get(Calendar.DAY_OF_WEEK) - 1; Integer calendarId = CalendarHelper.createMeetingForGroup(this.requestSpec, this.responseSpec, centerId, startDate, frequency, interval, repeatsOnDay.toString()); diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java index 3eeefb080..68142e01d 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java @@ -262,16 +262,5 @@ public class Utils { .andReturn().asString(); return templateLocation.substring(1,templateLocation.length()-1); } - - public static Integer getDayOfWeek(Calendar date) { - int dayOfWeek = 0; - if (null != date) { - dayOfWeek = date.get(Calendar.DAY_OF_WEEK) - 1; - if (dayOfWeek == 0) { - dayOfWeek = 7; - } - } - return Integer.valueOf(dayOfWeek); - } }