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

fixed GroupServiceTest for new Method in GroupService

Browse Source
This commit is contained in:
Mahgs
2020-03-11 13:52:26 +01:00
parent 31f19f0199
commit d102f9b0ee
4 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/mops/gruppen2/domain/Group.java
View File

@ -77,8 +77,4 @@ public class Group extends Aggregate {
throw new UserNotFoundException("Nutzer wurde nicht gefunden!");
}
}
private void applyEvent(DeleteGroupEvent event) {
this.id = this.id * -1;
}
}

28
src/main/java/mops/gruppen2/service/GroupService.java
View File

@ -1,9 +1,11 @@
package mops.gruppen2.service;
import lombok.EqualsAndHashCode;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Exceptions.GroupDoesNotExistException;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.event.CreateGroupEvent;
import mops.gruppen2.domain.event.DeleteGroupEvent;
import mops.gruppen2.domain.event.Event;
import org.springframework.stereotype.Service;
@ -21,22 +23,28 @@ public class GroupService {
this.eventService = eventService;
}
public List<Group> projectEventList(Map<Long, Group> groupMap, List<Event> events) {
public List<Group> projectEventList(Map<Long, Group> groupMap, List<Event> events) throws EventException {
for (Event event : events) {
if (event instanceof CreateGroupEvent) {
groupMap.put(event.getGroup_id(), new Group());
}
if (event instanceof DeleteGroupEvent) {
groupMap.remove(event.getGroup_id());
} else {
try {
Group group = groupMap.get(event.getGroup_id());
try {
Group group = groupMap.get(event.getGroup_id());
if (group == null) {
throw new GroupDoesNotExistException("Gruppe " + event.getGroup_id() + " existiert nicht");
}
if (group == null) {
throw new GroupDoesNotExistException("Gruppe " + event.getGroup_id() + " existiert nicht");
group.applyEvent(event);
} catch (EventException e) {
if (e instanceof GroupDoesNotExistException) {
throw e;
}
e.printStackTrace();
}
group.applyEvent(event);
} catch (EventException e) {
e.printStackTrace();
}
}
@ -44,7 +52,7 @@ public class GroupService {
return new ArrayList<>(groupMap.values());
}
public List<Group> projectEventList(List<Event> events) {
public List<Group> projectEventList(List<Event> events) throws EventException {
return projectEventList(new HashMap<>(), events);
}
}

1
src/test/java/mops/gruppen2/domain/GroupTest.java
View File

@ -1,6 +1,5 @@
package mops.gruppen2.domain;
import mops.gruppen2.domain.Exceptions.GroupDoesNotExistException;
import mops.gruppen2.domain.Exceptions.UserAlreadyExistsException;
import mops.gruppen2.domain.Exceptions.UserNotFoundException;
import mops.gruppen2.domain.event.*;

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

@ -10,18 +10,23 @@ import mops.gruppen2.domain.event.Event;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.configuration.IMockitoConfiguration;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.mock;
class GroupServiceTest {
GroupService groupService = new GroupService();
GroupService groupService;
@BeforeEach
public void setUp() {
groupService = new GroupService(mock(EventService.class));
}
@Test
@ -36,7 +41,7 @@ class GroupServiceTest {
Assertions.assertThrows(GroupDoesNotExistException.class, () -> {
groupService.buildGroupFromEvents(eventList);
groupService.projectEventList(eventList);
});
}
@ -48,30 +53,20 @@ class GroupServiceTest {
eventList.add(new DeleteGroupEvent(44, 10, "loescher78"));
assertThat(groupService.buildGroupFromEvents(eventList)).isEqualTo(null);
List<Group> list = new ArrayList<>();
assertThat(groupService.projectEventList(eventList)).isEqualTo(list);
}
@Test
void firstEventNotCreateGroup() throws Exception {
List<Event> eventList = new ArrayList<>();
eventList.add(new DeleteGroupEvent(44, 10, "loescher78"));
eventList.add(new CreateGroupEvent(1, 10L, "prof1", "hi", "foo"));
Assertions.assertThrows(GroupDoesNotExistException.class, () -> {
groupService.buildGroupFromEvents(eventList);
});
}
@Test
void sucsessfullReturnGroup() throws Exception {
void rightClassForSucsessfulGroup() throws Exception {
List<Event> eventList = new ArrayList<>();
eventList.add(new CreateGroupEvent(1, 10L, "prof1", "hi", "foo"));
eventList.add(new AddUserEvent(900L, 10L, "Ulli", "Ulli", "Honnis", "FC@B.de"));
assertThat(groupService.buildGroupFromEvents(eventList)).isInstanceOf(Group.class);
assertThat(groupService.projectEventList(eventList).get(0)).isInstanceOf(Group.class);
}
}