1

Intellij Code Cleaunp

Co-authored-by: Christoph <tobi@urpost.de>
This commit is contained in:
Christoph
2020-03-18 23:25:54 +01:00
parent a05ffe9e4c
commit e9bab1bf3f
6 changed files with 19 additions and 18 deletions

View File

@ -9,7 +9,7 @@ import com.tngtech.archunit.library.Architectures;
@AnalyzeClasses(packages = "mops.gruppen2", importOptions = ImportOption.DoNotIncludeTests.class)
public class LayeredArchitectureTest {
private static Architectures.LayeredArchitecture layeredArchitecture = Architectures
private static final Architectures.LayeredArchitecture layeredArchitecture = Architectures
.layeredArchitecture()
.layer("Domain").definedBy("..domain..")
.layer("Service").definedBy("..service")

View File

@ -24,13 +24,13 @@ public class EventBuilder {
*
* @param count Gruppenanzahl
* @param membercount Gesamte Mitgliederanzahl
* @return
* @return Eventliste
*/
public static List<Event> completeGroups(int count, int membercount) {
List<Event> eventList = new ArrayList<>();
for (int i = 1; i <= count; i++) {
eventList.addAll(EventBuilder.completeGroup(i, membercount / count));
eventList.addAll(completeGroup(i, membercount / count));
}
return eventList;
@ -39,11 +39,11 @@ public class EventBuilder {
public static List<Event> completeGroup(long groupId, int membercount) {
List<Event> eventList = new ArrayList<>();
eventList.add(EventBuilder.createGroupEvent(groupId));
eventList.add(EventBuilder.updateGroupTitleEvent(groupId));
eventList.add(EventBuilder.updateGroupDescriptionEvent(groupId));
eventList.add(createGroupEvent(groupId));
eventList.add(updateGroupTitleEvent(groupId));
eventList.add(updateGroupDescriptionEvent(groupId));
eventList.addAll(EventBuilder.addUserEvents(membercount, groupId));
eventList.addAll(addUserEvents(membercount, groupId));
return eventList;
}
@ -102,7 +102,7 @@ public class EventBuilder {
List<Event> eventList = new ArrayList<>();
for (int i = 1; i <= count; i++) {
eventList.add(EventBuilder.addUserEvent(groupId, "" + i));
eventList.add(addUserEvent(groupId, String.valueOf(i)));
}
return eventList;
@ -125,7 +125,7 @@ public class EventBuilder {
List<DeleteUserEvent> eventList = new ArrayList<>();
for (User user : group.getMembers()) {
eventList.add(EventBuilder.deleteUserEvent(group.getId(), user.getId()));
eventList.add(deleteUserEvent(group.getId(), user.getId()));
}
return eventList;

View File

@ -15,6 +15,8 @@ import java.util.ArrayList;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -56,14 +58,14 @@ class EventServiceTest {
void getDTOOffentlichTest() {
CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), "test", null, GroupType.LECTURE, Visibility.PUBLIC);
EventDTO eventDTO = eventService.getDTO(createGroupEvent);
assertEquals(eventDTO.isVisibility(), true);
assertTrue(eventDTO.isVisibility());
}
@Test
void getDTOPrivatTest() {
AddUserEvent addUserEvent = new AddUserEvent(eventService.checkGroup(), "test", "franz", "mueller", "a@a");
EventDTO eventDTO = eventService.getDTO(addUserEvent);
assertEquals(eventDTO.isVisibility(), false);
assertFalse(eventDTO.isVisibility());
}
}