Fix error handling valid yaml property values

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-4022
Change-Id: Ic30f29e350d47d29c00744271e1e81b08db3edb9

1 files changed, 13 insertions, 0 deletions

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/PropertyConvertorTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/PropertyConvertorTest.java
index 36c9eb8288..cd756ce49d 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/PropertyConvertorTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/PropertyConvertorTest.java
@@ -183,5 +183,18 @@ class PropertyConvertorTest {
             propertyConvertor.convertProperty(Collections.emptyMap(), property, PropertyConvertor.PropertyType.PROPERTY);
         assertEquals("/", toscaProperty.getDefaultp());
     }
+    
+    @Test
+    void convertPropertyWithYamlValue() {
+        final PropertyDefinition property = new PropertyDataDefinitionBuilder()
+            .setDefaultValue("{concat: [ get_input: service_name, '--', 'WirelessService']}")
+            .setType(ToscaPropertyType.STRING.getType())
+            .build();
+        final ToscaProperty toscaProperty =
+            propertyConvertor.convertProperty(Collections.emptyMap(), property, PropertyConvertor.PropertyType.PROPERTY);
+        assertTrue(toscaProperty.getDefaultp() instanceof Map);
+        assertTrue(((Map)toscaProperty.getDefaultp()).get("concat") instanceof List);
+        assertEquals(3, ((List)((Map)toscaProperty.getDefaultp()).get("concat")).size());
+    }
 
 }