Increase tests coverage

Change-Id: Ie1e2333ee43604408ddd0551aae536bbc9bda5a7
Signed-off-by: Michal Banka <michal.banka@nokia.com>
Issue-ID: INT-1517

diff --git a/pnfsimulator/src/main/java/org/onap/pnfsimulator/rest/model/TemplateRequest.java b/pnfsimulator/src/main/java/org/onap/pnfsimulator/rest/model/TemplateRequest.java
index d5a77f0..f1e0243 100644 (file)
--- a/pnfsimulator/src/main/java/org/onap/pnfsimulator/rest/model/TemplateRequest.java
+++ b/pnfsimulator/src/main/java/org/onap/pnfsimulator/rest/model/TemplateRequest.java
@@ -20,23 +20,19 @@
 
 package org.onap.pnfsimulator.rest.model;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 import org.bson.Document;
 
+@AllArgsConstructor
+@NoArgsConstructor
 @Getter
 @Setter
 @ToString
 public class TemplateRequest {
     private String name;
     private Document template;
-
-    public TemplateRequest(String name, Document template) {
-        this.name = name;
-        this.template = template;
-    }
-
-    public TemplateRequest() {
-    }
 }

diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/rest/SimulatorControllerTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/rest/SimulatorControllerTest.java
index de824a4..0b87f69 100644 (file)
--- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/rest/SimulatorControllerTest.java
+++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/rest/SimulatorControllerTest.java
@@ -30,22 +30,26 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
+import org.onap.pnfsimulator.event.EventData;
+import org.onap.pnfsimulator.event.EventDataService;
 import org.onap.pnfsimulator.rest.model.FullEvent;
 import org.onap.pnfsimulator.rest.model.SimulatorParams;
 import org.onap.pnfsimulator.rest.model.SimulatorRequest;
-import org.onap.pnfsimulator.rest.util.JsonObjectDeserializer;
 import org.onap.pnfsimulator.simulator.SimulatorService;
 import org.onap.pnfsimulator.simulatorconfig.SimulatorConfig;
 import org.quartz.SchedulerException;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
-import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 import java.io.IOException;
 import java.net.URL;
 import java.security.GeneralSecurityException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -63,18 +67,27 @@ class SimulatorControllerTest {
     private static final String START_ENDPOINT = "/simulator/start";
     private static final String CONFIG_ENDPOINT = "/simulator/config";
     private static final String EVENT_ENDPOINT = "/simulator/event";
+    private static final String CANCEL_JOB_ENDPOINT = "/simulator/cancel/";
+    private static final String ALL_EVENTS_ENDPOINT = "/simulator/all-events";
+    private static final String TEST_ENDPOINT = "/simulator/test";
+
     private static final String JSON_MSG_EXPRESSION = "$.message";
+    private static final String EVENT_WAS_CANCELLED = "Event(s) was cancelled";
+    private static final String EVENT_WAS_NOT_CANCELLED = "Simulator was not able to cancel event(s)";
 
     private static final String NEW_URL = "http://0.0.0.0:8090/eventListener/v7";
     private static final String UPDATE_SIM_CONFIG_VALID_JSON = "{\"vesServerUrl\": \""
             + NEW_URL + "\"}";
     private static final String SAMPLE_ID = "sampleId";
     private static final Gson GSON_OBJ = new Gson();
+    private static final String JOB_NAME = "testJobName";
     private static String simulatorRequestBody;
     private MockMvc mockMvc;
     @InjectMocks
     private SimulatorController controller;
     @Mock
+    private EventDataService eventDataService;
+    @Mock
     private SimulatorService simulatorService;
 
     @BeforeAll
@@ -197,6 +210,105 @@ class SimulatorControllerTest {
         verify(simulatorService, Mockito.times(1)).triggerOneTimeEvent(any(FullEvent.class));
     }
 
+    @Test
+    void shouldUseTestEndpointThenReceiveProperMessage() throws Exception {
+        String contentAsString = mockMvc
+                .perform(post(TEST_ENDPOINT)
+                        .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
+                        .content("{\"simulatorParams\": {\n" +
+                                "        \"vesServerUrl\": \"http://localhost:9999/eventListener\"\n" +
+                                "    },\n" +
+                                "    \"templateName\": \"testTemplateName\"\n" +
+                                "}"))
+                .andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
+        assertThat(contentAsString).contains("message1234");
+    }
+
+    @Test
+    void shouldSuccessfullyCancelJobThenReturnProperMessage() throws Exception {
+        when(simulatorService.cancelEvent(JOB_NAME)).thenReturn(true);
+
+        String contentAsString = mockMvc
+                .perform(post(CANCEL_JOB_ENDPOINT + JOB_NAME)
+                        .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
+                        .content(""))
+                .andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
+
+        assertThat(contentAsString).contains(EVENT_WAS_CANCELLED);
+    }
+
+    @Test
+    void shouldFailWhileCancelingJobThenReturnProperMessage() throws Exception {
+        when(simulatorService.cancelEvent(JOB_NAME)).thenReturn(false);
+
+        String contentAsString = mockMvc
+                .perform(post(CANCEL_JOB_ENDPOINT + JOB_NAME)
+                        .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
+                        .content(""))
+                .andExpect(status().isNotFound()).andReturn().getResponse().getContentAsString();
+
+        assertThat(contentAsString).contains(EVENT_WAS_NOT_CANCELLED);
+    }
+
+    @Test
+    void shouldSuccessfullyCancelAllJobsThenReturnsProperMessage() throws Exception {
+        when(simulatorService.cancelAllEvents()).thenReturn(true);
+
+        String contentAsString = mockMvc
+                .perform(post(CANCEL_JOB_ENDPOINT)
+                        .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
+                        .content(""))
+                .andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
+
+        assertThat(contentAsString).contains(EVENT_WAS_CANCELLED);
+    }
+
+    @Test
+    void shouldSuccessfullyCancelJobWhenSendingJobNameWithBreakingCharactersThenReturnProperMessage() throws SchedulerException {
+        final String lineBreakingJobName = "test\tJob\nName\r";
+        when(simulatorService.cancelEvent(lineBreakingJobName)).thenReturn(true);
+
+        Object actualResponseBody = Objects.requireNonNull(controller.cancelEvent(lineBreakingJobName).getBody());
+
+        assertThat(actualResponseBody.toString()).contains(EVENT_WAS_CANCELLED);
+    }
+
+    @Test
+    void shouldReturnAllEvents() throws Exception {
+        List<EventData> events = getEventDatas();
+        String expectedMessage = events.stream()
+                .map(EventData::toString)
+                .collect(Collectors.joining("\\n"));
+
+        when(eventDataService.getAllEvents()).thenReturn(events);
+
+        String contentAsString = mockMvc
+                .perform(get(ALL_EVENTS_ENDPOINT)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(""))
+                .andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
+
+        assertThat(contentAsString).contains(expectedMessage);
+    }
+
+
+    private List<EventData> getEventDatas() {
+        return Arrays.asList(
+                getEventData("id1", "keywords1", "input1", "patched1", "template1", 0),
+                getEventData("id2", "keywords2", "input2", "patched2", "template2", 1)
+        );
+    }
+
+    private EventData getEventData(String id, String keywords, String input, String patched, String template, int incrementValue) {
+        return EventData.builder()
+                .id(id)
+                .keywords(keywords)
+                .input(input)
+                .patched(patched)
+                .template(template)
+                .incrementValue(incrementValue)
+                .build();
+    }
 
     private void startSimulator() throws Exception {
         mockMvc

diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/SimulatorServiceTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/SimulatorServiceTest.java
index 870c963..c83c5cf 100644 (file)
--- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/SimulatorServiceTest.java
+++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/SimulatorServiceTest.java
@@ -40,12 +40,17 @@ import org.onap.pnfsimulator.simulatorconfig.SimulatorConfigService;
 import org.quartz.SchedulerException;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.GeneralSecurityException;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -57,6 +62,7 @@ import static org.mockito.internal.verification.VerificationModeFactory.times;
 class SimulatorServiceTest {
 
     private static final String VES_URL = "http://0.0.0.0:8080";
+    private static final String IN_DB_VES_URL = "http://0.0.0.0:8080/eventListener/v6";
     private static final Gson GSON = new Gson();
     private static final JsonObject VALID_PATCH = GSON.fromJson("{\"event\": {\n"
         + "    \"commonEventHeader\": {\n"
@@ -80,6 +86,7 @@ class SimulatorServiceTest {
     private static final String CLOSED_LOOP_VNF = "ClosedLoopVNF";
     private static final String SAMPLE_ID = "sampleId";
     private static final EventData SAMPLE_EVENT = EventData.builder().id("1").build();
+    private static URL inDbVesUrl;
     private final ArgumentCaptor<JsonObject> bodyCaptor = ArgumentCaptor.forClass(JsonObject.class);
     private final ArgumentCaptor<Integer> intervalCaptor = ArgumentCaptor.forClass(Integer.class);
     private final ArgumentCaptor<Integer> repeatCountCaptor = ArgumentCaptor
@@ -92,18 +99,20 @@ class SimulatorServiceTest {
     private EventDataService eventDataService;
     private EventScheduler eventScheduler;
     private SimulatorConfigService simulatorConfigService;
+    private SslAuthenticationHelper sslAuthenticationHelper = new SslAuthenticationHelper() ;
     private static TemplatePatcher templatePatcher = new TemplatePatcher();
     private static TemplateReader templateReader = new FilesystemTemplateReader(
         "src/test/resources/org/onap/pnfsimulator/simulator/", GSON);
 
     @BeforeEach
-    void setUp() {
+    void setUp() throws MalformedURLException {
+        inDbVesUrl = new URL(IN_DB_VES_URL);
         eventDataService = mock(EventDataService.class);
         eventScheduler = mock(EventScheduler.class);
         simulatorConfigService = mock(SimulatorConfigService.class);
 
         simulatorService = new SimulatorService(templatePatcher, templateReader,
-            eventScheduler, eventDataService, simulatorConfigService, new SslAuthenticationHelper());
+            eventScheduler, eventDataService, simulatorConfigService, sslAuthenticationHelper);
     }
 
     @Test
@@ -127,7 +136,6 @@ class SimulatorServiceTest {
             new SimulatorParams("", 1, 1),
             templateName, VALID_PATCH);
 
-        URL inDbVesUrl = new URL("http://0.0.0.0:8080/eventListener/v6");
         doReturn(SAMPLE_EVENT).when(eventDataService).persistEventData(any(JsonObject.class), any(JsonObject.class), any(JsonObject.class), any(JsonObject.class));
         when(simulatorConfigService.getConfiguration()).thenReturn(new SimulatorConfig(SAMPLE_ID, inDbVesUrl));
 
@@ -166,7 +174,6 @@ class SimulatorServiceTest {
             new SimulatorParams("", 1, 1),
             templateName, null);
 
-        URL inDbVesUrl = new URL("http://0.0.0.0:8080/eventListener/v6");
         doReturn(SAMPLE_EVENT).when(eventDataService).persistEventData(any(JsonObject.class), any(JsonObject.class), any(JsonObject.class), any(JsonObject.class));
         doReturn(new SimulatorConfig(SAMPLE_ID, inDbVesUrl)).when(simulatorConfigService).getConfiguration();
 
@@ -207,6 +214,38 @@ class SimulatorServiceTest {
         assertThat(sentContent.getAsJsonObject("event").getAsJsonObject("commonEventHeader").get("eventName").getAsString()).hasSize(20);
     }
 
+    @Test
+    void shouldGetSimulatorConfiguration() {
+        SimulatorConfig simulatorConfig = getSimulatorConfig();
+
+        when(simulatorConfigService.getConfiguration()).thenReturn(simulatorConfig);
+
+        assertEquals(simulatorService.getConfiguration(), simulatorConfig);
+    }
+
+    @Test
+    void shouldUpdateSimulatorConfiguration() {
+        SimulatorConfig simulatorConfig = getSimulatorConfig();
+
+        when(simulatorConfigService.updateConfiguration(simulatorConfig)).thenReturn(simulatorConfig);
+
+        assertEquals(simulatorService.updateConfiguration(simulatorConfig), simulatorConfig);
+    }
+
+    @Test
+    void shouldCancelAllEvents() throws SchedulerException {
+        when(eventScheduler.cancelAllEvents()).thenReturn(true);
+
+        assertTrue(simulatorService.cancelAllEvents());
+    }
+
+    @Test
+    void shouldCancelSingleEvent() throws SchedulerException {
+        final String jobName = "testJobName";
+        when(eventScheduler.cancelEvent(jobName)).thenReturn(true);
+
+        assertTrue(simulatorService.cancelEvent(jobName));
+    }
 
     private void assertEventHasExpectedStructure(String expectedVesUrl, String templateName, String sourceNameString) throws SchedulerException, IOException, GeneralSecurityException {
         verify(eventScheduler, times(1)).scheduleEvent(vesUrlCaptor.capture(), intervalCaptor.capture(),
@@ -224,4 +263,8 @@ class SimulatorServiceTest {
             .persistEventData(any(JsonObject.class), any(JsonObject.class), any(JsonObject.class),
                 any(JsonObject.class));
     }
+
+    private SimulatorConfig getSimulatorConfig() {
+        return new SimulatorConfig(SAMPLE_ID, inDbVesUrl);
+    }
 }