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

more integration tests

Browse source
This commit is contained in:
anhefti 2020-08-04 13:54:33 +02:00
parent dbaffff5c3
commit bb2c585eb6
3 changed files with 56 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ch/ethz/seb/sebserver/gbl/model/EntityName.java
View file

@ -30,7 +30,7 @@ public class EntityName extends EntityKey {
public EntityName(
@JsonProperty(value = API.PARAM_MODEL_ID, required = true) final String id,
@JsonProperty(value = API.PARAM_ENTITY_TYPE, required = true) final EntityType entityType,
@JsonProperty(value = ATTR_NAME, required = true) final String name) {
@JsonProperty(value = ATTR_NAME) final String name) {
super(id, entityType);
this.name = name;

4
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/UserActivityLogDAOImpl.java
View file

@ -465,7 +465,9 @@ public class UserActivityLogDAOImpl implements UserActivityLogDAO {
.map(record -> new UserActivityLog(
record.getId(),
record.getUserUuid(),
userMapping.get(record.getUserUuid()),
(userMapping.containsKey(record.getUserUuid()))
? userMapping.get(record.getUserUuid())
: "--",
record.getTimestamp(),
UserLogActivityType.valueOf(record.getActivityType()),
EntityType.valueOf(record.getEntityType()),

53
src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java
View file

@ -27,7 +27,7 @@ import java.util.stream.Collectors;
import org.apache.commons.codec.Charsets;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.tomcat.util.buf.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTimeZone;
import org.junit.After;
import org.junit.Before;
@ -122,7 +122,10 @@ import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.lmssetup.GetLmsSe
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.lmssetup.NewLmsSetup;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.lmssetup.SaveLmsSetup;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.lmssetup.TestLmsSetup;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.logs.DeleteAllUserLogs;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.logs.GetExtendedClientEventPage;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.logs.GetUserLogNames;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.logs.GetUserLogPage;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.quiz.GetQuizData;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.quiz.GetQuizPage;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.quiz.ImportAsExam;
@ -2494,4 +2497,52 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
}
}
@Test
@Order(20)
// *************************************
// Use Case 20: Login as admin and get and delete user activity logs
public void testUsecase20_DeleteUserActivityLogs() throws IOException {
final RestServiceImpl restService = createRestServiceForUser(
"admin",
"admin",
new GetUserLogPage(),
new GetUserLogNames(),
new DeleteAllUserLogs());
// get all user logs
final List<EntityName> allUserLogs = restService.getBuilder(GetUserLogNames.class)
.call()
.getOrThrow();
assertNotNull(allUserLogs);
assertFalse(allUserLogs.isEmpty());
// delete unknown user logs
final String toDelete = StringUtils.join(allUserLogs.stream()
.filter(log -> log.name.equals("--"))
.map(name -> name.getModelId())
.collect(Collectors.toList()), ",");
final EntityProcessingReport report = restService.getBuilder(DeleteAllUserLogs.class)
.withFormParam(API.PARAM_MODEL_ID_LIST, toDelete)
.call()
.getOrThrow();
assertNotNull(report);
assertTrue(report.errors.isEmpty());
assertFalse(report.results.isEmpty());
final List<EntityName> allUserLogsAfterDel = restService.getBuilder(GetUserLogNames.class)
.call()
.getOrThrow();
assertNotNull(allUserLogsAfterDel);
assertFalse(allUserLogsAfterDel.isEmpty());
assertTrue(allUserLogsAfterDel.stream()
.filter(log -> log.name.equals("--"))
.map(name -> name.getModelId())
.collect(Collectors.toList()).isEmpty());
}
}