christoph/lecture-professional-software-development
1
Fork 0
Code Activity

Fix tests

Browse Source 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
This commit is contained in:
XXNitram
2020-03-27 16:17:45 +01:00
parent 59e9ff4d4d
commit 82ae081f95
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/java/mops/gruppen2/service/ControllerServiceTest.java
View File

@ -34,8 +34,8 @@ class ControllerServiceTest {
ControllerService controllerService; ControllerService controllerService;
EventService eventService; EventService eventService;
UserService userService; UserService userService;
@Autowired
ValidationService validationService; ValidationService validationService;
@Autowired
EventRepository eventRepository; EventRepository eventRepository;
GroupService groupService; GroupService groupService;
@Autowired @Autowired
@ -243,7 +243,7 @@ class ControllerServiceTest {
controllerService.createGroup(account, "test", "hi", null, null, true, null, null); controllerService.createGroup(account, "test", "hi", null, null, true, null, null);
List<Group> groups = userService.getUserGroups(new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail())); List<Group> groups = userService.getUserGroups(new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail()));
controllerService.addUser(account2, groups.get(0).getId()); controllerService.addUser(account2, groups.get(0).getId());
User user = new User(account.getName(), "", "", ""); User user = new User(account2.getName(), "", "", "");
controllerService.updateRole(user, groups.get(0).getId()); controllerService.updateRole(user, groups.get(0).getId());
groups = userService.getUserGroups(new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail())); groups = userService.getUserGroups(new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail()));
assertEquals(Role.ADMIN, groups.get(0).getRoles().get(account2.getName())); assertEquals(Role.ADMIN, groups.get(0).getRoles().get(account2.getName()));
@ -253,18 +253,18 @@ class ControllerServiceTest {
public void updateRoleNonUserTest() { public void updateRoleNonUserTest() {
controllerService.createGroup(account, "test", "hi", null, null, true, null, null); controllerService.createGroup(account, "test", "hi", null, null, true, null, null);
List<Group> groups = userService.getUserGroups(new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail())); List<Group> groups = userService.getUserGroups(new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail()));
User user = new User(account.getName(), "", "", ""); User user = new User(account2.getName(), "", "", "");
Throwable exception = assertThrows(UserNotFoundException.class, () -> controllerService.updateRole(user, groups.get(0).getId())); Throwable exception = assertThrows(UserNotFoundException.class, () -> controllerService.updateRole(user, groups.get(0).getId()));
assertEquals("404 NOT_FOUND \"Der User wurde nicht gefunden. (class mops.gruppen2.service.ControllerService)\"", exception.getMessage()); assertEquals("404 NOT_FOUND \"Der User wurde nicht gefunden. (class mops.gruppen2.service.ValidationService)\"", exception.getMessage());
} }
@Test @Test
public void deleteNonUserTest() { public void deleteNonUserTest() {
controllerService.createGroup(account, "test", "hi", true, null, true, null, null); controllerService.createGroup(account, "test", "hi", true, null, true, null, null);
List<Group> groups = userService.getUserGroups(new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail())); List<Group> groups = userService.getUserGroups(new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail()));
User user = new User(account.getName(), "", "", ""); User user = new User(account2.getName(), "", "", "");
Throwable exception = assertThrows(UserNotFoundException.class, () -> controllerService.deleteUser(account, user, groups.get(0))); Throwable exception = assertThrows(UserNotFoundException.class, () -> controllerService.deleteUser(account, user, groups.get(0)));
assertEquals("404 NOT_FOUND \"Der User wurde nicht gefunden. (class mops.gruppen2.service.ControllerService)\"", exception.getMessage()); assertEquals("404 NOT_FOUND \"Der User wurde nicht gefunden. (class mops.gruppen2.service.ValidationService)\"", exception.getMessage());
} }
void testTitleAndDescription(String title, String description) { void testTitleAndDescription(String title, String description) {
@ -305,7 +305,6 @@ class ControllerServiceTest {
List<Group> groups = userService.getUserGroups(new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail())); List<Group> groups = userService.getUserGroups(new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail()));
controllerService.addUser(account2, groups.get(0).getId()); controllerService.addUser(account2, groups.get(0).getId());
controllerService.addUser(account3, groups.get(0).getId()); controllerService.addUser(account3, groups.get(0).getId());
controllerService.changeRoleIfLastAdmin(account, groups.get(0));
User user = new User(account.getName(), "", "", ""); User user = new User(account.getName(), "", "", "");
controllerService.deleteUser(account, user, groups.get(0)); controllerService.deleteUser(account, user, groups.get(0));
groups = userService.getUserGroups(new User(account2.getName(), account2.getGivenname(), account2.getFamilyname(), account2.getEmail())); groups = userService.getUserGroups(new User(account2.getName(), account2.getGivenname(), account2.getFamilyname(), account2.getEmail()));