diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/MockupLmsAPITemplate.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/MockupLmsAPITemplate.java index d0734fb8..87542447 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/MockupLmsAPITemplate.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/MockupLmsAPITemplate.java @@ -59,29 +59,29 @@ final class MockupLmsAPITemplate implements LmsAPITemplate { final LmsType lmsType = lmsSetup.getLmsType(); this.mockups = new ArrayList<>(); this.mockups.add(new QuizData( - "quiz1", institutionId, lmsSetupId, lmsType, "Demo Quiz 1", "Demo Quiz Mockup", + "quiz1", institutionId, lmsSetupId, lmsType, "Demo Quiz 1 (MOCKUP)", "Demo Quiz Mockup", "2020-01-01T09:00:00Z", "2021-01-01T09:00:00Z", "http://lms.mockup.com/api/")); this.mockups.add(new QuizData( - "quiz2", institutionId, lmsSetupId, lmsType, "Demo Quiz 2", "Demo Quiz Mockup", + "quiz2", institutionId, lmsSetupId, lmsType, "Demo Quiz 2 (MOCKUP)", "Demo Quiz Mockup", "2020-01-01T09:00:00Z", "2021-01-01T09:00:00Z", "http://lms.mockup.com/api/")); this.mockups.add(new QuizData( - "quiz3", institutionId, lmsSetupId, lmsType, "Demo Quiz 3", "Demo Quiz Mockup", + "quiz3", institutionId, lmsSetupId, lmsType, "Demo Quiz 3 (MOCKUP)", "Demo Quiz Mockup", "2018-07-30T09:00:00Z", "2018-08-01T00:00:00Z", "http://lms.mockup.com/api/")); this.mockups.add(new QuizData( - "quiz4", institutionId, lmsSetupId, lmsType, "Demo Quiz 4", "Demo Quiz Mockup", + "quiz4", institutionId, lmsSetupId, lmsType, "Demo Quiz 4 (MOCKUP)", "Demo Quiz Mockup", "2018-01-01T00:00:00Z", "2019-01-01T00:00:00Z", "http://lms.mockup.com/api/")); this.mockups.add(new QuizData( - "quiz5", institutionId, lmsSetupId, lmsType, "Demo Quiz 5", "Demo Quiz Mockup", + "quiz5", institutionId, lmsSetupId, lmsType, "Demo Quiz 5 (MOCKUP)", "Demo Quiz Mockup", "2018-01-01T09:00:00Z", "2021-01-01T09:00:00Z", "http://lms.mockup.com/api/")); this.mockups.add(new QuizData( - "quiz6", institutionId, lmsSetupId, lmsType, "Demo Quiz 6", "Demo Quiz Mockup", + "quiz6", institutionId, lmsSetupId, lmsType, "Demo Quiz 6 (MOCKUP)", "Demo Quiz Mockup", "2019-01-01T09:00:00Z", "2021-01-01T09:00:00Z", "http://lms.mockup.com/api/")); this.mockups.add(new QuizData( - "quiz7", institutionId, lmsSetupId, lmsType, "Demo Quiz 7", "Demo Quiz Mockup", + "quiz7", institutionId, lmsSetupId, lmsType, "Demo Quiz 7 (MOCKUP)", "Demo Quiz Mockup", "2018-01-01T09:00:00Z", "2021-01-01T09:00:00Z", "http://lms.mockup.com/api/")); this.mockups.add(new QuizData( - "quiz10", institutionId, lmsSetupId, lmsType, "Demo Quiz 10", + "quiz10", institutionId, lmsSetupId, lmsType, "Demo Quiz 10 (MOCKUP)", "Starts in a minute and ends after five minutes", DateTime.now(DateTimeZone.UTC).plus(Constants.MINUTE_IN_MILLIS) .toString(Constants.DEFAULT_DATE_TIME_FORMAT), diff --git a/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java b/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java index 6bd18e4b..56fa3850 100644 --- a/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java +++ b/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java @@ -674,7 +674,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { assertFalse(quizzes.isEmpty()); final QuizData quizData = quizzes.content.get(0); assertNotNull(quizData); - assertEquals("Demo Quiz 1", quizData.name); + assertEquals("Demo Quiz 1 (MOCKUP)", quizData.name); // import quiz as exam final Result newExamResult = restService @@ -688,7 +688,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { assertFalse(newExamResult.hasError()); final Exam newExam = newExamResult.get(); - assertEquals("Demo Quiz 1", newExam.name); + assertEquals("Demo Quiz 1 (MOCKUP)", newExam.name); assertEquals(ExamType.UNDEFINED, newExam.type); assertFalse(newExam.supporter.isEmpty()); @@ -753,7 +753,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { final List exams = examNamesResult.get(); assertFalse(exams.isEmpty()); final EntityName examName = exams.get(0); - assertEquals("Demo Quiz 1", examName.name); + assertEquals("Demo Quiz 1 (MOCKUP)", examName.name); final Result examResult = restService .getBuilder(GetExam.class) diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/exam/SebConnectionTest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/exam/SebConnectionTest.java index 64a647b8..93d00068 100644 --- a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/exam/SebConnectionTest.java +++ b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/exam/SebConnectionTest.java @@ -63,7 +63,7 @@ public class SebConnectionTest extends ExamAPIIntegrationTester { assertTrue(HttpStatus.OK.value() == createConnection.getStatus()); final String contentAsString = createConnection.getContentAsString(); assertEquals( - "[{\"examId\":\"2\",\"name\":\"Demo Quiz 6\",\"url\":\"http://lms.mockup.com/api/\",\"lmsType\":\"MOCKUP\"}]", + "[{\"examId\":\"2\",\"name\":\"Demo Quiz 6 (MOCKUP)\",\"url\":\"http://lms.mockup.com/api/\",\"lmsType\":\"MOCKUP\"}]", contentAsString); // check connection token @@ -111,7 +111,7 @@ public class SebConnectionTest extends ExamAPIIntegrationTester { assertTrue(HttpStatus.OK.value() == createConnection.getStatus()); final String contentAsString = createConnection.getContentAsString(); assertEquals( - "[{\"examId\":\"2\",\"name\":\"Demo Quiz 6\",\"url\":\"http://lms.mockup.com/api/\",\"lmsType\":\"MOCKUP\"}]", + "[{\"examId\":\"2\",\"name\":\"Demo Quiz 6 (MOCKUP)\",\"url\":\"http://lms.mockup.com/api/\",\"lmsType\":\"MOCKUP\"}]", contentAsString); // check connection token