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

fixed tests

Browse source
This commit is contained in:
anhefti 2023-11-09 14:32:12 +01:00
parent 2af659dd33
commit 486e10c8c1
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientPingBatchService.java
View file

@ -8,7 +8,6 @@
package ch.ethz.seb.sebserver.webservice.servicelayer.session.impl; package ch.ethz.seb.sebserver.webservice.servicelayer.session.impl;
import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -47,7 +46,6 @@ public class SEBClientPingBatchService implements SEBClientPingService {
private final Set<String> pingKeys = new HashSet<>(); private final Set<String> pingKeys = new HashSet<>();
private final Map<String, String> pings = new ConcurrentHashMap<>(); private final Map<String, String> pings = new ConcurrentHashMap<>();
private final Map<String, String> instructions = new ConcurrentHashMap<>(); private final Map<String, String> instructions = new ConcurrentHashMap<>();
private final Set<String> confirmedInstructions = Collections.synchronizedSet(new HashSet<>());
private ScheduledFuture<?> scheduleAtFixedRate = null; private ScheduledFuture<?> scheduleAtFixedRate = null;
@ -149,7 +147,7 @@ public class SEBClientPingBatchService implements SEBClientPingService {
log.error("Failed to get ClientConnectionDataInternal for: {}", connectionToken); log.error("Failed to get ClientConnectionDataInternal for: {}", connectionToken);
} }
if (instructionConfirm != StringUtils.EMPTY) { if (StringUtils.isNotBlank(instructionConfirm)) {
this.sebClientInstructionService.confirmInstructionDone(connectionToken, instructionConfirm); this.sebClientInstructionService.confirmInstructionDone(connectionToken, instructionConfirm);
} }

1
src/main/resources/config/application-dev-ws.properties
View file

@ -63,6 +63,7 @@ management.endpoints.web.base-path=/management
management.endpoints.web.exposure.include=logfile,loggers,jolokia management.endpoints.web.exposure.include=logfile,loggers,jolokia
management.endpoints.web.path-mapping.jolokia=jmx management.endpoints.web.path-mapping.jolokia=jmx
sebserver.feature.seb.screenProctoring.bundled=true
sebserver.feature.seb.screenProctoring.bundled.url=localhost:8090 sebserver.feature.seb.screenProctoring.bundled.url=localhost:8090
sebserver.feature.seb.screenProctoring.bundled.clientId=sebserverClient sebserver.feature.seb.screenProctoring.bundled.clientId=sebserverClient
sebserver.feature.seb.screenProctoring.bundled.sebserveraccount.username=SEBServerAPIAccount sebserver.feature.seb.screenProctoring.bundled.sebserveraccount.username=SEBServerAPIAccount

1
src/main/resources/config/application-ws.properties
View file

@ -47,7 +47,6 @@ sebserver.webservice.http.external.port=
sebserver.webservice.http.redirect.gui=/gui sebserver.webservice.http.redirect.gui=/gui
sebserver.webservice.ping.service.strategy=BLOCKING sebserver.webservice.ping.service.strategy=BLOCKING
### Open API Documentation ### Open API Documentation
springdoc.api-docs.enabled=false springdoc.api-docs.enabled=false
springdoc.swagger-ui.enabled=false springdoc.swagger-ui.enabled=false

5
src/test/resources/application-test.properties
View file

@ -23,6 +23,7 @@ spring.datasource.driver-class-name=org.h2.Driver
spring.datasource.platform=test spring.datasource.platform=test
spring.flyway.enabled=false spring.flyway.enabled=false
sebserver.webservice.ping.service.strategy=BLOCKING
sebserver.init.adminaccount.gen-on-init=false sebserver.init.adminaccount.gen-on-init=false
sebserver.webservice.http.external.scheme=http sebserver.webservice.http.external.scheme=http
sebserver.webservice.http.redirect.gui=/gui sebserver.webservice.http.redirect.gui=/gui
@ -45,4 +46,6 @@ sebserver.webservice.api.exam.indicator.name=Ping
sebserver.webservice.api.exam.indicator.type=LAST_PING sebserver.webservice.api.exam.indicator.type=LAST_PING
sebserver.webservice.api.exam.indicator.color=b4b4b4 sebserver.webservice.api.exam.indicator.color=b4b4b4
sebserver.webservice.api.exam.indicator.thresholds=[{"value":5000.0,"color":"22b14c"},{"value":10000.0,"color":"ff7e00"},{"value":15000.0,"color":"ed1c24"}] sebserver.webservice.api.exam.indicator.thresholds=[{"value":5000.0,"color":"22b14c"},{"value":10000.0,"color":"ff7e00"},{"value":15000.0,"color":"ed1c24"}]
sebserver.webservice.master.delay.threshold=1000 sebserver.webservice.master.delay.threshold=1000
sebserver.feature.seb.screenProctoring.bundled=false