From 0071fce0758a26b183dd17ff471cd4a3e132632a Mon Sep 17 00:00:00 2001 From: Mahgs Date: Fri, 13 Mar 2020 16:16:51 +0100 Subject: [PATCH 1/2] added Tests for checkGroup() and getMaxID() --- build.gradle | 1 + .../mops/gruppen2/domain/event/Event.java | 2 + .../gruppen2/service/EventServiceTest.java | 79 +++++++++++++++++-- 3 files changed, 76 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 0872831..43e2d18 100644 --- a/build.gradle +++ b/build.gradle @@ -78,6 +78,7 @@ dependencies { } testImplementation 'org.springframework.security:spring-security-test' testImplementation 'com.tngtech.archunit:archunit-junit5:0.13.1' + implementation 'junit:junit:4.12' } test { diff --git a/src/main/java/mops/gruppen2/domain/event/Event.java b/src/main/java/mops/gruppen2/domain/event/Event.java index 830f355..8915986 100644 --- a/src/main/java/mops/gruppen2/domain/event/Event.java +++ b/src/main/java/mops/gruppen2/domain/event/Event.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; @Getter @@ -23,6 +24,7 @@ import lombok.NoArgsConstructor; @JsonSubTypes.Type(value = UpdateGroupTitleEvent.class, name = "UpdateGroupTitleEvent"), @JsonSubTypes.Type(value = UpdateRoleEvent.class, name = "UpdateRoleEvent"), }) +@Setter public class Event { Long event_id; Long group_id; diff --git a/src/test/java/mops/gruppen2/service/EventServiceTest.java b/src/test/java/mops/gruppen2/service/EventServiceTest.java index 77a2b7b..1065942 100644 --- a/src/test/java/mops/gruppen2/service/EventServiceTest.java +++ b/src/test/java/mops/gruppen2/service/EventServiceTest.java @@ -1,31 +1,36 @@ package mops.gruppen2.service; import mops.gruppen2.domain.EventDTO; +import mops.gruppen2.domain.GroupType; +import mops.gruppen2.domain.Visibility; +import mops.gruppen2.domain.event.AddUserEvent; +import mops.gruppen2.domain.event.CreateGroupEvent; import mops.gruppen2.domain.event.Event; import mops.gruppen2.repository.EventRepository; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.runner.RunWith; +import org.mockito.junit.MockitoJUnitRunner; 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; +@RunWith(MockitoJUnitRunner.class) class EventServiceTest { EventService eventService; EventRepository eventRepositoryMock = mock(EventRepository.class); @BeforeEach - void setUp(){ - eventService = new EventService(mock(SerializationService.class),eventRepositoryMock); + void setUp() { + eventService = new EventService(mock(SerializationService.class), eventRepositoryMock); } @Test - void checkGroupTest(){ + void checkGroupTest() { EventDTO eventDTO = new EventDTO(); EventDTO eventDTO1 = new EventDTO(); eventDTO1.setGroup_id(1L); @@ -36,6 +41,68 @@ class EventServiceTest { eventDTOS.add(eventDTO); eventDTOS.add(eventDTO1); when(eventRepositoryMock.findAll()).thenReturn(eventDTOS); - assertEquals(eventDTO1.getGroup_id()+1, eventService.checkGroup()); + assertEquals(eventDTO1.getGroup_id() + 1, eventService.checkGroup()); + } + + @Test + void getMaxID() { + when(eventRepositoryMock.getHighesEvent_ID()).thenReturn(42L); + + assertEquals(eventService.getMaxEvent_id(), 42L); + } + + //Funktionert nicht + @Test + void getEventListAfterStatus() { + List eventIDs = new ArrayList<>(); + eventIDs.add(9L); + eventIDs.add(10L); + when(eventRepositoryMock.findNewEventSinceStatus(8L)).thenReturn(eventIDs); + + List eventDTOs = new ArrayList<>(); + EventDTO eventDTO1 = new EventDTO(); + eventDTO1.setEvent_id(9L); + eventDTO1.setGroup_id(1L); + eventDTO1.setUser_id("ad"); + eventDTO1.setEvent_payload({"type":"CreateGroupEvent","event_id":null,"group_id":1,"user_id":"orga","groupVisibility":"PUBLIC","groupParent":null,"groupType":"LECTURE"} ); + eventDTOs.add(eventDTO1); + EventDTO eventDTO2 = new EventDTO(); + eventDTO2.setEvent_id(10L); + eventDTO2.setGroup_id(1L); + eventDTO2.setUser_id("sd"); + eventDTOs.add(eventDTO2); + when(eventRepositoryMock.findAllEventsOfGroups(eventIDs)).thenReturn(eventDTOs); + + + List newEvents = new ArrayList<>(); + CreateGroupEvent event1 = new CreateGroupEvent(1L, "user1", 1L, GroupType.LECTURE, Visibility.PRIVATE); + newEvents.add(event1); + event1.setEvent_id(9L); + CreateGroupEvent event2 = new CreateGroupEvent(2L, "user2", 1L, GroupType.SIMPLE, Visibility.PRIVATE); + event2.setEvent_id(57L); + newEvents.add(event2); + //assertEquals(eventService.getNewEvents(8L), newEvents); + } + + @Test + void checkGroupReturnNextValue() { + List eventDTOS = new ArrayList<>(); + EventDTO eventDTO1 = new EventDTO(); + EventDTO eventDTO2 = new EventDTO(); + eventDTO1.setGroup_id(1L); + eventDTO2.setGroup_id(2L); + eventDTOS.add(eventDTO1); + eventDTOS.add(eventDTO2); + when(eventRepositoryMock.findAll()).thenReturn(eventDTOS); + + assertEquals(eventService.checkGroup(), 3L); + } + + @Test + void checkGroupReturnOneIfDBIsEmpty() { + List eventDTOS = new ArrayList<>(); + when(eventRepositoryMock.findAll()).thenReturn(eventDTOS); + + assertEquals(eventService.checkGroup(), 1); } } \ No newline at end of file From 061d6d2390476cd5a8887ad8366aa6e923cac07a Mon Sep 17 00:00:00 2001 From: Mahgs Date: Mon, 16 Mar 2020 13:15:54 +0100 Subject: [PATCH 2/2] merged with master --- .../gruppen2/service/EventServiceTest.java | 46 ++----------------- 1 file changed, 4 insertions(+), 42 deletions(-) diff --git a/src/test/java/mops/gruppen2/service/EventServiceTest.java b/src/test/java/mops/gruppen2/service/EventServiceTest.java index cae715c..4991baf 100644 --- a/src/test/java/mops/gruppen2/service/EventServiceTest.java +++ b/src/test/java/mops/gruppen2/service/EventServiceTest.java @@ -5,11 +5,6 @@ import mops.gruppen2.domain.GroupType; import mops.gruppen2.domain.Visibility; import mops.gruppen2.domain.event.AddUserEvent; import mops.gruppen2.domain.event.CreateGroupEvent; -import mops.gruppen2.domain.event.Event; -import mops.gruppen2.domain.GroupType; -import mops.gruppen2.domain.Visibility; -import mops.gruppen2.domain.event.AddUserEvent; -import mops.gruppen2.domain.event.CreateGroupEvent; import mops.gruppen2.repository.EventRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -55,39 +50,6 @@ class EventServiceTest { assertEquals(eventService.getMaxEvent_id(), 42L); } - //Funktionert nicht - @Test - void getEventListAfterStatus() { - List eventIDs = new ArrayList<>(); - eventIDs.add(9L); - eventIDs.add(10L); - when(eventRepositoryMock.findNewEventSinceStatus(8L)).thenReturn(eventIDs); - - List eventDTOs = new ArrayList<>(); - EventDTO eventDTO1 = new EventDTO(); - eventDTO1.setEvent_id(9L); - eventDTO1.setGroup_id(1L); - eventDTO1.setUser_id("ad"); - eventDTO1.setEvent_payload({"type":"CreateGroupEvent","event_id":null,"group_id":1,"user_id":"orga","groupVisibility":"PUBLIC","groupParent":null,"groupType":"LECTURE"} ); - eventDTOs.add(eventDTO1); - EventDTO eventDTO2 = new EventDTO(); - eventDTO2.setEvent_id(10L); - eventDTO2.setGroup_id(1L); - eventDTO2.setUser_id("sd"); - eventDTOs.add(eventDTO2); - when(eventRepositoryMock.findAllEventsOfGroups(eventIDs)).thenReturn(eventDTOs); - - - List newEvents = new ArrayList<>(); - CreateGroupEvent event1 = new CreateGroupEvent(1L, "user1", 1L, GroupType.LECTURE, Visibility.PRIVATE); - newEvents.add(event1); - event1.setEvent_id(9L); - CreateGroupEvent event2 = new CreateGroupEvent(2L, "user2", 1L, GroupType.SIMPLE, Visibility.PRIVATE); - event2.setEvent_id(57L); - newEvents.add(event2); - //assertEquals(eventService.getNewEvents(8L), newEvents); - } - @Test void checkGroupReturnNextValue() { List eventDTOS = new ArrayList<>(); @@ -111,15 +73,15 @@ class EventServiceTest { } @Test - void getDTOOffentlichTest(){ - CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), "test", null , GroupType.LECTURE, Visibility.PUBLIC); + void getDTOOffentlichTest() { + CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), "test", null, GroupType.LECTURE, Visibility.PUBLIC); EventDTO eventDTO = eventService.getDTO(createGroupEvent); assertEquals(eventDTO.isVisibility(), true); } @Test - void getDTOPrivatTest(){ - AddUserEvent addUserEvent = new AddUserEvent(eventService.checkGroup(), "test","franz","mueller","a@a"); + void getDTOPrivatTest() { + AddUserEvent addUserEvent = new AddUserEvent(eventService.checkGroup(), "test", "franz", "mueller", "a@a"); EventDTO eventDTO = eventService.getDTO(addUserEvent); assertEquals(eventDTO.isVisibility(), false); }