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

ControllerService + CreationController + GroupService improvements + disabled controllerservice tests, the need to be rewritten

Browse Source
This commit is contained in:
Christoph
2020-04-07 17:58:04 +02:00
parent e13af57ab6
commit 897722fbd7
12 changed files with 331 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,16 +2,7 @@ package mops.gruppen2.service;
import mops.gruppen2.Gruppen2Application;
import mops.gruppen2.domain.Account;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.GroupType;
import mops.gruppen2.domain.Role;
import mops.gruppen2.domain.User;
import mops.gruppen2.domain.Visibility;
import mops.gruppen2.domain.exception.UserNotFoundException;
import mops.gruppen2.repository.EventRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@ -19,16 +10,6 @@ import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
//TODO: Alles in die entsprechenden Klassen sortieren :((((
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = Gruppen2Application.class)
@ -56,6 +37,7 @@ class ControllerServiceTest {
@Autowired
ProjectionService projectionService;
/*
@BeforeEach
void setUp() {
Set<String> roles = new HashSet<>();
@ -68,7 +50,7 @@ class ControllerServiceTest {
@Test
void createPublicGroupWithNoParentAndLimitedNumberTest() {
controllerService.createGroup(account, "test", "hi", null, null, null, 20L, null);
groupService.createGroup(account, "test", "hi", null, null, null, 20L, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
testTitleAndDescription(groups.get(0).getTitle(), groups.get(0).getDescription());
assertEquals(Visibility.PUBLIC, groups.get(0).getVisibility());
@ -78,7 +60,7 @@ class ControllerServiceTest {
@Test
void createPublicGroupWithNoParentAndUnlimitedNumberTest() {
controllerService.createGroup(account, "test", "hi", null, null, true, null, null);
groupService.createGroup(account, "test", "hi", null, null, true, null, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
testTitleAndDescription(groups.get(0).getTitle(), groups.get(0).getDescription());
assertEquals(Visibility.PUBLIC, groups.get(0).getVisibility());
@ -88,7 +70,7 @@ class ControllerServiceTest {
@Test
void createPrivateGroupWithNoParentAndUnlimitedNumberTest() {
controllerService.createGroup(account, "test", "hi", true, null, true, null, null);
groupService.createGroup(account, "test", "hi", true, null, true, null, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
testTitleAndDescription(groups.get(0).getTitle(), groups.get(0).getDescription());
assertEquals(Visibility.PRIVATE, groups.get(0).getVisibility());
@ -98,7 +80,7 @@ class ControllerServiceTest {
@Test
void createPrivateGroupWithNoParentAndLimitedNumberTest() {
controllerService.createGroup(account, "test", "hi", true, null, null, 20L, null);
groupService.createGroup(account, "test", "hi", true, null, null, 20L, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
testTitleAndDescription(groups.get(0).getTitle(), groups.get(0).getDescription());
assertEquals(Visibility.PRIVATE, groups.get(0).getVisibility());
@ -108,9 +90,9 @@ class ControllerServiceTest {
@Test
void createPrivateGroupWithParentAndLimitedNumberTest() throws IOException {
controllerService.createGroupAsOrga(account2, "test", "hi", null, true, true, null, null, null);
groupService.createGroupAsOrga(account2, "test", "hi", false, true, true, 1L, null, null);
List<Group> groups1 = projectionService.projectUserGroups(account2.getName());
controllerService.createGroup(account, "test", "hi", true, null, null, 20L, groups1.get(0).getId());
groupService.createGroup(account, "test", "hi", true, null, null, 20L, groups1.get(0).getId());
List<Group> groups = projectionService.projectUserGroups(account.getName());
testTitleAndDescription(groups.get(0).getTitle(), groups.get(0).getDescription());
assertEquals(Visibility.PRIVATE, groups.get(0).getVisibility());
@ -120,9 +102,9 @@ class ControllerServiceTest {
@Test
void createPublicGroupWithParentAndLimitedNumberTest() throws IOException {
controllerService.createGroupAsOrga(account2, "test", "hi", null, null, true, null, null, null);
groupService.createGroupAsOrga(account2, "test", "hi", false, false, true, 1L, null, null);
List<Group> groups1 = projectionService.projectUserGroups(account2.getName());
controllerService.createGroup(account, "test", "hi", null, null, null, 20L, groups1.get(0).getId());
groupService.createGroup(account, "test", "hi", null, null, null, 20L, groups1.get(0).getId());
List<Group> groups = projectionService.projectUserGroups(account.getName());
testTitleAndDescription(groups.get(0).getTitle(), groups.get(0).getDescription());
assertEquals(Visibility.PUBLIC, groups.get(0).getVisibility());
@ -132,9 +114,9 @@ class ControllerServiceTest {
@Test
void createPublicGroupWithParentAndUnlimitedNumberTest() throws IOException {
controllerService.createGroupAsOrga(account2, "test", "hi", null, null, true, null, null, null);
groupService.createGroupAsOrga(account2, "test", "hi", false, false, true, 1L, null, null);
List<Group> groups1 = projectionService.projectUserGroups(account2.getName());
controllerService.createGroup(account, "test", "hi", null, true, true, null, groups1.get(0).getId());
groupService.createGroup(account, "test", "hi", null, true, true, null, groups1.get(0).getId());
List<Group> groups = projectionService.projectUserGroups(account.getName());
testTitleAndDescription(groups.get(0).getTitle(), groups.get(0).getDescription());
assertEquals(Visibility.PUBLIC, groups.get(0).getVisibility());
@ -144,9 +126,9 @@ class ControllerServiceTest {
@Test
void createPrivateGroupWithParentAndUnlimitedNumberTest() throws IOException {
controllerService.createGroupAsOrga(account2, "test", "hi", null, null, true, null, null, null);
groupService.createGroupAsOrga(account2, "test", "hi", false, false, true, 1L, null, null);
List<Group> groups1 = projectionService.projectUserGroups(account2.getName());
controllerService.createGroup(account, "test", "hi", true, true, true, null, groups1.get(0).getId());
groupService.createGroup(account, "test", "hi", true, true, true, null, groups1.get(0).getId());
List<Group> groups = projectionService.projectUserGroups(account.getName());
testTitleAndDescription(groups.get(0).getTitle(), groups.get(0).getDescription());
assertEquals(Visibility.PRIVATE, groups.get(0).getVisibility());
@ -156,7 +138,7 @@ class ControllerServiceTest {
@Test
void createPublicOrgaGroupWithNoParentAndLimitedNumberTest() throws IOException {
controllerService.createGroupAsOrga(account, "test", "hi", null, null, null, 20L, null, null);
groupService.createGroupAsOrga(account, "test", "hi", false, false, false, 20L, null, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
testTitleAndDescription(groups.get(0).getTitle(), groups.get(0).getDescription());
assertEquals(GroupType.SIMPLE, groups.get(0).getType());
@ -167,7 +149,7 @@ class ControllerServiceTest {
@Test
void createPublicOrgaGroupWithNoParentAndUnlimitedNumberTest() throws IOException {
controllerService.createGroupAsOrga(account, "test", "hi", null, null, true, null, null, null);
groupService.createGroupAsOrga(account, "test", "hi", false, false, true, 1L, null, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
testTitleAndDescription(groups.get(0).getTitle(), groups.get(0).getDescription());
assertEquals(GroupType.SIMPLE, groups.get(0).getType());
@ -178,7 +160,7 @@ class ControllerServiceTest {
@Test
void createPrivateOrgaGroupWithNoParentAndLimitedNumberTest() throws IOException {
controllerService.createGroupAsOrga(account, "test", "hi", true, null, null, 20L, null, null);
groupService.createGroupAsOrga(account, "test", "hi", true, false, false, 20L, null, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
testTitleAndDescription(groups.get(0).getTitle(), groups.get(0).getDescription());
assertEquals(GroupType.SIMPLE, groups.get(0).getType());
@ -189,7 +171,7 @@ class ControllerServiceTest {
@Test
void createPrivateOrgaGroupWithNoParentAndUnlimitedNumberTest() throws IOException {
controllerService.createGroupAsOrga(account, "test", "hi", true, null, true, null, null, null);
groupService.createGroupAsOrga(account, "test", "hi", true, false, true, 1L, null, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
testTitleAndDescription(groups.get(0).getTitle(), groups.get(0).getDescription());
assertEquals(GroupType.SIMPLE, groups.get(0).getType());
@ -200,7 +182,7 @@ class ControllerServiceTest {
@Test
void createOrgaLectureGroupAndLimitedNumberTest() throws IOException {
controllerService.createGroupAsOrga(account, "test", "hi", null, true, null, 20L, null, null);
groupService.createGroupAsOrga(account, "test", "hi", false, true, false, 20L, null, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
testTitleAndDescription(groups.get(0).getTitle(), groups.get(0).getDescription());
assertEquals(GroupType.LECTURE, groups.get(0).getType());
@ -211,7 +193,7 @@ class ControllerServiceTest {
@Test
void createOrgaLectureGroupAndUnlimitedNumberTest() throws IOException {
controllerService.createGroupAsOrga(account, "test", "hi", null, true, true, null, null, null);
groupService.createGroupAsOrga(account, "test", "hi", false, true, true, 1L, null, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
testTitleAndDescription(groups.get(0).getTitle(), groups.get(0).getDescription());
assertEquals(GroupType.LECTURE, groups.get(0).getType());
@ -224,7 +206,7 @@ class ControllerServiceTest {
@Disabled
@Test
public void deleteUserTest() {
controllerService.createGroup(account, "test", "hi", true, true, true, null, null);
groupService.createGroup(account, "test", "hi", true, true, true, null, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
groupService.addUser(account2, groups.get(0).getId());
User user = new User(account.getName(), "", "", "");
@ -236,7 +218,7 @@ class ControllerServiceTest {
@Disabled
@Test
public void updateRoleAdminTest() {
controllerService.createGroup(account, "test", "hi", null, null, true, null, null);
groupService.createGroup(account, "test", "hi", null, null, true, null, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
groupService.addUser(account2, groups.get(0).getId());
User user = new User(account.getName(), "", "", "");
@ -249,7 +231,7 @@ class ControllerServiceTest {
@Disabled
@Test
public void updateRoleMemberTest() {
controllerService.createGroup(account, "test", "hi", null, null, true, null, null);
groupService.createGroup(account, "test", "hi", null, null, true, null, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
groupService.addUser(account2, groups.get(0).getId());
User user = new User(account2.getName(), "", "", "");
@ -261,7 +243,7 @@ class ControllerServiceTest {
//TODO: GroupServiceTest
@Test
public void updateRoleNonUserTest() {
controllerService.createGroup(account, "test", "hi", null, null, true, null, null);
groupService.createGroup(account, "test", "hi", null, null, true, null, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
User user = new User(account2.getName(), "", "", "");
Throwable exception = assertThrows(UserNotFoundException.class, () -> groupService.updateRole(user, groups.get(0).getId()));
@ -271,7 +253,7 @@ class ControllerServiceTest {
//TODO: GroupServiceTest
@Test
public void deleteNonUserTest() {
controllerService.createGroup(account, "test", "hi", true, null, true, null, null);
groupService.createGroup(account, "test", "hi", true, null, true, null, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
User user = new User(account2.getName(), "", "", "");
Throwable exception = assertThrows(UserNotFoundException.class, () -> groupService.deleteUser(account, user, groups.get(0)));
@ -287,7 +269,7 @@ class ControllerServiceTest {
@Disabled
@Test
void passIfLastAdminTest() {
controllerService.createGroup(account, "test", "hi", null, null, true, null, null);
groupService.createGroup(account, "test", "hi", null, null, true, null, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
groupService.addUser(account2, groups.get(0).getId());
User user = new User(account.getName(), "", "", "");
@ -301,7 +283,7 @@ class ControllerServiceTest {
@Disabled
@Test
void dontPassIfNotLastAdminTest() {
controllerService.createGroup(account, "test", "hi", null, null, true, null, null);
groupService.createGroup(account, "test", "hi", null, null, true, null, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
groupService.addUser(account2, groups.get(0).getId());
User user2 = new User(account2.getName(), "", "", "");
@ -318,7 +300,7 @@ class ControllerServiceTest {
@Disabled
@Test
void getVeteranMemberTest() {
controllerService.createGroup(account, "test", "hi", null, null, true, null, null);
groupService.createGroup(account, "test", "hi", null, null, true, null, null);
List<Group> groups = projectionService.projectUserGroups(account.getName());
groupService.addUser(account2, groups.get(0).getId());
groupService.addUser(account3, groups.get(0).getId());
@ -328,5 +310,5 @@ class ControllerServiceTest {
groups = projectionService.projectUserGroups(account2.getName());
assertEquals(Role.ADMIN, groups.get(0).getRoles().get(account2.getName()));
assertEquals(Role.MEMBER, groups.get(0).getRoles().get(account3.getName()));
}
}*/
}