Add Service Template instance attributes to TOSCA Export

[sdc.git] / catalog-be / src / test / java / org / openecomp / sdc / be / tosca / AttributeConverterTest.java

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/AttributeConverterTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/AttributeConverterTest.java
index 2bd5295..fcc0ebf 100644 (file)
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/AttributeConverterTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/AttributeConverterTest.java
@@ -20,6 +20,7 @@
 package org.openecomp.sdc.be.tosca;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
@@ -44,7 +45,7 @@ class AttributeConverterTest {
     @Test
     void testScalarTypeConversion() throws ToscaConversionException {
         //given
-        final AttributeConverter attributeConverter = new AttributeConverter(Collections.emptyMap());
+        final AttributeConverter attributeConverter = createTestSubject();
         final AttributeDefinition attributeDefinition = new AttributeDefinition();
         attributeDefinition.setType(ToscaPropertyType.STRING.getType());
         attributeDefinition.setDescription("aDescription");
@@ -59,7 +60,7 @@ class AttributeConverterTest {
     @Test
     void testScalarNoDefaultValueConversion() throws ToscaConversionException {
         //given
-        final AttributeConverter attributeConverter = new AttributeConverter(Collections.emptyMap());
+        final AttributeConverter attributeConverter = createTestSubject();
         final AttributeDefinition attributeDefinition = new AttributeDefinition();
         attributeDefinition.setType(ToscaPropertyType.STRING.getType());
         attributeDefinition.setDescription("aDescription");
@@ -132,13 +133,29 @@ class AttributeConverterTest {
     @Test
     void testInvalidDefaultValueJsonConversion() {
         //given
-        final AttributeConverter attributeConverter = new AttributeConverter(Collections.emptyMap());
+        final AttributeConverter attributeConverter = createTestSubject();
         final AttributeDefinition attributeDefinition = new AttributeDefinition();
         attributeDefinition.setDefaultValue(": thisIsAnInvalidJson");
         //when, then
-        final ToscaConversionException toscaConversionException = assertThrows(ToscaConversionException.class,
-            () -> attributeConverter.convert(attributeDefinition));
-        assertEquals("Failed to parse json value", toscaConversionException.getMessage());
+        final ToscaAttribute attribute = attributeConverter.convert(attributeDefinition);
+        assertNotNull(attribute);
+        assertNull(attribute.getDefault());
+    }
+
+    @Test
+    void testConvertAndAddValue() throws ToscaConversionException {
+        final AttributeConverter converter = createTestSubject();
+        final AttributeDefinition attribute = new AttributeDefinition();
+        attribute.setName("attrib");
+        attribute.setDefaultValue("default");
+        final Map<String, Object> attribs = new HashMap<>();
+        converter.convertAndAddValue(attribs, attribute);
+        assertEquals(1, attribs.size());
+        assertEquals("default", attribs.get("attrib"));
+    }
+
+    private AttributeConverter createTestSubject() {
+        return new AttributeConverter(Collections.emptyMap());
     }
 
     private void assertAttribute(final AttributeDefinition expectedAttributeDefinition, final ToscaAttribute actualToscaAttribute) {