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

Merge remote-tracking branch 'origin/rel-1.5.3-uzh' into dev-1.5

Browse source 
# Conflicts:
#	pom.xml
This commit is contained in:
anhefti 2023-11-20 12:09:43 +01:00
commit edf4706da7
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ZoomRoomRequestResponse.java
View file

@ -163,6 +163,8 @@ public interface ZoomRoomRequestResponse {
static class InMeetingSettings {
@JsonProperty final boolean virtual_background = false;
@JsonProperty final VirtualBackgroundSettings virtual_background_settings = new VirtualBackgroundSettings();
@JsonProperty final boolean auto_saving_chat;
@JsonProperty final int allow_users_save_chats;
@JsonProperty final int allow_participants_chat_with;
@ -178,6 +180,13 @@ public interface ZoomRoomRequestResponse {
}
}
@JsonIgnoreProperties(ignoreUnknown = true)
static class VirtualBackgroundSettings {
@JsonProperty final boolean enable = false;
@JsonProperty final boolean allow_upload_custom = false;
@JsonProperty final boolean allow_videos = false;
}
static class FeaturesSettings {
@JsonProperty final String concurrent_meeting;
public FeaturesSettings(final String concurrent_meeting) {

4
src/test/java/ch/ethz/seb/sebserver/gbl/util/UtilsTest.java
View file

@ -122,8 +122,8 @@ public class UtilsTest {
try {
assertEquals("RGB {255, 255, 255}", Utils.toRGB(rgbString3).toString());
fail("NumberFormatException expected here");
} catch (final NumberFormatException e) {
assertEquals("For input string: \"wr\"", e.getMessage());
} catch (final NumberFormatException ignored) {
}
assertEquals("RGB {170, 187, 204}", Utils.toRGB(rgbString4).toString());
assertEquals("RGB {170, 187, 204}", Utils.toRGB(rgbString5).toString());