From 242847f41b8f439bd1386dd177b6dddf93ee5646 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Sat, 3 Mar 2018 17:59:14 +0100
Subject: [PATCH] no-jira: fix unit test which fails on saturday
---
.../course/statistic/WeeklyStatisticUpdateManagerTest.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/test/java/org/olat/course/statistic/WeeklyStatisticUpdateManagerTest.java b/src/test/java/org/olat/course/statistic/WeeklyStatisticUpdateManagerTest.java
index 6b47e5cc659..0c2d2d4da22 100644
--- a/src/test/java/org/olat/course/statistic/WeeklyStatisticUpdateManagerTest.java
+++ b/src/test/java/org/olat/course/statistic/WeeklyStatisticUpdateManagerTest.java
@@ -119,6 +119,7 @@ public class WeeklyStatisticUpdateManagerTest extends AbstractStatisticUpdateMan
private String getWeekString(Calendar start) {
Calendar cal = Calendar.getInstance();
+ cal.setFirstDayOfWeek(Calendar.MONDAY);
cal.set(Calendar.YEAR, start.get(Calendar.YEAR));
cal.set(Calendar.MONTH, start.get(Calendar.MONTH));
cal.set(Calendar.DATE, start.get(Calendar.DATE));
@@ -128,8 +129,10 @@ public class WeeklyStatisticUpdateManagerTest extends AbstractStatisticUpdateMan
cal.set(Calendar.MILLISECOND, 0);
if(dbInstance.isMySQL()) {
+ weeklyMySQLFormat.setCalendar(cal);
return weeklyMySQLFormat.format(cal.getTime());
}
+ weeklyFormat.setCalendar(cal);
return weeklyFormat.format(cal.getTime());
}
@@ -146,7 +149,9 @@ public class WeeklyStatisticUpdateManagerTest extends AbstractStatisticUpdateMan
protected String addLogEntry(RepositoryEntry repositoryEntry, CourseNode courseNode, Calendar start,
int dayInPast, int hour, int minute, int second) {
Calendar cal = addLog(repositoryEntry.getKey(), courseNode.getIdent(), start, dayInPast, hour, minute, second);
+
String week = getWeekString(cal);
+ System.out.println(cal.getTime() + " " + week);
incrementInMemoryStatistics(repositoryEntry.getKey(), courseNode.getIdent(), week);
return week;
}
--
GitLab