From c489a2eb22484e798c39a978bc8b61821b92322f Mon Sep 17 00:00:00 2001 From: an4828 Date: Mon, 22 Jan 2018 17:17:34 -0500 Subject: TCA: Replace any openecomp reference by onap Change-Id: I7c6d812ab5c1d7b30c63653d1974b0b1abc099be Signed-off-by: an4828 Issue-ID: DCAEGEN2-224 Signed-off-by: an4828 --- .../model/BaseAnalyticsModelUnitTest.java | 154 --------------------- .../model/domain/cef/EventSeverityTest.java | 71 ---------- .../apod/analytics/model/facade/tca/AAITest.java | 57 -------- .../model/facade/tca/TCAVESResponseTest.java | 76 ---------- .../model/util/AnalyticsModelIOUtilsTest.java | 86 ------------ .../model/util/AnalyticsModelJsonUtilsTest.java | 80 ----------- .../apod/analytics/model/util/ConfigHolder.java | 33 ----- .../apod/analytics/model/util/TestAppConfig.java | 38 ----- .../AnalyticsModelObjectMapperSupplierTest.java | 64 --------- .../util/json/mixin/cef/AlertTypeMixinTest.java | 51 ------- .../json/mixin/cef/EventListenerMixinTest.java | 83 ----------- .../tca/TCAControllerAppConfigMixinTest.java | 63 --------- .../mixin/facade/tca/TCAVESResponseMixinTest.java | 55 -------- .../json/mixin/policy/tca/TCAPolicyMixinTest.java | 51 ------- 14 files changed, 962 deletions(-) delete mode 100644 dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/BaseAnalyticsModelUnitTest.java delete mode 100644 dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventSeverityTest.java delete mode 100644 dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAITest.java delete mode 100644 dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponseTest.java delete mode 100644 dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtilsTest.java delete mode 100644 dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelJsonUtilsTest.java delete mode 100644 dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/ConfigHolder.java delete mode 100644 dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/TestAppConfig.java delete mode 100644 dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplierTest.java delete mode 100644 dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertTypeMixinTest.java delete mode 100644 dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventListenerMixinTest.java delete mode 100644 dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/TCAControllerAppConfigMixinTest.java delete mode 100644 dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java delete mode 100644 dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixinTest.java (limited to 'dcae-analytics-model/src/test/java/org/openecomp/dcae') diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/BaseAnalyticsModelUnitTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/BaseAnalyticsModelUnitTest.java deleted file mode 100644 index 76f225d..0000000 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/BaseAnalyticsModelUnitTest.java +++ /dev/null @@ -1,154 +0,0 @@ -/* - * ===============================LICENSE_START====================================== - * dcae-analytics - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. 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.openecomp.dcae.apod.analytics.model; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.base.Suppliers; -import org.json.JSONException; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.openecomp.dcae.apod.analytics.model.util.json.AnalyticsModelObjectMapperSupplier; -import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest; - -import java.io.IOException; -import java.io.InputStream; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - -/** - * @author Rajiv Singla . Creation Date: 10/17/2016. - */ -public abstract class BaseAnalyticsModelUnitTest extends BaseDCAEAnalyticsUnitTest { - - - protected static ObjectMapper objectMapper; - - /** - * Before running test cases need to assign object mapper. - */ - @BeforeClass - public static void beforeClass() { - final AnalyticsModelObjectMapperSupplier analyticsModelObjectMapperSupplier = - new AnalyticsModelObjectMapperSupplier(); - objectMapper = Suppliers.memoize(analyticsModelObjectMapperSupplier).get(); - } - - - /** - * Deserialize given Json file location to given model class and returns it back without any validation check. - * - * @param jsonFileLocation Classpath location of the json file - * @param modelClass Model Class type - * @param Json Model Type - * @return Deserialized Model Object - */ - public static T deserializeJsonFileToModel(String jsonFileLocation, Class modelClass) { - final InputStream jsonFileInputStream = - BaseDCAEAnalyticsUnitTest.class.getClassLoader().getResourceAsStream(jsonFileLocation); - Assert.assertNotNull("Json File Location must be valid", jsonFileInputStream); - try { - return objectMapper.readValue(jsonFileInputStream, modelClass); - } catch (IOException ex) { - LOG.error("Error while doing assert Json for fileLocation: {}, modelClass: {}, Exception {}", - jsonFileLocation, modelClass, ex); - throw new RuntimeException(ex); - } finally { - try { - jsonFileInputStream.close(); - } catch (IOException e) { - LOG.error("Error while closing input stream at file location: {}", jsonFileLocation); - throw new RuntimeException(e); - } - } - } - - /** - * Deserialize given Json file location to given model class and then validates deserialization by comparing it - * with given expected Object. - * - * @param jsonFileLocation Classpath location of the json file - * @param modelClass Model Class type - * @param expectedJsonObject Expected Json Object - * @param Json Model Type - * @return deserialized actual value if expected Json Object matches deserialized object - */ - public static T assertJsonDeserialization(String jsonFileLocation, Class modelClass, T expectedJsonObject) { - final T actualValue = deserializeJsonFileToModel(jsonFileLocation, modelClass); - assertThat(actualValue, is(expectedJsonObject)); - return actualValue; - } - - /** - * Serialize model to json. - * @param model model - * @return json - * @throws JsonProcessingException when fails to process object - */ - public static String serializeModelToJson(Object model) throws JsonProcessingException { - return objectMapper.writeValueAsString(model); - } - - /** - * Converts given model to json string and compare it with json present at given file location. - * - * @param model Model which needs to be compared - * @param expectedJsonFileLocation Location of file containing expected json string - * - * @return If assertion passes returns the input model - */ - public static T assertJsonSerialization(T model, String expectedJsonFileLocation) { - try { - final String actualModelString = serializeModelToJson(model); - final String expectedModelString = fromStream(expectedJsonFileLocation); - assertJson(expectedModelString, actualModelString); - return model; - } catch (IOException | JSONException ex) { - LOG.error("Error while doing assert Json serialization Assertion: model: {}, " - + "expected Json File Location: {}, Exception {}", model, expectedJsonFileLocation, ex); - throw new RuntimeException(ex); - } - } - - - /** - * Checks both serialization and deserialization. - *

- * First checks deserialization and then serialize the deserialized object back to json - * and check if matches the given json file location string - * - * @param jsonFileLocation Classpath location of the json file - * @param modelClass Class type - * @param Json Model Type - * - * @return If assertion passes, returns deserialized object - */ - - public static T assertJsonConversions(String jsonFileLocation, Class modelClass) { - //first check deserialization - final T actualValue = deserializeJsonFileToModel(jsonFileLocation, modelClass); - //then check serialization - assertJsonSerialization(actualValue, jsonFileLocation); - - return actualValue; - } -} diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventSeverityTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventSeverityTest.java deleted file mode 100644 index c7da0f5..0000000 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventSeverityTest.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * ===============================LICENSE_START====================================== - * dcae-analytics - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. 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.openecomp.dcae.apod.analytics.model.domain.cef; - -import org.junit.Assert; -import org.junit.Test; -import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest; - -import java.util.Collections; -import java.util.Comparator; -import java.util.LinkedList; -import java.util.List; - -/** - * - * @author Rajiv Singla . Creation Date: 11/10/2016. - */ -public class EventSeverityTest extends BaseDCAEAnalyticsUnitTest { - - private static Comparator eventSeverityComparator = new Comparator() { - @Override - public int compare(EventSeverity eventSeverity1, EventSeverity eventSeverity2) { - return eventSeverity1.compareTo(eventSeverity2); - } - }; - - @Test - public void testEventSeverityOrdering() throws Exception { - - List eventSeverities = new LinkedList<>(); - Collections.addAll(eventSeverities, - EventSeverity.NORMAL, - EventSeverity.WARNING, - EventSeverity.MINOR, - EventSeverity.MAJOR, - EventSeverity.CRITICAL); - - Collections.sort(eventSeverities); - - List expectedEventSeverities = new LinkedList<>(); - Collections.addAll(expectedEventSeverities, - EventSeverity.CRITICAL, - EventSeverity.MAJOR, - EventSeverity.MINOR, - EventSeverity.WARNING, - EventSeverity.NORMAL - ); - - Assert.assertTrue("Severity Order must be CRITICAL, MAJOR, MINOR, WARNING, NORMAL", - eventSeverities.equals(expectedEventSeverities)); - - } -} diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAITest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAITest.java deleted file mode 100644 index 689633b..0000000 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAITest.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * ===============================LICENSE_START====================================== - * dcae-analytics - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. 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.openecomp.dcae.apod.analytics.model.facade.tca; - -import org.junit.Before; -import org.junit.Test; -import org.openecomp.dcae.apod.analytics.model.BaseAnalyticsModelUnitTest; - -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; - -/** - * @author Rajiv Singla . Creation Date: 12/16/2016. - */ -public class AAITest extends BaseAnalyticsModelUnitTest { - - private AAI aai; - private static final String GENERIC_VNF_ID = "testVNFID"; - private static final String CHANGED_GENERIC_VNF_ID = "changedVNFID"; - - @Before - public void before() { - aai = new AAI(); - } - - @Test - public void getGenericVNFId() throws Exception { - aai.setGenericVNFName(GENERIC_VNF_ID); - assertThat("VNFID must be same", aai.getGenericVNFName(), is(GENERIC_VNF_ID)); - } - - @Test - public void setGenericVNFId() throws Exception { - final String genericVNFId = "testVNFID"; - aai.setGenericVNFName(GENERIC_VNF_ID); - aai.setGenericVNFName(CHANGED_GENERIC_VNF_ID); - assertThat("VNFID must be same as changed VNFID", aai.getGenericVNFName(), is(CHANGED_GENERIC_VNF_ID)); - } -} diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponseTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponseTest.java deleted file mode 100644 index 3724c8d..0000000 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponseTest.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * ===============================LICENSE_START====================================== - * dcae-analytics - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. 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.openecomp.dcae.apod.analytics.model.facade.tca; - -import org.junit.Test; -import org.openecomp.dcae.apod.analytics.model.BaseAnalyticsModelUnitTest; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - -/** - * @author Rajiv Singla . Creation Date: 12/16/2016. - */ -public class TCAVESResponseTest extends BaseAnalyticsModelUnitTest { - - private static final String TCA_VES_CEF_RESPONSE_JSON_FILE_LOCATION = "data/json/facade/tca_ves_cef_response.json"; - - @Test - public void testTCAPolicyJsonConversions() throws Exception { - - final TCAVESResponse vesCEFMessageResponse = - assertJsonConversions(TCA_VES_CEF_RESPONSE_JSON_FILE_LOCATION, TCAVESResponse.class); - - assertThat("VES CEF Message Response AAI generics VNF Id must match", - vesCEFMessageResponse.getAai().getGenericVNFName(), is("vpp-test(?)")); - - assertThat("VES CEF Message target type must be parsed correctly as VNF", - vesCEFMessageResponse.getTargetType(), is("VNF")); - - assertThat("VES closed Loop Name must be CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8", - vesCEFMessageResponse.getClosedLoopControlName(), - is("CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8")); - - assertThat("version must be 1.0.2", vesCEFMessageResponse.getVersion(), is("1.0.2")); - - assertThat("closedLoopAlarmStart must be 1478189220547", - vesCEFMessageResponse.getClosedLoopAlarmStart(), is(1478189220547L)); - assertThat("closedLoopEventClient must be tca.instance00001", - vesCEFMessageResponse.getClosedLoopEventClient(), is("tca.instance00001")); - assertThat("target_type must be VNF", vesCEFMessageResponse.getTargetType(), is("VNF")); - assertThat("target must be VNF", vesCEFMessageResponse.getTarget(), is("generic-vnf.vnf-name")); - assertThat("aai generic vnf id must be vpp-test(?)", vesCEFMessageResponse.getAai().getGenericVNFName(), - is("vpp-test(?)")); - assertThat("from must be DCAE", vesCEFMessageResponse.getFrom(), is("DCAE")); - assertThat("policyScope must be resource=vFirewall;type=configuration", - vesCEFMessageResponse.getPolicyScope(), is("resource=vFirewall;type=configuration")); - - assertThat("policyName must be configuration.dcae.microservice.tca.xml", - vesCEFMessageResponse.getPolicyName(), is("configuration.dcae.microservice.tca.xml")); - - assertThat("policyVersion must be v0.0.1", - vesCEFMessageResponse.getPolicyVersion(), is("v0.0.1")); - - assertThat("closedLoopEventStatus is ONSET", - vesCEFMessageResponse.getClosedLoopEventStatus(), is("ONSET")); - - } -} diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtilsTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtilsTest.java deleted file mode 100644 index fed3fd2..0000000 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtilsTest.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * ===============================LICENSE_START====================================== - * dcae-analytics - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. 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.openecomp.dcae.apod.analytics.model.util; - - -import org.junit.Test; -import org.mockito.Mockito; -import org.openecomp.dcae.apod.analytics.model.BaseAnalyticsModelUnitTest; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doThrow; - -/** - * @author Rajiv Singla . Creation Date: 10/17/2016. - */ -public class AnalyticsModelIOUtilsTest extends BaseAnalyticsModelUnitTest { - - private static final String TEST_CONFIG_FILE_LOCATION = "data/json/config/testAppConfig.json"; - private static final String INVALID_TEST_CONFIG_FILE_LOCATION = "data/json/config/invalidJsonConfig.json"; - private static final String TEST_PROPERTIES_FILE_LOCATION = "data/properties/testApp.properties"; - - @Test - public void testConvertToJsonObjectWhenFileLocationIsValid() throws Exception { - ConfigHolder configHolder = - AnalyticsModelIOUtils.convertToJsonObject(TEST_CONFIG_FILE_LOCATION, ConfigHolder.class); - String appName = configHolder.getConfig().getAppName(); - assertEquals("App Name must match with json settings file value", "TestAppName", appName); - String appDescription = configHolder.getConfig().getAppDescription(); - assertEquals("App Description much with json settings file value", "Test App Description", appDescription); - } - - @Test(expected = IOException.class) - public void testConvertToJsonObjectWhenFileLocationIsInvValid() throws Exception { - AnalyticsModelIOUtils.convertToJsonObject("InvalidFileLocation", ConfigHolder.class); - } - - @Test(expected = IOException.class) - public void testConvertToJsonObjectWhenJsonFileHasInvalidJson() throws Exception { - AnalyticsModelIOUtils.convertToJsonObject(INVALID_TEST_CONFIG_FILE_LOCATION, ConfigHolder.class); - } - - @Test - public void testValidPropertiesFileLoading() throws Exception { - final Properties properties = - AnalyticsModelIOUtils.loadPropertiesFile(TEST_PROPERTIES_FILE_LOCATION, new Properties()); - assertThat("Properties File must contain 2 properties", properties.size(), is(2)); - } - - @Test(expected = RuntimeException.class) - public void testNonExistingPropertiesFileLoading() throws Exception { - AnalyticsModelIOUtils.loadPropertiesFile("InvalidPropertiesFileLocation", new Properties()); - } - - @Test(expected = RuntimeException.class) - public void testLoadPropertiesFileWhenIOException() throws Exception { - final Properties mockProperties = Mockito.mock(Properties.class); - doThrow(new IOException()).when(mockProperties).load(any(InputStream.class)); - AnalyticsModelIOUtils.loadPropertiesFile(TEST_PROPERTIES_FILE_LOCATION, mockProperties); - } -} - diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelJsonUtilsTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelJsonUtilsTest.java deleted file mode 100644 index a715c2c..0000000 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelJsonUtilsTest.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * ===============================LICENSE_START====================================== - * dcae-analytics - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. 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.openecomp.dcae.apod.analytics.model.util; - -import com.fasterxml.jackson.core.type.TypeReference; -import org.junit.Test; -import org.openecomp.dcae.apod.analytics.model.BaseAnalyticsModelUnitTest; -import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; - -import java.io.InputStream; -import java.util.List; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; - -/** - * @author Rajiv Singla . Creation Date: 12/16/2016. - */ -public class AnalyticsModelJsonUtilsTest extends BaseAnalyticsModelUnitTest { - - private static final TypeReference> EVENT_LISTENER_TYPE_REFERENCE = - new TypeReference>() { - }; - - final String cefMessagesJsonFileLocation = "data/json/cef/cef_messages.json"; - final String eventListenerJsonFileLocation = "data/json/cef/cef_message.json"; - - @Test - public void testReadValueWithTypeReference() throws Exception { - final InputStream resourceAsStream = - Thread.currentThread().getContextClassLoader().getResourceAsStream(cefMessagesJsonFileLocation); - List eventListeners = AnalyticsModelJsonUtils.readValue(resourceAsStream, - EVENT_LISTENER_TYPE_REFERENCE); - assertThat("Event Listeners size must be 31", eventListeners.size(), is(31)); - } - - @Test - public void testReadValueWithClassType() throws Exception { - final InputStream resourceAsStream = - Thread.currentThread().getContextClassLoader().getResourceAsStream(eventListenerJsonFileLocation); - final EventListener eventListener = AnalyticsModelJsonUtils.readValue(resourceAsStream, EventListener.class); - assertNotNull("Event Listener event is not null", eventListener.getEvent()); - } - - @Test - public void testWriteValueAsString() throws Exception { - final InputStream resourceAsStream = - Thread.currentThread().getContextClassLoader().getResourceAsStream(eventListenerJsonFileLocation); - final EventListener eventListener = AnalyticsModelJsonUtils.readValue(resourceAsStream, EventListener.class); - final String eventListenerString = AnalyticsModelJsonUtils.writeValueAsString(eventListener); - assertJson(fromStream(eventListenerJsonFileLocation), eventListenerString); - } - - @Test - public void testReadValueWithJsonString() throws Exception { - final EventListener eventListener = - AnalyticsModelJsonUtils.readValue(fromStream(eventListenerJsonFileLocation), EventListener.class); - assertNotNull("Event Listener event is not null", eventListener.getEvent()); - } - -} diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/ConfigHolder.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/ConfigHolder.java deleted file mode 100644 index f6d65aa..0000000 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/ConfigHolder.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * ===============================LICENSE_START====================================== - * dcae-analytics - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. 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.openecomp.dcae.apod.analytics.model.util; - -/** - * Created by Rajiv Singla on 10/5/2016. - */ -public class ConfigHolder { - - private TestAppConfig config; - - public TestAppConfig getConfig() { - return config; - } -} diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/TestAppConfig.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/TestAppConfig.java deleted file mode 100644 index ea5e5e4..0000000 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/TestAppConfig.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * ===============================LICENSE_START====================================== - * dcae-analytics - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. 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.openecomp.dcae.apod.analytics.model.util; - -/** - * Created by Rajiv Singla on 10/5/2016. - */ -public class TestAppConfig { - - private String appName; - private String appDescription; - - public String getAppName() { - return appName; - } - - public String getAppDescription() { - return appDescription; - } -} diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplierTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplierTest.java deleted file mode 100644 index 55dd817..0000000 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplierTest.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * ===============================LICENSE_START====================================== - * dcae-analytics - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. 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.openecomp.dcae.apod.analytics.model.util.json; - -import com.jayway.jsonpath.Configuration; -import com.jayway.jsonpath.JsonPath; -import com.jayway.jsonpath.Option; -import com.jayway.jsonpath.spi.json.JsonProvider; -import com.jayway.jsonpath.spi.mapper.MappingProvider; -import org.junit.Test; -import org.openecomp.dcae.apod.analytics.model.BaseAnalyticsModelUnitTest; - -import java.util.Set; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.junit.Assert.assertThat; - - -/** - * @author Rajiv Singla . Creation Date: 12/16/2016. - */ -public class AnalyticsModelObjectMapperSupplierTest extends BaseAnalyticsModelUnitTest { - - - @Test - public void testJsonPathSettings() throws Exception { - final Configuration configuration = JsonPath.parse("{\"test\": \"test\"}").configuration(); - - final JsonProvider jsonProvider = configuration.jsonProvider(); - final String jsonProviderClassName = jsonProvider.getClass().getSimpleName(); - assertThat("Json Provider cass name must be JacksonJsonProvider", - jsonProviderClassName, is("JacksonJsonProvider")); - - final MappingProvider mappingProvider = configuration.mappingProvider(); - final String mappingProviderClassName = mappingProvider.getClass().getSimpleName(); - assertThat("Mapping Provider cass name must be JacksonMappingProvider", - mappingProviderClassName, is("JacksonMappingProvider")); - - final Set