diff options
Diffstat (limited to 'catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/UpgradeOperationTest.java')
| -rw-r--r-- | catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/UpgradeOperationTest.java | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/UpgradeOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/UpgradeOperationTest.java index 1494f206f6..6a069a04b9 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/UpgradeOperationTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/UpgradeOperationTest.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. @@ -20,12 +20,16 @@ package org.openecomp.sdc.be.model.jsonjanusgraph.operations; +import static org.assertj.core.api.Assertions.assertThat; + import fj.data.Either; +import java.util.ArrayList; +import java.util.List; +import javax.annotation.Resource; import org.apache.commons.lang3.tuple.ImmutablePair; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.openecomp.sdc.be.dao.api.ActionStatus; import org.openecomp.sdc.be.dao.janusgraph.JanusGraphDao; import org.openecomp.sdc.be.dao.jsongraph.utils.IdBuilderUtils; @@ -33,7 +37,11 @@ import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; -import org.openecomp.sdc.be.model.*; +import org.openecomp.sdc.be.model.ComponentDependency; +import org.openecomp.sdc.be.model.ComponentInstance; +import org.openecomp.sdc.be.model.LifecycleStateEnum; +import org.openecomp.sdc.be.model.ModelTestBase; +import org.openecomp.sdc.be.model.User; import org.openecomp.sdc.be.model.category.CategoryDefinition; import org.openecomp.sdc.be.model.category.SubCategoryDefinition; import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate; @@ -41,17 +49,9 @@ import org.openecomp.sdc.be.model.jsonjanusgraph.utils.GraphTestUtils; import org.openecomp.sdc.be.model.operations.api.IElementOperation; import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus; import org.openecomp.sdc.be.model.operations.impl.UserAdminOperation; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import static org.assertj.core.api.Assertions.assertThat; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration("classpath:application-context-test.xml") +@SpringJUnitConfig(locations = "classpath:application-context-test.xml") public class UpgradeOperationTest extends ModelTestBase { private boolean isInitialized; @@ -64,7 +64,7 @@ public class UpgradeOperationTest extends ModelTestBase { @Resource private NodeTemplateOperation nodeTemplateOperation; @Resource - private UserAdminOperation userAdminOperation; + private UserAdminOperation userAdminOperation; @javax.annotation.Resource private IElementOperation elementOperation; @@ -72,14 +72,14 @@ public class UpgradeOperationTest extends ModelTestBase { private CategoryDefinition resourceCategory; private CategoryDefinition serviceCategory; - - @BeforeClass + + @BeforeAll public static void initTest() { ModelTestBase.init(); } - @Before + @BeforeEach public void beforeTest() { if (!isInitialized) { GraphTestUtils.clearGraph(janusGraphDao); @@ -90,22 +90,21 @@ public class UpgradeOperationTest extends ModelTestBase { @Test public void testGetSimpleDependency() { - + TopologyTemplate vf = createVf("vf1"); - + TopologyTemplate service = createServiceWitnInstance("service1", vf); - Either<List<ComponentDependency>, StorageOperationStatus> result = upgradeOperation.getComponentDependencies(vf.getUniqueId()); assertThat(result.isLeft()).isTrue(); List<ComponentDependency> dependencies = result.left().value(); assertThat(dependencies).hasSize(1); - + ComponentDependency dependency = dependencies.get(0); assertThat(dependency.getName()).isEqualTo(vf.getName()); assertThat(dependency.getVersion()).isEqualTo(vf.getVersion()); assertThat(dependency.getDependencies()).hasSize(1); - + ComponentDependency container = dependency.getDependencies().get(0); assertThat(container.getName()).isEqualTo(service.getName()); assertThat(container.getVersion()).isEqualTo(service.getVersion()); @@ -123,12 +122,12 @@ public class UpgradeOperationTest extends ModelTestBase { GraphTestUtils.createRootCatalogVertex(janusGraphDao); resourceCategory = createResourceCategories(); - serviceCategory = createServiceCategory(); - + serviceCategory = createServiceCategory(); + } private TopologyTemplate createServiceWitnInstance(String name, TopologyTemplate createdVf) { - + TopologyTemplate serviceNew = createTopologyTemplate(ComponentTypeEnum.SERVICE, name); List<CategoryDefinition> categoriesService = new ArrayList<>(); categoriesService.add(serviceCategory); @@ -136,12 +135,13 @@ public class UpgradeOperationTest extends ModelTestBase { Either<TopologyTemplate, StorageOperationStatus> createService = topologyTemplateOperation.createTopologyTemplate(serviceNew); assertThat(createService.isLeft()).isTrue(); - + ComponentInstance vfInstance = new ComponentInstance(); vfInstance.setUniqueId(createdVf.getUniqueId() + createdVf.getName()); vfInstance.setComponentUid(createdVf.getUniqueId()); vfInstance.setName(createdVf.getName()); - Either<ImmutablePair<TopologyTemplate, String>, StorageOperationStatus> addInstance = nodeTemplateOperation.addComponentInstanceToTopologyTemplate(serviceNew, createdVf, "0", vfInstance, false, user); + Either<ImmutablePair<TopologyTemplate, String>, StorageOperationStatus> addInstance = nodeTemplateOperation.addComponentInstanceToTopologyTemplate( + serviceNew, createdVf, "0", vfInstance, false, user); assertThat(addInstance.isLeft()).isTrue(); return serviceNew; } @@ -151,14 +151,14 @@ public class UpgradeOperationTest extends ModelTestBase { categoryService.setName("servicecategory"); categoryService.setNormalizedName("servicecategory"); categoryService.setUniqueId("servicecategory"); - Either<CategoryDefinition, ActionStatus> createCategory = elementOperation.createCategory(categoryService , NodeTypeEnum.ServiceNewCategory); - + Either<CategoryDefinition, ActionStatus> createCategory = elementOperation.createCategory(categoryService, NodeTypeEnum.ServiceNewCategory); + assertThat(createCategory.isLeft()).isTrue(); return categoryService; } private TopologyTemplate createVf(String name) { - + TopologyTemplate resource = createTopologyTemplate(ComponentTypeEnum.RESOURCE, name); resource.setResourceType(ResourceTypeEnum.VF); @@ -166,7 +166,7 @@ public class UpgradeOperationTest extends ModelTestBase { categories.add(resourceCategory); resource.setCategories(categories); Either<TopologyTemplate, StorageOperationStatus> createVf = topologyTemplateOperation.createTopologyTemplate(resource); - assertThat( createVf.isLeft()).isTrue(); + assertThat(createVf.isLeft()).isTrue(); return resource; } @@ -175,11 +175,11 @@ public class UpgradeOperationTest extends ModelTestBase { category.setName("category1"); category.setNormalizedName("category1"); category.setUniqueId("category1"); - Either<CategoryDefinition, ActionStatus> createCategory = elementOperation.createCategory(category , NodeTypeEnum.ResourceNewCategory); + Either<CategoryDefinition, ActionStatus> createCategory = elementOperation.createCategory(category, NodeTypeEnum.ResourceNewCategory); assertThat(createCategory.isLeft()).isTrue(); - + SubCategoryDefinition subCategory = new SubCategoryDefinition(); - + subCategory.setName("subcategory1"); subCategory.setNormalizedName("subcategory1"); subCategory.setUniqueId("subcategory1"); |