From e9e0bbc930ded7e1b3be942d237e228bacdb52b8 Mon Sep 17 00:00:00 2001 From: Shaik Nazeer Hussain Date: Sat, 25 Jan 2020 12:18:59 +0530 Subject: [PATCH] FINERACT-820 - Fixing Integration Test which fails on Sundays --- .../integrationtests/ClientLoanIntegrationTest.java | 9 +-------- .../LoanReschedulingWithinCenterTest.java | 2 +- .../fineract/integrationtests/common/Utils.java | 11 +++++++++++ 3 files changed, 13 insertions(+), 9 deletions(-) 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 c6aede494..a9b216769 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,14 +5070,7 @@ public class ClientLoanIntegrationTest { } public 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); + return Utils.getDayOfWeek(date) ; } 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 24d1f9558..dc3b97cc7 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 = today.get(Calendar.DAY_OF_WEEK) - 1; + final Integer repeatsOnDay = Utils.getDayOfWeek(today) ; 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 68142e01d..3eeefb080 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,5 +262,16 @@ 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); + } }