zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev-1.2' into SEBSERV-191

Browse source
This commit is contained in:
anhefti 2021-11-03 13:22:04 +01:00
commit 32d8c8a978
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/SEBRestrictionServiceImpl.java
View file

@ -202,7 +202,8 @@ public class SEBRestrictionServiceImpl implements SEBRestrictionService {
.map(sebRestrictionData -> {
if (log.isDebugEnabled()) {
log.debug("Applying SEB Client restriction on LMS with: {}", sebRestrictionData);
log.debug(" *** SEB Restriction *** Applying SEB Client restriction on LMS with: {}",
sebRestrictionData);
}
return this.lmsAPIService
@ -221,7 +222,7 @@ public class SEBRestrictionServiceImpl implements SEBRestrictionService {
public Result<Exam> releaseSEBClientRestriction(final Exam exam) {
if (log.isDebugEnabled()) {
log.debug("Release SEB Client restrictions for exam: {}", exam);
log.debug(" *** SEB Restriction *** Release SEB Client restrictions from LMS for exam: {}", exam);
}
return this.lmsAPIService

3
src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/ExamProctoringRoomServiceTest.java
View file

@ -51,7 +51,8 @@ public class ExamProctoringRoomServiceTest extends AdministrationAPIIntegrationT
assertFalse(runningExamsForInstitution.hasError());
final Collection<Exam> collection = runningExamsForInstitution.get();
assertFalse(collection.isEmpty());
final Exam exam = collection.iterator().next();
final Exam exam = collection.stream().filter(e -> e.id == 2L).findAny().orElse(null);
assertNotNull(exam);
assertEquals("Demo Quiz 6 (MOCKUP)", exam.name);
assertEquals("2", String.valueOf(exam.id));
}