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

tests for instructions

Browse source
This commit is contained in:
anhefti 2021-09-16 09:50:44 +02:00
parent fe7f2bbaba
commit b0ad786c45
2 changed files with 86 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientInstructionServiceImpl.java
View file

@ -158,7 +158,6 @@ public class SEBClientInstructionServiceImpl implements SEBClientInstructionServ
.filter(Objects::nonNull)
.forEach(this::putToCache);
});
}
@Override

86
src/test/java/ch/ethz/seb/sebserver/webservice/integration/services/SEBClientInstructionServiceTest.java Normal file
View file

@ -0,0 +1,86 @@
/*
* Copyright (c) 2021 ETH Zürich, Educational Development and Technology (LET)
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package ch.ethz.seb.sebserver.webservice.integration.services;
import static org.junit.Assert.*;
import java.util.Collection;
import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.jdbc.Sql;
import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection;
import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection.ConnectionStatus;
import ch.ethz.seb.sebserver.gbl.model.session.ClientInstruction.InstructionType;
import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.ClientInstructionRecord;
import ch.ethz.seb.sebserver.webservice.integration.api.admin.AdministrationAPIIntegrationTester;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ClientConnectionDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ClientInstructionDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.session.SEBClientInstructionService;
@Sql(scripts = { "classpath:schema-test.sql", "classpath:data-test.sql", "classpath:data-test-additional.sql" })
public class SEBClientInstructionServiceTest extends AdministrationAPIIntegrationTester {
@Autowired
private SEBClientInstructionService sebClientInstructionService;
@Autowired
private ClientConnectionDAO clientConnectionDAO;
@Autowired
private ClientInstructionDAO clientInstructionDAO;
@Before
public void initSEBConnection() {
this.clientConnectionDAO.createNew(new ClientConnection(
null, 1L, 2L, ConnectionStatus.ACTIVE, "testToken", "user1", "0.0.0.0", false, null, null))
.getOrThrow();
}
@Test
public void testRegister() {
// check no instructions in DB
Collection<ClientInstructionRecord> all = this.clientInstructionDAO
.getAllActive()
.getOrThrow();
assertNotNull(all);
assertTrue(all.isEmpty());
// register instruction
this.sebClientInstructionService.registerInstruction(2L, InstructionType.SEB_QUIT, Collections.emptyMap(),
"testToken", false);
// check on DB
all = this.clientInstructionDAO
.getAllActive()
.getOrThrow();
assertNotNull(all);
assertFalse(all.isEmpty());
final ClientInstructionRecord instrRec = all.iterator().next();
assertEquals("testToken", instrRec.getConnectionToken());
assertEquals(InstructionType.SEB_QUIT.name(), instrRec.getType());
assertEquals("", instrRec.getAttributes());
// get instruction JSON
final String json = this.sebClientInstructionService.getInstructionJSON("testToken");
assertEquals("", json);
// check DB is empty again
all = this.clientInstructionDAO
.getAllActive()
.getOrThrow();
assertNotNull(all);
assertTrue(all.isEmpty());
}
}