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

Merge branch 'master' into change_DTO

Browse Source
This commit is contained in:
Talha Caliskan
2020-03-14 09:28:39 +01:00
committed by GitHub
parent fa79b3f136 c4f90e0baf
commit 434a69f93d
21 changed files with 326 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,7 @@ class GroupTest {
// Assert
assertThat(group.getRoles())
.containsOnlyKeys(group.getMembers().get(0))
.containsOnlyKeys(group.getMembers().get(0).getUser_id())
.containsValue(Role.ADMIN);
}

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

@ -12,6 +12,7 @@ import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;