From bae12bf7d5a92a4d6be22e9ce8c3dc9878c59f36 Mon Sep 17 00:00:00 2001 From: Bogumil Zebek Date: Wed, 10 Mar 2021 12:55:08 +0100 Subject: Package rename Step 2: package rename, fix pom.xml, fix integration tests Issue-ID: INT-1869 Signed-off-by: Zebek Bogumil Change-Id: Ia4c6823e4facc3791583fb39caba3bcc125b3af7 --- .../vesclient/event/EventDataServiceTest.java | 133 +++++++++ .../filesystem/InMemoryTemplateStorage.java | 71 +++++ .../filesystem/WatcherEventProcessorTest.java | 125 ++++++++ .../vesclient/rest/SimulatorControllerTest.java | 329 +++++++++++++++++++++ .../vesclient/rest/TemplateControllerTest.java | 256 ++++++++++++++++ .../vesclient/rest/util/DateUtilTest.java | 38 +++ .../vesclient/rest/util/ResponseBuilderTest.java | 66 +++++ .../vesclient/simulator/DbTemplateReaderTest.java | 81 +++++ .../simulator/IncrementProviderImplTest.java | 79 +++++ .../KeywordsExtractorInvalidRandomIntegerTest.java | 67 +++++ .../KeywordsExtractorInvalidRandomStringTest.java | 67 +++++ .../KeywordsExtractorInvalidTimestampTest.java | 65 ++++ .../KeywordsExtractorValidRandomIntegerTest.java | 66 +++++ ...dsExtractorValidRandomPrimitiveIntegerTest.java | 66 +++++ .../KeywordsExtractorValidRandomStringTest.java | 68 +++++ ...ywordsExtractorValidTimestampPrimitiveTest.java | 66 +++++ .../KeywordsExtractorValidTimestampTest.java | 68 +++++ .../vesclient/simulator/KeywordsHandlerTest.java | 305 +++++++++++++++++++ .../simulator/KeywordsValueProviderTest.java | 82 +++++ .../vesclient/simulator/SimulatorServiceTest.java | 309 +++++++++++++++++++ .../vesclient/simulator/TemplatePatcherTest.java | 164 ++++++++++ .../vesclient/simulator/TemplateReaderTest.java | 51 ++++ .../simulator/TemplateVariablesReplacerTest.java | 174 +++++++++++ .../HttpApacheResponseAdapterFactoryTest.java | 98 ++++++ .../client/HttpClientAdapterImplTest.java | 157 ++++++++++ .../vesclient/simulator/client/HttpTestUtils.java | 55 ++++ .../utils/ssl/CertAuthSslContextFactoryTest.java | 141 +++++++++ .../utils/ssl/HttpClientFactoryFacadeTest.java | 35 +++ .../client/utils/ssl/HttpClientFactoryTest.java | 143 +++++++++ .../client/utils/ssl/PasswordConverterTest.java | 44 +++ .../client/utils/ssl/SSLContextFactoryTest.java | 61 ++++ .../keywords/TwoParameterKeywordTest.java | 48 +++ .../simulator/scheduler/EventJobTest.java | 84 ++++++ .../simulator/scheduler/EventSchedulerTest.java | 148 +++++++++ .../SimulatorConfigServiceTest.java | 104 +++++++ .../template/FsToDbTemplateSynchronizerTest.java | 53 ++++ .../vesclient/template/TemplateServiceTest.java | 153 ++++++++++ .../vesclient/template/search/JsonUtilsTest.java | 166 +++++++++++ .../template/search/TemplateSearchHelperTest.java | 159 ++++++++++ .../handler/PrimitiveValueCriteriaBuilderTest.java | 75 +++++ .../pnfsimulator/event/EventDataServiceTest.java | 133 --------- .../filesystem/InMemoryTemplateStorage.java | 71 ----- .../filesystem/WatcherEventProcessorTest.java | 125 -------- .../pnfsimulator/rest/SimulatorControllerTest.java | 329 --------------------- .../pnfsimulator/rest/TemplateControllerTest.java | 256 ---------------- .../onap/pnfsimulator/rest/util/DateUtilTest.java | 38 --- .../rest/util/ResponseBuilderTest.java | 66 ----- .../simulator/DbTemplateReaderTest.java | 81 ----- .../simulator/IncrementProviderImplTest.java | 79 ----- .../KeywordsExtractorInvalidRandomIntegerTest.java | 67 ----- .../KeywordsExtractorInvalidRandomStringTest.java | 67 ----- .../KeywordsExtractorInvalidTimestampTest.java | 65 ---- .../KeywordsExtractorValidRandomIntegerTest.java | 66 ----- ...dsExtractorValidRandomPrimitiveIntegerTest.java | 66 ----- .../KeywordsExtractorValidRandomStringTest.java | 69 ----- ...ywordsExtractorValidTimestampPrimitiveTest.java | 66 ----- .../KeywordsExtractorValidTimestampTest.java | 68 ----- .../simulator/KeywordsHandlerTest.java | 306 ------------------- .../simulator/KeywordsValueProviderTest.java | 82 ----- .../simulator/SimulatorServiceTest.java | 308 ------------------- .../simulator/TemplatePatcherTest.java | 164 ---------- .../pnfsimulator/simulator/TemplateReaderTest.java | 51 ---- .../simulator/TemplateVariablesReplacerTest.java | 174 ----------- .../HttpApacheResponseAdapterFactoryTest.java | 98 ------ .../client/HttpClientAdapterImplTest.java | 157 ---------- .../simulator/client/HttpTestUtils.java | 55 ---- .../utils/ssl/CertAuthSslContextFactoryTest.java | 141 --------- .../utils/ssl/HttpClientFactoryFacadeTest.java | 35 --- .../client/utils/ssl/HttpClientFactoryTest.java | 143 --------- .../client/utils/ssl/PasswordConverterTest.java | 44 --- .../client/utils/ssl/SSLContextFactoryTest.java | 61 ---- .../keywords/TwoParameterKeywordTest.java | 48 --- .../simulator/scheduler/EventJobTest.java | 90 ------ .../simulator/scheduler/EventSchedulerTest.java | 148 --------- .../SimulatorConfigServiceTest.java | 104 ------- .../template/FsToDbTemplateSynchronizerTest.java | 53 ---- .../pnfsimulator/template/TemplateServiceTest.java | 152 ---------- .../template/search/JsonUtilsTest.java | 166 ----------- .../template/search/TemplateSearchHelperTest.java | 160 ---------- .../handler/PrimitiveValueCriteriaBuilderTest.java | 75 ----- .../vesclient/simulator/filesystem/test1.json | 12 + .../simulator/invalidJsonStructureEvent.json | 1 + .../simulator/validExampleMeasurementEvent.json | 86 ++++++ .../pnfsimulator/simulator/filesystem/test1.json | 12 - .../simulator/invalidJsonStructureEvent.json | 1 - .../simulator/validExampleMeasurementEvent.json | 86 ------ 86 files changed, 4619 insertions(+), 4626 deletions(-) create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventDataServiceTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/InMemoryTemplateStorage.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherEventProcessorTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/SimulatorControllerTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/TemplateControllerTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/DateUtilTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/ResponseBuilderTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/DbTemplateReaderTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/IncrementProviderImplTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorInvalidRandomIntegerTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorInvalidRandomStringTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorInvalidTimestampTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidRandomIntegerTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidRandomPrimitiveIntegerTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidRandomStringTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidTimestampPrimitiveTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidTimestampTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsHandlerTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsValueProviderTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/SimulatorServiceTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplatePatcherTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateReaderTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateVariablesReplacerTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpApacheResponseAdapterFactoryTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpClientAdapterImplTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpTestUtils.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/CertAuthSslContextFactoryTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactoryFacadeTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactoryTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/PasswordConverterTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/SSLContextFactoryTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/TwoParameterKeywordTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventJobTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventSchedulerTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfigServiceTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/FsToDbTemplateSynchronizerTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/TemplateServiceTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/JsonUtilsTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/TemplateSearchHelperTest.java create mode 100644 src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/handler/PrimitiveValueCriteriaBuilderTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/event/EventDataServiceTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/filesystem/InMemoryTemplateStorage.java delete mode 100644 src/test/java/org/onap/pnfsimulator/filesystem/WatcherEventProcessorTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/rest/SimulatorControllerTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/rest/TemplateControllerTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/rest/util/DateUtilTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/rest/util/ResponseBuilderTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/DbTemplateReaderTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/IncrementProviderImplTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorInvalidRandomIntegerTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorInvalidRandomStringTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorInvalidTimestampTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidRandomIntegerTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidRandomPrimitiveIntegerTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidRandomStringTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampPrimitiveTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/KeywordsHandlerTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/KeywordsValueProviderTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/SimulatorServiceTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/TemplatePatcherTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/TemplateReaderTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/TemplateVariablesReplacerTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/client/HttpApacheResponseAdapterFactoryTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/client/HttpTestUtils.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/CertAuthSslContextFactoryTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactoryFacadeTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactoryTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/PasswordConverterTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SSLContextFactoryTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/keywords/TwoParameterKeywordTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventJobTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventSchedulerTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfigServiceTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/template/FsToDbTemplateSynchronizerTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/template/TemplateServiceTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/template/search/JsonUtilsTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/template/search/TemplateSearchHelperTest.java delete mode 100644 src/test/java/org/onap/pnfsimulator/template/search/handler/PrimitiveValueCriteriaBuilderTest.java create mode 100644 src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/filesystem/test1.json create mode 100644 src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/invalidJsonStructureEvent.json create mode 100644 src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/validExampleMeasurementEvent.json delete mode 100644 src/test/resources/org/onap/pnfsimulator/simulator/filesystem/test1.json delete mode 100644 src/test/resources/org/onap/pnfsimulator/simulator/invalidJsonStructureEvent.json delete mode 100644 src/test/resources/org/onap/pnfsimulator/simulator/validExampleMeasurementEvent.json (limited to 'src/test') diff --git a/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventDataServiceTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventDataServiceTest.java new file mode 100644 index 0000000..637c658 --- /dev/null +++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventDataServiceTest.java @@ -0,0 +1,133 @@ +/* + * ============LICENSE_START======================================================= + * PNF-REGISTRATION-HANDLER + * ================================================================================ + * Copyright (C) 2018 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.integration.simulators.nfsimulator.vesclient.event; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.initMocks; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import org.hamcrest.collection.IsIterableContainingInOrder; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.BeforeEach; +import org.mockito.ArgumentCaptor; +import org.mockito.InjectMocks; +import org.mockito.Mock; + +public class EventDataServiceTest { + + @Mock + private EventDataRepository repositoryMock; + + @InjectMocks + private EventDataService service; + + private static EventData sampleEventData(String id, String template, + String patched, String input, String keywords) { + return EventData.builder() + .id(id) + .template(template) + .patched(patched) + .input(input) + .keywords(keywords) + .build(); + } + + @BeforeEach + void resetMocks() { + initMocks(this); + } + + @Test + void persistEventDataJsonObjectTest() { + JsonParser parser = new JsonParser(); + JsonObject template = parser.parse("{ \"bla1\": \"bla2\"}").getAsJsonObject(); + JsonObject patched = parser.parse("{ \"bla3\": \"bla4\"}").getAsJsonObject(); + JsonObject input = parser.parse("{ \"bla5\": \"bla6\"}").getAsJsonObject(); + JsonObject keywords = parser.parse("{ \"bla7\": \"bla8\"}").getAsJsonObject(); + ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(EventData.class); + + service.persistEventData(template, patched, input, keywords); + + verify(repositoryMock).save(argumentCaptor.capture()); + EventData captured = argumentCaptor.getValue(); + + assertEquals(captured.getTemplate(), template.toString()); + assertEquals(captured.getPatched(), patched.toString()); + assertEquals(captured.getInput(), input.toString()); + assertEquals(captured.getKeywords(), keywords.toString()); + } + + @Test + void getAllEventsTest() { + + List eventDataList = new ArrayList<>(); + EventData ed1 = sampleEventData("id1", "t1", "p1", "i1", "k1"); + EventData ed2 = sampleEventData("id2", "t2", "p2", "i2", "k2"); + eventDataList.add(ed1); + eventDataList.add(ed2); + + when(repositoryMock.findAll()).thenReturn(eventDataList); + List actualList = service.getAllEvents(); + + assertEquals(eventDataList.size(), actualList.size()); + assertThat(actualList, IsIterableContainingInOrder.contains(ed1, ed2)); + } + + @Test + void findByIdPresentTest() { + String id = "some_object"; + EventData eventData = sampleEventData(id, "template", "patched", "input", "keywords"); + Optional optional = Optional.of(eventData); + + when(repositoryMock.findById(id)).thenReturn(optional); + + Optional actualOptional = service.getById(id); + assertTrue(actualOptional.isPresent()); + EventData actualObject = actualOptional.get(); + assertEquals(eventData.getId(), actualObject.getId()); + assertEquals(eventData.getTemplate(), actualObject.getTemplate()); + assertEquals(eventData.getPatched(), actualObject.getPatched()); + assertEquals(eventData.getInput(), actualObject.getInput()); + assertEquals(eventData.getKeywords(), actualObject.getKeywords()); + + } + + @Test + void findByIdNotPresentTest() { + String id = "some_object"; + Optional optional = Optional.empty(); + + when(repositoryMock.findById(id)).thenReturn(optional); + + Optional actualOptional = service.getById(id); + assertTrue(!actualOptional.isPresent()); + } +} diff --git a/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/InMemoryTemplateStorage.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/InMemoryTemplateStorage.java new file mode 100644 index 0000000..b4534bf --- /dev/null +++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/InMemoryTemplateStorage.java @@ -0,0 +1,71 @@ +/*- + * ============LICENSE_START======================================================= + * Simulator + * ================================================================================ + * Copyright (C) 2019 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.integration.simulators.nfsimulator.vesclient.filesystem; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import com.google.gson.JsonObject; +import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage; +import org.onap.integration.simulators.nfsimulator.vesclient.template.Template; + +public class InMemoryTemplateStorage implements Storage