X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fbabel%2Fparser%2FTestArtifactGeneratorToscaParser.java;h=9988076b61bf633193861ae6202191c69f56a1cd;hb=HEAD;hp=50f0aa97e2fa0a80666a6be7091e1063c889dfaf;hpb=895cafe7aaf5f462e0bf3c3a2ab7fcb863bba78e;p=aai%2Fbabel.git diff --git a/src/test/java/org/onap/aai/babel/parser/TestArtifactGeneratorToscaParser.java b/src/test/java/org/onap/aai/babel/parser/TestArtifactGeneratorToscaParser.java index 50f0aa9..9988076 100644 --- a/src/test/java/org/onap/aai/babel/parser/TestArtifactGeneratorToscaParser.java +++ b/src/test/java/org/onap/aai/babel/parser/TestArtifactGeneratorToscaParser.java @@ -24,21 +24,27 @@ package org.onap.aai.babel.parser; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.onap.aai.babel.util.ArtifactTestUtils; import org.onap.aai.babel.util.Resources; import org.onap.aai.babel.xml.generator.XmlArtifactGenerationException; import org.onap.aai.babel.xml.generator.data.WidgetConfigurationUtil; import org.onap.aai.babel.xml.generator.data.WidgetMapping; +import org.onap.aai.babel.xml.generator.model.Model; import org.onap.aai.babel.xml.generator.model.Resource; +import org.onap.aai.babel.xml.generator.model.Service; import org.onap.aai.babel.xml.generator.model.WidgetType; +import org.onap.aai.babel.xml.generator.types.ModelType; import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; import org.onap.sdc.toscaparser.api.Group; import org.onap.sdc.toscaparser.api.NodeTemplate; @@ -53,27 +59,17 @@ public class TestArtifactGeneratorToscaParser { private static final String TEST_UUID = "1234"; - /** - * Initialize the Generator with an invalid artifact generator properties file path. - * - * @throws IOException - * if an error occurs reading the configuration properties - */ - @Test(expected = IllegalArgumentException.class) - public void testMissingPropertiesFile() throws IOException { - System.setProperty(ArtifactGeneratorToscaParser.PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE, "non-existent.file"); - ArtifactGeneratorToscaParser.initWidgetConfiguration(); - } - /** * Initialize the Generator with an invalid mappings file path. * * @throws IOException * if the file content could not be read successfully */ - @Test(expected = IllegalArgumentException.class) + @Test public void testMissingMappingsFile() throws IOException { - ArtifactGeneratorToscaParser.initToscaMappingsConfiguration("non-existent.file"); + assertThrows(IllegalArgumentException.class, () -> { + ArtifactGeneratorToscaParser.initToscaMappingsConfiguration("non-existent.file"); + }); } /** @@ -82,10 +78,12 @@ public class TestArtifactGeneratorToscaParser { * @throws IOException * if the file content could not be read successfully */ - @Test(expected = IOException.class) + @Test public void testMissingMappingsContent() throws IOException { - String invalidJson = new ArtifactTestUtils().getResourcePath(Resources.EMPTY_TOSCA_MAPPING_CONFIG); - ArtifactGeneratorToscaParser.initToscaMappingsConfiguration(invalidJson); + assertThrows(IOException.class, () -> { + String emptyJson = new ArtifactTestUtils().getResourcePath(Resources.EMPTY_TOSCA_MAPPING_CONFIG); + ArtifactGeneratorToscaParser.initToscaMappingsConfiguration(emptyJson); + }); } /** @@ -94,31 +92,47 @@ public class TestArtifactGeneratorToscaParser { * @throws IOException * if the file content could not be read successfully */ - @Test(expected = IOException.class) + @Test public void testInvalidMappingsContent() throws IOException { - String invalidJson = new ArtifactTestUtils().getResourcePath(Resources.INVALID_TOSCA_MAPPING_CONFIG); - ArtifactGeneratorToscaParser.initToscaMappingsConfiguration(invalidJson); + assertThrows(IOException.class, () -> { + String invalidJson = new ArtifactTestUtils().getResourcePath(Resources.INVALID_TOSCA_MAPPING_CONFIG); + ArtifactGeneratorToscaParser.initToscaMappingsConfiguration(invalidJson); + }); } /** * Process an Allotted Resource that does not have a Providing Service. + * + * @throws XmlArtifactGenerationException + * because the ALLOTTED_RESOURCE lacks a Providing Service */ - @Test(expected = IllegalArgumentException.class) - public void testMissingProvidingService() { - List nodeTemplateList = Collections.singletonList(buildNodeTemplate("name", "BlockStorage")); - new ArtifactGeneratorToscaParser(null) - .processResourceModels(new Resource(WidgetType.valueOf("ALLOTTED_RESOURCE"), true), nodeTemplateList); + @Test + public void testMissingProvidingService() throws XmlArtifactGenerationException { + assertThrows(XmlArtifactGenerationException.class, () -> { + List nodeTemplateList = Collections.singletonList(buildNodeTemplate("name", "BlockStorage")); + new ArtifactGeneratorToscaParser(null) + .processResourceModels(new Resource(WidgetType.valueOf("ALLOTTED_RESOURCE"), true), nodeTemplateList); + }); } /** * Add a CR (a type of Resource which is not a Providing Service) to a Resource Model. + * + * @throws XmlArtifactGenerationException + * because the ALLOTTED_RESOURCE lacks a Providing Service + * @throws IOException + * if the test mappings cannot be loaded */ - @Test(expected = IllegalArgumentException.class) - public void testAddResourceNotProvidingService() { - List nodeTemplateList = Collections.singletonList(buildNodeTemplate("testCR", "CR")); - // Create any Resource to which the CR can be added - final Resource dummyResource = new Resource(WidgetType.valueOf("ALLOTTED_RESOURCE"), true); - new ArtifactGeneratorToscaParser(null).processResourceModels(dummyResource, nodeTemplateList); + @Test + public void testAddResourceNotProvidingService() throws XmlArtifactGenerationException, IOException { + assertThrows(XmlArtifactGenerationException.class, () -> { + new ArtifactTestUtils().loadWidgetMappings(); + List nodeTemplateList = Collections.singletonList(buildNodeTemplate("testCR", "CR")); + + // Create any Resource to which the CR can be added + final Resource dummyResource = new Resource(WidgetType.valueOf("ALLOTTED_RESOURCE"), true); + new ArtifactGeneratorToscaParser(null).processResourceModels(dummyResource, nodeTemplateList); + }); } /** @@ -127,11 +141,13 @@ public class TestArtifactGeneratorToscaParser { * @throws IOException * if a WidgetMapping is invalid */ - @Test(expected = IOException.class) + @Test public void testToscaMappingWithoutType() throws IOException { - WidgetMapping invalidMapping = new WidgetMapping(); - invalidMapping.setType(null); - WidgetConfigurationUtil.setWidgetMappings(Collections.singletonList(invalidMapping)); + assertThrows(IOException.class, () -> { + WidgetMapping invalidMapping = new WidgetMapping(); + invalidMapping.setType(null); + WidgetConfigurationUtil.setWidgetMappings(Collections.singletonList(invalidMapping)); + }); } /** @@ -140,11 +156,13 @@ public class TestArtifactGeneratorToscaParser { * @throws IOException * if a WidgetMapping is invalid */ - @Test(expected = IOException.class) + @Test public void testToscaMappingWithInvalidType() throws IOException { - WidgetMapping invalidMapping = new WidgetMapping(); - invalidMapping.setType("invalid"); - WidgetConfigurationUtil.setWidgetMappings(Collections.singletonList(invalidMapping)); + assertThrows(IOException.class, () -> { + WidgetMapping invalidMapping = new WidgetMapping(); + invalidMapping.setType("invalid"); + WidgetConfigurationUtil.setWidgetMappings(Collections.singletonList(invalidMapping)); + }); } /** @@ -153,11 +171,38 @@ public class TestArtifactGeneratorToscaParser { * @throws IOException * if a WidgetMapping is invalid */ - @Test(expected = IOException.class) + @Test public void testToscaMappingWithoutWidget() throws IOException { - WidgetMapping invalidMapping = new WidgetMapping(); - invalidMapping.setWidget(null); - WidgetConfigurationUtil.setWidgetMappings(Collections.singletonList(invalidMapping)); + assertThrows(IOException.class, () -> { + WidgetMapping invalidMapping = new WidgetMapping(); + invalidMapping.setWidget(null); + WidgetConfigurationUtil.setWidgetMappings(Collections.singletonList(invalidMapping)); + }); + } + + /** + * Create a Resource with a Widget model type and add this to a Service. Note that there are no test CSAR files + * which require this functionality, but the code path exists to support it. + * + * @throws IOException + * if the widget mappings are not loaded + * @throws XmlArtifactGenerationException + * if there is no configuration defined for the test resource's widget type + */ + @Test + public void testAddWidgetToService() throws IOException, XmlArtifactGenerationException { + assertDoesNotThrow(() -> { + ArtifactTestUtils testUtils = new ArtifactTestUtils(); + testUtils.loadWidgetMappings(); + + Model serviceModel = new Service(); + Resource resourceModel = new Resource(WidgetType.valueOf("VF"), false); + resourceModel.setModelType(ModelType.WIDGET); + + ISdcCsarHelper helper = Mockito.mock(ISdcCsarHelper.class); + ArtifactGeneratorToscaParser parser = new ArtifactGeneratorToscaParser(helper); + parser.addRelatedModel(serviceModel, resourceModel); + }); } /** @@ -175,21 +220,18 @@ public class TestArtifactGeneratorToscaParser { final String instanceGroupType = "org.openecomp.groups.ResourceInstanceGroup"; WidgetConfigurationUtil.setSupportedInstanceGroups(Collections.singletonList(instanceGroupType)); - ISdcCsarHelper helper = Mockito.mock(ISdcCsarHelper.class); SubstitutionMappings sm = Mockito.mock(SubstitutionMappings.class); + List groups = Arrays.asList(buildGroup("group", instanceGroupType)); + Mockito.when(sm.getGroups()).thenReturn(new ArrayList(groups)); + NodeTemplate serviceNodeTemplate = buildNodeTemplate("service", "org.openecomp.resource.cr.a-collection-resource"); serviceNodeTemplate.setSubMappingToscaTemplate(sm); - Mockito.when(helper.getNodeTemplateByName(serviceNodeTemplate.getName())).thenReturn(serviceNodeTemplate); - - ArrayList groups = new ArrayList<>(); - groups.add(buildGroup("group", instanceGroupType)); - Mockito.when(helper.getGroupsOfOriginOfNodeTemplate(serviceNodeTemplate)).thenReturn(groups); - ArtifactGeneratorToscaParser parser = new ArtifactGeneratorToscaParser(helper); Resource groupResource = new Resource(WidgetType.valueOf("INSTANCE_GROUP"), true); - List resources = parser.processInstanceGroups(groupResource, serviceNodeTemplate); + List resources = new ArtifactGeneratorToscaParser(Mockito.mock(ISdcCsarHelper.class)) + .processInstanceGroups(groupResource, serviceNodeTemplate); assertThat(resources.size(), is(1)); Resource resource = resources.get(0);