From a1cfaa7c66a1e29079a33539f2cbcd662f987ab4 Mon Sep 17 00:00:00 2001 From: anhefti Date: Wed, 2 Nov 2022 13:11:20 +0100 Subject: [PATCH] SEBSERV-358 removed exam description --- .../servicelayer/exam/impl/SEBClientEventCSVExporter.java | 4 ---- .../exam/impl/SEBClientEventCSVExporterTest.java | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/SEBClientEventCSVExporter.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/SEBClientEventCSVExporter.java index fecf7049..4019ba4f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/SEBClientEventCSVExporter.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/SEBClientEventCSVExporter.java @@ -74,8 +74,6 @@ public class SEBClientEventCSVExporter implements SEBClientEventExporter { .append(Constants.COMMA) .append("Exam Name") .append(Constants.COMMA) - .append("Exam Description") - .append(Constants.COMMA) .append("Exam Type") .append(Constants.COMMA) .append("Start Time (LMS)") @@ -133,8 +131,6 @@ public class SEBClientEventCSVExporter implements SEBClientEventExporter { builder.append(Constants.COMMA); builder.append(Utils.toCSVString(examData.getName())); builder.append(Constants.COMMA); - builder.append(Utils.toCSVString(examData.getDescription())); - builder.append(Constants.COMMA); builder.append(examData.getType().name()); builder.append(Constants.COMMA); builder.append(Utils.formatDate(examData.getStartTime())); diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/SEBClientEventCSVExporterTest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/SEBClientEventCSVExporterTest.java index 131400be..59c85b20 100644 --- a/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/SEBClientEventCSVExporterTest.java +++ b/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/SEBClientEventCSVExporterTest.java @@ -70,7 +70,7 @@ public class SEBClientEventCSVExporterTest { final String string = Utils.toString(array); Assert.assertEquals( - "Event Type,Message,Value,Client Time (UTC),Server Time (UTC),Exam Name,Exam Description,Exam Type,Start Time (LMS),End Time (LMS)\n", + "Event Type,Message,Value,Client Time (UTC),Server Time (UTC),Exam Name,Exam Type,Start Time (LMS),End Time (LMS)\n", string); } @@ -86,7 +86,7 @@ public class SEBClientEventCSVExporterTest { final String string = Utils.toString(array); Assert.assertEquals( - "Event Type,Message,Value,Client Time (UTC),Server Time (UTC),User Session-ID,Client Machine,Connection Status,Connection Token,Exam Name,Exam Description,Exam Type,Start Time (LMS),End Time (LMS)\n", + "Event Type,Message,Value,Client Time (UTC),Server Time (UTC),User Session-ID,Client Machine,Connection Status,Connection Token,Exam Name,Exam Type,Start Time (LMS),End Time (LMS)\n", string); } @@ -131,7 +131,7 @@ public class SEBClientEventCSVExporterTest { final String string = Utils.toString(array); Assert.assertEquals( - "INFO_LOG,\"text\",5,1970-01-01T00:00:00.003,1970-01-01T00:00:00.004,\"name\",\"description\",BYOD,1970-01-01T00:00:00.001,1970-01-01T00:00:00.001\n", + "INFO_LOG,\"text\",5,1970-01-01T00:00:00.003,1970-01-01T00:00:00.004,\"name\",BYOD,1970-01-01T00:00:00.001,1970-01-01T00:00:00.001\n", string); } @@ -159,7 +159,7 @@ public class SEBClientEventCSVExporterTest { final String string = Utils.toString(array); Assert.assertEquals( - "INFO_LOG,\"text\",5,1970-01-01T00:00:00.003,1970-01-01T00:00:00.004,\"sessionid\",\"clientaddress\",status,token,\"name\",\"description\",BYOD,1970-01-01T00:00:00.001,1970-01-01T00:00:00.001\n", + "INFO_LOG,\"text\",5,1970-01-01T00:00:00.003,1970-01-01T00:00:00.004,\"sessionid\",\"clientaddress\",status,token,\"name\",BYOD,1970-01-01T00:00:00.001,1970-01-01T00:00:00.001\n", string); } }