diff options
Diffstat (limited to 'vid-app-common/src/test/java/org')
3 files changed, 176 insertions, 14 deletions
diff --git a/vid-app-common/src/test/java/org/onap/vid/job/command/VnfCommandTest.kt b/vid-app-common/src/test/java/org/onap/vid/job/command/VnfCommandTest.kt new file mode 100644 index 000000000..660abe4d2 --- /dev/null +++ b/vid-app-common/src/test/java/org/onap/vid/job/command/VnfCommandTest.kt @@ -0,0 +1,90 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2020 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.onap.vid.job.command + +import net.javacrumbs.jsonunit.JsonMatchers.jsonPartEquals +import org.hamcrest.MatcherAssert.assertThat +import org.hamcrest.core.AllOf.allOf +import org.mockito.Answers +import org.mockito.InjectMocks +import org.mockito.Mock +import org.onap.vid.job.JobAdapter +import org.onap.vid.job.JobsBrokerService +import org.onap.vid.job.command.ResourceCommandTest.FakeResourceCreator +import org.onap.vid.job.impl.JobSharedData +import org.onap.vid.model.Action +import org.onap.vid.mso.RestMsoImplementation +import org.onap.vid.properties.Features +import org.onap.vid.services.AsyncInstantiationBusinessLogic +import org.onap.vid.testUtils.TestUtils +import org.onap.vid.testUtils.TestUtils.initMockitoMocks +import org.testng.annotations.BeforeMethod +import org.testng.annotations.Test +import org.togglz.core.manager.FeatureManager +import org.mockito.Mockito.`when` as _when + +class VnfCommandTest { + + @Mock lateinit var asyncInstantiationBL: AsyncInstantiationBusinessLogic + @Mock lateinit var restMso: RestMsoImplementation + @Mock lateinit var msoRequestBuilder: MsoRequestBuilder + @Mock lateinit var msoResultHandlerService: MsoResultHandlerService + @Mock lateinit var inProgressStatusService:InProgressStatusService + @Mock lateinit var watchChildrenJobsBL: WatchChildrenJobsBL + @Mock lateinit var jobsBrokerService: JobsBrokerService + @Mock lateinit var jobAdapter: JobAdapter + @Mock lateinit var featureManager: FeatureManager + + @Mock lateinit var jobSharedData: JobSharedData + @Mock(answer = Answers.RETURNS_MOCKS) lateinit var vnfJobRequest: org.onap.vid.model.serviceInstantiation.Vnf + + @InjectMocks lateinit var vnfCommand: VnfCommand; + + @BeforeMethod + fun initMocks() { + initMockitoMocks(this) + } + + @Test(dataProvider = "trueAndFalse", dataProviderClass = TestUtils::class) + fun `childVfModuleWithVnfRegionAndTenant -- given vfmodule -- tenant and region are copied from vnf`(featureToggleOn: Boolean) { + + val vfModule = FakeResourceCreator.createVfModule(Action.Create) + .cloneWith("vfmodule-lcp-cloud-region-id", "vfmodule-tenant-id") + + _when(featureManager.isActive(Features.FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF)).thenReturn(featureToggleOn) + + _when(vnfJobRequest.lcpCloudRegionId).thenReturn("vnf-lcp-cloud-region-id") + _when(vnfJobRequest.tenantId).thenReturn("vnf-tenant-id") + _when(jobSharedData.request).thenReturn(vnfJobRequest) + + vnfCommand.init(jobSharedData, mapOf()) + + val expectedSource = if (featureToggleOn) "vnf" else "vfmodule" + + assertThat(vnfCommand.childVfModuleWithVnfRegionAndTenant(vfModule), + allOf( + jsonPartEquals("lcpCloudRegionId", "${expectedSource}-lcp-cloud-region-id"), + jsonPartEquals("tenantId", "${expectedSource}-tenant-id") + ) + ) + } + +} diff --git a/vid-app-common/src/test/java/org/onap/vid/model/serviceInstantiation/VfModuleTest.java b/vid-app-common/src/test/java/org/onap/vid/model/serviceInstantiation/VfModuleTest.java new file mode 100644 index 000000000..a1c78c421 --- /dev/null +++ b/vid-app-common/src/test/java/org/onap/vid/model/serviceInstantiation/VfModuleTest.java @@ -0,0 +1,62 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2020 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.onap.vid.model.serviceInstantiation; + +import static net.javacrumbs.jsonunit.JsonMatchers.jsonEquals; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.beans.HasPropertyWithValue.hasProperty; +import static org.hamcrest.core.AllOf.allOf; +import static org.onap.vid.testUtils.TestUtils.setStringsInStringProperties; + +import org.onap.vid.mso.model.ModelInfo; +import org.testng.annotations.Test; + +public class VfModuleTest { + + @Test + public void cloneWithLcpCloudRegionIdAndTenantId() { + String targetLcpCloudRegionId = "dictated lcpCloudRegionId"; + String targetTenantId = "dictated tenantId"; + + VfModule originVfModule = createVfModule(); + + assertThat(originVfModule.cloneWith(targetLcpCloudRegionId, targetTenantId), allOf( + hasProperty("lcpCloudRegionId", equalTo(targetLcpCloudRegionId)), + hasProperty("tenantId", equalTo(targetTenantId)), + jsonEquals(originVfModule).whenIgnoringPaths("lcpCloudRegionId", "tenantId") + )); + + // verify vfModule did not mutate + assertThat(originVfModule, jsonEquals(createVfModule())); + } + + private VfModule createVfModule() { + VfModule vfModule = new VfModule( + setStringsInStringProperties(new ModelInfo()), + null, null, null, null, null, + null, null, null, true, true, + null, null, true, null, true, + true, null, null); + + return setStringsInStringProperties(vfModule); + } +}
\ No newline at end of file diff --git a/vid-app-common/src/test/java/org/onap/vid/testUtils/TestUtils.java b/vid-app-common/src/test/java/org/onap/vid/testUtils/TestUtils.java index 862b8db8f..71f7ee015 100644 --- a/vid-app-common/src/test/java/org/onap/vid/testUtils/TestUtils.java +++ b/vid-app-common/src/test/java/org/onap/vid/testUtils/TestUtils.java @@ -21,9 +21,7 @@ package org.onap.vid.testUtils; import static com.fasterxml.jackson.module.kotlin.ExtensionsKt.jacksonObjectMapper; -import static java.util.function.Function.identity; import static java.util.stream.Collectors.toList; -import static java.util.stream.Collectors.toMap; import static org.apache.commons.beanutils.PropertyUtils.getPropertyDescriptors; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; import static org.apache.commons.text.CharacterPredicates.DIGITS; @@ -52,7 +50,9 @@ import java.lang.reflect.Field; import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.Arrays; +import java.util.Collections; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.function.Predicate; import javax.ws.rs.client.Client; @@ -61,7 +61,6 @@ import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.GenericType; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.lang3.reflect.FieldUtils; @@ -174,15 +173,27 @@ public class TestUtils { } public static String[] allPropertiesOf(Class<?> aClass) { - return Arrays.stream(getPropertyDescriptors(aClass)) + return getPropertyDescriptorsRecursively(aClass).stream() .map(PropertyDescriptor::getDisplayName) + .distinct() .toArray(String[]::new); } + private static List<PropertyDescriptor> getPropertyDescriptorsRecursively(Class<?> aClass) { + List<PropertyDescriptor> result = new LinkedList<>(); + + for (Class<?> i = aClass; i != null && i != Object.class; i = i.getSuperclass()) { + Collections.addAll(result, getPropertyDescriptors(i)); + } + + return result; + } + private static <T> List<String> allStringPropertiesOf(T object) { - return Arrays.stream(getPropertyDescriptors(object.getClass())) + return getPropertyDescriptorsRecursively(object.getClass()).stream() .filter(descriptor -> descriptor.getPropertyType().isAssignableFrom(String.class)) .map(PropertyDescriptor::getDisplayName) + .distinct() .collect(toList()); } @@ -221,16 +232,15 @@ public class TestUtils { * @return The modified object */ public static <T> T setStringsInStringProperties(T object) { - try { - final List<String> stringFields = allStringPropertiesOf(object); - - BeanUtils.populate(object, stringFields.stream() - .collect(toMap(identity(), identity()))); + allStringPropertiesOf(object).forEach(it -> { + try { + FieldUtils.writeField(object, it, it, true); + } catch (IllegalAccessException e) { + // YOLO + } + }); - return object; - } catch (Exception e) { - throw new RuntimeException(e); - } + return object; } public static void registerCloudConfigurationValueGenerator() { |