From 0b06291c6c0c6f8f1e8240c8c6b1175648a177aa Mon Sep 17 00:00:00 2001 From: Stanislav Marszalek Date: Fri, 9 Jul 2021 09:41:08 +0200 Subject: O1 PM Bulk support - collecting events, basic structure for PM Bulk File creation Issue-ID: INT-1945 Signed-off-by: Stanislav Marszalek Change-Id: If08908035719798d8d7b129ddcdb6ef62f1787fe --- .../org/onap/a1pesimulator/service/CellServiceTest.java | 1 + .../a1pesimulator/service/VesBrokerServiceImplTest.java | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/onap/a1pesimulator/service/CellServiceTest.java b/src/test/java/org/onap/a1pesimulator/service/CellServiceTest.java index 5e9dc05..4c05b23 100644 --- a/src/test/java/org/onap/a1pesimulator/service/CellServiceTest.java +++ b/src/test/java/org/onap/a1pesimulator/service/CellServiceTest.java @@ -26,6 +26,7 @@ import static org.onap.a1pesimulator.TestHelpers.checkFirstUserEquipment; import java.util.Collection; import java.util.Set; + import org.junit.Test; import org.junit.runner.RunWith; import org.onap.a1pesimulator.data.Topology; diff --git a/src/test/java/org/onap/a1pesimulator/service/VesBrokerServiceImplTest.java b/src/test/java/org/onap/a1pesimulator/service/VesBrokerServiceImplTest.java index 5b27529..2c2d9ff 100644 --- a/src/test/java/org/onap/a1pesimulator/service/VesBrokerServiceImplTest.java +++ b/src/test/java/org/onap/a1pesimulator/service/VesBrokerServiceImplTest.java @@ -15,19 +15,20 @@ package org.onap.a1pesimulator.service; import static org.mockito.Mockito.when; -import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.net.URISyntaxException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.onap.a1pesimulator.data.ves.Event; +import org.onap.a1pesimulator.data.ReportingMethodEnum; +import org.onap.a1pesimulator.data.ves.VesEvent; import org.onap.a1pesimulator.service.ves.RanVesBrokerService; import org.onap.a1pesimulator.service.ves.RanVesSender; import org.springframework.beans.factory.annotation.Autowired; @@ -40,6 +41,8 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.web.client.RestTemplate; +import com.fasterxml.jackson.databind.ObjectMapper; + @RunWith(SpringRunner.class) @SpringBootTest public class VesBrokerServiceImplTest { @@ -68,13 +71,13 @@ public class VesBrokerServiceImplTest { ArgumentMatchers.any(HttpEntity.class), ArgumentMatchers.eq(String.class))).thenReturn(responseEntity); ResponseEntity response = vesBrokerService.startSendingVesEvents("CustomIdentifier", - loadEventFromFile("VesBrokerControllerTest_pm_ves.json"), 10); + loadEventFromFile("VesBrokerControllerTest_pm_ves.json"), 10, ReportingMethodEnum.VES); Assert.assertEquals(HttpStatus.ACCEPTED, response.getStatusCode()); } - private Event loadEventFromFile(String fileName) throws Exception { - return mapper.readValue(loadFileContent(fileName), Event.class); + private VesEvent loadEventFromFile(String fileName) throws Exception { + return mapper.readValue(loadFileContent(fileName), VesEvent.class); } private String loadFileContent(String fileName) throws IOException, URISyntaxException { -- cgit 1.2.3-korg