From a307476b07b5221bfd70c9db787fa52f6ce07e48 Mon Sep 17 00:00:00 2001 From: killerber4t Date: Tue, 24 Mar 2020 13:43:36 +0100 Subject: [PATCH] fix JsonService implementation --- .../mops/gruppen2/service/EventServiceTest.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/test/java/mops/gruppen2/service/EventServiceTest.java b/src/test/java/mops/gruppen2/service/EventServiceTest.java index 57349b0..d961750 100644 --- a/src/test/java/mops/gruppen2/service/EventServiceTest.java +++ b/src/test/java/mops/gruppen2/service/EventServiceTest.java @@ -1,13 +1,9 @@ package mops.gruppen2.service; import mops.gruppen2.Gruppen2Application; -import mops.gruppen2.domain.GroupType; -import mops.gruppen2.domain.Visibility; import mops.gruppen2.domain.dto.EventDTO; -import mops.gruppen2.domain.event.AddUserEvent; import mops.gruppen2.domain.event.CreateGroupEvent; import mops.gruppen2.domain.event.Event; -import mops.gruppen2.domain.event.UpdateGroupTitleEvent; import mops.gruppen2.repository.EventRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -20,9 +16,13 @@ import org.springframework.test.annotation.Rollback; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; +import java.lang.reflect.Array; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.InstanceOfAssertFactories.ARRAY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -38,11 +38,13 @@ class EventServiceTest { @Autowired private EventRepository eventRepository; + @Autowired + private JsonService jsonService; private EventService eventService; @BeforeEach void setUp() { - eventService = new EventService(mock(JsonService.class), eventRepository); + eventService = new EventService(jsonService, eventRepository); } @Test @@ -69,9 +71,8 @@ class EventServiceTest { List eventDTOS1 = new ArrayList<>(); eventDTOS1.add(eventDTO1); eventDTOS1.add(eventDTO2); - Iterable eventDTOS2 = eventDTOS1; - List events = eventService.translateEventDTOs(eventDTOS2); - assertTrue(events.get(0).getClass().isInstance(CreateGroupEvent.class)); + List events = eventService.translateEventDTOs(eventDTOS1); + assertThat(events.get(0)).isInstanceOf(CreateGroupEvent.class); } }