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

blah test merge fehler manno

Browse Source
This commit is contained in:
Christoph
2020-03-24 16:05:44 +01:00
parent 3b918308c6
commit cefc122dfc
5 changed files with 101 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/test/java/mops/gruppen2/domain/event/AddUserEventTest.java
View File

@ -1,23 +1,35 @@
package mops.gruppen2.domain.event; package mops.gruppen2.domain.event;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.User;
import mops.gruppen2.domain.exception.EventException;
import mops.gruppen2.domain.exception.UserAlreadyExistsException;
import org.junit.jupiter.api.Test;
import java.util.UUID;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
class AddUserEventTest { class AddUserEventTest {
/*@Test @Test
void userAlreadyExistExeption() throws EventException { void userAlreadyExistExeption() throws EventException {
Group group = new Group(); Group group = new Group();
User user = new User("user1", "Stein", "Speck", "@sdasd"); User user = new User("user1", "Stein", "Speck", "@sdasd");
group.getMembers().add(user); group.getMembers().add(user);
group.setUserMaximum(10L); group.setUserMaximum(10L);
Event event1 = new AddUserEvent(4L, "user2", "Rock", "Roll", "and"); UUID id = UUID.randomUUID();
Event event1 = new AddUserEvent(id, "user2", "Rock", "Roll", "and");
event1.apply(group); event1.apply(group);
Event event2 = new AddUserEvent(4L, "user1", "Rock", "Roll", "and"); Event event2 = new AddUserEvent(id, "user1", "Rock", "Roll", "and");
assertThrows(UserAlreadyExistsException.class, () -> assertThrows(UserAlreadyExistsException.class, () ->
event2.apply(group) event2.apply(group)
); );
assertThat(group.getMembers().size()).isEqualTo(2); assertThat(group.getMembers().size()).isEqualTo(2);
}*/ }
} }

24
src/test/java/mops/gruppen2/domain/event/DeleteUserEventTest.java
View File

@ -1,8 +1,16 @@
package mops.gruppen2.domain.event; package mops.gruppen2.domain.event;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.User;
import mops.gruppen2.domain.exception.EventException;
import org.junit.jupiter.api.Test;
import static mops.gruppen2.domain.Role.MEMBER;
import static org.assertj.core.api.Assertions.assertThat;
class DeleteUserEventTest { class DeleteUserEventTest {
/*@Test @Test
void applyDeleteUser() throws EventException { void applyDeleteUser() throws EventException {
Group group = new Group(); Group group = new Group();
User user = new User("user1", "Stein", "Speck", "@sdasd"); User user = new User("user1", "Stein", "Speck", "@sdasd");
@ -12,8 +20,8 @@ class DeleteUserEventTest {
group.getMembers().add(user2); group.getMembers().add(user2);
group.getRoles().put("user2", MEMBER); group.getRoles().put("user2", MEMBER);
Event event = new DeleteUserEvent(1L, "user1"); //Event event = new DeleteUserEvent(1L, "user1");
event.apply(group); //event.apply(group);
assertThat(group.getMembers().size()).isEqualTo(1); assertThat(group.getMembers().size()).isEqualTo(1);
assertThat(group.getRoles().size()).isEqualTo(1); assertThat(group.getRoles().size()).isEqualTo(1);
@ -27,10 +35,10 @@ class DeleteUserEventTest {
group.getMembers().add(user); group.getMembers().add(user);
group.getRoles().put("user1", MEMBER); group.getRoles().put("user1", MEMBER);
Event event = new DeleteUserEvent(17L, "user5"); //Event event = new DeleteUserEvent(17L, "user5");
assertThrows(UserNotFoundException.class, () -> //assertThrows(UserNotFoundException.class, () ->
event.apply(group) // event.apply(group)
); //);
assertThat(group.getMembers().size()).isEqualTo(1); assertThat(group.getMembers().size()).isEqualTo(1);
}*/ }
} }

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

@ -1,10 +1,6 @@
package mops.gruppen2.service; package mops.gruppen2.service;
import com.github.javafaker.Faker; import com.github.javafaker.Faker;
import mops.gruppen2.builder.EventBuilder;
import mops.gruppen2.domain.*;
import mops.gruppen2.domain.event.AddUserEvent;
import mops.gruppen2.domain.event.CreateGroupEvent;
import mops.gruppen2.repository.EventRepository; import mops.gruppen2.repository.EventRepository;
import mops.gruppen2.security.Account; import mops.gruppen2.security.Account;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
@ -13,9 +9,7 @@ import org.junit.jupiter.api.Test;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
class ControllerServiceTest { class ControllerServiceTest {
Faker faker; Faker faker;
@ -23,7 +17,6 @@ class ControllerServiceTest {
ControllerService controllerService; ControllerService controllerService;
EventService eventService; EventService eventService;
UserService userService; UserService userService;
InviteLinkRepositoryService inviteLinkRepositoryService;
EventRepository eventRepository; EventRepository eventRepository;
GroupService groupService; GroupService groupService;
JsonService jsonService; JsonService jsonService;
@ -36,8 +29,8 @@ class ControllerServiceTest {
eventRepository = mock(EventRepository.class); eventRepository = mock(EventRepository.class);
eventService = new EventService(jsonService, eventRepository); eventService = new EventService(jsonService, eventRepository);
groupService = new GroupService(eventService, eventRepository); groupService = new GroupService(eventService, eventRepository);
userService = new UserService(eventRepository,groupService); userService = new UserService(eventRepository, groupService, eventService);
controllerService = new ControllerService(eventService,userService, inviteLinkRepositoryService); controllerService = new ControllerService(eventService, userService);
Set<String> roles = new HashSet<>(); Set<String> roles = new HashSet<>();
roles.add("l"); roles.add("l");
account = new Account("ich", "ich@hhu.de", "l", "ichdude", "jap", roles); account = new Account("ich", "ich@hhu.de", "l", "ichdude", "jap", roles);
@ -84,4 +77,4 @@ class ControllerServiceTest {
@Test @Test
void passIfLastAdmin() { void passIfLastAdmin() {
} }
} }

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

@ -1,55 +1,79 @@
package mops.gruppen2.service; package mops.gruppen2.service;
import mops.gruppen2.Gruppen2Application;
import mops.gruppen2.domain.GroupType;
import mops.gruppen2.domain.Visibility;
import mops.gruppen2.domain.dto.EventDTO;
import mops.gruppen2.domain.event.CreateGroupEvent;
import mops.gruppen2.domain.event.Event;
import mops.gruppen2.repository.EventRepository; 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.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = Gruppen2Application.class)
@Rollback
@Transactional
@RunWith(MockitoJUnitRunner.class) @RunWith(MockitoJUnitRunner.class)
class EventServiceTest { class EventServiceTest {
@Autowired
private EventRepository eventRepository; private EventRepository eventRepository;
@Autowired
private JsonService jsonService;
private EventService eventService; private EventService eventService;
/*@BeforeEach @BeforeEach
void setUp() { void setUp() {
eventRepository = mock(EventRepository.class); eventService = new EventService(jsonService, eventRepository);
eventService = new EventService(mock(JsonService.class), eventRepository);
} }
@Disabled
@Test @Test
void getMaxID() { void getMaxID() {
when(eventRepository.getHighesEvent_ID()).thenReturn(42L); eventRepository.deleteAll();
//UpdateRoleEvent updateRoleEvent = new UpdateRoleEvent(2L, "hi",Role.ADMIN);
assertEquals(eventService.getMaxEvent_id(), 42L); //eventService.saveEvent(updateRoleEvent);
assertEquals(1L, eventService.getMaxEvent_id()); // funzt noch net richtig weil Autoincrement hochaddiert auch wenn DB leer
} }
@Test @Test
void checkGroupReturnNextValue() { void checkGroupReturnNextValue() {
when(eventRepository.getMaxGroupID()).thenReturn(2L); eventRepository.deleteAll();
CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), "lol", null, GroupType.SIMPLE, Visibility.PUBLIC, 20L);
assertEquals(eventService.checkGroup(), 3L); eventService.saveEvent(createGroupEvent);
assertEquals(2L, eventService.checkGroup()); // weil in DataSQL eine Gruppe erstellt wird
} }
@Test @Test
void checkGroupReturnOneIfDBIsEmpty() { void checkGroupReturnOneIfDBIsEmpty() {
List<EventDTO> eventDTOS = new ArrayList<>(); //dafür muss data.sql weg
when(eventRepository.findAll()).thenReturn(eventDTOS); eventRepository.deleteAll();
assertEquals(1L, eventService.checkGroup());
assertEquals(eventService.checkGroup(), 1);
}*/
/*@Test
void getDTOOffentlichTest() {
CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), "test", null, GroupType.LECTURE, Visibility.PUBLIC, null);
EventDTO eventDTO = eventService.getDTO(createGroupEvent);
assertTrue(eventDTO.isVisibility());
} }
@Test @Test
void getDTOPrivatTest() { void translateEventDTOsTest() {
AddUserEvent addUserEvent = new AddUserEvent(eventService.checkGroup(), "test", "franz", "mueller", "a@a"); //EventDTO eventDTO1 = new EventDTO(1L,1L, "killerbert", "CreateGroupEvent", "{\"type\":\"CreateGroupEvent\",\"groupId\":1,\"userId\":\"orga\",\"groupVisibility\":\"PUBLIC\",\"groupParent\":null,\"groupType\":\"SIMPLE\",\"groupUserMaximum\":2}");
EventDTO eventDTO = eventService.getDTO(addUserEvent); List<EventDTO> eventDTOS1 = new ArrayList<>();
assertFalse(eventDTO.isVisibility()); //eventDTOS1.add(eventDTO1);
}*/ List<Event> events = eventService.translateEventDTOs(eventDTOS1);
assertThat(events.get(0)).isInstanceOf(CreateGroupEvent.class);
}
} }

22
src/test/java/mops/gruppen2/service/GroupServiceTest.java
View File

@ -1,8 +1,20 @@
package mops.gruppen2.service; package mops.gruppen2.service;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.GroupType;
import mops.gruppen2.domain.Visibility;
import mops.gruppen2.domain.event.AddUserEvent;
import mops.gruppen2.domain.event.CreateGroupEvent;
import mops.gruppen2.domain.event.Event;
import mops.gruppen2.repository.EventRepository; import mops.gruppen2.repository.EventRepository;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
class GroupServiceTest { class GroupServiceTest {
@ -13,14 +25,14 @@ class GroupServiceTest {
void setUp() { void setUp() {
groupService = new GroupService(mock(EventService.class), mock(EventRepository.class)); groupService = new GroupService(mock(EventService.class), mock(EventRepository.class));
} }
/* @Test @Test
void rightClassForSuccessfulGroup() { void rightClassForSuccessfulGroup() {
List<Event> eventList = new ArrayList<>(); List<Event> eventList = new ArrayList<>();
eventList.add(new CreateGroupEvent(1L, "Prof", null, GroupType.LECTURE, Visibility.PRIVATE,1000L)); UUID id = UUID.randomUUID();
eventList.add(new AddUserEvent(1L, "Ulli", "Ulli", "Honnis", "FC@B.de")); eventList.add(new CreateGroupEvent(id, "Prof", null, GroupType.LECTURE, Visibility.PRIVATE, 1000L));
eventList.add(new AddUserEvent(id, "Ulli", "Ulli", "Honnis", "FC@B.de"));
List<Group> groups = groupService.projectEventList(eventList); List<Group> groups = groupService.projectEventList(eventList);
assertThat(groups.get(0)).isInstanceOf(Group.class); assertThat(groups.get(0)).isInstanceOf(Group.class);
}*/ }
} }