From eba81f57156499efc50e1c331a5552680994db1c Mon Sep 17 00:00:00 2001 From: anhefti Date: Wed, 15 Jul 2020 08:44:04 +0200 Subject: [PATCH 1/2] fix: cut too long event messages to max 512 and tests --- .../gbl/model/session/ClientEvent.java | 2 +- .../gui/integration/SEBClientBot.java | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientEvent.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientEvent.java index eb109239..0586d429 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientEvent.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientEvent.java @@ -103,7 +103,7 @@ public class ClientEvent implements Entity, IndicatorValueHolder { this.clientTime = (clientTime != null) ? clientTime : 0; this.serverTime = (serverTime != null) ? serverTime : Utils.getMillisecondsNow(); this.numValue = numValue; - this.text = text; + this.text = Utils.truncateText(text, 512); } @Override diff --git a/src/test/java/ch/ethz/seb/sebserver/gui/integration/SEBClientBot.java b/src/test/java/ch/ethz/seb/sebserver/gui/integration/SEBClientBot.java index 89b25202..0b7eef7e 100644 --- a/src/test/java/ch/ethz/seb/sebserver/gui/integration/SEBClientBot.java +++ b/src/test/java/ch/ethz/seb/sebserver/gui/integration/SEBClientBot.java @@ -520,6 +520,7 @@ public class SEBClientBot { private final String eventBodyTemplate = "{ \"type\": \"%s\", \"timestamp\": %s, \"text\": \"some error " + UUID.randomUUID() + " \" }"; + private boolean first = true; private long timestamp = 0; private final String eventType; @@ -534,7 +535,23 @@ public class SEBClientBot { @Override public String getBody() { - return String.format(this.eventBodyTemplate, this.eventType, this.timestamp); + if (this.first) { + this.first = false; + final String longText = + "DEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHT" + + "DEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHT" + + "DEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHT" + + "DEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHT" + + "DEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHT" + + "DEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHT" + + "DEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHT" + + "DEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHTDEDSFGREZHT"; + final String template = + "{ \"type\": \"%s\", \"timestamp\": %s, \"text\": \"some error " + longText + " \" }"; + return String.format(template, this.eventType, this.timestamp); + } else { + return String.format(this.eventBodyTemplate, this.eventType, this.timestamp); + } } @Override From 1d80926f51992986e2c4fc4c9a73cb2c35c93b95 Mon Sep 17 00:00:00 2001 From: anhefti Date: Wed, 15 Jul 2020 08:48:48 +0200 Subject: [PATCH 2/2] fixed Moodle quiz URL for Exam --- .../servicelayer/lms/impl/moodle/MoodleCourseAccess.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/MoodleCourseAccess.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/MoodleCourseAccess.java index c276480c..f6f806f0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/MoodleCourseAccess.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/MoodleCourseAccess.java @@ -44,7 +44,7 @@ public class MoodleCourseAccess extends CourseAccess { private static final Logger log = LoggerFactory.getLogger(MoodleCourseAccess.class); - private static final String MOODLE_QUIZ_START_URL_PATH = "/mod/quiz/view.php?id="; + private static final String MOODLE_QUIZ_START_URL_PATH = "mod/quiz/view.php?id="; private static final String MOODLE_COURSE_API_FUNCTION_NAME = "core_course_get_courses"; private static final String MOODLE_QUIZ_API_FUNCTION_NAME = "mod_quiz_get_quizzes_by_courses"; private static final String MOODLE_COURSE_API_COURSE_IDS = "courseids"; @@ -187,7 +187,7 @@ public class MoodleCourseAccess extends CourseAccess { return courseData.quizzes .stream() .map(courseQuizData -> { - final String startURI = uriPrefix + courseData.id; + final String startURI = uriPrefix + courseQuizData.id; additionalAttrs.put(QuizData.ATTR_ADDITIONAL_TIME_LIMIT, String.valueOf(courseQuizData.time_limit)); return new QuizData( courseQuizData.id,