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

Merge remote-tracking branch 'origin/master' into group-invite-links

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/repository/EventRepository.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/java/mops/gruppen2/service/GroupService.java
This commit is contained in:
[Mahgs]
2020-03-18 13:18:34 +01:00
parent aa67bd2e88 e412c051f7
commit 722cd80831
25 changed files with 303 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/test/java/mops/gruppen2/builder/EventBuilder.java
View File

@ -73,7 +73,6 @@ public class EventBuilder {
String lastname = faker.name().lastName();
return new AddUserEvent(
faker.random().nextLong(),
group_id,
user_id,
firstname,
@ -103,7 +102,6 @@ public class EventBuilder {
Faker faker = new Faker();
return new DeleteUserEvent(
faker.random().nextLong(),
group_id,
user_id
);
@ -129,7 +127,6 @@ public class EventBuilder {
Faker faker = new Faker();
return new UpdateGroupDescriptionEvent(
faker.random().nextLong(),
group_id,
faker.random().hex(),
faker.leagueOfLegends().quote()
@ -140,7 +137,6 @@ public class EventBuilder {
Faker faker = new Faker();
return new UpdateGroupTitleEvent(
faker.random().nextLong(),
group_id,
faker.random().hex(),
faker.leagueOfLegends().champion()
@ -151,7 +147,6 @@ public class EventBuilder {
Faker faker = new Faker();
return new UpdateRoleEvent(
faker.random().nextLong(),
group_id,
user_id,
role

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

@ -5,14 +5,16 @@ import mops.gruppen2.domain.Exceptions.UserNotFoundException;
import mops.gruppen2.domain.event.*;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
class GroupTest {
class GroupTest {
/*
@BeforeEach
public void setUp() {
}
@ -148,5 +150,5 @@ class GroupTest {
group.applyEvent(updateGroupDescriptionEvent);
assertThat("Tolle Beschreibung").isEqualTo("Tolle Beschreibung");
}
}*/
}

35
src/test/java/mops/gruppen2/domain/event/AddUserEventTest.java Normal file
View File

@ -0,0 +1,35 @@
package mops.gruppen2.domain.event;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Exceptions.UserAlreadyExistsException;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.User;
import org.junit.jupiter.api.Test;
import static mops.gruppen2.domain.Role.MEMBER;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;
class AddUserEventTest {
@Test
public void userAllreadyExistExeption() throws EventException {
Group group = new Group();
User user = new User("user1","Stein", "Speck", "@sdasd");
group.getMembers().add(user);
Event event1 = new AddUserEvent(4L, "user2", "Rock", "Roll", "and");
event1.apply(group);
Event event2 = new AddUserEvent(4L, "user1", "Rock", "Roll", "and");
assertThrows(UserAlreadyExistsException.class, ()->
event2.apply(group)
);
assertThat(group.getMembers().size()).isEqualTo(2);
}
}

56
src/test/java/mops/gruppen2/domain/event/DeleteUserEventTest.java Normal file
View File

@ -0,0 +1,56 @@
package mops.gruppen2.domain.event;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Exceptions.UserAlreadyExistsException;
import mops.gruppen2.domain.Exceptions.UserNotFoundException;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.User;
import org.junit.jupiter.api.Test;
import static mops.gruppen2.domain.Role.MEMBER;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;
class DeleteUserEventTest {
@Test
void applyDeleteUser() throws EventException {
Group group = new Group();
User user = new User("user1","Stein", "Speck", "@sdasd");
group.getMembers().add(user);
group.getRoles().put("user1", MEMBER);
User user2 = new User("user2","Rock", "Roll", "and");
group.getMembers().add(user2);
group.getRoles().put("user2", MEMBER);
Event event = new DeleteUserEvent(1L, "user1");
event.apply(group);
assertThat(group.getMembers().size()).isEqualTo(1);
assertThat(group.getRoles().size()).isEqualTo(1);
}
@Test
void userDoesNotExistExeption() {
Group group = new Group();
User user = new User("user1","Stein", "Speck", "@sdasd");
group.getMembers().add(user);
group.getRoles().put("user1", MEMBER);
Event event = new DeleteUserEvent(17L,"user5");
assertThrows(UserNotFoundException.class, ()->
event.apply(group)
);
assertThat(group.getMembers().size()).isEqualTo(1);
}
}

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

@ -1,6 +1,5 @@
package mops.gruppen2.service;
import mops.gruppen2.domain.Exceptions.GroupDoesNotExistException;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.GroupType;
import mops.gruppen2.domain.Visibility;
@ -29,36 +28,6 @@ class GroupServiceTest {
groupService = new GroupService(mock(EventService.class), eventRepository);
}
@Disabled
@Test
void applyEventOnGroupThatIsDeleted() throws Exception {
List<Event> eventList = new ArrayList<>();
eventList.add(new CreateGroupEvent(1L,"Ulli", null, GroupType.LECTURE, Visibility.PRIVATE));
eventList.add(new DeleteGroupEvent(44, 10, "loescher78"));
eventList.add(new AddUserEvent(900L, 10L, "Ulli", "Ulli", "Honnis", "FC@B.de"));
Assertions.assertThrows(GroupDoesNotExistException.class, () -> {
groupService.projectEventList(eventList);
});
}
@Disabled
@Test
void returnDeletedGroup() throws Exception {
List<Event> eventList = new ArrayList<>();
eventList.add(new CreateGroupEvent(1L, "Prof", null, GroupType.LECTURE, Visibility.PRIVATE));
eventList.add(new DeleteGroupEvent(44, 1L, "loescher78"));
List<Group> list = new ArrayList<>();
assertThat(groupService.projectEventList(eventList)).isEqualTo(list);
}
@Test
void rightClassForSucsessfulGroup() throws Exception {
@ -66,7 +35,7 @@ class GroupServiceTest {
eventList.add(new CreateGroupEvent(1L, "Prof", null, GroupType.LECTURE, Visibility.PRIVATE));
eventList.add(new AddUserEvent(900L, 1L, "Ulli", "Ulli", "Honnis", "FC@B.de"));
eventList.add(new AddUserEvent(1L, "Ulli", "Ulli", "Honnis", "FC@B.de"));
assertThat(groupService.projectEventList(eventList).get(0)).isInstanceOf(Group.class);
}

61
src/test/java/mops/gruppen2/service/SerializationServiceTest.java
View File

@ -23,65 +23,8 @@ class SerializationServiceTest {
@Test
void serializeEventTest() throws JsonProcessingException {
Event event = new Event(1L,1L,"1");
Event event = new Event(1L,"1");
assertThat(serializationService.serializeEvent(event)).isEqualTo("{\"type\":\"Event\",\"event_id\":1,\"group_id\":1,\"user_id\":\"1\"}");
}
@Test
void deserializeAddUserEventToRightClass() throws JsonProcessingException {
String json = "{\"type\":\"AddUserEvent\",\"event_id\":1,\"group_id\":1,\"user_id\":\"1\"}";
Event event = serializationService.deserializeEvent(json);
assertThat(event).isInstanceOf(AddUserEvent.class);
}
@Test
void deserializeDeleteUserEventToRightClass() throws JsonProcessingException {
String json = "{\"type\":\"DeleteUserEvent\",\"event_id\":1,\"group_id\":1,\"user_id\":\"1\"}";
Event event = serializationService.deserializeEvent(json);
assertThat(event).isInstanceOf(DeleteUserEvent.class);
}
@Test
void deserializeUpdateGroupDescriptionEventToRightClass() throws JsonProcessingException {
String json = "{\"type\":\"UpdateGroupDescriptionEvent\",\"event_id\":1,\"group_id\":1,\"user_id\":\"1\",\"newGroupDescription\":\"test\"}";
Event event = serializationService.deserializeEvent(json);
assertThat(event).isInstanceOf(UpdateGroupDescriptionEvent.class);
}
@Test
void deserializeUpdateGroupTitleEventToRightClass() throws JsonProcessingException {
String json = "{\"type\":\"UpdateGroupTitleEvent\",\"event_id\":1,\"group_id\":1,\"user_id\":\"1\",\"newGroupTitle\":\"test\"}";
Event event = serializationService.deserializeEvent(json);
assertThat(event).isInstanceOf(UpdateGroupTitleEvent.class);
}
@Test
void deserializeUpdateRoleEventToRightClass() throws JsonProcessingException {
System.out.println(serializationService.serializeEvent(new UpdateRoleEvent(1L, 1L, "1", Role.ADMIN)));
String json = "{\"type\":\"UpdateRoleEvent\",\"event_id\":1,\"group_id\":1,\"user_id\":1,\"newRole\":\"ADMIN\"}";
Event event = serializationService.deserializeEvent(json);
assertThat(event).isInstanceOf(UpdateRoleEvent.class);
}
@Disabled
@Test
void deserializeCreateGroupEventToRightClass() throws JsonProcessingException {
String json = "{\"type\":\"CreateGroupEvent\",\"event_id\":1,\"group_id\":1,\"user_id\":\"1\",\"type\":\"test\",\"visibility\":\"test\"}";
Event event = serializationService.deserializeEvent(json);
assertThat(event).isInstanceOf(CreateGroupEvent.class);
assertThat(serializationService.serializeEvent(event)).isEqualTo("{\"type\":\"Event\",\"group_id\":1,\"user_id\":\"1\"}");
}
}