1 files changed, 8 insertions, 6 deletions
diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ServiceTemplateDesignUiTests.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ServiceTemplateDesignUiTests.java
index e944ab329a..8bec8353ef 100644
--- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ServiceTemplateDesignUiTests.java
+++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ServiceTemplateDesignUiTests.java
@@ -284,8 +284,10 @@ public class ServiceTemplateDesignUiTests extends SetupCDTest {
         componentPage.isLoaded();
         final ResourcePropertiesPage vfcPropertiesPage = componentPage.goToProperties();
         vfcPropertiesPage.isLoaded();
-        final List<String> propertyNames = vfcPropertiesPage.getPropertyNames();
-        final ServiceDependencyProperty serviceDependencyProperty = new ServiceDependencyProperty(propertyNames.get(0), value, operator);
+        final Map<String, String> propertyNamesAndTypes = vfcPropertiesPage.getPropertyNamesAndTypes();
+        final List<String> propertyNames = propertyNamesAndTypes.keySet().stream().collect(Collectors.toList());
+        final ServiceDependencyProperty serviceDependencyProperty =
+                new ServiceDependencyProperty(propertyNames.get(0), propertyNamesAndTypes.get(propertyNames.get(0)), value, operator);
 
         homePage.getTopNavComponent().clickOnHome();
         homePage.isLoaded();
@@ -881,7 +883,7 @@ public class ServiceTemplateDesignUiTests extends SetupCDTest {
         assertThat(String.format("The Component '%s' should have properties", vfResourceCreateData.getName()), propertyNamesAndTypes,
             not(anEmptyMap()));
         propertyNamesAndTypes.forEach((name, type)
-            -> substitutionFilterProperties.add(new ServiceDependencyProperty(name, getPropertyValueByType(type), LogicalOperator.EQUALS)));
+            -> substitutionFilterProperties.add(new ServiceDependencyProperty(name, type, getPropertyValueByType(type), LogicalOperator.EQUALS)));
     }
 
     private String getPropertyValueByType(final String type) {
@@ -895,9 +897,9 @@ public class ServiceTemplateDesignUiTests extends SetupCDTest {
             case "boolean":
                 return "TRUE";
             case "list":
-                return "[value1, value2]";
+                return "[\"value1\", \"value2\"]";
             case "map":
-                return "MyKey: MyValue";
+                return "{\"MyKey\": \"MyValue\"}";
             default:
                 throw new UnsupportedOperationException("Not yet implemented for " + type);
         }
@@ -925,7 +927,7 @@ public class ServiceTemplateDesignUiTests extends SetupCDTest {
                 substitutionFilterMap.containsKey(substitutionFilterProperty.getName()));
             final Map<?, ?> substitutionFilterValue = (Map<?, ?>) ((List<?>) substitutionFilterMap.get(substitutionFilterProperty.getName())).get(0);
             assertThat("Substitution Filter Value should not be empty", substitutionFilterMap, not(anEmptyMap()));
-            final String expectedSubstitutionPropertyValue = substitutionFilterProperty.getValue();
+            final String expectedSubstitutionPropertyValue = substitutionFilterProperty.getValue().replaceAll("[\"{}]", "");
             final String actualSubstitutionPropertyValue = substitutionFilterValue.values().stream().findFirst().get() instanceof Map
                 ? substitutionFilterValue.values().stream().findFirst().get().toString().replace("=", ": ")
                 .replaceAll("\\{(.*?)\\}", "$1").trim()