From 8423794738e6411f8a4c5ef97764c20a433a67bb Mon Sep 17 00:00:00 2001 From: Tomasz Golabek Date: Thu, 23 May 2019 14:33:40 +0200 Subject: Unit tests for sdc-be-utils utils from common-be covered by tests Change-Id: I63cda35fc00c3c9c751302babea04ad8c3c144eb Issue-ID: SDC-2326 Signed-off-by: Tomasz Golabek --- .../openecomp/sdc/be/utils/CommonBeUtilsTest.java | 12 ++- .../sdc/be/utils/PropertyDefinitionUtilsTest.java | 101 +++++++++++++++++++++ .../org/openecomp/sdc/be/utils/TypeUtilsTest.java | 57 ++++++++++++ 3 files changed, 167 insertions(+), 3 deletions(-) create mode 100644 common-be/src/test/java/org/openecomp/sdc/be/utils/PropertyDefinitionUtilsTest.java create mode 100644 common-be/src/test/java/org/openecomp/sdc/be/utils/TypeUtilsTest.java (limited to 'common-be/src/test/java/org/openecomp') diff --git a/common-be/src/test/java/org/openecomp/sdc/be/utils/CommonBeUtilsTest.java b/common-be/src/test/java/org/openecomp/sdc/be/utils/CommonBeUtilsTest.java index dbe17e6968..7670913163 100644 --- a/common-be/src/test/java/org/openecomp/sdc/be/utils/CommonBeUtilsTest.java +++ b/common-be/src/test/java/org/openecomp/sdc/be/utils/CommonBeUtilsTest.java @@ -16,6 +16,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= + * Modifications copyright (c) 2019 Nokia + * ================================================================================ */ package org.openecomp.sdc.be.utils; @@ -30,7 +32,6 @@ public class CommonBeUtilsTest { @Test public void testCompareAsdcComponentVersions() { - assertTrue(CommonBeUtils.compareAsdcComponentVersions("1.1", "0.15")); assertFalse(CommonBeUtils.compareAsdcComponentVersions("0.5", "0.5")); assertFalse(CommonBeUtils.compareAsdcComponentVersions("0.5", "0.6")); @@ -42,9 +43,8 @@ public class CommonBeUtilsTest { @Test public void testConformanceLevelCompare() { - assertTrue(CommonBeUtils.conformanceLevelCompare("1.1", "0.15") > 0); - assertEquals(0, CommonBeUtils.conformanceLevelCompare("0.5", "0.5")); + assertEquals(0, CommonBeUtils.conformanceLevelCompare("0.5", "0.5")); assertTrue(CommonBeUtils.conformanceLevelCompare("0.5", "0.6") < 0); assertTrue(CommonBeUtils.conformanceLevelCompare("1.5", "2.6") < 0); assertTrue(CommonBeUtils.conformanceLevelCompare("1.5", "1.5.3") < 0); @@ -52,4 +52,10 @@ public class CommonBeUtilsTest { assertTrue(CommonBeUtils.conformanceLevelCompare("0.10", "0.1") > 0); assertTrue(CommonBeUtils.conformanceLevelCompare("2", "1.15") > 0); } + + @Test + public void testGenerateToscaResourceName(){ + assertEquals(CommonBeUtils.generateToscaResourceName("ANY_RESOURCE", "ANY_RESOURCE_SYSTEM_NAME"), + "org.openecomp.resource.any_resource.ANY_RESOURCE_SYSTEM_NAME"); + } } diff --git a/common-be/src/test/java/org/openecomp/sdc/be/utils/PropertyDefinitionUtilsTest.java b/common-be/src/test/java/org/openecomp/sdc/be/utils/PropertyDefinitionUtilsTest.java new file mode 100644 index 0000000000..b9f11d32a7 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/utils/PropertyDefinitionUtilsTest.java @@ -0,0 +1,101 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 Nokia 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.sdc.be.utils; + +import static java.util.Collections.emptyMap; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.junit.Test; +import org.openecomp.sdc.be.datatypes.elements.GetInputValueDataDefinition; +import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition; + +public class PropertyDefinitionUtilsTest { + + private static final String NAME = "NAME"; + private static final String UNIQUE_ID = "UNIQUE_ID"; + private static final String PROP_NAME = "PROP_NAME"; + private static final String FIRST = "FIRST"; + private static final String SECOND = "SECOND"; + private static final String THIRD = "THIRD"; + + @Test + public void testConvertListOfProperties() { + List inputDataDefinitions = createDataDefinitions(); + List propertyDataDefinitions = PropertyDefinitionUtils + .convertListOfProperties(inputDataDefinitions); + + assertEquals(propertyDataDefinitions.size(), 1); + assertEquals(propertyDataDefinitions.get(0).getName(), NAME); + assertEquals(propertyDataDefinitions.get(0).getUniqueId(), UNIQUE_ID); + assertNotSame(inputDataDefinitions, propertyDataDefinitions); + assertEquals(inputDataDefinitions, propertyDataDefinitions); + assertNotSame(inputDataDefinitions.get(0), propertyDataDefinitions.get(0)); + assertEquals(inputDataDefinitions.get(0), propertyDataDefinitions.get(0)); + } + + @Test + public void testResolveGetInputPropertiesForEmptyMap() { + Map> inputProps = PropertyDefinitionUtils + .resolveGetInputProperties(null); + assertEquals(inputProps, emptyMap()); + } + + @Test + public void testResolveGetInputPropertiesForNotEmptyMap() { + Map> props = new HashMap<>(); + props.put(FIRST, createDataDefinitions()); + props.put(SECOND, createDataDefinitions()); + props.put(THIRD, createDataDefinitionsWithEmptyGetInputValueDefinition()); + Map> result = PropertyDefinitionUtils.resolveGetInputProperties(props); + assertEquals(result.size(), 3); + assertEquals(result.get(FIRST).size(), 1); + assertEquals(result.get(FIRST).get(0).getUniqueId(), UNIQUE_ID); + assertEquals(result.get(SECOND).size(), 1); + assertEquals(result.get(THIRD).size(), 0); + } + + private List createDataDefinitions(){ + ArrayList propertyDataDefinitions = new ArrayList<>(); + PropertyDataDefinition dataDefinition = new PropertyDataDefinition(); + dataDefinition.setUniqueId(UNIQUE_ID); + dataDefinition.setName(NAME); + List getInputValues = new ArrayList<>(); + GetInputValueDataDefinition getInputValueDataDefinition = new GetInputValueDataDefinition(); + getInputValueDataDefinition.setPropName(PROP_NAME); + getInputValues.add(getInputValueDataDefinition); + dataDefinition.setGetInputValues(getInputValues); + propertyDataDefinitions.add(dataDefinition); + return propertyDataDefinitions; + } + + private List createDataDefinitionsWithEmptyGetInputValueDefinition(){ + ArrayList propertyDataDefinitions = new ArrayList<>(); + PropertyDataDefinition dataDefinition = new PropertyDataDefinition(); + dataDefinition.setUniqueId(UNIQUE_ID); + dataDefinition.setName(NAME); + propertyDataDefinitions.add(dataDefinition); + return propertyDataDefinitions; + } +} \ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/utils/TypeUtilsTest.java b/common-be/src/test/java/org/openecomp/sdc/be/utils/TypeUtilsTest.java new file mode 100644 index 0000000000..fc5cea4b82 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/utils/TypeUtilsTest.java @@ -0,0 +1,57 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 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========================================================= + * Modifications copyright (c) 2019 Nokia + * ================================================================================ + */ +package org.openecomp.sdc.be.utils; + +import java.util.HashMap; +import java.util.Map; +import java.util.function.Consumer; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.mockito.junit.MockitoJUnitRunner; +import org.openecomp.sdc.be.utils.TypeUtils.ToscaTagNamesEnum; + +@RunWith(MockitoJUnitRunner.class) +public class TypeUtilsTest { + + private static final String ANY_GROUP = "anyGroup"; + + @SuppressWarnings("unchecked") + private Consumer anyConsumer = (Consumer) Mockito.spy(Consumer.class); + + @Test + public void testSetFieldShouldConsumeForJSONContainingParam() { + Map toscaJson = new HashMap<>(); + toscaJson.put(ToscaTagNamesEnum.GROUPS.getElementName(), ANY_GROUP); + TypeUtils.setField(toscaJson, ToscaTagNamesEnum.GROUPS, anyConsumer); + Mockito.verify(anyConsumer).accept(ANY_GROUP); + } + + @Test + public void testSetFieldShouldDoNothingForJSONNotContainingParam() { + Map toscaJson = new HashMap<>(); + toscaJson.put(ToscaTagNamesEnum.GROUPS.getElementName(), ANY_GROUP); + TypeUtils.setField(toscaJson, ToscaTagNamesEnum.INPUTS, anyConsumer); + Mockito.verifyZeroInteractions(anyConsumer); + } + +} \ No newline at end of file -- cgit 1.2.3-korg