From 768fcea15b2b2090558e3359d1e1ca809a6a6ed9 Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Thu, 15 Jun 2023 10:43:37 +0200
Subject: [PATCH] SEBSERV-444 fixed also in exam delete message

---
 .../ethz/seb/sebserver/gui/content/exam/ExamDeletePopup.java  | 3 ++-
 src/main/java/ch/ethz/seb/sebserver/gui/widget/Message.java   | 2 +-
 .../servicelayer/lms/impl/mockup/MockCourseAccessAPI.java     | 2 +-
 .../webservice/integration/api/admin/ExamAPITest.java         | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamDeletePopup.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamDeletePopup.java
index 5ec0af5d..c039a91d 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamDeletePopup.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamDeletePopup.java
@@ -16,6 +16,7 @@ import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import org.apache.commons.text.StringEscapeUtils;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
@@ -161,7 +162,7 @@ public class ExamDeletePopup {
                     new ActionEvent(action),
                     action.pageContext());
 
-            final String examName = examToDelete.toName().name;
+            final String examName = StringEscapeUtils.escapeXml11(examToDelete.toName().name);
             final List<EntityKey> dependencies = report.results.stream()
                     .filter(key -> !key.equals(entityKey))
                     .collect(Collectors.toList());
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/widget/Message.java b/src/main/java/ch/ethz/seb/sebserver/gui/widget/Message.java
index 9913deec..4ad20c14 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/widget/Message.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/widget/Message.java
@@ -46,7 +46,7 @@ public final class Message extends MessageBox {
             super.prepareOpen();
         } catch (final IllegalArgumentException e) {
             // fallback on markup text error
-            super.setMessage(StringEscapeUtils.escapeHtml4(super.getMessage()));
+            super.setMessage(StringEscapeUtils.escapeXml11(super.getMessage()));
             super.prepareOpen();
         }
         final GridLayout layout = (GridLayout) super.shell.getLayout();
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/mockup/MockCourseAccessAPI.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/mockup/MockCourseAccessAPI.java
index e5db1a9b..b65da02a 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/mockup/MockCourseAccessAPI.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/mockup/MockCourseAccessAPI.java
@@ -63,7 +63,7 @@ public class MockCourseAccessAPI implements CourseAccessAPI {
                 "quiz1", institutionId, lmsSetupId, lmsType, "Demo Quiz 1 (MOCKUP)", "<p>Demo Quiz Mockup</p>",
                 "2020-01-01T09:00:00Z", null, "http://lms.mockup.com/api/"));
         this.mockups.add(new QuizData(
-                "quiz2", institutionId, lmsSetupId, lmsType, "Demo Quiz 2 (MOCKUP) äöüèÜÄÖ ?< ",
+                "quiz2 äöüèÜÄÖ ?<", institutionId, lmsSetupId, lmsType, "Demo Quiz 2 (MOCKUP) äöüèÜÄÖ ?< ",
                 "<p>Demo Quiz Mockup</p>",
                 "2020-01-01T09:00:00Z", "2025-01-01T09:00:00Z", "http://lms.mockup.com/api/"));
         this.mockups.add(new QuizData(
diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/ExamAPITest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/ExamAPITest.java
index 3076b492..5bd8c9b1 100644
--- a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/ExamAPITest.java
+++ b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/ExamAPITest.java
@@ -36,12 +36,12 @@ public class ExamAPITest extends AdministrationAPIIntegrationTester {
                 sebAdminAccess,
                 sebAdminAccess,
                 "LmsSetupMock",
-                "quiz2",
+                "quiz2 äöüèÜÄÖ ?<",
                 ExamType.MANAGED,
                 "user5");
 
         assertNotNull(exam);
-        assertEquals("quiz2", exam.getExternalId());
+        assertEquals("quiz2 äöüèÜÄÖ ?<", exam.getExternalId()); // Note cannot set right collation on h2
         assertEquals(ExamType.MANAGED, exam.getType());
         assertFalse(exam.getSupporter().isEmpty());