aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/be/datamodel/UiComponentDataConverterTest.java131
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/be/datamodel/utils/NodeTypeConvertUtilsTest.java1
2 files changed, 132 insertions, 0 deletions
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/datamodel/UiComponentDataConverterTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/datamodel/UiComponentDataConverterTest.java
index 7ebb3ee2d1..eb123771a9 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/datamodel/UiComponentDataConverterTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/datamodel/UiComponentDataConverterTest.java
@@ -37,6 +37,8 @@ import org.openecomp.sdc.be.components.impl.GroupTypeBusinessLogic;
import org.openecomp.sdc.be.components.impl.PolicyTypeBusinessLogic;
import org.openecomp.sdc.be.components.utils.GroupDefinitionBuilder;
import org.openecomp.sdc.be.components.utils.PolicyDefinitionBuilder;
+import org.openecomp.sdc.be.components.utils.InputsBuilder;
+import org.openecomp.sdc.be.components.utils.PropertyDataDefinitionBuilder;
import org.openecomp.sdc.be.components.utils.ResourceBuilder;
import org.openecomp.sdc.be.components.utils.ServiceBuilder;
import org.openecomp.sdc.be.datamodel.utils.UiComponentDataConverter;
@@ -44,7 +46,13 @@ import org.openecomp.sdc.be.model.GroupDefinition;
import org.openecomp.sdc.be.model.PolicyDefinition;
import org.openecomp.sdc.be.model.Resource;
import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.InputDefinition;
+import org.openecomp.sdc.be.model.PropertyDefinition;
+import org.openecomp.sdc.be.model.InterfaceDefinition;
import org.openecomp.sdc.be.ui.model.UiComponentDataTransfer;
+import org.openecomp.sdc.be.ui.model.UiComponentMetadata;
+import org.openecomp.sdc.be.ui.model.UiServiceDataTransfer;
+
import java.util.Arrays;
import java.util.Collections;
@@ -60,6 +68,11 @@ public class UiComponentDataConverterTest {
private PolicyDefinition policy1, policy2;
private GroupDefinition group1, group2;
+ private InputDefinition input1;
+ private PropertyDefinition propertyDef;
+ private InterfaceDefinition interfaceDef;
+
+
private static GroupTypeBusinessLogic groupTypeBusinessLogic;
private static PolicyTypeBusinessLogic policyTypeBusinessLogic;
private static UiComponentDataConverter uiComponentDataConverter;
@@ -94,11 +107,27 @@ public class UiComponentDataConverterTest {
.setName("Group 2")
.setType("b")
.build();
+
+ input1 = InputsBuilder.create()
+ .setName("input1")
+ .setPropertyId("inputid")
+ .build();
+
+ propertyDef = new PropertyDataDefinitionBuilder()
+ .setName("propety1")
+ .setValue("true")
+ .setType("boolean")
+ .setUniqueId("property1")
+ .build();
+
+
}
@Test
public void getUiDataTransferFromResourceByParams_groups_allGroups() {
Resource resourceWithGroups = buildResourceWithGroups();
+ UiComponentDataTransfer componentDTO1 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("PROPERTIES"));
+ UiComponentDataTransfer componentDTO2 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("properties"));
UiComponentDataTransfer componentDTO = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("groups"));
assertThat(componentDTO.getGroups()).isEqualTo(resourceWithGroups.getGroups());
}
@@ -120,12 +149,72 @@ public class UiComponentDataConverterTest {
}
@Test
+ public void getUiDataTransferFromResourceByParams_All() {
+ Resource resourceWithGroups = buildResourceWithGroups();
+ Resource resourceWithInputs = buildResourceWithInputs();
+
+ UiComponentDataTransfer componentDTO1 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("PROPERTIES"));
+ UiComponentDataTransfer componentDTO2 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("properties"));
+ UiComponentDataTransfer componentDTO3 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("interfaces"));
+ UiComponentDataTransfer componentDTO4 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("attributes"));
+ UiComponentDataTransfer componentDTO5 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("metadata"));
+ UiComponentDataTransfer componentDTO6 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("derivedFrom"));
+ UiComponentDataTransfer componentDTO7 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("additionalInformation"));
+
+ UiComponentDataTransfer componentDTO8 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("inputs"));
+ UiComponentDataTransfer componentDTO81 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithInputs, Collections.singletonList("inputs"));
+
+ UiComponentDataTransfer componentDTO9 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("users"));
+ UiComponentDataTransfer componentDTO10 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("componentInstances"));
+ UiComponentDataTransfer componentDTO11 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("componentInstancesProperties"));
+ UiComponentDataTransfer componentDTO12 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("capabilities"));
+ UiComponentDataTransfer componentDTO13 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("requirements"));
+ UiComponentDataTransfer componentDTO14 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("allVersions"));
+ UiComponentDataTransfer componentDTO15 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("artifacts"));
+
+ UiComponentDataTransfer componentDTO16 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("interfaces"));
+ UiComponentDataTransfer componentDTO17 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("componentInstancesAttributes"));
+ UiComponentDataTransfer componentDTO18= uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("componentInstancesInputs"));
+ UiComponentDataTransfer componentDTO19 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("toscaArtifacts"));
+
+ UiComponentDataTransfer componentDTO21= uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("componentInstancesRelations"));
+ UiComponentDataTransfer componentDTO20 = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("deploymentArtifacts"));
+
+ UiComponentDataTransfer componentDTO = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithGroups, Collections.singletonList("groups"));
+ assertThat(componentDTO.getGroups()).isEqualTo(resourceWithGroups.getGroups());
+ }
+
+ @Test
public void getUiDataTransferFromServiceByParams_policies_noPoliciesForResource() {
UiComponentDataTransfer componentDTO = uiComponentDataConverter.getUiDataTransferFromServiceByParams(new Service(), Collections.singletonList("policies"));
assertThat(componentDTO.getPolicies()).isEmpty();
}
@Test
+ public void getUiDataTransferFromServiceByParams_SERVICE_API_ARTIFACTS() {
+ UiComponentDataTransfer componentDTO = uiComponentDataConverter.getUiDataTransferFromServiceByParams(new Service(), Collections.singletonList("serviceApiArtifacts"));
+ assertThat(componentDTO.getArtifacts()).isNull();
+ }
+
+ @Test
+ public void getUiDataTransferFromServiceByParams_FORWARDING_PATHS() {
+ UiServiceDataTransfer componentDTO = (UiServiceDataTransfer) uiComponentDataConverter.getUiDataTransferFromServiceByParams(new Service(), Collections.singletonList("forwardingPaths"));
+ assertThat(componentDTO.getForwardingPaths()).isEmpty();
+ }
+
+ @Test
+ public void getUiDataTransferFromServiceByParams_METADATA() {
+ UiServiceDataTransfer componentDTO = (UiServiceDataTransfer) uiComponentDataConverter.getUiDataTransferFromServiceByParams(new Service(), Collections.singletonList("metadata"));
+ assertThat(componentDTO.getMetadata().getNamingPolicy()).isEqualTo("");
+ }
+
+ @Test
+ public void getUiDataTransferFromServiceByParams_INTERFACES() {
+ UiServiceDataTransfer componentDTO = (UiServiceDataTransfer) uiComponentDataConverter.getUiDataTransferFromServiceByParams(new Service(), Collections.singletonList("interfaces"));
+ assertThat(componentDTO.getInterfaces()).isEmpty();
+ }
+
+ @Test
public void getUiDataTransferFromResourceByParams_policies() {
Resource resourceWithPolicies = buildResourceWithPolicies();
UiComponentDataTransfer componentDTO = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resourceWithPolicies, Collections.singletonList("policies"));
@@ -150,6 +239,23 @@ public class UiComponentDataConverterTest {
}
@Test
+ public void convertToUiComponentMetadataTestResource() {
+ Resource resourceWithPolicies = buildResourceWithPolicies();
+ when(policyTypeBusinessLogic.getExcludedPolicyTypes("VFC")).thenReturn(buildExcludedTypesList());
+ UiComponentMetadata componentMd = uiComponentDataConverter.convertToUiComponentMetadata(resourceWithPolicies);
+ assertThat(componentMd.getComponentType().getValue()).isEqualTo("Resource");
+
+ }
+
+ @Test
+ public void convertToUiComponentMetadataTestService() {
+ Service resourceWithPolicies = buildServiceWithPolicies();
+ when(policyTypeBusinessLogic.getExcludedPolicyTypes("VFC")).thenReturn(buildExcludedTypesList());
+ UiComponentMetadata componentMd = uiComponentDataConverter.convertToUiComponentMetadata(resourceWithPolicies);
+ assertThat(componentMd.getComponentType().getValue()).isEqualTo("Service");
+
+ }
+ @Test
public void getResourceWithoutGroupsAndPolicies_returnsEmptyLists() {
Resource resource = new ResourceBuilder().build();
UiComponentDataTransfer componentDTO = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resource, Arrays.asList("nonExcludedPolicies", "nonExcludedGroups"));
@@ -166,6 +272,31 @@ public class UiComponentDataConverterTest {
.build();
}
+ private Resource buildResourceWithInputs() {
+ return new ResourceBuilder()
+ .addInput(input1)
+ .build();
+ }
+
+ private Resource buildResourceWithParameter(String field) {
+ ResourceBuilder res = new ResourceBuilder();
+ switch(field){
+ case "inputs":
+ res.addInput(input1);
+ break;
+ case "properties":
+ //res.addProperty(propertyDef);
+ break;
+
+
+ }
+
+
+ return new ResourceBuilder()
+ .addInput(input1)
+ .build();
+ }
+
private Resource buildResourceWithPolicies() {
return new ResourceBuilder()
.addPolicy(policy1)
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/datamodel/utils/NodeTypeConvertUtilsTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/datamodel/utils/NodeTypeConvertUtilsTest.java
index d75d760076..08966cee3a 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/datamodel/utils/NodeTypeConvertUtilsTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/datamodel/utils/NodeTypeConvertUtilsTest.java
@@ -14,5 +14,6 @@ public class NodeTypeConvertUtilsTest {
NodeTypeConvertUtils.getCategoryNodeTypeByComponentParam(comp, cat);
}
}
+
}
} \ No newline at end of file