diff options
Diffstat (limited to 'pnfsimulator/src/test/java/org/onap/pnfsimulator')
21 files changed, 540 insertions, 402 deletions
diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/filesystem/InMemoryTemplateStorage.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/filesystem/InMemoryTemplateStorage.java index 98c4bc5..b86a0f9 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/filesystem/InMemoryTemplateStorage.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/filesystem/InMemoryTemplateStorage.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -30,42 +30,42 @@ import org.onap.pnfsimulator.template.Template; public class InMemoryTemplateStorage implements Storage<Template> { - private List<Template> storage = new ArrayList<>(); + private List<Template> storage = new ArrayList<>(); - @Override - public List<Template> getAll() { - return new ArrayList<>(storage); - } + @Override + public List<Template> getAll() { + return new ArrayList<>(storage); + } - @Override - public Optional<Template> get(String name) { - return storage.stream().filter(template -> template.getId().equals(name)).findFirst(); - } + @Override + public Optional<Template> get(String name) { + return storage.stream().filter(template -> template.getId().equals(name)).findFirst(); + } - @Override - public void persist(Template template) { - if (!storage.contains(template)){ - storage.add(template); + @Override + public void persist(Template template) { + if (!storage.contains(template)) { + storage.add(template); + } } - } - @Override - public boolean tryPersistOrOverwrite(Template template, boolean overwrite) { - if (!storage.contains(template) || overwrite){ - storage.add(template); - return true; + @Override + public boolean tryPersistOrOverwrite(Template template, boolean overwrite) { + if (!storage.contains(template) || overwrite) { + storage.add(template); + return true; + } + return false; } - return false; - } - @Override - public void delete(String templateName) { - get(templateName).ifPresent(template -> storage.remove(template)); - } + @Override + public void delete(String templateName) { + get(templateName).ifPresent(template -> storage.remove(template)); + } - @Override - public List<String> getIdsByContentCriteria(JsonObject queryJson) { - throw new RuntimeException("Method is not implemented."); - } + @Override + public List<String> getIdsByContentCriteria(JsonObject queryJson) { + throw new RuntimeException("Method is not implemented."); + } } diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/filesystem/WatcherEventProcessorTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/filesystem/WatcherEventProcessorTest.java index 42ed4d3..9dfa002 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/filesystem/WatcherEventProcessorTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/filesystem/WatcherEventProcessorTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -31,6 +31,7 @@ import java.time.Instant; import java.util.Collections; import java.util.HashMap; import java.util.Optional; + import org.bson.Document; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -84,18 +85,18 @@ class WatcherEventProcessorTest { } private void verifyPersistedValue() { - Assertions.assertEquals(storage.getAll().size(), 1); + Assertions.assertEquals(1, storage.getAll().size()); Optional<Template> templateFromStorage = storage.get("test1.json"); if (templateFromStorage.isPresent()) { Template retrievedTemplate = templateFromStorage.get(); Document templateContent = retrievedTemplate.getContent(); Document flatContent = retrievedTemplate.getFlatContent(); - Assertions.assertEquals(templateContent.getString("field1"), "value1"); - Assertions.assertEquals(templateContent.getInteger("field2", 0), 2); - Assertions.assertEquals(flatContent.getInteger(":nested:key1[0]", 0), 1); - Assertions.assertEquals(flatContent.getInteger(":nested:key1[1]", 0), 2); - Assertions.assertEquals(flatContent.getInteger(":nested:key1[2]", 0), 3); - Assertions.assertEquals(flatContent.getString(":nested:key2"), "sampleValue2"); + Assertions.assertEquals("value1", templateContent.getString("field1")); + Assertions.assertEquals(2, templateContent.getInteger("field2", 0)); + Assertions.assertEquals(1, flatContent.getInteger(":nested:key1[0]", 0)); + Assertions.assertEquals(2, flatContent.getInteger(":nested:key1[1]", 0)); + Assertions.assertEquals(3, flatContent.getInteger(":nested:key1[2]", 0)); + Assertions.assertEquals("sampleValue2", flatContent.getString(":nested:key2")); } else { fail(); } @@ -113,7 +114,7 @@ class WatcherEventProcessorTest { Mockito.when(watchEvent.kind()).thenReturn(StandardWatchEventKinds.ENTRY_DELETE); WatcherEventProcessor.process(watchEvent, storage, templatesDir); // then - Assertions.assertEquals(storage.getAll().size(), 0); + Assertions.assertEquals(0, storage.getAll().size()); } private void initStubs() { 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 dae16c7..de824a4 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/rest/SimulatorControllerTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/rest/SimulatorControllerTest.java @@ -66,7 +66,8 @@ class SimulatorControllerTest { private static final String JSON_MSG_EXPRESSION = "$.message"; 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 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 String simulatorRequestBody; @@ -144,7 +145,8 @@ class SimulatorControllerTest { mockMvc .perform(put(CONFIG_ENDPOINT) .contentType(MediaType.APPLICATION_JSON) - .content("{\"vesUrl\": \"" + NEW_URL + "\"}")) + .content("{\"vesUrl\": \"" + + NEW_URL + "\"}")) .andExpect(status().isBadRequest()); } @@ -162,18 +164,18 @@ class SimulatorControllerTest { String contentAsString = mockMvc .perform(post(EVENT_ENDPOINT) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) - .content("{\"vesServerUrl\":\"http://0.0.0.0:8080/simulator/v7\",\n" + - " \"event\":{ \n" + - " \"commonEventHeader\":{ \n" + - " \"domain\":\"notification\",\n" + - " \"eventName\":\"vFirewallBroadcastPackets\"\n" + - " },\n" + - " \"notificationFields\":{ \n" + - " \"arrayOfNamedHashMap\":[ \n" + - " { \n" + - " \"name\":\"A20161221.1031-1041.bin.gz\",\n" + - " \"hashMap\":{ \n" + - " \"fileformatType\":\"org.3GPP.32.435#measCollec\"}}]}}}")) + .content("{\"vesServerUrl\":\"http://0.0.0.0:8080/simulator/v7\",\n" + + " \"event\":{ \n" + + " \"commonEventHeader\":{ \n" + + " \"domain\":\"notification\",\n" + + " \"eventName\":\"vFirewallBroadcastPackets\"\n" + + " },\n" + + " \"notificationFields\":{ \n" + + " \"arrayOfNamedHashMap\":[ \n" + + " { \n" + + " \"name\":\"A20161221.1031-1041.bin.gz\",\n" + + " \"hashMap\":{ \n" + + " \"fileformatType\":\"org.3GPP.32.435#measCollec\"}}]}}}")) .andExpect(status().isAccepted()).andReturn().getResponse().getContentAsString(); assertThat(contentAsString).contains("One-time direct event sent successfully"); } @@ -183,12 +185,12 @@ class SimulatorControllerTest { String contentAsString = mockMvc .perform(post(EVENT_ENDPOINT) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) - .content("{\"vesServerUrl\": \"http://localhost:9999/eventListener\",\n" + - " \"event\": {\n" + - " \"commonEventHeader\": {\n" + - " \"eventId\": \"#RandomString(20)\",\n" + - " \"sourceName\": \"PATCHED_sourceName\",\n" + - " \"version\": 3.0\n}}}")) + .content("{\"vesServerUrl\": \"http://localhost:9999/eventListener\",\n" + + " \"event\": {\n" + + " \"commonEventHeader\": {\n" + + " \"eventId\": \"#RandomString(20)\",\n" + + " \"sourceName\": \"PATCHED_sourceName\",\n" + + " \"version\": 3.0\n}}}")) .andExpect(status().isAccepted()).andReturn().getResponse().getContentAsString(); assertThat(contentAsString).contains("One-time direct event sent successfully"); diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/rest/TemplateControllerTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/rest/TemplateControllerTest.java index f34d73c..17be475 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/rest/TemplateControllerTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/rest/TemplateControllerTest.java @@ -29,9 +29,9 @@ import static org.onap.pnfsimulator.rest.TemplateController.CANNOT_OVERRIDE_TEMP import static org.onap.pnfsimulator.rest.TemplateController.TEMPLATE_NOT_FOUND_MSG; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.mockito.Mockito.times; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -52,7 +52,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import static org.mockito.Mockito.times; import org.mockito.MockitoAnnotations; import org.onap.pnfsimulator.db.Storage; import org.onap.pnfsimulator.rest.model.SearchExp; @@ -63,6 +62,7 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.setup.MockMvcBuilders; + class TemplateControllerTest { private static final String LIST_URL = "/template/list"; diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/rest/util/ResponseBuilderTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/rest/util/ResponseBuilderTest.java index 0d62ee9..4e8e4dc 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/rest/util/ResponseBuilderTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/rest/util/ResponseBuilderTest.java @@ -25,6 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import java.util.Map; + import org.junit.jupiter.api.Test; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -39,7 +40,7 @@ class ResponseBuilderTest { ResponseEntity responseEntity = ResponseBuilder.status(SAMPLE_STATUS).build(); assertAll( - () -> assertEquals(responseEntity.getStatusCode(), SAMPLE_STATUS), + () -> assertEquals(SAMPLE_STATUS, responseEntity.getStatusCode()), () -> assertNull(responseEntity.getBody()) ); } diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/DbTemplateReaderTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/DbTemplateReaderTest.java new file mode 100644 index 0000000..c3f85f5 --- /dev/null +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/DbTemplateReaderTest.java @@ -0,0 +1,81 @@ +/*- + * ============LICENSE_START======================================================= + * Simulator + * ================================================================================ + * Copyright (C) 2020 Nokia. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.pnfsimulator.simulator; + +import com.google.gson.Gson; +import com.google.gson.JsonObject; +import org.assertj.core.api.Assertions; +import org.bson.Document; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.onap.pnfsimulator.template.Template; +import org.onap.pnfsimulator.template.TemplateService; + +import java.io.IOException; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class DbTemplateReaderTest { + + public static final String SOME_TEMPLATE = "someTemplate"; + public static final String KEY = "key"; + public static final String VALUE = "value"; + public static final long LMOD = 10L; + private TemplateService service; + private DbTemplateReader dbTemplateReader; + + @BeforeEach + void setUp() { + this.service = mock(TemplateService.class); + this.dbTemplateReader = new DbTemplateReader(this.service, new Gson()); + } + + @Test + public void shouldReportErrorWhenTemplateDoesNotExistInTemplateService() { + // given + when(this.service.get(SOME_TEMPLATE)).thenReturn(Optional.empty()); + + // when/then + assertThrows(IOException.class, + () -> this.dbTemplateReader.readTemplate(SOME_TEMPLATE) + ); + } + + @Test + public void shouldReturnTemplateFromService() throws IOException { + // given + Template template = givenTemplate(SOME_TEMPLATE); + when(this.service.get(SOME_TEMPLATE)).thenReturn(Optional.of(template)); + + // when + final JsonObject someTemplate = this.dbTemplateReader.readTemplate(SOME_TEMPLATE); + + // then + Assertions.assertThat(someTemplate).isNotNull(); + Assertions.assertThat(someTemplate.get(KEY).getAsString()).isEqualTo(VALUE); + } + + private Template givenTemplate(String templateName) { + return new Template(templateName, new Document(KEY, VALUE), LMOD); + } +} diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/IncrementProviderImplTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/IncrementProviderImplTest.java index 53f02da..b5304a7 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/IncrementProviderImplTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/IncrementProviderImplTest.java @@ -27,6 +27,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.Optional; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -35,44 +36,44 @@ import org.onap.pnfsimulator.event.EventData; import org.onap.pnfsimulator.event.EventDataRepository; public class IncrementProviderImplTest { - private IncrementProvider incrementProvider; + private IncrementProvider incrementProvider; - @Mock - private EventDataRepository eventDataRepositoryMock; + @Mock + private EventDataRepository eventDataRepositoryMock; - @BeforeEach - void setUp() { - eventDataRepositoryMock = mock(EventDataRepository.class); - incrementProvider = new IncrementProviderImpl(eventDataRepositoryMock); - } + @BeforeEach + void setUp() { + eventDataRepositoryMock = mock(EventDataRepository.class); + incrementProvider = new IncrementProviderImpl(eventDataRepositoryMock); + } - @Test - public void getAndIncrementTest() { - ArgumentCaptor<EventData> eventDataArgumentCaptor = ArgumentCaptor.forClass(EventData.class); - String eventId = "1"; - int initialIncrementValue = 0; - int expectedValue = initialIncrementValue + 1; - EventData eventData = EventData.builder().id(eventId).incrementValue(initialIncrementValue).build(); - Optional<EventData> optional = Optional.of(eventData); + @Test + public void getAndIncrementTest() { + ArgumentCaptor<EventData> eventDataArgumentCaptor = ArgumentCaptor.forClass(EventData.class); + String eventId = "1"; + int initialIncrementValue = 0; + int expectedValue = initialIncrementValue + 1; + EventData eventData = EventData.builder().id(eventId).incrementValue(initialIncrementValue).build(); + Optional<EventData> optional = Optional.of(eventData); - when(eventDataRepositoryMock.findById(eventId)).thenReturn(optional); + when(eventDataRepositoryMock.findById(eventId)).thenReturn(optional); - int value = incrementProvider.getAndIncrement(eventId); + int value = incrementProvider.getAndIncrement(eventId); - verify(eventDataRepositoryMock).save(eventDataArgumentCaptor.capture()); + verify(eventDataRepositoryMock).save(eventDataArgumentCaptor.capture()); - assertThat(value).isEqualTo(expectedValue); - assertThat(eventDataArgumentCaptor.getValue().getIncrementValue()).isEqualTo(expectedValue); + assertThat(value).isEqualTo(expectedValue); + assertThat(eventDataArgumentCaptor.getValue().getIncrementValue()).isEqualTo(expectedValue); - } + } - @Test + @Test public void shouldThrowOnNonExistingEvent() { - Optional<EventData> emptyOptional = Optional.empty(); - String nonExistingEventId = "THIS_DOES_NOT_EXIST"; - when(eventDataRepositoryMock.findById(nonExistingEventId)).thenReturn(emptyOptional); + Optional<EventData> emptyOptional = Optional.empty(); + String nonExistingEventId = "THIS_DOES_NOT_EXIST"; + when(eventDataRepositoryMock.findById(nonExistingEventId)).thenReturn(emptyOptional); - assertThrows(EventNotFoundException.class, - () -> incrementProvider.getAndIncrement(nonExistingEventId)); - } + assertThrows(EventNotFoundException.class, + () -> incrementProvider.getAndIncrement(nonExistingEventId)); + } } diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampTest.java index f5c12c3..bf6f290 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampTest.java @@ -24,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.Collection; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,10 +38,10 @@ public class KeywordsExtractorValidTimestampTest { private KeywordsExtractor keywordsExtractor; private static final Collection VALID_TIMESTAMP_KEYWORDS = Arrays.asList(new Object[][]{ - {"#Timestamp", 10}, - {"#Timestamp12", 10 + 2}, - {"1#Timestamp", 1 + 10}, - {"1#Timestamp2", 1 + 10 +1} + {"#Timestamp", 10}, + {"#Timestamp12", 10 + 2}, + {"1#Timestamp", 1 + 10}, + {"1#Timestamp2", 1 + 10 + 1} }); public KeywordsExtractorValidTimestampTest(String keyword, Integer length) { diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsHandlerTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsHandlerTest.java index e67d4a3..e36bb28 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsHandlerTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsHandlerTest.java @@ -26,119 +26,121 @@ import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.DEFAULT_STRI import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; + import java.util.Arrays; import java.util.LinkedList; import java.util.Queue; + import org.junit.jupiter.api.Test; class KeywordsHandlerTest { - private static final String TEMPLATE_JSON = "{\n" + - " \"event\": {\n" + - " \"commonEventHeader\": {\n" + - " \"domain\": \"#RandomString\"\n" + - " },\n" + - " \"measurementsForVfScalingFields\": {\n" + - " \"measurementsForVfSclaingFieldsVersion\": 2.0,\n" + - " \"additionalMeasurements\": {\n" + - " \"name\": \"licenseUsage\",\n" + - " \"extraFields\": {\n" + - " \"name\": \"#RandomString(4)\",\n" + - " \"value\": \"1\"\n" + - " }\n" + - " }\n" + - " }\n" + - " }\n" + - "}"; - - private static final String TEMPLATE_JSON_WITH_MANY_KEYWORDS_INSIDE_SINGLE_VALUE = "{\n" + - " \"event\": {\n" + - " \"commonEventHeader\": {\n" + - " \"domain1\": \"#RandomString(1) #RandomString(2) #RandomString(3)\",\n" + - " \"domain2\": \"1 #RandomString(1) 2\"\n" + - " },\n" + - " \"measurementsForVfScalingFields\": {\n" + - " \"measurementsForVfSclaingFieldsVersion\": 2.0,\n" + - " \"additionalMeasurements\": {\n" + - " \"name\": \"licenseUsage\",\n" + - " \"extraFields\": {\n" + - " \"value\": \"1\"\n" + - " }\n" + - " }\n" + - " }\n" + - " }\n" + - "}"; + private static final String TEMPLATE_JSON = "{\n" + + " \"event\": {\n" + + " \"commonEventHeader\": {\n" + + " \"domain\": \"#RandomString\"\n" + + " },\n" + + " \"measurementsForVfScalingFields\": {\n" + + " \"measurementsForVfSclaingFieldsVersion\": 2.0,\n" + + " \"additionalMeasurements\": {\n" + + " \"name\": \"licenseUsage\",\n" + + " \"extraFields\": {\n" + + " \"name\": \"#RandomString(4)\",\n" + + " \"value\": \"1\"\n" + + " }\n" + + " }\n" + + " }\n" + + " }\n" + + "}"; + + private static final String TEMPLATE_JSON_WITH_MANY_KEYWORDS_INSIDE_SINGLE_VALUE = "{\n" + + " \"event\": {\n" + + " \"commonEventHeader\": {\n" + + " \"domain1\": \"#RandomString(1) #RandomString(2) #RandomString(3)\",\n" + + " \"domain2\": \"1 #RandomString(1) 2\"\n" + + " },\n" + + " \"measurementsForVfScalingFields\": {\n" + + " \"measurementsForVfSclaingFieldsVersion\": 2.0,\n" + + " \"additionalMeasurements\": {\n" + + " \"name\": \"licenseUsage\",\n" + + " \"extraFields\": {\n" + + " \"value\": \"1\"\n" + + " }\n" + + " }\n" + + " }\n" + + " }\n" + + "}"; private static final String TEMPLATE_JSON_WITH_ARRAY = "{\n" - + " \"event\": {\n" - + " \"commonEventHeader\": {\n" - + " \"domain\": \"#RandomString(1)\",\n" - + " \"version\": 2.0\n" - + " },\n" - + " \"measurementsForVfScalingFields\": {\n" - + " \"additionalMeasurements\": [\n" - + " {\n" - + " \"name\": \"licenseUsage\",\n" - + " \"arrayOfFields\": [\n" - + " {\n" - + " \"name\": \"G711AudioPort\",\n" - + " \"value\": \"1\"\n" - + " },\n" - + " {\n" - + " \"name\": [\"1\",\"2\"],\n" - + " \"value\": \"#RandomString(2)\"\n" - + " },\n" - + " {\n" - + " \"name\": \"G722AudioPort\",\n" - + " \"value\": \"1\"\n" - + " }\n" - + " ]\n" - + " }\n" - + " ]\n" - + " }\n" - + " }\n" - + "}"; - - private static final String TEMPLATE_ONE_INCREMENT_JSON = "{\n" + - " \"event\": {\n" + - " \"commonEventHeader\": {\n" + - " \"domain\": \"#RandomString\"\n" + - " },\n" + - " \"measurementsForVfScalingFields\": {\n" + - " \"measurementsForVfSclaingFieldsVersion\": 2.0,\n" + - " \"additionalMeasurements\": {\n" + - " \"name\": \"licenseUsage\",\n" + - " \"extraFields\": {\n" + - " \"name\": \"#RandomString(4)\",\n" + - " \"value\": \"#Increment\"\n" + - " }\n" + - " }\n" + - " }\n" + - " }\n" + - "}"; - - private static final String TEMPLATE_WITH_SIMPLE_VALUE= "\"#RandomString(4)\""; + + " \"event\": {\n" + + " \"commonEventHeader\": {\n" + + " \"domain\": \"#RandomString(1)\",\n" + + " \"version\": 2.0\n" + + " },\n" + + " \"measurementsForVfScalingFields\": {\n" + + " \"additionalMeasurements\": [\n" + + " {\n" + + " \"name\": \"licenseUsage\",\n" + + " \"arrayOfFields\": [\n" + + " {\n" + + " \"name\": \"G711AudioPort\",\n" + + " \"value\": \"1\"\n" + + " },\n" + + " {\n" + + " \"name\": [\"1\",\"2\"],\n" + + " \"value\": \"#RandomString(2)\"\n" + + " },\n" + + " {\n" + + " \"name\": \"G722AudioPort\",\n" + + " \"value\": \"1\"\n" + + " }\n" + + " ]\n" + + " }\n" + + " ]\n" + + " }\n" + + " }\n" + + "}"; + + private static final String TEMPLATE_ONE_INCREMENT_JSON = "{\n" + + " \"event\": {\n" + + " \"commonEventHeader\": {\n" + + " \"domain\": \"#RandomString\"\n" + + " },\n" + + " \"measurementsForVfScalingFields\": {\n" + + " \"measurementsForVfSclaingFieldsVersion\": 2.0,\n" + + " \"additionalMeasurements\": {\n" + + " \"name\": \"licenseUsage\",\n" + + " \"extraFields\": {\n" + + " \"name\": \"#RandomString(4)\",\n" + + " \"value\": \"#Increment\"\n" + + " }\n" + + " }\n" + + " }\n" + + " }\n" + + "}"; + + private static final String TEMPLATE_WITH_SIMPLE_VALUE = "\"#RandomString(4)\""; private static final String TEMPLATE_WITH_ARRAY_OF_PRIMITIVES = "[ 1, \"#RandomString(5)\", 3]"; - private static final String TEMPLATE_TWO_INCREMENT_JSON = "{\n" + - " \"event\": {\n" + - " \"commonEventHeader\": {\n" + - " \"domain\": \"#RandomString\"\n" + - " },\n" + - " \"measurementsForVfScalingFields\": {\n" + - " \"measurementsForVfSclaingFieldsVersion\": 2.0,\n" + - " \"additionalMeasurements\": {\n" + - " \"name\": \"licenseUsage\",\n" + - " \"extraFields\": {\n" + - " \"name\": \"#RandomString(4)\",\n" + - " \"value\": \"#Increment\",\n" + - " \"otherValue\": \"#Increment\"\n" + - " }\n" + - " }\n" + - " }\n" + - " }\n" + - "}"; + private static final String TEMPLATE_TWO_INCREMENT_JSON = "{\n" + + " \"event\": {\n" + + " \"commonEventHeader\": {\n" + + " \"domain\": \"#RandomString\"\n" + + " },\n" + + " \"measurementsForVfScalingFields\": {\n" + + " \"measurementsForVfSclaingFieldsVersion\": 2.0,\n" + + " \"additionalMeasurements\": {\n" + + " \"name\": \"licenseUsage\",\n" + + " \"extraFields\": {\n" + + " \"name\": \"#RandomString(4)\",\n" + + " \"value\": \"#Increment\",\n" + + " \"otherValue\": \"#Increment\"\n" + + " }\n" + + " }\n" + + " }\n" + + " }\n" + + "}"; private Gson gson = new Gson(); @@ -153,15 +155,15 @@ class KeywordsHandlerTest { // then String extraFields = resultJson - .get("event").getAsJsonObject() - .get("measurementsForVfScalingFields").getAsJsonObject() - .get("additionalMeasurements").getAsJsonObject() - .get("extraFields").getAsJsonObject() - .get("name").getAsString(); + .get("event").getAsJsonObject() + .get("measurementsForVfScalingFields").getAsJsonObject() + .get("additionalMeasurements").getAsJsonObject() + .get("extraFields").getAsJsonObject() + .get("name").getAsString(); String newDomain = resultJson - .get("event").getAsJsonObject() - .get("commonEventHeader").getAsJsonObject() - .get("domain").getAsString(); + .get("event").getAsJsonObject() + .get("commonEventHeader").getAsJsonObject() + .get("domain").getAsString(); assertThat(extraFields.length()).isEqualTo(4); assertThat(newDomain.length()).isEqualTo(DEFAULT_STRING_LENGTH); @@ -178,16 +180,16 @@ class KeywordsHandlerTest { // then String newDomain1 = resultJson - .get("event").getAsJsonObject() - .get("commonEventHeader").getAsJsonObject() - .get("domain1").getAsString(); + .get("event").getAsJsonObject() + .get("commonEventHeader").getAsJsonObject() + .get("domain1").getAsString(); String newDomain2 = resultJson - .get("event").getAsJsonObject() - .get("commonEventHeader").getAsJsonObject() - .get("domain2").getAsString(); + .get("event").getAsJsonObject() + .get("commonEventHeader").getAsJsonObject() + .get("domain2").getAsString(); - assertThat(newDomain1.length()).isEqualTo(1+1+2+1+3); - assertThat(newDomain2.length()).isEqualTo(1+1+1+1+1); + assertThat(newDomain1.length()).isEqualTo(1 + 1 + 2 + 1 + 3); + assertThat(newDomain2.length()).isEqualTo(1 + 1 + 1 + 1 + 1); } @Test @@ -225,17 +227,17 @@ class KeywordsHandlerTest { // then String actualValue = resultJson - .get("event").getAsJsonObject() - .get("measurementsForVfScalingFields").getAsJsonObject() - .get("additionalMeasurements").getAsJsonArray() - .get(0).getAsJsonObject() - .get("arrayOfFields").getAsJsonArray() - .get(1).getAsJsonObject() - .get("value").getAsString(); + .get("event").getAsJsonObject() + .get("measurementsForVfScalingFields").getAsJsonObject() + .get("additionalMeasurements").getAsJsonArray() + .get(0).getAsJsonObject() + .get("arrayOfFields").getAsJsonArray() + .get(1).getAsJsonObject() + .get("value").getAsString(); String otherActualValue = resultJson - .get("event").getAsJsonObject() - .get("commonEventHeader").getAsJsonObject() - .get("domain").getAsString(); + .get("event").getAsJsonObject() + .get("commonEventHeader").getAsJsonObject() + .get("domain").getAsString(); assertThat(otherActualValue.length()).isEqualTo(1); assertThat(actualValue.length()).isEqualTo(2); @@ -253,11 +255,11 @@ class KeywordsHandlerTest { // then String actualValue = resultJson - .get("event").getAsJsonObject() - .get("measurementsForVfScalingFields").getAsJsonObject() - .get("additionalMeasurements").getAsJsonObject() - .get("extraFields").getAsJsonObject() - .get("value").getAsString(); + .get("event").getAsJsonObject() + .get("measurementsForVfScalingFields").getAsJsonObject() + .get("additionalMeasurements").getAsJsonObject() + .get("extraFields").getAsJsonObject() + .get("value").getAsString(); assertThat(actualValue).isEqualTo(newIncrementedValue.toString()); } @@ -270,7 +272,7 @@ class KeywordsHandlerTest { JsonObject templateJson = gson.fromJson(TEMPLATE_TWO_INCREMENT_JSON, JsonObject.class); KeywordsHandler keywordsHandler = new KeywordsHandler(new KeywordsExtractor(), new IncrementProvider() { Queue<Integer> sequenceOfValues = new LinkedList<>( - Arrays.asList(firstIncrementValue, secondIncrementValue)); + Arrays.asList(firstIncrementValue, secondIncrementValue)); @Override public int getAndIncrement(String id) { @@ -284,18 +286,18 @@ class KeywordsHandlerTest { // then String actualValue = resultJson - .get("event").getAsJsonObject() - .get("measurementsForVfScalingFields").getAsJsonObject() - .get("additionalMeasurements").getAsJsonObject() - .get("extraFields").getAsJsonObject() - .get("value").getAsString(); + .get("event").getAsJsonObject() + .get("measurementsForVfScalingFields").getAsJsonObject() + .get("additionalMeasurements").getAsJsonObject() + .get("extraFields").getAsJsonObject() + .get("value").getAsString(); String actualOtherValue = resultJson - .get("event").getAsJsonObject() - .get("measurementsForVfScalingFields").getAsJsonObject() - .get("additionalMeasurements").getAsJsonObject() - .get("extraFields").getAsJsonObject() - .get("otherValue").getAsString(); + .get("event").getAsJsonObject() + .get("measurementsForVfScalingFields").getAsJsonObject() + .get("additionalMeasurements").getAsJsonObject() + .get("extraFields").getAsJsonObject() + .get("otherValue").getAsString(); assertThat(actualValue).isEqualTo(secondIncrementValue.toString()); assertThat(actualOtherValue).isEqualTo(secondIncrementValue.toString()); diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsValueProviderTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsValueProviderTest.java index 73e4c31..ac54237 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsValueProviderTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsValueProviderTest.java @@ -25,6 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.DEFAULT_STRING_LENGTH; import java.util.Random; + import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.Test; @@ -33,49 +34,49 @@ class KeywordsValueProviderTest { @RepeatedTest(10) void randomLimitedStringTest() { String supplierResult = KeywordsValueProvider.getRandomLimitedString().apply(); - assertEquals(supplierResult.length(), DEFAULT_STRING_LENGTH); + assertEquals(DEFAULT_STRING_LENGTH, supplierResult.length()); } @RepeatedTest(10) void randomStringTest() { int length = new Random().nextInt(15) + 1; String supplierResult = KeywordsValueProvider.getRandomString().apply(length); - assertEquals(supplierResult.length(), length); + assertEquals(length, supplierResult.length()); } @RepeatedTest(10) - void randomIntegerTest(){ + void randomIntegerTest() { int min = new Random().nextInt(10) + 1; int max = new Random().nextInt(1000) + 20; String supplierResult = KeywordsValueProvider.getRandomInteger().apply(min, max); - assertTrue(Integer.parseInt(supplierResult)>=min); - assertTrue(Integer.parseInt(supplierResult)<=max); + assertTrue(Integer.parseInt(supplierResult) >= min); + assertTrue(Integer.parseInt(supplierResult) <= max); } @Test - void randomIntegerContainsMaximalAndMinimalValuesTest(){ + void randomIntegerContainsMaximalAndMinimalValuesTest() { int anyNumber = new Random().nextInt(10) + 1; String supplierResult = KeywordsValueProvider.getRandomInteger().apply(anyNumber, anyNumber); assertEquals(Integer.parseInt(supplierResult), anyNumber); } @Test - void randomIntegerFromNegativeRangeTest(){ + void randomIntegerFromNegativeRangeTest() { String supplierResult = KeywordsValueProvider.getRandomInteger().apply(-20, -20); assertEquals(Integer.parseInt(supplierResult), -20); } @RepeatedTest(10) - void randomIntegerFromParametersWithDifferentOrdersTest(){ + void randomIntegerFromParametersWithDifferentOrdersTest() { String supplierResult = KeywordsValueProvider.getRandomInteger().apply(-20, -10); - assertTrue(Integer.parseInt(supplierResult)>=-20); - assertTrue(Integer.parseInt(supplierResult)<=-10); + assertTrue(Integer.parseInt(supplierResult) >= -20); + assertTrue(Integer.parseInt(supplierResult) <= -10); } @RepeatedTest(10) - void epochSecondGeneratedInCorrectFormatTest(){ + void epochSecondGeneratedInCorrectFormatTest() { String supplierResult = KeywordsValueProvider.getEpochSecond().apply(); - assertEquals(supplierResult.length(), 10); + assertEquals(10, supplierResult.length()); } } 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 0196eb0..870c963 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/SimulatorServiceTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/SimulatorServiceTest.java @@ -33,14 +33,13 @@ 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.simulator.client.HttpClientAdapter; -import org.onap.pnfsimulator.simulator.client.utils.ssl.SSLAuthenticationHelper; +import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper; import org.onap.pnfsimulator.simulator.scheduler.EventScheduler; import org.onap.pnfsimulator.simulatorconfig.SimulatorConfig; 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; @@ -59,32 +58,32 @@ class SimulatorServiceTest { private static final String VES_URL = "http://0.0.0.0:8080"; private static final Gson GSON = new Gson(); - private static final JsonObject VALID_PATCH = GSON.fromJson("{\"event\": {\n" + - " \"commonEventHeader\": {\n" + - " \"sourceName\": \"SomeCustomSource\"}}}\n", JsonObject.class); - private static JsonObject VALID_FULL_EVENT = GSON.fromJson("{\"event\": {\n" + - " \"commonEventHeader\": {\n" + - " \"domain\": \"notification\",\n" + - " \"eventName\": \"vFirewallBroadcastPackets\"\n" + - " },\n" + - " \"notificationFields\": {\n" + - " \"arrayOfNamedHashMap\": [{\n" + - " \"name\": \"A20161221.1031-1041.bin.gz\",\n" + - " \"hashMap\": {\n" + - " \"fileformatType\": \"org.3GPP.32.435#measCollec\"}}]}}}", JsonObject.class); - private static JsonObject FULL_EVENT_WITH_KEYWORDS = GSON.fromJson("{\"event\":{ \n" + - " \"commonEventHeader\":{ \n" + - " \"domain\":\"notification\",\n" + - " \"eventName\":\"#RandomString(20)\",\n" + - " \"eventOrderNo\":\"#Increment\"}}}", JsonObject.class); + private static final JsonObject VALID_PATCH = GSON.fromJson("{\"event\": {\n" + + " \"commonEventHeader\": {\n" + + " \"sourceName\": \"SomeCustomSource\"}}}\n", JsonObject.class); + private static JsonObject VALID_FULL_EVENT = GSON.fromJson("{\"event\": {\n" + + " \"commonEventHeader\": {\n" + + " \"domain\": \"notification\",\n" + + " \"eventName\": \"vFirewallBroadcastPackets\"\n" + + " },\n" + + " \"notificationFields\": {\n" + + " \"arrayOfNamedHashMap\": [{\n" + + " \"name\": \"A20161221.1031-1041.bin.gz\",\n" + + " \"hashMap\": {\n" + + " \"fileformatType\": \"org.3GPP.32.435#measCollec\"}}]}}}", JsonObject.class); + private static JsonObject FULL_EVENT_WITH_KEYWORDS = GSON.fromJson("{\"event\":{ \n" + + " \"commonEventHeader\":{ \n" + + " \"domain\":\"notification\",\n" + + " \"eventName\":\"#RandomString(20)\",\n" + + " \"eventOrderNo\":\"#Increment\"}}}", JsonObject.class); private static final String SOME_CUSTOM_SOURCE = "SomeCustomSource"; - private static final String CLOSED_LOOP_VNF ="ClosedLoopVNF"; + 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 final ArgumentCaptor<JsonObject> bodyCaptor = ArgumentCaptor.forClass(JsonObject.class); private final ArgumentCaptor<Integer> intervalCaptor = ArgumentCaptor.forClass(Integer.class); private final ArgumentCaptor<Integer> repeatCountCaptor = ArgumentCaptor - .forClass(Integer.class); + .forClass(Integer.class); private final ArgumentCaptor<String> templateNameCaptor = ArgumentCaptor.forClass(String.class); private final ArgumentCaptor<String> eventIdCaptor = ArgumentCaptor.forClass(String.class); private final ArgumentCaptor<String> vesUrlCaptor = ArgumentCaptor.forClass(String.class); @@ -104,7 +103,7 @@ class SimulatorServiceTest { simulatorConfigService = mock(SimulatorConfigService.class); simulatorService = new SimulatorService(templatePatcher, templateReader, - eventScheduler, eventDataService, simulatorConfigService, new SSLAuthenticationHelper()); + eventScheduler, eventDataService, simulatorConfigService, new SslAuthenticationHelper()); } @Test @@ -112,7 +111,7 @@ class SimulatorServiceTest { String templateName = "validExampleMeasurementEvent.json"; SimulatorParams simulatorParams = new SimulatorParams(VES_URL, 1, 1); SimulatorRequest simulatorRequest = new SimulatorRequest(simulatorParams, - templateName, VALID_PATCH); + templateName, VALID_PATCH); doReturn(SAMPLE_EVENT).when(eventDataService).persistEventData(any(JsonObject.class), any(JsonObject.class), any(JsonObject.class), any(JsonObject.class)); @@ -125,8 +124,8 @@ class SimulatorServiceTest { void shouldTriggerEventWithDefaultVesUrlWhenNotProvidedInRequest() throws IOException, SchedulerException, GeneralSecurityException { String templateName = "validExampleMeasurementEvent.json"; SimulatorRequest simulatorRequest = new SimulatorRequest( - new SimulatorParams("", 1, 1), - templateName, VALID_PATCH); + 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)); @@ -140,23 +139,24 @@ class SimulatorServiceTest { @Test void shouldThrowJsonSyntaxWhenInvalidJson() { //given - JsonObject patch = GSON.fromJson("{\n" + - " \"event\": {\n" + - " \"commonEventHeader\": {\n" + - " \"sourceName\": \"" + SOME_CUSTOM_SOURCE + "\"\n" + - " }\n" + - " }\n" + - "}\n", JsonObject.class); + JsonObject patch = GSON.fromJson("{\n" + + " \"event\": {\n" + + " \"commonEventHeader\": {\n" + + " \"sourceName\": \"" + + SOME_CUSTOM_SOURCE + "\"\n" + + " }\n" + + " }\n" + + "}\n", JsonObject.class); EventData eventData = EventData.builder().id("1").build(); SimulatorParams simulatorParams = new SimulatorParams(VES_URL, 1, 1); SimulatorRequest simulatorRequest = new SimulatorRequest(simulatorParams, - "invalidJsonStructureEvent.json", patch); + "invalidJsonStructureEvent.json", patch); doReturn(eventData).when(eventDataService).persistEventData(any(JsonObject.class), any(JsonObject.class), any(JsonObject.class), any(JsonObject.class)); //when assertThrows(JsonSyntaxException.class, - () -> simulatorService.triggerEvent(simulatorRequest)); + () -> simulatorService.triggerEvent(simulatorRequest)); } @Test @@ -177,7 +177,7 @@ class SimulatorServiceTest { @Test void shouldSuccessfullySendOneTimeEventWithVesUrlWhenPassed() throws IOException, GeneralSecurityException { - SimulatorService spiedTestedService = spy(new SimulatorService(templatePatcher,templateReader, eventScheduler, eventDataService, simulatorConfigService, new SSLAuthenticationHelper())); + SimulatorService spiedTestedService = spy(new SimulatorService(templatePatcher, templateReader, eventScheduler, eventDataService, simulatorConfigService, new SslAuthenticationHelper())); HttpClientAdapter adapterMock = mock(HttpClientAdapter.class); doNothing().when(adapterMock).send(eventContentCaptor.capture()); @@ -193,7 +193,7 @@ class SimulatorServiceTest { @Test void shouldSubstituteKeywordsAndSuccessfullySendOneTimeEvent() throws IOException, GeneralSecurityException { - SimulatorService spiedTestedService = spy(new SimulatorService(templatePatcher,templateReader, eventScheduler, eventDataService, simulatorConfigService, new SSLAuthenticationHelper())); + SimulatorService spiedTestedService = spy(new SimulatorService(templatePatcher, templateReader, eventScheduler, eventDataService, simulatorConfigService, new SslAuthenticationHelper())); HttpClientAdapter adapterMock = mock(HttpClientAdapter.class); doNothing().when(adapterMock).send(eventContentCaptor.capture()); @@ -210,18 +210,18 @@ class SimulatorServiceTest { private void assertEventHasExpectedStructure(String expectedVesUrl, String templateName, String sourceNameString) throws SchedulerException, IOException, GeneralSecurityException { verify(eventScheduler, times(1)).scheduleEvent(vesUrlCaptor.capture(), intervalCaptor.capture(), - repeatCountCaptor.capture(), templateNameCaptor.capture(), eventIdCaptor.capture(), bodyCaptor.capture()); + repeatCountCaptor.capture(), templateNameCaptor.capture(), eventIdCaptor.capture(), bodyCaptor.capture()); assertThat(vesUrlCaptor.getValue()).isEqualTo(expectedVesUrl); assertThat(intervalCaptor.getValue()).isEqualTo(1); assertThat(repeatCountCaptor.getValue()).isEqualTo(1); assertThat(templateNameCaptor.getValue()).isEqualTo(templateName); String actualSourceName = GSON.fromJson(bodyCaptor.getValue(), JsonObject.class) - .get("event").getAsJsonObject() - .get("commonEventHeader").getAsJsonObject() - .get("sourceName").getAsString(); + .get("event").getAsJsonObject() + .get("commonEventHeader").getAsJsonObject() + .get("sourceName").getAsString(); assertThat(actualSourceName).isEqualTo(sourceNameString); verify(eventDataService) - .persistEventData(any(JsonObject.class), any(JsonObject.class), any(JsonObject.class), - any(JsonObject.class)); + .persistEventData(any(JsonObject.class), any(JsonObject.class), any(JsonObject.class), + any(JsonObject.class)); } } diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/TemplatePatcherTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/TemplatePatcherTest.java index 52e0d6a..818c8be 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/TemplatePatcherTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/TemplatePatcherTest.java @@ -31,23 +31,23 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; class TemplatePatcherTest { - private static final String TEMPLATE_JSON = "{\n" + - " \"event\": {\n" + - " \"commonEventHeader\": {\n" + - " \"domain\": \"measurementsForVfScaling\"\n" + - " },\n" + - " \"measurementsForVfScalingFields\": {\n" + - " \"measurementsForVfSclaingFieldsVersion\": 2.0,\n" + - " \"additionalMeasurements\": {\n" + - " \"name\": \"licenseUsage\",\n" + - " \"extraFields\": {\n" + - " \"name\": \"G711AudioPort\",\n" + - " \"value\": \"1\"\n" + - " }\n" + - " }\n" + - " }\n" + - " }\n" + - "}"; + private static final String TEMPLATE_JSON = "{\n" + + " \"event\": {\n" + + " \"commonEventHeader\": {\n" + + " \"domain\": \"measurementsForVfScaling\"\n" + + " },\n" + + " \"measurementsForVfScalingFields\": {\n" + + " \"measurementsForVfSclaingFieldsVersion\": 2.0,\n" + + " \"additionalMeasurements\": {\n" + + " \"name\": \"licenseUsage\",\n" + + " \"extraFields\": {\n" + + " \"name\": \"G711AudioPort\",\n" + + " \"value\": \"1\"\n" + + " }\n" + + " }\n" + + " }\n" + + " }\n" + + "}"; private TemplatePatcher templatePatcher; private Gson gson = new Gson(); @@ -109,9 +109,9 @@ class TemplatePatcherTest { .get("commonEventHeader").getAsJsonObject() .get("domain"); assertThat(newDomain.isJsonObject()).isTrue(); - JsonObject newDomainJO = newDomain.getAsJsonObject(); - AssertionsForInterfaceTypes.assertThat(newDomainJO.keySet()).containsExactly("extraFields"); - JsonObject newDomainExtraFields = newDomainJO.get("extraFields").getAsJsonObject(); + JsonObject newDomainJsonObject = newDomain.getAsJsonObject(); + AssertionsForInterfaceTypes.assertThat(newDomainJsonObject.keySet()).containsExactly("extraFields"); + JsonObject newDomainExtraFields = newDomainJsonObject.get("extraFields").getAsJsonObject(); AssertionsForInterfaceTypes.assertThat(newDomainExtraFields.keySet()).containsExactly("name", "value"); } diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java index 63c1b72..9eaab5c 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java @@ -26,7 +26,7 @@ import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.onap.pnfsimulator.simulator.client.utils.ssl.SSLAuthenticationHelper; +import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper; import java.io.IOException; import java.net.MalformedURLException; @@ -59,17 +59,18 @@ class HttpClientAdapterImplTest { } @Test - void sendShouldSuccessfullySendRequestGivenValidUrlUsingHTTPS() throws IOException { + void sendShouldSuccessfullySendRequestGivenValidUrlUsingHttps() throws IOException { assertAdapterSentRequest("https://valid-url:8443"); } @Test - void shouldThrowExceptionWhenMalformedVesUrlPassed(){ - assertThrows(MalformedURLException.class, () -> new HttpClientAdapterImpl("http://blablabla:VES-PORT", new SSLAuthenticationHelper())); + void shouldThrowExceptionWhenMalformedVesUrlPassed() { + assertThrows(MalformedURLException.class, () -> new HttpClientAdapterImpl("http://blablabla:VES-PORT", new SslAuthenticationHelper())); } + @Test - void shouldCreateAdapterWithClientNotSupportingSSLConnection() throws IOException, GeneralSecurityException { - HttpClientAdapter adapterWithHttps = new HttpClientAdapterImpl(HTTPS_URL, new SSLAuthenticationHelper()); + void shouldCreateAdapterWithClientNotSupportingSslConnection() throws IOException, GeneralSecurityException { + HttpClientAdapter adapterWithHttps = new HttpClientAdapterImpl(HTTPS_URL, new SslAuthenticationHelper()); try { adapterWithHttps.send("sample"); } catch (Exception actualException) { @@ -79,7 +80,7 @@ class HttpClientAdapterImplTest { @Test void shouldCreateAdapterWithClientSupportingPlainConnectionOnly() throws IOException, GeneralSecurityException { - HttpClientAdapter adapterWithHttps = new HttpClientAdapterImpl(HTTP_URL, new SSLAuthenticationHelper()); + HttpClientAdapter adapterWithHttps = new HttpClientAdapterImpl(HTTP_URL, new SslAuthenticationHelper()); try { adapterWithHttps.send("sample"); } catch (Exception actualException) { diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SslSupportLevelTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SslSupportLevelTest.java index ff41c44..3a7dbf2 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SslSupportLevelTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SslSupportLevelTest.java @@ -35,17 +35,17 @@ class SslSupportLevelTest { @Test void testShouldReturnAlwaysTrustSupportLevelForHttpsUrl() throws MalformedURLException { SslSupportLevel actualSupportLevel = SslSupportLevel.getSupportLevelBasedOnProtocol(HTTPS_URL); - assertEquals(actualSupportLevel, SslSupportLevel.ALWAYS_TRUST); + assertEquals(SslSupportLevel.ALWAYS_TRUST, actualSupportLevel); } @Test void testShouldReturnNoneSupportLevelForHttpUrl() throws MalformedURLException { SslSupportLevel actualSupportLevel = SslSupportLevel.getSupportLevelBasedOnProtocol(HTTP_URL); - assertEquals(actualSupportLevel, SslSupportLevel.NONE); + assertEquals(SslSupportLevel.NONE, actualSupportLevel); } @Test - void testShouldRaiseExceptionWhenInvalidUrlPassed(){ + void testShouldRaiseExceptionWhenInvalidUrlPassed() { assertThrows(MalformedURLException.class, () -> SslSupportLevel.getSupportLevelBasedOnProtocol("http://bla:VES-PORT/")); } diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/keywords/TwoParameterKeywordTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/keywords/TwoParameterKeywordTest.java new file mode 100644 index 0000000..6477fbf --- /dev/null +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/keywords/TwoParameterKeywordTest.java @@ -0,0 +1,48 @@ +/*- + * ============LICENSE_START======================================================= + * Simulator + * ================================================================================ + * Copyright (C) 2020 Nokia. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.pnfsimulator.simulator.keywords; + + +import io.vavr.Tuple1; +import org.junit.jupiter.api.Test; + +import static org.junit.Assert.assertEquals; + +class TwoParameterKeywordTest { + @Test + public void whenGivenKeywordShouldReturnTwoParameterKeywordObjectWithParsedValues() { + //given + final String expectedName = "TEST"; + final Integer expectedParam1 = 123; + final Integer expectedParam2 = 456; + + String keyword = "#" + expectedName + "(" + expectedParam1 + "," + expectedParam2 + ")"; + + //when + Tuple1<TwoParameterKeyword> keywordTuple = TwoParameterKeyword.twoParameterKeyword(keyword); + TwoParameterKeyword twoParameterKeyword = keywordTuple._1(); + + //then + assertEquals(twoParameterKeyword.getName(), expectedName); + assertEquals(twoParameterKeyword.getAdditionalParameter1(), expectedParam1); + assertEquals(twoParameterKeyword.getAdditionalParameter2(), expectedParam2); + } +}
\ No newline at end of file diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventJobTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventJobTest.java index 25ed84c..fed6bb6 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventJobTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventJobTest.java @@ -69,14 +69,14 @@ class EventJobTest { assertThat(bodyCaptor.getValue()).isEqualTo(body.toString()); } - private JobExecutionContext createMockJobExecutionContext(String templateName, String eventId, String vesURL, + private JobExecutionContext createMockJobExecutionContext(String templateName, String eventId, String vesUrl, JsonObject body, HttpClientAdapter clientAdapter) { JobDataMap jobDataMap = new JobDataMap(); jobDataMap.put(TEMPLATE_NAME, templateName); jobDataMap.put(KEYWORDS_HANDLER, new KeywordsHandler(new KeywordsExtractor(), (id) -> 1)); jobDataMap.put(EVENT_ID, eventId); - jobDataMap.put(VES_URL, vesURL); + jobDataMap.put(VES_URL, vesUrl); jobDataMap.put(BODY, body); jobDataMap.put(CLIENT_ADAPTER, clientAdapter); diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventSchedulerTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventSchedulerTest.java index 84df5e9..d7cabb7 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventSchedulerTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventSchedulerTest.java @@ -28,7 +28,6 @@ import static org.mockito.Mockito.when; import com.google.gson.JsonObject; import java.io.IOException; -import java.net.MalformedURLException; import java.security.GeneralSecurityException; import java.util.ArrayList; import java.util.Arrays; @@ -39,7 +38,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.onap.pnfsimulator.simulator.client.utils.ssl.SSLAuthenticationHelper; +import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper; import org.quartz.JobDataMap; import org.quartz.JobDetail; import org.quartz.JobExecutionContext; @@ -57,7 +56,7 @@ class EventSchedulerTest { Scheduler quartzScheduler; @Mock - SSLAuthenticationHelper sslAuthenticationHelper; + SslAuthenticationHelper sslAuthenticationHelper; @BeforeEach void setUp() { diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/TemplateServiceTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/TemplateServiceTest.java index 0746960..fd41045 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/TemplateServiceTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/TemplateServiceTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -28,7 +28,7 @@ import org.junit.Assert; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; -import org.mockito.Mock;; +import org.mockito.Mock; import org.onap.pnfsimulator.template.search.viewmodel.FlatTemplateContent; import org.onap.pnfsimulator.template.search.TemplateSearchHelper; import org.springframework.data.mongodb.core.MongoTemplate; @@ -112,7 +112,7 @@ class TemplateServiceTest { } @Test - void shouldReturnNamesForGivenComposedSearchCriteria(){ + void shouldReturnNamesForGivenComposedSearchCriteria() { JsonObject composedCriteriaObject = GSON.fromJson("{\"eventName\": \"pnfRegistration_Nokia_5gDu\", \"sequence\": 1}", JsonObject.class); List<FlatTemplateContent> arr = Lists.newArrayList(new FlatTemplateContent("sampleId", null)); diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/search/JsonUtilsTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/search/JsonUtilsTest.java index fa0bed1..aac15a6 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/search/JsonUtilsTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/search/JsonUtilsTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -38,41 +38,41 @@ class JsonUtilsTest { utils = new JsonUtils(); } - private static final String NOTIFICATION_JSON = "{\n\"event\": {\n" + - " \"commonEventHeader\": {\n" + - " \"domain\": \"notification\",\n" + - " \"eventName\": \"vFirewallBroadcastPackets\"\n" + - " },\n" + - " \"notificationFields\": {\n" + - " \"changeIdentifier\": \"PM_MEAS_FILES\",\n" + - " \"arrayOfNamedHashMap\": [{\n" + - " \"name\": \"A20161221.1031-1041.bin.gz\",\n" + - " \"hashMap\": {\n" + - " \"fileformatType\": \"org.3GPP.32.435#measCollec\",\n" + - " \"fileFormatVersion\": \"V10\"\n"+ - " }\n" + - " }, {\n" + - " \"name\": \"A20161222.1042-1102.bin.gz\",\n" + - " \"hashMap\": {\n" + - " \"fileFormatType\": \"org.3GPP.32.435#measCollec\",\n" + - " \"fileFormatVersion\": \"1.0.0\"\n" + - " }\n" + - " }],\n" + - " \"notificationFieldsVersion\": \"2.0\"\n}\n\n}}"; - private static final String EXPECTED_FLATTENED_NOTIFICATION = "{" + - " \":event:commonEventHeader:domain\" : \"notification\"," + - " \":event:commonEventHeader:eventName\" : \"vFirewallBroadcastPackets\"," + - " \":event:notificationFields:changeIdentifier\" : \"PM_MEAS_FILES\"," + - " \":event:notificationFields:arrayOfNamedHashMap[0]:name\" : \"A20161221.1031-1041.bin.gz\"," + - " \":event:notificationFields:arrayOfNamedHashMap[0]:hashMap:fileformatType\" : \"org.3GPP.32.435#measCollec\"," + - " \":event:notificationFields:arrayOfNamedHashMap[0]:hashMap:fileFormatVersion\" : \"V10\"," + - " \":event:notificationFields:arrayOfNamedHashMap[1]:name\" : \"A20161222.1042-1102.bin.gz\"," + - " \":event:notificationFields:arrayOfNamedHashMap[1]:hashMap:fileFormatType\" : \"org.3GPP.32.435#measCollec\"," + - " \":event:notificationFields:arrayOfNamedHashMap[1]:hashMap:fileFormatVersion\" : \"1.0.0\"," + - " \":event:notificationFields:notificationFieldsVersion\" : \"2.0\" }"; + private static final String NOTIFICATION_JSON = "{\n\"event\": {\n" + + " \"commonEventHeader\": {\n" + + " \"domain\": \"notification\",\n" + + " \"eventName\": \"vFirewallBroadcastPackets\"\n" + + " },\n" + + " \"notificationFields\": {\n" + + " \"changeIdentifier\": \"PM_MEAS_FILES\",\n" + + " \"arrayOfNamedHashMap\": [{\n" + + " \"name\": \"A20161221.1031-1041.bin.gz\",\n" + + " \"hashMap\": {\n" + + " \"fileformatType\": \"org.3GPP.32.435#measCollec\",\n" + + " \"fileFormatVersion\": \"V10\"\n" + + " }\n" + + " }, {\n" + + " \"name\": \"A20161222.1042-1102.bin.gz\",\n" + + " \"hashMap\": {\n" + + " \"fileFormatType\": \"org.3GPP.32.435#measCollec\",\n" + + " \"fileFormatVersion\": \"1.0.0\"\n" + + " }\n" + + " }],\n" + + " \"notificationFieldsVersion\": \"2.0\"\n}\n\n}}"; + private static final String EXPECTED_FLATTENED_NOTIFICATION = "{" + + " \":event:commonEventHeader:domain\" : \"notification\"," + + " \":event:commonEventHeader:eventName\" : \"vFirewallBroadcastPackets\"," + + " \":event:notificationFields:changeIdentifier\" : \"PM_MEAS_FILES\"," + + " \":event:notificationFields:arrayOfNamedHashMap[0]:name\" : \"A20161221.1031-1041.bin.gz\"," + + " \":event:notificationFields:arrayOfNamedHashMap[0]:hashMap:fileformatType\" : \"org.3GPP.32.435#measCollec\"," + + " \":event:notificationFields:arrayOfNamedHashMap[0]:hashMap:fileFormatVersion\" : \"V10\"," + + " \":event:notificationFields:arrayOfNamedHashMap[1]:name\" : \"A20161222.1042-1102.bin.gz\"," + + " \":event:notificationFields:arrayOfNamedHashMap[1]:hashMap:fileFormatType\" : \"org.3GPP.32.435#measCollec\"," + + " \":event:notificationFields:arrayOfNamedHashMap[1]:hashMap:fileFormatVersion\" : \"1.0.0\"," + + " \":event:notificationFields:notificationFieldsVersion\" : \"2.0\" }"; @Test - void shouldFlattenNestedJsonAndSeparateKeysWithDoubleHash(){ + void shouldFlattenNestedJsonAndSeparateKeysWithDoubleHash() { JsonObject templateJson = GSON_HELPER.fromJson(NOTIFICATION_JSON, JsonObject.class); JsonObject result = utils.flatten(templateJson); @@ -81,18 +81,18 @@ class JsonUtilsTest { } @Test - void shouldWorkOnEmptyJsonObject(){ + void shouldWorkOnEmptyJsonObject() { JsonObject result = utils.flatten(new JsonObject()); assertThat(result.toString()).isEqualTo("{}"); } @Test - void shouldFlattenObjectWithArrayValue(){ - String expectedFlattenedObjectWithArray = "{" + - " \":sample[0]\": 1," + - " \":sample[1]\": 2," + - " \":sample[2]\": 3}"; + void shouldFlattenObjectWithArrayValue() { + String expectedFlattenedObjectWithArray = "{" + + " \":sample[0]\": 1," + + " \":sample[1]\": 2," + + " \":sample[2]\": 3}"; JsonObject jsonWithPrimitivesArray = GSON_HELPER.fromJson("{\"sample\": [1, 2, 3]}", JsonObject.class); JsonObject result = utils.flatten(jsonWithPrimitivesArray); @@ -101,7 +101,7 @@ class JsonUtilsTest { } @Test - void shouldFlattenObjectWithEmptyArrayValue(){ + void shouldFlattenObjectWithEmptyArrayValue() { String expectedFlattenedObjectWithEmptyArray = "{\":sample\": []}"; JsonObject jsonWithEmptyArrayValue = GSON_HELPER.fromJson("{\"sample\": []}", JsonObject.class); @@ -111,7 +111,7 @@ class JsonUtilsTest { } @Test - void shouldFlattenNestedObjectWithEmptyObjectValue(){ + void shouldFlattenNestedObjectWithEmptyObjectValue() { String expectedFlattenedNestedObjectWithEmptyObject = "{\":sample:key\": {}}"; JsonObject nestedJsonWithEmptyObject = GSON_HELPER.fromJson("{\"sample\": {\"key\":{}}}", JsonObject.class); @@ -121,12 +121,12 @@ class JsonUtilsTest { } @Test - void shouldFlattenObjectWithDifferentDataTypes(){ + void shouldFlattenObjectWithDifferentDataTypes() { String jsonWithDifferentDataTypes = "{ \"topLevelKey\": {\"sampleInt\": 1, \"sampleBool\": false, \"sampleDouble\": 10.0, \"sampleString\": \"str\"}}"; - String expectedResult = "{\":topLevelKey:sampleInt\": 1," + - " \":topLevelKey:sampleBool\": \"false\"," + - " \":topLevelKey:sampleDouble\": 10.0," + - " \":topLevelKey:sampleString\": \"str\"}"; + String expectedResult = "{\":topLevelKey:sampleInt\": 1," + + " \":topLevelKey:sampleBool\": \"false\"," + + " \":topLevelKey:sampleDouble\": 10.0," + + " \":topLevelKey:sampleString\": \"str\"}"; JsonObject templateJson = GSON_HELPER.fromJson(jsonWithDifferentDataTypes, JsonObject.class); JsonObject result = utils.flatten(templateJson); @@ -135,10 +135,10 @@ class JsonUtilsTest { } @Test - void shouldHandleNullValues(){ + void shouldHandleNullValues() { String jsonWithNullValue = "{ \"topLevelKey\": {\"sampleNull\": null, \"sampleString\": \"str\"}}"; - String expectedResult = "{\":topLevelKey:sampleNull\": null," + - " \":topLevelKey:sampleString\": \"str\"}"; + String expectedResult = "{\":topLevelKey:sampleNull\": null," + + " \":topLevelKey:sampleString\": \"str\"}"; JsonObject templateJson = GSON_HELPER.fromJson(jsonWithNullValue, JsonObject.class); JsonObject result = utils.flatten(templateJson); @@ -147,7 +147,7 @@ class JsonUtilsTest { } @Test - void shouldFlattenBsonDocument(){ + void shouldFlattenBsonDocument() { Document documentInput = Document.parse(NOTIFICATION_JSON); Document result = utils.flatten(documentInput); @@ -156,7 +156,7 @@ class JsonUtilsTest { } @Test - void shouldNotChangeEmptyBsonDocument(){ + void shouldNotChangeEmptyBsonDocument() { Document input = Document.parse("{}"); Document result = utils.flatten(input); diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/search/TemplateSearchHelperTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/search/TemplateSearchHelperTest.java index aeef870..13ea7c6 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/search/TemplateSearchHelperTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/search/TemplateSearchHelperTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -72,7 +72,7 @@ class TemplateSearchHelperTest { } @Test - void shouldReturnNamesForGivenComposedSearchCriteria(){ + void shouldReturnNamesForGivenComposedSearchCriteria() { String expectedComposedQueryString = "{\"$and\":[{\"keyValues\":{\"$elemMatch\":{\"k\":{\"$regex\":\":eventName(?:(\\\\[[\\\\d]+\\\\]))?$\",\"$options\":\"iu\"},\"v\":{\"$regex\":\"^\\\\QpnfRegistration_Nokia_5gDu\\\\E$\",\"$options\":\"iu\"}}}},{\"keyValues\":{\"$elemMatch\":{\"k\":{\"$regex\":\":sequence(?:(\\\\[[\\\\d]+\\\\]))?$\",\"$options\":\"iu\"},\"v\":1.0}}}]}"; Query expectedQuery = new BasicQuery(expectedComposedQueryString); @@ -105,7 +105,7 @@ class TemplateSearchHelperTest { } @Test - void shouldGetQueryForEmptyJson(){ + void shouldGetQueryForEmptyJson() { JsonObject jsonObject = GSON.fromJson("{}", JsonObject.class); String expectedComposedQueryString = "{}"; @@ -123,7 +123,7 @@ class TemplateSearchHelperTest { @Test - void shouldGetQueryWithAllTypeValues(){ + void shouldGetQueryWithAllTypeValues() { JsonObject jsonObject = GSON.fromJson("{\"stringKey\": \"stringValue\", \"numberKey\": 16.00, \"boolKey\": false}", JsonObject.class); helper.getIdsOfDocumentMatchingCriteria(jsonObject); @@ -147,13 +147,13 @@ class TemplateSearchHelperTest { } @Test - void shouldThrowExceptionWhenNullIsPresentAsCriteriaValue(){ + void shouldThrowExceptionWhenNullIsPresentAsCriteriaValue() { JsonObject jsonObject = GSON.fromJson("{\"stringKey\": \"stringValue\", \"nullKey\": null}", JsonObject.class); assertThrows(IllegalJsonValueException.class, () -> helper.getIdsOfDocumentMatchingCriteria(jsonObject)); } - private void assertJsonPreparedKeyHasCorrectStructure(Document actual, String expectedPattern){ + private void assertJsonPreparedKeyHasCorrectStructure(Document actual, String expectedPattern) { assertThat(actual.get("k").toString()).isEqualTo(Pattern.compile(String.format(":%s(?:(\\[[\\d]+\\]))?$", expectedPattern)).toString()); } diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/search/handler/PrimitiveValueCriteriaBuilderTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/search/handler/PrimitiveValueCriteriaBuilderTest.java index 31bcf1c..6de86e0 100644 --- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/search/handler/PrimitiveValueCriteriaBuilderTest.java +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/search/handler/PrimitiveValueCriteriaBuilderTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -31,42 +31,42 @@ class PrimitiveValueCriteriaBuilderTest { private PrimitiveValueCriteriaBuilder builder = new PrimitiveValueCriteriaBuilder(); @Test - void testShouldAddRegexLikeCriteriaForStringType(){ + void testShouldAddRegexLikeCriteriaForStringType() { Criteria criteria = builder.applyValueCriteriaBasedOnPrimitiveType(Criteria.where("k").is("10").and("v"), new JsonPrimitive("sample")); assertThat(criteria.getCriteriaObject().toJson()).isEqualTo("{ \"k\" : \"10\", \"v\" : { \"$regex\" : \"^\\\\Qsample\\\\E$\", \"$options\" : \"iu\" } }"); } @Test - void testShouldAddRegexLikeAndEscapeStringWithMetaChars(){ + void testShouldAddRegexLikeAndEscapeStringWithMetaChars() { Criteria criteria = builder.applyValueCriteriaBasedOnPrimitiveType(Criteria.where("k").is("10").and("v"), new JsonPrimitive("[1,2,3,4,5]")); assertThat(criteria.getCriteriaObject().toJson()).isEqualTo("{ \"k\" : \"10\", \"v\" : { \"$regex\" : \"^\\\\Q[1,2,3,4,5]\\\\E$\", \"$options\" : \"iu\" } }"); } @Test - void testShouldAddRegexLikeCriteriaForIntType(){ + void testShouldAddRegexLikeCriteriaForIntType() { Criteria criteria = builder.applyValueCriteriaBasedOnPrimitiveType(Criteria.where("k").is("10").and("v"), new JsonPrimitive(1)); assertThat(criteria.getCriteriaObject().toJson()).isEqualTo("{ \"k\" : \"10\", \"v\" : 1.0 }"); } @Test - void testShouldAddRegexLikeCriteriaForLongType(){ + void testShouldAddRegexLikeCriteriaForLongType() { Criteria criteria = builder.applyValueCriteriaBasedOnPrimitiveType(Criteria.where("k").is("10").and("v"), new JsonPrimitive(Long.MAX_VALUE)); assertThat(criteria.getCriteriaObject().toJson()).isEqualTo("{ \"k\" : \"10\", \"v\" : 9.223372036854776E18 }"); } @Test - void testShouldAddRegexLikeCriteriaForDoubleType(){ + void testShouldAddRegexLikeCriteriaForDoubleType() { Criteria criteria = builder.applyValueCriteriaBasedOnPrimitiveType(Criteria.where("k").is("10").and("v"), new JsonPrimitive(2.5)); assertThat(criteria.getCriteriaObject().toJson()).isEqualTo("{ \"k\" : \"10\", \"v\" : 2.5 }"); } @Test - void testShouldAddRegexLikeCriteriaForBooleanType(){ + void testShouldAddRegexLikeCriteriaForBooleanType() { Criteria criteria = builder.applyValueCriteriaBasedOnPrimitiveType(Criteria.where("k").is("10").and("v"), new JsonPrimitive(true)); assertThat(criteria.getCriteriaObject().toJson()).isEqualTo("{ \"k\" : \"10\", \"v\" : \"true\" }"); |