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

fix uuidMock() after merge

Browse Source 
Co-authored-by: Christoph <tobi@urpost.de>
This commit is contained in:
Christoph
2020-03-30 11:15:40 +02:00
parent 935b1c7a60
commit b730dee4b1
9 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test;
import static mops.gruppen2.TestBuilder.addUserEvent; import static mops.gruppen2.TestBuilder.addUserEvent;
import static mops.gruppen2.TestBuilder.apply; import static mops.gruppen2.TestBuilder.apply;
import static mops.gruppen2.TestBuilder.createPublicGroupEvent; import static mops.gruppen2.TestBuilder.createPublicGroupEvent;
import static mops.gruppen2.TestBuilder.uuidFromInt; import static mops.gruppen2.TestBuilder.uuidMock;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertThrows;
@ -16,8 +16,8 @@ class AddUserEventTest {
@Test @Test
void applyEvent() { void applyEvent() {
Event createEvent = createPublicGroupEvent(uuidFromInt(0)); Event createEvent = createPublicGroupEvent(uuidMock(0));
Event addEvent = new AddUserEvent(uuidFromInt(0), "A", "Thomas", "Tom", "tho@mail.de"); Event addEvent = new AddUserEvent(uuidMock(0), "A", "Thomas", "Tom", "tho@mail.de");
Group group = apply(createEvent, addEvent); Group group = apply(createEvent, addEvent);
@ -29,10 +29,10 @@ class AddUserEventTest {
@Test @Test
void applyEvent_userAlreadyExists() { void applyEvent_userAlreadyExists() {
Event createEvent = createPublicGroupEvent(uuidFromInt(0)); Event createEvent = createPublicGroupEvent(uuidMock(0));
Event addEventA = addUserEvent(uuidFromInt(0), "A"); Event addEventA = addUserEvent(uuidMock(0), "A");
Event addEventB = addUserEvent(uuidFromInt(0), "B"); Event addEventB = addUserEvent(uuidMock(0), "B");
Event addEventC = addUserEvent(uuidFromInt(0), "A"); Event addEventC = addUserEvent(uuidMock(0), "A");
Group group = apply(createEvent, addEventA, addEventB); Group group = apply(createEvent, addEventA, addEventB);
@ -43,11 +43,11 @@ class AddUserEventTest {
@Test @Test
void applyEvent_groupFull() { void applyEvent_groupFull() {
Event createEvent = createPublicGroupEvent(uuidFromInt(0)); Event createEvent = createPublicGroupEvent(uuidMock(0));
Event maxSizeEvent = new UpdateUserMaxEvent(uuidFromInt(0), "A", 2L); Event maxSizeEvent = new UpdateUserMaxEvent(uuidMock(0), "A", 2L);
Event addEventA = addUserEvent(uuidFromInt(0), "A"); Event addEventA = addUserEvent(uuidMock(0), "A");
Event addEventB = addUserEvent(uuidFromInt(0), "B"); Event addEventB = addUserEvent(uuidMock(0), "B");
Event addEventC = addUserEvent(uuidFromInt(0), "C"); Event addEventC = addUserEvent(uuidMock(0), "C");
Group group = apply(createEvent, maxSizeEvent, addEventA, addEventB); Group group = apply(createEvent, maxSizeEvent, addEventA, addEventB);

10
src/test/java/mops/gruppen2/domain/event/CreateGroupEventTest.java
View File

@ -6,16 +6,16 @@ import mops.gruppen2.domain.GroupType;
import mops.gruppen2.domain.Visibility; import mops.gruppen2.domain.Visibility;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static mops.gruppen2.TestBuilder.uuidFromInt; import static mops.gruppen2.TestBuilder.uuidMock;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
class CreateGroupEventTest { class CreateGroupEventTest {
@Test @Test
void applyEvent() { void applyEvent() {
Event createEvent = new CreateGroupEvent(uuidFromInt(0), Event createEvent = new CreateGroupEvent(uuidMock(0),
"A", "A",
uuidFromInt(1), uuidMock(1),
GroupType.SIMPLE, GroupType.SIMPLE,
Visibility.PUBLIC, Visibility.PUBLIC,
100L); 100L);
@ -26,7 +26,7 @@ class CreateGroupEventTest {
assertThat(group.getType()).isEqualTo(GroupType.SIMPLE); assertThat(group.getType()).isEqualTo(GroupType.SIMPLE);
assertThat(group.getVisibility()).isEqualTo(Visibility.PUBLIC); assertThat(group.getVisibility()).isEqualTo(Visibility.PUBLIC);
assertThat(group.getUserMaximum()).isEqualTo(100); assertThat(group.getUserMaximum()).isEqualTo(100);
assertThat(group.getId()).isEqualTo(uuidFromInt(0)); assertThat(group.getId()).isEqualTo(uuidMock(0));
assertThat(group.getParent()).isEqualTo(uuidFromInt(1)); assertThat(group.getParent()).isEqualTo(uuidMock(1));
} }
} }

10
src/test/java/mops/gruppen2/domain/event/DeleteGroupEventTest.java
View File

@ -6,20 +6,20 @@ import mops.gruppen2.domain.GroupType;
import mops.gruppen2.domain.Visibility; import mops.gruppen2.domain.Visibility;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static mops.gruppen2.TestBuilder.uuidFromInt; import static mops.gruppen2.TestBuilder.uuidMock;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
class DeleteGroupEventTest { class DeleteGroupEventTest {
@Test @Test
void applyEvent() { void applyEvent() {
Event createEvent = new CreateGroupEvent(uuidFromInt(0), Event createEvent = new CreateGroupEvent(uuidMock(0),
"A", "A",
uuidFromInt(1), uuidMock(1),
GroupType.SIMPLE, GroupType.SIMPLE,
Visibility.PUBLIC, Visibility.PUBLIC,
100L); 100L);
Event deleteEvent = new DeleteGroupEvent(uuidFromInt(0), "A"); Event deleteEvent = new DeleteGroupEvent(uuidMock(0), "A");
Group group = TestBuilder.apply(createEvent, deleteEvent); Group group = TestBuilder.apply(createEvent, deleteEvent);
@ -27,7 +27,7 @@ class DeleteGroupEventTest {
assertThat(group.getType()).isEqualTo(null); assertThat(group.getType()).isEqualTo(null);
assertThat(group.getVisibility()).isEqualTo(null); assertThat(group.getVisibility()).isEqualTo(null);
assertThat(group.getUserMaximum()).isEqualTo(0); assertThat(group.getUserMaximum()).isEqualTo(0);
assertThat(group.getId()).isEqualTo(uuidFromInt(0)); assertThat(group.getId()).isEqualTo(uuidMock(0));
assertThat(group.getParent()).isEqualTo(null); assertThat(group.getParent()).isEqualTo(null);
} }
} }

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

@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test;
import static mops.gruppen2.TestBuilder.addUserEvent; import static mops.gruppen2.TestBuilder.addUserEvent;
import static mops.gruppen2.TestBuilder.createPublicGroupEvent; import static mops.gruppen2.TestBuilder.createPublicGroupEvent;
import static mops.gruppen2.TestBuilder.uuidFromInt; import static mops.gruppen2.TestBuilder.uuidMock;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertThrows;
@ -15,9 +15,9 @@ class DeleteUserEventTest {
@Test @Test
void applyEvent() { void applyEvent() {
Event createEvent = createPublicGroupEvent(uuidFromInt(0)); Event createEvent = createPublicGroupEvent(uuidMock(0));
Event addEvent = addUserEvent(uuidFromInt(0), "A"); Event addEvent = addUserEvent(uuidMock(0), "A");
Event deleteEvent = new DeleteUserEvent(uuidFromInt(0), "A"); Event deleteEvent = new DeleteUserEvent(uuidMock(0), "A");
Group group = TestBuilder.apply(createEvent, addEvent, deleteEvent); Group group = TestBuilder.apply(createEvent, addEvent, deleteEvent);
@ -26,9 +26,9 @@ class DeleteUserEventTest {
@Test @Test
void applyEvent_userNotFound() { void applyEvent_userNotFound() {
Event createEvent = createPublicGroupEvent(uuidFromInt(0)); Event createEvent = createPublicGroupEvent(uuidMock(0));
Event addEvent = addUserEvent(uuidFromInt(0), "A"); Event addEvent = addUserEvent(uuidMock(0), "A");
Event deleteEvent = new DeleteUserEvent(uuidFromInt(0), "B"); Event deleteEvent = new DeleteUserEvent(uuidMock(0), "B");
Group group = TestBuilder.apply(createEvent, addEvent); Group group = TestBuilder.apply(createEvent, addEvent);

6
src/test/java/mops/gruppen2/domain/event/EventTest.java
View File

@ -6,15 +6,15 @@ import mops.gruppen2.domain.exception.GroupIdMismatchException;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static mops.gruppen2.TestBuilder.createPublicGroupEvent; import static mops.gruppen2.TestBuilder.createPublicGroupEvent;
import static mops.gruppen2.TestBuilder.uuidFromInt; import static mops.gruppen2.TestBuilder.uuidMock;
import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertThrows;
class EventTest { class EventTest {
@Test @Test
void apply() { void apply() {
Event createEvent = createPublicGroupEvent(uuidFromInt(0)); Event createEvent = createPublicGroupEvent(uuidMock(0));
Event addEvent = TestBuilder.addUserEvent(uuidFromInt(1)); Event addEvent = TestBuilder.addUserEvent(uuidMock(1));
Group group = TestBuilder.apply(createEvent); Group group = TestBuilder.apply(createEvent);

12
src/test/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEventTest.java
View File

@ -6,7 +6,7 @@ import mops.gruppen2.domain.exception.BadParameterException;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static mops.gruppen2.TestBuilder.createPublicGroupEvent; import static mops.gruppen2.TestBuilder.createPublicGroupEvent;
import static mops.gruppen2.TestBuilder.uuidFromInt; import static mops.gruppen2.TestBuilder.uuidMock;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertThrows;
@ -14,8 +14,8 @@ class UpdateGroupDescriptionEventTest {
@Test @Test
void applyEvent() { void applyEvent() {
Event createEvent = createPublicGroupEvent(uuidFromInt(0)); Event createEvent = createPublicGroupEvent(uuidMock(0));
Event updateEvent = new UpdateGroupDescriptionEvent(uuidFromInt(0), "A", "desc."); Event updateEvent = new UpdateGroupDescriptionEvent(uuidMock(0), "A", "desc.");
Group group = TestBuilder.apply(createEvent, updateEvent); Group group = TestBuilder.apply(createEvent, updateEvent);
@ -24,9 +24,9 @@ class UpdateGroupDescriptionEventTest {
@Test @Test
void applyEvent_badDescription() { void applyEvent_badDescription() {
Event createEvent = createPublicGroupEvent(uuidFromInt(0)); Event createEvent = createPublicGroupEvent(uuidMock(0));
Event updateEventA = new UpdateGroupDescriptionEvent(uuidFromInt(0), "A", ""); Event updateEventA = new UpdateGroupDescriptionEvent(uuidMock(0), "A", "");
Event updateEventB = new UpdateGroupDescriptionEvent(uuidFromInt(0), "A", " "); Event updateEventB = new UpdateGroupDescriptionEvent(uuidMock(0), "A", " ");
Group group = TestBuilder.apply(createEvent); Group group = TestBuilder.apply(createEvent);

12
src/test/java/mops/gruppen2/domain/event/UpdateGroupTitleEventTest.java
View File

@ -6,7 +6,7 @@ import mops.gruppen2.domain.exception.BadParameterException;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static mops.gruppen2.TestBuilder.createPublicGroupEvent; import static mops.gruppen2.TestBuilder.createPublicGroupEvent;
import static mops.gruppen2.TestBuilder.uuidFromInt; import static mops.gruppen2.TestBuilder.uuidMock;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertThrows;
@ -14,8 +14,8 @@ class UpdateGroupTitleEventTest {
@Test @Test
void applyEvent() { void applyEvent() {
Event createEvent = createPublicGroupEvent(uuidFromInt(0)); Event createEvent = createPublicGroupEvent(uuidMock(0));
Event updateEvent = new UpdateGroupTitleEvent(uuidFromInt(0), "A", "title."); Event updateEvent = new UpdateGroupTitleEvent(uuidMock(0), "A", "title.");
Group group = TestBuilder.apply(createEvent, updateEvent); Group group = TestBuilder.apply(createEvent, updateEvent);
@ -24,9 +24,9 @@ class UpdateGroupTitleEventTest {
@Test @Test
void applyEvent_badDescription() { void applyEvent_badDescription() {
Event createEvent = createPublicGroupEvent(uuidFromInt(0)); Event createEvent = createPublicGroupEvent(uuidMock(0));
Event updateEventA = new UpdateGroupTitleEvent(uuidFromInt(0), "A", ""); Event updateEventA = new UpdateGroupTitleEvent(uuidMock(0), "A", "");
Event updateEventB = new UpdateGroupTitleEvent(uuidFromInt(0), "A", " "); Event updateEventB = new UpdateGroupTitleEvent(uuidMock(0), "A", " ");
Group group = TestBuilder.apply(createEvent); Group group = TestBuilder.apply(createEvent);

14
src/test/java/mops/gruppen2/domain/event/UpdateRoleEventTest.java
View File

@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test;
import static mops.gruppen2.TestBuilder.addUserEvent; import static mops.gruppen2.TestBuilder.addUserEvent;
import static mops.gruppen2.TestBuilder.apply; import static mops.gruppen2.TestBuilder.apply;
import static mops.gruppen2.TestBuilder.createPublicGroupEvent; import static mops.gruppen2.TestBuilder.createPublicGroupEvent;
import static mops.gruppen2.TestBuilder.uuidFromInt; import static mops.gruppen2.TestBuilder.uuidMock;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertThrows;
@ -16,9 +16,9 @@ class UpdateRoleEventTest {
@Test @Test
void applyEvent() { void applyEvent() {
Event createEvent = createPublicGroupEvent(uuidFromInt(0)); Event createEvent = createPublicGroupEvent(uuidMock(0));
Event addEvent = addUserEvent(uuidFromInt(0), "A"); Event addEvent = addUserEvent(uuidMock(0), "A");
Event updateEvent = new UpdateRoleEvent(uuidFromInt(0), "A", Role.ADMIN); Event updateEvent = new UpdateRoleEvent(uuidMock(0), "A", Role.ADMIN);
Group group = apply(createEvent, addEvent, updateEvent); Group group = apply(createEvent, addEvent, updateEvent);
@ -27,9 +27,9 @@ class UpdateRoleEventTest {
@Test @Test
void applyEvent_userNotFound() { void applyEvent_userNotFound() {
Event createEvent = createPublicGroupEvent(uuidFromInt(0)); Event createEvent = createPublicGroupEvent(uuidMock(0));
Event addEvent = addUserEvent(uuidFromInt(0), "A"); Event addEvent = addUserEvent(uuidMock(0), "A");
Event updateEvent = new UpdateRoleEvent(uuidFromInt(0), "B", Role.ADMIN); Event updateEvent = new UpdateRoleEvent(uuidMock(0), "B", Role.ADMIN);
Group group = apply(createEvent, addEvent); Group group = apply(createEvent, addEvent);

22
src/test/java/mops/gruppen2/domain/event/UpdateUserMaxEventTest.java
View File

@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test;
import static mops.gruppen2.TestBuilder.addUserEvent; import static mops.gruppen2.TestBuilder.addUserEvent;
import static mops.gruppen2.TestBuilder.apply; import static mops.gruppen2.TestBuilder.apply;
import static mops.gruppen2.TestBuilder.createPublicGroupEvent; import static mops.gruppen2.TestBuilder.createPublicGroupEvent;
import static mops.gruppen2.TestBuilder.uuidFromInt; import static mops.gruppen2.TestBuilder.uuidMock;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertThrows;
@ -15,8 +15,8 @@ class UpdateUserMaxEventTest {
@Test @Test
void applyEvent() { void applyEvent() {
Event createEvent = createPublicGroupEvent(uuidFromInt(0)); Event createEvent = createPublicGroupEvent(uuidMock(0));
Event updateEvent = new UpdateUserMaxEvent(uuidFromInt(0), "A", 5L); Event updateEvent = new UpdateUserMaxEvent(uuidMock(0), "A", 5L);
Group group = apply(createEvent, updateEvent); Group group = apply(createEvent, updateEvent);
@ -25,8 +25,8 @@ class UpdateUserMaxEventTest {
@Test @Test
void applyEvent_badParameter_negative() { void applyEvent_badParameter_negative() {
Event createEvent = createPublicGroupEvent(uuidFromInt(0)); Event createEvent = createPublicGroupEvent(uuidMock(0));
Event updateEvent = new UpdateUserMaxEvent(uuidFromInt(0), "A", -5L); Event updateEvent = new UpdateUserMaxEvent(uuidMock(0), "A", -5L);
Group group = apply(createEvent); Group group = apply(createEvent);
@ -35,12 +35,12 @@ class UpdateUserMaxEventTest {
@Test @Test
void applyEvent_badParameter_tooSmall() { void applyEvent_badParameter_tooSmall() {
Event createEvent = createPublicGroupEvent(uuidFromInt(0)); Event createEvent = createPublicGroupEvent(uuidMock(0));
Event updateEventA = new UpdateUserMaxEvent(uuidFromInt(0), "A", 5L); Event updateEventA = new UpdateUserMaxEvent(uuidMock(0), "A", 5L);
Event addEventA = addUserEvent(uuidFromInt(0)); Event addEventA = addUserEvent(uuidMock(0));
Event addEventB = addUserEvent(uuidFromInt(0)); Event addEventB = addUserEvent(uuidMock(0));
Event addEventC = addUserEvent(uuidFromInt(0)); Event addEventC = addUserEvent(uuidMock(0));
Event updateEventB = new UpdateUserMaxEvent(uuidFromInt(0), "A", 2L); Event updateEventB = new UpdateUserMaxEvent(uuidMock(0), "A", 2L);
Group group = apply(createEvent, updateEventA, addEventA, addEventB, addEventC); Group group = apply(createEvent, updateEventA, addEventA, addEventB, addEventC);