diff options
author | priyanshu <pagarwal@amdocs.com> | 2019-01-14 15:46:55 +0530 |
---|---|---|
committer | priyanshu <pagarwal@amdocs.com> | 2019-01-14 15:46:55 +0530 |
commit | 5b9d9a134778d4dc7bf45474ba13be6ba0c46282 (patch) | |
tree | a9dde66cc370513384670ad9587605795774bfbd /catalog-be/src/test/java/org/openecomp/sdc/be/datamodel | |
parent | efc185c60153bed4988abbb159e2103ec7653f83 (diff) |
Interface operation feature enhancements
1. API restructuring to enhance model and provide more capabilities.
2. Allowed multiple interface creation under same resource/service.
3. Enhanced validations to align with updated model.
4. API restructuring to align UI model with Tosca model.
5. Enhanced Junit and code coverage.
6. Added BDD and CI-API tests.
Change-Id: I2d8ac8a6154fd9be8254836ba0da1540210031c0
Issue-ID: SDC-1999
Signed-off-by: priyanshu <pagarwal@amdocs.com>
Diffstat (limited to 'catalog-be/src/test/java/org/openecomp/sdc/be/datamodel')
-rw-r--r-- | catalog-be/src/test/java/org/openecomp/sdc/be/datamodel/utils/InterfaceUIDataConverterTest.java | 104 |
1 files changed, 0 insertions, 104 deletions
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/datamodel/utils/InterfaceUIDataConverterTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/datamodel/utils/InterfaceUIDataConverterTest.java deleted file mode 100644 index 0c02e71bd2..0000000000 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/datamodel/utils/InterfaceUIDataConverterTest.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.openecomp.sdc.be.datamodel.utils; - -import org.junit.Assert; -import org.junit.Test; -import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition; -import org.openecomp.sdc.be.datatypes.elements.InterfaceOperationDataDefinition; -import org.openecomp.sdc.be.datatypes.elements.InterfaceOperationParamDataDefinition; -import org.openecomp.sdc.be.datatypes.elements.ListDataDefinition; -import org.openecomp.sdc.be.datatypes.elements.OperationInputDefinition; -import org.openecomp.sdc.be.datatypes.elements.OperationOutputDefinition; -import org.openecomp.sdc.be.model.Operation; - -import static org.openecomp.sdc.test.utils.InterfaceOperationTestUtils.createMockOperationInputDefinition; -import static org.openecomp.sdc.test.utils.InterfaceOperationTestUtils.createMockOperationOutputDefinition; - -public class InterfaceUIDataConverterTest { - - @Test - public void testConvertInterfaceDataToOperationData() { - InterfaceOperationDataDefinition interfaceOperation = createIODD("test", - "test description", - createParamDataList("inpName", "property", true, "String"), - createParamDataList("OutName", null, true, "String"), - "workflowId", - "workflowVersionId"); - Operation result; - result = InterfaceUIDataConverter.convertInterfaceDataToOperationData(interfaceOperation); - Assert.assertNotNull(result); - } - - @Test - public void testConvertInterfaceDataToOperationDataWithoutMandatory() { - ListDataDefinition<InterfaceOperationParamDataDefinition> iopd = new ListDataDefinition<>(); - iopd.add(createParamData("test", "property", "String")); - InterfaceOperationDataDefinition interfaceOperation = createIODD("test", - "test description", iopd, iopd, - "workflowId", - "workflowVersionId"); - Operation result; - result = InterfaceUIDataConverter.convertInterfaceDataToOperationData(interfaceOperation); - Assert.assertNotNull(result); - } - - @Test - public void testConvertInterfaceDataToOperationDataWithoutOptionalFields() { - InterfaceOperationDataDefinition interfaceOperation = new InterfaceOperationDataDefinition(); - interfaceOperation.setOperationType("operationType"); - Operation result; - result = InterfaceUIDataConverter.convertInterfaceDataToOperationData(interfaceOperation); - Assert.assertNotNull(result); - } - - @Test - public void testConvertOperationDataToInterfaceData() { - Operation operationData = new Operation(); - InterfaceOperationDataDefinition result; - ListDataDefinition<OperationInputDefinition> inputs = new ListDataDefinition<>(); - inputs.add(createMockOperationInputDefinition("Inp1")); - ListDataDefinition<OperationOutputDefinition> outputs = new ListDataDefinition<>(); - outputs.add(createMockOperationOutputDefinition("out1")); - operationData.setInputs(inputs); - operationData.setOutputs(outputs); - operationData.setImplementation(new ArtifactDataDefinition()); - result = InterfaceUIDataConverter.convertOperationDataToInterfaceData(operationData); - Assert.assertNotNull(result); - } - - private InterfaceOperationDataDefinition createIODD(String operationType, String description, - ListDataDefinition<InterfaceOperationParamDataDefinition> inputParams, - ListDataDefinition<InterfaceOperationParamDataDefinition> outputParams, - String workflowId, - String workflowVersionId) { - InterfaceOperationDataDefinition interfaceOperation = new InterfaceOperationDataDefinition(); - interfaceOperation.setOperationType(operationType); - interfaceOperation.setDescription(description); - interfaceOperation.setInputParams(inputParams); - interfaceOperation.setOutputParams(outputParams); - interfaceOperation.setWorkflowId(workflowId); - interfaceOperation.setWorkflowVersionId(workflowVersionId); - return interfaceOperation; - } - - private InterfaceOperationParamDataDefinition createParamData(String name, String property, boolean mandatory, String type) { - InterfaceOperationParamDataDefinition definition = createParamData(name, property, type); - definition.setMandatory(mandatory); - return definition; - } - - private InterfaceOperationParamDataDefinition createParamData(String name, String property, String type) { - InterfaceOperationParamDataDefinition definition = new InterfaceOperationParamDataDefinition(); - definition.setName(name); - definition.setProperty(property); - definition.setType(type); - return definition; - } - - private ListDataDefinition<InterfaceOperationParamDataDefinition> createParamDataList(String name, - String property, boolean mandatory, String type) { - ListDataDefinition<InterfaceOperationParamDataDefinition> list = new ListDataDefinition<>(); - list.add(createParamData(name, property, mandatory, type)); - return list; - } - -}
\ No newline at end of file |