68 files changed, 4692 insertions, 163 deletions

diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/AdditionalInformationDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/AdditionalInformationDefinitionTest.java
new file mode 100644
index 0000000000..67e5280f53
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/AdditionalInformationDefinitionTest.java
@@ -0,0 +1,48 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import java.util.*;
+import org.junit.Assert;
+
+
+public class AdditionalInformationDefinitionTest {
+
+	private AdditionalInformationDefinition createTestSubject() {
+		return new AdditionalInformationDefinition();
+	}
+
+	
+	@Test
+	public void testGetParentUniqueId() throws Exception {
+		AdditionalInformationDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getParentUniqueId();
+	}
+
+	
+	@Test
+	public void testSetParentUniqueId() throws Exception {
+		AdditionalInformationDefinition testSubject;
+		String parentUniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setParentUniqueId(parentUniqueId);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		AdditionalInformationDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ArtifactDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ArtifactDefinitionTest.java
new file mode 100644
index 0000000000..ae347cabc3
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ArtifactDefinitionTest.java
@@ -0,0 +1,111 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ArtifactDefinitionTest {
+
+	private ArtifactDefinition createTestSubject() {
+		return new ArtifactDefinition();
+	}
+
+	
+	@Test
+	public void testGetPayloadData() throws Exception {
+		ArtifactDefinition testSubject;
+		byte[] result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPayloadData();
+	}
+
+	
+	@Test
+	public void testSetPayload() throws Exception {
+		ArtifactDefinition testSubject;
+		byte[] payloadData = new byte[] { ' ' };
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPayload(payloadData);
+	}
+
+	
+	@Test
+	public void testSetPayloadData() throws Exception {
+		ArtifactDefinition testSubject;
+		String payloadData = "";
+
+		// test 1
+		testSubject = createTestSubject();
+		payloadData = null;
+		testSubject.setPayloadData(payloadData);
+
+		// test 2
+		testSubject = createTestSubject();
+		payloadData = "";
+		testSubject.setPayloadData(payloadData);
+	}
+
+	
+	@Test
+	public void testGetListHeatParameters() throws Exception {
+		ArtifactDefinition testSubject;
+		List<HeatParameterDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getListHeatParameters();
+	}
+
+	
+	@Test
+	public void testSetListHeatParameters() throws Exception {
+		ArtifactDefinition testSubject;
+		List<HeatParameterDefinition> properties = null;
+
+		// test 1
+		testSubject = createTestSubject();
+		properties = null;
+		testSubject.setListHeatParameters(properties);
+	}
+
+	
+	@Test
+	public void testCheckEsIdExist() throws Exception {
+		ArtifactDefinition testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.checkEsIdExist();
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		ArtifactDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		ArtifactDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.equals(obj);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ArtifactUiDownloadDataTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ArtifactUiDownloadDataTest.java
new file mode 100644
index 0000000000..6df1079f4a
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ArtifactUiDownloadDataTest.java
@@ -0,0 +1,56 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+public class ArtifactUiDownloadDataTest {
+
+	private ArtifactUiDownloadData createTestSubject() {
+		return new ArtifactUiDownloadData();
+	}
+
+	
+	@Test
+	public void testSetArtifactName() throws Exception {
+		ArtifactUiDownloadData testSubject;
+		String artifactName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactName(artifactName);
+	}
+
+	
+	@Test
+	public void testSetBase64Contents() throws Exception {
+		ArtifactUiDownloadData testSubject;
+		String base64Contents = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setBase64Contents(base64Contents);
+	}
+
+	
+	@Test
+	public void testGetArtifactName() throws Exception {
+		ArtifactUiDownloadData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactName();
+	}
+
+	
+	@Test
+	public void testGetBase64Contents() throws Exception {
+		ArtifactUiDownloadData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getBase64Contents();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapReqDefTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapReqDefTest.java
new file mode 100644
index 0000000000..d0c121fa5f
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapReqDefTest.java
@@ -0,0 +1,60 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class CapReqDefTest {
+
+	private CapReqDef createTestSubject() {
+		return new CapReqDef();
+	}
+
+	
+	@Test
+	public void testGetCapabilities() throws Exception {
+		CapReqDef testSubject;
+		Map<String, List<CapabilityDefinition>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilities();
+	}
+
+	
+	@Test
+	public void testGetRequirements() throws Exception {
+		CapReqDef testSubject;
+		Map<String, List<RequirementDefinition>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirements();
+	}
+
+	
+	@Test
+	public void testSetCapabilities() throws Exception {
+		CapReqDef testSubject;
+		Map<String, List<CapabilityDefinition>> capabilities = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilities(capabilities);
+	}
+
+	
+	@Test
+	public void testSetRequirements() throws Exception {
+		CapReqDef testSubject;
+		Map<String, List<RequirementDefinition>> requirements = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirements(requirements);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityDefinitionTest.java
new file mode 100644
index 0000000000..007a64a75d
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityDefinitionTest.java
@@ -0,0 +1,73 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import java.util.*;
+import org.junit.Assert;
+
+
+public class CapabilityDefinitionTest {
+
+	private CapabilityDefinition createTestSubject() {
+		return new CapabilityDefinition();
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		CapabilityDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		CapabilityDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.equals(obj);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		CapabilityDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		CapabilityDefinition testSubject;
+		List<ComponentInstanceProperty> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		CapabilityDefinition testSubject;
+		List<ComponentInstanceProperty> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityTypeDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityTypeDefinitionTest.java
new file mode 100644
index 0000000000..75cc2054e5
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityTypeDefinitionTest.java
@@ -0,0 +1,70 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class CapabilityTypeDefinitionTest {
+
+	private CapabilityTypeDefinition createTestSubject() {
+		return new CapabilityTypeDefinition();
+	}
+
+	
+	@Test
+	public void testGetDerivedFrom() throws Exception {
+		CapabilityTypeDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerivedFrom();
+	}
+
+	
+	@Test
+	public void testSetDerivedFrom() throws Exception {
+		CapabilityTypeDefinition testSubject;
+		String derivedFrom = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerivedFrom(derivedFrom);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		CapabilityTypeDefinition testSubject;
+		Map<String, PropertyDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		CapabilityTypeDefinition testSubject;
+		Map<String, PropertyDefinition> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		CapabilityTypeDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstInputsMapTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstInputsMapTest.java
new file mode 100644
index 0000000000..af9f683193
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstInputsMapTest.java
@@ -0,0 +1,59 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+public class ComponentInstInputsMapTest {
+
+	private ComponentInstInputsMap createTestSubject() {
+		return new ComponentInstInputsMap();
+	}
+
+	
+	@Test
+	public void testGetComponentInstanceInputsMap() throws Exception {
+		ComponentInstInputsMap testSubject;
+		Map<String, List<ComponentInstancePropInput>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstanceInputsMap();
+	}
+
+	
+	@Test
+	public void testSetComponentInstanceInputsMap() throws Exception {
+		ComponentInstInputsMap testSubject;
+		Map<String, List<ComponentInstancePropInput>> componentInstanceInputsMap = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstanceInputsMap(componentInstanceInputsMap);
+	}
+
+	
+	@Test
+	public void testGetComponentInstanceProperties() throws Exception {
+		ComponentInstInputsMap testSubject;
+		Map<String, List<ComponentInstancePropInput>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstanceProperties();
+	}
+
+	
+	@Test
+	public void testSetComponentInstancePropInput() throws Exception {
+		ComponentInstInputsMap testSubject;
+		Map<String, List<ComponentInstancePropInput>> componentInstanceProperties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstancePropInput(componentInstanceProperties);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstanceInputTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstanceInputTest.java
new file mode 100644
index 0000000000..07eea5584c
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstanceInputTest.java
@@ -0,0 +1,137 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.PropertyRule;
+
+
+public class ComponentInstanceInputTest {
+
+	private ComponentInstanceInput createTestSubject() {
+		return new ComponentInstanceInput();
+	}
+
+	
+	@Test
+	public void testGetComponentInstanceName() throws Exception {
+		ComponentInstanceInput testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstanceName();
+	}
+
+	
+	@Test
+	public void testSetComponentInstanceName() throws Exception {
+		ComponentInstanceInput testSubject;
+		String componentInstanceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstanceName(componentInstanceName);
+	}
+
+	
+	@Test
+	public void testGetComponentInstanceId() throws Exception {
+		ComponentInstanceInput testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstanceId();
+	}
+
+	
+	@Test
+	public void testSetComponentInstanceId() throws Exception {
+		ComponentInstanceInput testSubject;
+		String componentInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstanceId(componentInstanceId);
+	}
+
+	
+	@Test
+	public void testGetValueUniqueUid() throws Exception {
+		ComponentInstanceInput testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValueUniqueUid();
+	}
+
+	
+	@Test
+	public void testSetValueUniqueUid() throws Exception {
+		ComponentInstanceInput testSubject;
+		String valueUniqueUid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValueUniqueUid(valueUniqueUid);
+	}
+
+	
+	@Test
+	public void testGetPath() throws Exception {
+		ComponentInstanceInput testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPath();
+	}
+
+	
+	@Test
+	public void testSetPath() throws Exception {
+		ComponentInstanceInput testSubject;
+		List<String> path = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPath(path);
+	}
+
+	
+	@Test
+	public void testGetRules() throws Exception {
+		ComponentInstanceInput testSubject;
+		List<PropertyRule> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRules();
+	}
+
+	
+	@Test
+	public void testSetRules() throws Exception {
+		ComponentInstanceInput testSubject;
+		List<PropertyRule> rules = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRules(rules);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ComponentInstanceInput testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstancePropInputTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstancePropInputTest.java
new file mode 100644
index 0000000000..69b3f25f5e
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstancePropInputTest.java
@@ -0,0 +1,68 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ComponentInstancePropInputTest {
+
+	private ComponentInstancePropInput createTestSubject() {
+		return new ComponentInstancePropInput();
+	}
+
+	
+	@Test
+	public void testGetPropertiesName() throws Exception {
+		ComponentInstancePropInput testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPropertiesName();
+	}
+
+	
+	@Test
+	public void testSetPropertiesName() throws Exception {
+		ComponentInstancePropInput testSubject;
+		String propertiesName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPropertiesName(propertiesName);
+	}
+
+	
+	@Test
+	public void testGetInput() throws Exception {
+		ComponentInstancePropInput testSubject;
+		PropertyDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInput();
+	}
+
+	
+	@Test
+	public void testSetInput() throws Exception {
+		ComponentInstancePropInput testSubject;
+		PropertyDefinition input = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInput(input);
+	}
+
+	
+	@Test
+	public void testGetParsedPropNames() throws Exception {
+		ComponentInstancePropInput testSubject;
+		String[] result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getParsedPropNames();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstancePropertyTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstancePropertyTest.java
new file mode 100644
index 0000000000..4718847559
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstancePropertyTest.java
@@ -0,0 +1,137 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.PropertyRule;
+
+
+public class ComponentInstancePropertyTest {
+
+	private ComponentInstanceProperty createTestSubject() {
+		return new ComponentInstanceProperty();
+	}
+
+	
+	@Test
+	public void testGetComponentInstanceName() throws Exception {
+		ComponentInstanceProperty testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstanceName();
+	}
+
+	
+	@Test
+	public void testSetComponentInstanceName() throws Exception {
+		ComponentInstanceProperty testSubject;
+		String componentInstanceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstanceName(componentInstanceName);
+	}
+
+	
+	@Test
+	public void testGetComponentInstanceId() throws Exception {
+		ComponentInstanceProperty testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstanceId();
+	}
+
+	
+	@Test
+	public void testSetComponentInstanceId() throws Exception {
+		ComponentInstanceProperty testSubject;
+		String componentInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstanceId(componentInstanceId);
+	}
+
+	
+	@Test
+	public void testGetValueUniqueUid() throws Exception {
+		ComponentInstanceProperty testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValueUniqueUid();
+	}
+
+	
+	@Test
+	public void testSetValueUniqueUid() throws Exception {
+		ComponentInstanceProperty testSubject;
+		String valueUniqueUid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValueUniqueUid(valueUniqueUid);
+	}
+
+	
+	@Test
+	public void testGetPath() throws Exception {
+		ComponentInstanceProperty testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPath();
+	}
+
+	
+	@Test
+	public void testSetPath() throws Exception {
+		ComponentInstanceProperty testSubject;
+		List<String> path = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPath(path);
+	}
+
+	
+	@Test
+	public void testGetRules() throws Exception {
+		ComponentInstanceProperty testSubject;
+		List<PropertyRule> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRules();
+	}
+
+	
+	@Test
+	public void testSetRules() throws Exception {
+		ComponentInstanceProperty testSubject;
+		List<PropertyRule> rules = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRules(rules);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ComponentInstanceProperty testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentMetadataDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentMetadataDefinitionTest.java
new file mode 100644
index 0000000000..f728aac968
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentMetadataDefinitionTest.java
@@ -0,0 +1,51 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.components.ComponentMetadataDataDefinition;
+
+
+public class ComponentMetadataDefinitionTest {
+
+	private ComponentMetadataDefinition createTestSubject() {
+		return new ComponentMetadataDefinition();
+	}
+
+	
+	@Test
+	public void testGetMetadataDataDefinition() throws Exception {
+		ComponentMetadataDefinition testSubject;
+		ComponentMetadataDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMetadataDataDefinition();
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		ComponentMetadataDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		ComponentMetadataDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		obj = null;
+		result = testSubject.equals(obj);
+		Assert.assertEquals(false, result);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/CsarInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CsarInfoTest.java
new file mode 100644
index 0000000000..31864c479c
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CsarInfoTest.java
@@ -0,0 +1,203 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.Map;
+import java.util.Queue;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class CsarInfoTest {
+
+	private CsarInfo createTestSubject() {
+		return new CsarInfo("", new User(), "", null, "", false);
+	}
+
+	
+	@Test
+	public void testGetVfResourceName() throws Exception {
+		CsarInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVfResourceName();
+	}
+
+	
+	@Test
+	public void testSetVfResourceName() throws Exception {
+		CsarInfo testSubject;
+		String vfResourceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setVfResourceName(vfResourceName);
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		CsarInfo testSubject;
+		User result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		CsarInfo testSubject;
+		User modifier = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetCsarUUID() throws Exception {
+		CsarInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCsarUUID();
+	}
+
+	
+	@Test
+	public void testSetCsarUUID() throws Exception {
+		CsarInfo testSubject;
+		String csarUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCsarUUID(csarUUID);
+	}
+
+	
+	@Test
+	public void testGetCsar() throws Exception {
+		CsarInfo testSubject;
+		Map<String, byte[]> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCsar();
+	}
+
+	
+	@Test
+	public void testSetCsar() throws Exception {
+		CsarInfo testSubject;
+		Map<String, byte[]> csar = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCsar(csar);
+	}
+
+	
+	@Test
+	public void testGetMainTemplateContent() throws Exception {
+		CsarInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMainTemplateContent();
+	}
+
+	
+	@Test
+	public void testGetMappedToscaMainTemplate() throws Exception {
+		CsarInfo testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMappedToscaMainTemplate();
+	}
+
+	
+	@Test
+	public void testGetCreatedNodesToscaResourceNames() throws Exception {
+		CsarInfo testSubject;
+		Map<String, String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreatedNodesToscaResourceNames();
+	}
+
+	
+	@Test
+	public void testSetCreatedNodesToscaResourceNames() throws Exception {
+		CsarInfo testSubject;
+		Map<String, String> createdNodesToscaResourceNames = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreatedNodesToscaResourceNames(createdNodesToscaResourceNames);
+	}
+
+	
+	@Test
+	public void testGetCvfcToCreateQueue() throws Exception {
+		CsarInfo testSubject;
+		Queue<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCvfcToCreateQueue();
+	}
+
+	
+	@Test
+	public void testSetCvfcToCreateQueue() throws Exception {
+		CsarInfo testSubject;
+		Queue<String> cvfcToCreateQueue = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCvfcToCreateQueue(cvfcToCreateQueue);
+	}
+
+	
+	@Test
+	public void testIsUpdate() throws Exception {
+		CsarInfo testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isUpdate();
+	}
+
+	
+	@Test
+	public void testSetUpdate() throws Exception {
+		CsarInfo testSubject;
+		boolean isUpdate = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUpdate(isUpdate);
+	}
+
+	
+	@Test
+	public void testGetCreatedNodes() throws Exception {
+		CsarInfo testSubject;
+		Map<String, Resource> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreatedNodes();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/DataTypeDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/DataTypeDefinitionTest.java
new file mode 100644
index 0000000000..996e3a7bd8
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/DataTypeDefinitionTest.java
@@ -0,0 +1,94 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import java.util.*;
+import org.junit.Assert;
+
+
+public class DataTypeDefinitionTest {
+
+	private DataTypeDefinition createTestSubject() {
+		return new DataTypeDefinition();
+	}
+
+	
+	@Test
+	public void testGetConstraints() throws Exception {
+		DataTypeDefinition testSubject;
+		List<PropertyConstraint> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConstraints();
+	}
+
+	
+	@Test
+	public void testSetConstraints() throws Exception {
+		DataTypeDefinition testSubject;
+		List<PropertyConstraint> constraints = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConstraints(constraints);
+	}
+
+	
+	@Test
+	public void testGetDerivedFrom() throws Exception {
+		DataTypeDefinition testSubject;
+		DataTypeDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerivedFrom();
+	}
+
+	
+	@Test
+	public void testSetDerivedFrom() throws Exception {
+		DataTypeDefinition testSubject;
+		DataTypeDefinition derivedFrom = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerivedFrom(derivedFrom);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		DataTypeDefinition testSubject;
+		List<PropertyDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		DataTypeDefinition testSubject;
+		List<PropertyDefinition> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		DataTypeDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/FunctionalMenuInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/FunctionalMenuInfoTest.java
new file mode 100644
index 0000000000..3df5b58955
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/FunctionalMenuInfoTest.java
@@ -0,0 +1,46 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class FunctionalMenuInfoTest {
+
+	private FunctionalMenuInfo createTestSubject() {
+		return new FunctionalMenuInfo();
+	}
+
+	
+	@Test
+	public void testGetFunctionalMenu() throws Exception {
+		FunctionalMenuInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFunctionalMenu();
+	}
+
+	
+	@Test
+	public void testSetFunctionalMenu() throws Exception {
+		FunctionalMenuInfo testSubject;
+		String functionalMenu = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setFunctionalMenu(functionalMenu);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		FunctionalMenuInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupDefinitionTest.java
new file mode 100644
index 0000000000..6cae685644
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupDefinitionTest.java
@@ -0,0 +1,50 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class GroupDefinitionTest {
+
+	private GroupDefinition createTestSubject() {
+		return new GroupDefinition();
+	}
+
+	
+	@Test
+	public void testConvertToGroupProperties() throws Exception {
+		GroupDefinition testSubject;
+		List<GroupProperty> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convertToGroupProperties();
+	}
+
+	
+	@Test
+	public void testConvertFromGroupProperties() throws Exception {
+		GroupDefinition testSubject;
+		List<GroupProperty> properties = null;
+
+		// test 1
+		testSubject = createTestSubject();
+		properties = null;
+		testSubject.convertFromGroupProperties(properties);
+	}
+
+	
+	@Test
+	public void testIsSamePrefix() throws Exception {
+		GroupDefinition testSubject;
+		String resourceName = "";
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isSamePrefix(resourceName);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupPropertyTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupPropertyTest.java
new file mode 100644
index 0000000000..6f8f53b991
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupPropertyTest.java
@@ -0,0 +1,46 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class GroupPropertyTest {
+
+	private GroupProperty createTestSubject() {
+		return new GroupProperty();
+	}
+
+	
+	@Test
+	public void testGetValueUniqueUid() throws Exception {
+		GroupProperty testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValueUniqueUid();
+	}
+
+	
+	@Test
+	public void testSetValueUniqueUid() throws Exception {
+		GroupProperty testSubject;
+		String valueUniqueUid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValueUniqueUid(valueUniqueUid);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GroupProperty testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupTypeDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupTypeDefinitionTest.java
new file mode 100644
index 0000000000..63f9e624cb
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupTypeDefinitionTest.java
@@ -0,0 +1,50 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import java.util.*;
+import org.junit.Assert;
+
+
+public class GroupTypeDefinitionTest {
+
+	private GroupTypeDefinition createTestSubject() {
+		return new GroupTypeDefinition();
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		GroupTypeDefinition testSubject;
+		List<PropertyDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		GroupTypeDefinition testSubject;
+		List<PropertyDefinition> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GroupTypeDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/InputDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/InputDefinitionTest.java
new file mode 100644
index 0000000000..68ff7ed6d3
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/InputDefinitionTest.java
@@ -0,0 +1,59 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class InputDefinitionTest {
+
+	private InputDefinition createTestSubject() {
+		return new InputDefinition();
+	}
+
+	
+	@Test
+	public void testGetInputs() throws Exception {
+		InputDefinition testSubject;
+		List<ComponentInstanceInput> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInputs();
+	}
+
+	
+	@Test
+	public void testSetInputs() throws Exception {
+		InputDefinition testSubject;
+		List<ComponentInstanceInput> inputs = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInputs(inputs);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		InputDefinition testSubject;
+		List<ComponentInstanceProperty> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		InputDefinition testSubject;
+		List<ComponentInstanceProperty> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/InterfaceDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/InterfaceDefinitionTest.java
new file mode 100644
index 0000000000..88c253360c
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/InterfaceDefinitionTest.java
@@ -0,0 +1,57 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class InterfaceDefinitionTest {
+
+	private InterfaceDefinition createTestSubject() {
+		return new InterfaceDefinition();
+	}
+
+	@Test
+	public void testIsDefinition() throws Exception {
+		InterfaceDefinition testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isDefinition();
+	}
+
+	@Test
+	public void testSetDefinition() throws Exception {
+		InterfaceDefinition testSubject;
+		boolean definition = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDefinition(definition);
+	}
+
+	@Test
+	public void testGetOperationsMap() throws Exception {
+		InterfaceDefinition testSubject;
+		Map<String, Operation> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getOperationsMap();
+	}
+
+
+
+	@Test
+	public void testToString() throws Exception {
+		InterfaceDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/NodeTypeInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/NodeTypeInfoTest.java
new file mode 100644
index 0000000000..9a95a879df
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/NodeTypeInfoTest.java
@@ -0,0 +1,137 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class NodeTypeInfoTest {
+
+	private NodeTypeInfo createTestSubject() {
+		return new NodeTypeInfo();
+	}
+
+	
+	@Test
+	public void testGetUnmarkedCopy() throws Exception {
+		NodeTypeInfo testSubject;
+		NodeTypeInfo result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUnmarkedCopy();
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		NodeTypeInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		NodeTypeInfo testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetTemplateFileName() throws Exception {
+		NodeTypeInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTemplateFileName();
+	}
+
+	
+	@Test
+	public void testSetTemplateFileName() throws Exception {
+		NodeTypeInfo testSubject;
+		String templateFileName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTemplateFileName(templateFileName);
+	}
+
+	
+	@Test
+	public void testGetDerivedFrom() throws Exception {
+		NodeTypeInfo testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerivedFrom();
+	}
+
+	
+	@Test
+	public void testSetDerivedFrom() throws Exception {
+		NodeTypeInfo testSubject;
+		List<String> derivedFrom = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerivedFrom(derivedFrom);
+	}
+
+	
+	@Test
+	public void testIsNested() throws Exception {
+		NodeTypeInfo testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isNested();
+	}
+
+	
+	@Test
+	public void testSetNested() throws Exception {
+		NodeTypeInfo testSubject;
+		boolean isNested = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNested(isNested);
+	}
+
+	
+	@Test
+	public void testGetMappedToscaTemplate() throws Exception {
+		NodeTypeInfo testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMappedToscaTemplate();
+	}
+
+	
+	@Test
+	public void testSetMappedToscaTemplate() throws Exception {
+		NodeTypeInfo testSubject;
+		Map<String, Object> mappedToscaTemplate = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMappedToscaTemplate(mappedToscaTemplate);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/PointTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PointTest.java
new file mode 100644
index 0000000000..8f25cfd5e4
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PointTest.java
@@ -0,0 +1,68 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class PointTest {
+
+	private Point createTestSubject() {
+		return new Point();
+	}
+
+	
+	@Test
+	public void testGetX() throws Exception {
+		Point testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getX();
+	}
+
+	
+	@Test
+	public void testSetX() throws Exception {
+		Point testSubject;
+		String x = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setX(x);
+	}
+
+	
+	@Test
+	public void testGetY() throws Exception {
+		Point testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getY();
+	}
+
+	
+	@Test
+	public void testSetY() throws Exception {
+		Point testSubject;
+		String y = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setY(y);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		Point testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/PolicyTypeDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PolicyTypeDefinitionTest.java
new file mode 100644
index 0000000000..3ba8f61826
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PolicyTypeDefinitionTest.java
@@ -0,0 +1,48 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class PolicyTypeDefinitionTest {
+
+	private PolicyTypeDefinition createTestSubject() {
+		return new PolicyTypeDefinition();
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		PolicyTypeDefinition testSubject;
+		List<PropertyDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		PolicyTypeDefinition testSubject;
+		List<PropertyDefinition> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		PolicyTypeDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ProductTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ProductTest.java
new file mode 100644
index 0000000000..64ee3db41b
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ProductTest.java
@@ -0,0 +1,118 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.ProductMetadataDataDefinition;
+
+
+public class ProductTest {
+
+	private Product createTestSubject() {
+		return new Product();
+	}
+
+	
+	@Test
+	public void testGetFullName() throws Exception {
+		Product testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFullName();
+	}
+
+	
+	@Test
+	public void testSetFullName() throws Exception {
+		Product testSubject;
+		String fullName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setFullName(fullName);
+	}
+
+	
+	@Test
+	public void testGetInvariantUUID() throws Exception {
+		Product testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInvariantUUID();
+	}
+
+	
+	@Test
+	public void testSetInvariantUUID() throws Exception {
+		Product testSubject;
+		String invariantUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInvariantUUID(invariantUUID);
+	}
+
+	
+	@Test
+	public void testGetContacts() throws Exception {
+		Product testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getContacts();
+	}
+
+	
+	@Test
+	public void testSetContacts() throws Exception {
+		Product testSubject;
+		List<String> contacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setContacts(contacts);
+	}
+
+	
+	@Test
+	public void testAddContact() throws Exception {
+		Product testSubject;
+		String contact = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.addContact(contact);
+	}
+
+	
+	@Test
+	public void testGetIsActive() throws Exception {
+		Product testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIsActive();
+	}
+
+	
+	@Test
+	public void testSetIsActive() throws Exception {
+		Product testSubject;
+		Boolean isActive = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIsActive(isActive);
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/PropertyDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PropertyDefinitionTest.java
new file mode 100644
index 0000000000..81df0e223d
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PropertyDefinitionTest.java
@@ -0,0 +1,86 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class PropertyDefinitionTest {
+
+	private PropertyDefinition createTestSubject() {
+		return new PropertyDefinition();
+	}
+
+	@Test
+	public void testGetConstraints() throws Exception {
+		PropertyDefinition testSubject;
+		List<PropertyConstraint> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConstraints();
+	}
+
+	@Test
+	public void testSetConstraints() throws Exception {
+		PropertyDefinition testSubject;
+		List<PropertyConstraint> constraints = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConstraints(constraints);
+	}
+
+	@Test
+	public void testToString() throws Exception {
+		PropertyDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	@Test
+	public void testIsDefinition() throws Exception {
+		PropertyDefinition testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isDefinition();
+	}
+
+	@Test
+	public void testSetDefinition() throws Exception {
+		PropertyDefinition testSubject;
+		boolean definition = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDefinition(definition);
+	}
+
+	@Test
+	public void testHashCode() throws Exception {
+		PropertyDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	@Test
+	public void testEquals() throws Exception {
+		PropertyDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.equals(obj);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementAndRelationshipPairTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementAndRelationshipPairTest.java
new file mode 100644
index 0000000000..bc03848b9c
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementAndRelationshipPairTest.java
@@ -0,0 +1,216 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.RelationshipInstDataDefinition;
+
+
+public class RequirementAndRelationshipPairTest {
+
+	private RequirementAndRelationshipPair createTestSubject() {
+		return new RequirementAndRelationshipPair();
+	}
+
+	
+	@Test
+	public void testGetRequirement() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirement();
+	}
+
+	
+	@Test
+	public void testSetRequirement() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String requirement = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirement(requirement);
+	}
+
+	
+	@Test
+	public void testGetCapabilityOwnerId() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilityOwnerId();
+	}
+
+	
+	@Test
+	public void testSetCapabilityOwnerId() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String capabilityOwnerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilityOwnerId(capabilityOwnerId);
+	}
+
+	
+	@Test
+	public void testGetRequirementOwnerId() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirementOwnerId();
+	}
+
+	
+	@Test
+	public void testSetRequirementOwnerId() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String requirementOwnerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirementOwnerId(requirementOwnerId);
+	}
+
+	
+	@Test
+	public void testGetRelationship() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		RelationshipImpl result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRelationship();
+	}
+
+	
+	@Test
+	public void testSetRelationships() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		RelationshipImpl relationship = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRelationships(relationship);
+	}
+
+	
+	@Test
+	public void testGetCapability() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapability();
+	}
+
+	
+	@Test
+	public void testSetCapability() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String capability = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapability(capability);
+	}
+
+	
+	@Test
+	public void testGetCapabilityUid() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilityUid();
+	}
+
+	
+	@Test
+	public void testSetCapabilityUid() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String capabilityUid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilityUid(capabilityUid);
+	}
+
+	
+	@Test
+	public void testGetRequirementUid() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirementUid();
+	}
+
+	
+	@Test
+	public void testSetRequirementUid() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String requirementUid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirementUid(requirementUid);
+	}
+
+	
+	@Test
+	public void testGetId() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getId();
+	}
+
+	
+	@Test
+	public void testSetId() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String id = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setId(id);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testEqualsTo() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		RelationshipInstDataDefinition savedRelation = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		savedRelation = null;
+		result = testSubject.equalsTo(savedRelation);
+		Assert.assertEquals(false, result);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementImplDefTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementImplDefTest.java
new file mode 100644
index 0000000000..ea747b3a48
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementImplDefTest.java
@@ -0,0 +1,114 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class RequirementImplDefTest {
+
+	private RequirementImplDef createTestSubject() {
+		return new RequirementImplDef();
+	}
+
+	
+	@Test
+	public void testGetNodeId() throws Exception {
+		RequirementImplDef testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNodeId();
+	}
+
+	
+	@Test
+	public void testSetNodeId() throws Exception {
+		RequirementImplDef testSubject;
+		String nodeId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNodeId(nodeId);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		RequirementImplDef testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		RequirementImplDef testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetRequirementProperties() throws Exception {
+		RequirementImplDef testSubject;
+		Map<String, CapabiltyInstance> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirementProperties();
+	}
+
+	
+	@Test
+	public void testSetRequirementProperties() throws Exception {
+		RequirementImplDef testSubject;
+		Map<String, CapabiltyInstance> requirementProperties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirementProperties(requirementProperties);
+	}
+
+	
+	@Test
+	public void testGetPoint() throws Exception {
+		RequirementImplDef testSubject;
+		Point result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPoint();
+	}
+
+	
+	@Test
+	public void testSetPoint() throws Exception {
+		RequirementImplDef testSubject;
+		Point point = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPoint(point);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RequirementImplDef testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementInstanceTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementInstanceTest.java
new file mode 100644
index 0000000000..72f6ee2716
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementInstanceTest.java
@@ -0,0 +1,68 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class RequirementInstanceTest {
+
+	private RequirementInstance createTestSubject() {
+		return new RequirementInstance();
+	}
+
+	
+	@Test
+	public void testGetNode() throws Exception {
+		RequirementInstance testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNode();
+	}
+
+	
+	@Test
+	public void testSetNode() throws Exception {
+		RequirementInstance testSubject;
+		String node = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNode(node);
+	}
+
+	
+	@Test
+	public void testGetRelationship() throws Exception {
+		RequirementInstance testSubject;
+		RelationshipImpl result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRelationship();
+	}
+
+	
+	@Test
+	public void testSetRelationship() throws Exception {
+		RequirementInstance testSubject;
+		RelationshipImpl relationship = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRelationship(relationship);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RequirementInstance testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceInstanceHeatParameterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceInstanceHeatParameterTest.java
new file mode 100644
index 0000000000..50c423b847
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceInstanceHeatParameterTest.java
@@ -0,0 +1,46 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ResourceInstanceHeatParameterTest {
+
+	private ResourceInstanceHeatParameter createTestSubject() {
+		return new ResourceInstanceHeatParameter();
+	}
+
+	
+	@Test
+	public void testGetValueUniqueId() throws Exception {
+		ResourceInstanceHeatParameter testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValueUniqueId();
+	}
+
+	
+	@Test
+	public void testSetValueUniqueId() throws Exception {
+		ResourceInstanceHeatParameter testSubject;
+		String valueUniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValueUniqueId(valueUniqueId);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ResourceInstanceHeatParameter testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadCapInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadCapInfoTest.java
new file mode 100644
index 0000000000..655df75cc4
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadCapInfoTest.java
@@ -0,0 +1,81 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class UploadCapInfoTest {
+
+	private UploadCapInfo createTestSubject() {
+		return new UploadCapInfo();
+	}
+
+	
+	@Test
+	public void testGetNode() throws Exception {
+		UploadCapInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNode();
+	}
+
+	
+	@Test
+	public void testSetNode() throws Exception {
+		UploadCapInfo testSubject;
+		String node = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNode(node);
+	}
+
+	
+	@Test
+	public void testGetValidSourceTypes() throws Exception {
+		UploadCapInfo testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValidSourceTypes();
+	}
+
+	
+	@Test
+	public void testSetValidSourceTypes() throws Exception {
+		UploadCapInfo testSubject;
+		List<String> validSourceTypes = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValidSourceTypes(validSourceTypes);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		UploadCapInfo testSubject;
+		List<UploadPropInfo> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		UploadCapInfo testSubject;
+		List<UploadPropInfo> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadPropInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadPropInfoTest.java
new file mode 100644
index 0000000000..0b3e9301cd
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadPropInfoTest.java
@@ -0,0 +1,104 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.GetInputValueDataDefinition;
+
+
+public class UploadPropInfoTest {
+
+	private UploadPropInfo createTestSubject() {
+		return new UploadPropInfo();
+	}
+
+	
+	@Test
+	public void testGetGet_input() throws Exception {
+		UploadPropInfo testSubject;
+		List<GetInputValueDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGet_input();
+	}
+
+	
+	@Test
+	public void testSetGet_input() throws Exception {
+		UploadPropInfo testSubject;
+		List<GetInputValueDataDefinition> get_input = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGet_input(get_input);
+	}
+
+	
+	@Test
+	public void testGetValue() throws Exception {
+		UploadPropInfo testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValue();
+	}
+
+	
+	@Test
+	public void testSetValue() throws Exception {
+		UploadPropInfo testSubject;
+		Object value = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValue(value);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		UploadPropInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		UploadPropInfo testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testIsPassword() throws Exception {
+		UploadPropInfo testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isPassword();
+	}
+
+	
+	@Test
+	public void testSetPassword() throws Exception {
+		UploadPropInfo testSubject;
+		boolean password = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPassword(password);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadReqInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadReqInfoTest.java
new file mode 100644
index 0000000000..eb1306c597
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadReqInfoTest.java
@@ -0,0 +1,57 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class UploadReqInfoTest {
+
+	private UploadReqInfo createTestSubject() {
+		return new UploadReqInfo();
+	}
+
+	
+	@Test
+	public void testGetCapabilityName() throws Exception {
+		UploadReqInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilityName();
+	}
+
+	
+	@Test
+	public void testSetCapabilityName() throws Exception {
+		UploadReqInfo testSubject;
+		String capabilityName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilityName(capabilityName);
+	}
+
+	
+	@Test
+	public void testGetNode() throws Exception {
+		UploadReqInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNode();
+	}
+
+	
+	@Test
+	public void testSetNode() throws Exception {
+		UploadReqInfo testSubject;
+		String node = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNode(node);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/DaoInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/DaoInfoTest.java
new file mode 100644
index 0000000000..1428a86342
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/DaoInfoTest.java
@@ -0,0 +1,36 @@
+package org.openecomp.sdc.be.model.cache;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+
+
+public class DaoInfoTest {
+
+	private DaoInfo createTestSubject() {
+		return new DaoInfo(new ToscaOperationFacade(), new ComponentCache());
+	}
+
+	
+	@Test
+	public void testGetToscaOperationFacade() throws Exception {
+		DaoInfo testSubject;
+		ToscaOperationFacade result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getToscaOperationFacade();
+	}
+
+	
+	@Test
+	public void testGetComponentCache() throws Exception {
+		DaoInfo testSubject;
+		ComponentCache result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentCache();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/CategoryDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/CategoryDefinitionTest.java
new file mode 100644
index 0000000000..3bb589a976
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/CategoryDefinitionTest.java
@@ -0,0 +1,61 @@
+package org.openecomp.sdc.be.model.category;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import java.util.*;
+import org.junit.Assert;
+
+
+public class CategoryDefinitionTest {
+
+	private CategoryDefinition createTestSubject() {
+		return new CategoryDefinition();
+	}
+
+	
+	@Test
+	public void testGetSubcategories() throws Exception {
+		CategoryDefinition testSubject;
+		List<SubCategoryDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getSubcategories();
+	}
+
+	
+	@Test
+	public void testSetSubcategories() throws Exception {
+		CategoryDefinition testSubject;
+		List<SubCategoryDefinition> subcategories = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setSubcategories(subcategories);
+	}
+
+	
+	@Test
+	public void testAddSubCategory() throws Exception {
+		CategoryDefinition testSubject;
+		SubCategoryDefinition subcategory = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.addSubCategory(subcategory);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		CategoryDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/SubCategoryDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/SubCategoryDefinitionTest.java
new file mode 100644
index 0000000000..f9acabdc4b
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/SubCategoryDefinitionTest.java
@@ -0,0 +1,59 @@
+package org.openecomp.sdc.be.model.category;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class SubCategoryDefinitionTest {
+
+	private SubCategoryDefinition createTestSubject() {
+		return new SubCategoryDefinition();
+	}
+
+	
+	@Test
+	public void testGetGroupings() throws Exception {
+		SubCategoryDefinition testSubject;
+		List<GroupingDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupings();
+	}
+
+	
+	@Test
+	public void testSetGroupings() throws Exception {
+		SubCategoryDefinition testSubject;
+		List<GroupingDefinition> groupingDefinitions = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupings(groupingDefinitions);
+	}
+
+	
+	@Test
+	public void testAddGrouping() throws Exception {
+		SubCategoryDefinition testSubject;
+		GroupingDefinition groupingDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.addGrouping(groupingDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		SubCategoryDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/NodeTypeTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/NodeTypeTest.java
new file mode 100644
index 0000000000..ba7b253463
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/NodeTypeTest.java
@@ -0,0 +1,175 @@
+package org.openecomp.sdc.be.model.jsontitan.datamodel;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.InterfaceDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ListCapabilityDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ListRequirementDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapPropertiesDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+
+
+public class NodeTypeTest {
+
+	private NodeType createTestSubject() {
+		return new NodeType();
+	}
+
+	
+	@Test
+	public void testGetDerivedList() throws Exception {
+		NodeType testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerivedList();
+	}
+
+	
+	@Test
+	public void testSetDerivedList() throws Exception {
+		NodeType testSubject;
+		List<String> derivedList = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerivedList(derivedList);
+	}
+
+	
+	@Test
+	public void testGetDerivedFrom() throws Exception {
+		NodeType testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerivedFrom();
+	}
+
+	
+	@Test
+	public void testSetDerivedFrom() throws Exception {
+		NodeType testSubject;
+		List<String> derivedFrom = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerivedFrom(derivedFrom);
+	}
+
+	
+	@Test
+	public void testGetAttributes() throws Exception {
+		NodeType testSubject;
+		Map<String, PropertyDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAttributes();
+	}
+
+	
+	@Test
+	public void testSetAttributes() throws Exception {
+		NodeType testSubject;
+		Map<String, PropertyDataDefinition> attributes = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAttributes(attributes);
+	}
+
+	
+	@Test
+	public void testGetCapabilties() throws Exception {
+		NodeType testSubject;
+		Map<String, ListCapabilityDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilties();
+	}
+
+	
+	@Test
+	public void testSetCapabilties() throws Exception {
+		NodeType testSubject;
+		Map<String, ListCapabilityDataDefinition> capabilties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilties(capabilties);
+	}
+
+	
+	@Test
+	public void testGetRequirements() throws Exception {
+		NodeType testSubject;
+		Map<String, ListRequirementDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirements();
+	}
+
+	
+	@Test
+	public void testSetRequirements() throws Exception {
+		NodeType testSubject;
+		Map<String, ListRequirementDataDefinition> requirements = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirements(requirements);
+	}
+
+	
+	@Test
+	public void testGetCapabiltiesProperties() throws Exception {
+		NodeType testSubject;
+		Map<String, MapPropertiesDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabiltiesProperties();
+	}
+
+	
+	@Test
+	public void testSetCapabiltiesProperties() throws Exception {
+		NodeType testSubject;
+		Map<String, MapPropertiesDataDefinition> capabiltiesProperties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabiltiesProperties(capabiltiesProperties);
+	}
+
+	
+	@Test
+	public void testGetInterfaceArtifacts() throws Exception {
+		NodeType testSubject;
+		Map<String, InterfaceDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInterfaceArtifacts();
+	}
+
+	
+	@Test
+	public void testSetInterfaceArtifacts() throws Exception {
+		NodeType testSubject;
+		Map<String, InterfaceDataDefinition> interfaceArtifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInterfaceArtifacts(interfaceArtifacts);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/TopologyTemplateTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/TopologyTemplateTest.java
new file mode 100644
index 0000000000..bd5a16a844
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/TopologyTemplateTest.java
@@ -0,0 +1,416 @@
+package org.openecomp.sdc.be.model.jsontitan.datamodel;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ComponentInstanceDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.CompositionDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapArtifactDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapCapabiltyProperty;
+import org.openecomp.sdc.be.datatypes.elements.MapGroupsDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapListCapabiltyDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapListRequirementDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapPropertiesDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.RelationshipInstDataDefinition;
+import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
+
+
+public class TopologyTemplateTest {
+
+	private TopologyTemplate createTestSubject() {
+		return new TopologyTemplate();
+	}
+
+	
+	@Test
+	public void testGetInputs() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, PropertyDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInputs();
+	}
+
+	
+	@Test
+	public void testSetInputs() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, PropertyDataDefinition> inputs = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInputs(inputs);
+	}
+
+	
+	@Test
+	public void testGetInstInputs() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapPropertiesDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInstInputs();
+	}
+
+	
+	@Test
+	public void testSetInstInputs() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapPropertiesDataDefinition> instInputs = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInstInputs(instInputs);
+	}
+
+	
+	@Test
+	public void testGetHeatParameters() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, ? extends ToscaDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getHeatParameters();
+	}
+
+	
+	@Test
+	public void testSetHeatParameters() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, ? extends ToscaDataDefinition> heatParameters = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setHeatParameters(heatParameters);
+	}
+
+	
+	@Test
+	public void testGetInstAttributes() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapPropertiesDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInstAttributes();
+	}
+
+	
+	@Test
+	public void testSetInstAttributes() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapPropertiesDataDefinition> instAttributes = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInstAttributes(instAttributes);
+	}
+
+	
+	@Test
+	public void testGetInstProperties() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapPropertiesDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInstProperties();
+	}
+
+	
+	@Test
+	public void testSetInstProperties() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapPropertiesDataDefinition> instProperties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInstProperties(instProperties);
+	}
+
+	
+	@Test
+	public void testGetGroups() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, GroupDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroups();
+	}
+
+	
+	@Test
+	public void testSetGroups() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, GroupDataDefinition> groups = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroups(groups);
+	}
+
+	
+	@Test
+	public void testGetInstGroups() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapGroupsDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInstGroups();
+	}
+
+	
+	@Test
+	public void testSetInstGroups() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapGroupsDataDefinition> instGroups = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInstGroups(instGroups);
+	}
+
+	
+	@Test
+	public void testGetServiceApiArtifacts() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, ArtifactDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceApiArtifacts();
+	}
+
+	
+	@Test
+	public void testSetServiceApiArtifacts() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, ArtifactDataDefinition> serviceApiArtifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceApiArtifacts(serviceApiArtifacts);
+	}
+
+	
+	@Test
+	public void testGetCompositions() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, CompositionDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCompositions();
+	}
+
+	
+	@Test
+	public void testSetCompositions() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, CompositionDataDefinition> compositions = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCompositions(compositions);
+	}
+
+	
+	@Test
+	public void testGetCalculatedCapabilities() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListCapabiltyDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCalculatedCapabilities();
+	}
+
+	
+	@Test
+	public void testSetCalculatedCapabilities() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListCapabiltyDataDefinition> calculatedCapabilities = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCalculatedCapabilities(calculatedCapabilities);
+	}
+
+	
+	@Test
+	public void testGetCalculatedRequirements() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListRequirementDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCalculatedRequirements();
+	}
+
+	
+	@Test
+	public void testSetCalculatedRequirements() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListRequirementDataDefinition> calculatedRequirements = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCalculatedRequirements(calculatedRequirements);
+	}
+
+	
+	@Test
+	public void testGetFullfilledCapabilities() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListCapabiltyDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFullfilledCapabilities();
+	}
+
+	
+	@Test
+	public void testSetFullfilledCapabilities() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListCapabiltyDataDefinition> fullfilledCapabilities = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setFullfilledCapabilities(fullfilledCapabilities);
+	}
+
+	
+	@Test
+	public void testGetFullfilledRequirements() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListRequirementDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFullfilledRequirements();
+	}
+
+	
+	@Test
+	public void testSetFullfilledRequirements() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListRequirementDataDefinition> fullfilledRequirements = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setFullfilledRequirements(fullfilledRequirements);
+	}
+
+	
+	@Test
+	public void testGetInstDeploymentArtifacts() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapArtifactDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInstDeploymentArtifacts();
+	}
+
+	
+	@Test
+	public void testSetInstDeploymentArtifacts() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapArtifactDataDefinition> instDeploymentArtifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInstDeploymentArtifacts(instDeploymentArtifacts);
+	}
+
+	
+	@Test
+	public void testGetCalculatedCapabilitiesProperties() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapCapabiltyProperty> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCalculatedCapabilitiesProperties();
+	}
+
+	
+	@Test
+	public void testSetCalculatedCapabilitiesProperties() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapCapabiltyProperty> calculatedCapabilitiesProperties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCalculatedCapabilitiesProperties(calculatedCapabilitiesProperties);
+	}
+
+	
+	@Test
+	public void testGetInstanceArtifacts() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapArtifactDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInstanceArtifacts();
+	}
+
+	
+	@Test
+	public void testSetInstanceArtifacts() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapArtifactDataDefinition> instanceArtifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInstanceArtifacts(instanceArtifacts);
+	}
+
+	
+
+
+	
+	@Test
+	public void testGetComponentInstances() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, ComponentInstanceDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstances();
+	}
+
+	
+	@Test
+	public void testSetComponentInstances() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, ComponentInstanceDataDefinition> instances = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstances(instances);
+	}
+
+	
+	@Test
+	public void testGetRelations() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, RelationshipInstDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRelations();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElementTypeEnumTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElementTypeEnumTest.java
new file mode 100644
index 0000000000..671eeb2219
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElementTypeEnumTest.java
@@ -0,0 +1,28 @@
+package org.openecomp.sdc.be.model.jsontitan.datamodel;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
+
+
+public class ToscaElementTypeEnumTest {
+
+	private ToscaElementTypeEnum createTestSubject() {
+		return  ToscaElementTypeEnum.TopologyTemplate;
+	}
+
+	
+
+
+	
+	@Test
+	public void testGetValue() throws Exception {
+		ToscaElementTypeEnum testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValue();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/enums/JsonConstantKeysEnumTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/enums/JsonConstantKeysEnumTest.java
new file mode 100644
index 0000000000..11faa42b79
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/enums/JsonConstantKeysEnumTest.java
@@ -0,0 +1,24 @@
+package org.openecomp.sdc.be.model.jsontitan.enums;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class JsonConstantKeysEnumTest {
+
+	private JsonConstantKeysEnum createTestSubject() {
+		return  JsonConstantKeysEnum.COMPOSITION;
+	}
+
+	
+	@Test
+	public void testGetValue() throws Exception {
+		JsonConstantKeysEnum testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValue();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/EqualConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/EqualConstraintTest.java
new file mode 100644
index 0000000000..8978c405b0
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/EqualConstraintTest.java
@@ -0,0 +1,31 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.tosca.ToscaType;
+
+
+public class EqualConstraintTest {
+
+	private EqualConstraint createTestSubject() {
+		return new EqualConstraint("");
+	}
+
+	
+
+	
+	@Test
+	public void testValidate() throws Exception {
+		EqualConstraint testSubject;
+		Object propertyValue = null;
+
+		// test 1
+		testSubject = createTestSubject();
+		propertyValue = null;
+		testSubject.validate(propertyValue);
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/GreaterThanConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/GreaterThanConstraintTest.java
new file mode 100644
index 0000000000..001b09c517
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/GreaterThanConstraintTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.tosca.ToscaType;
+
+public class GreaterThanConstraintTest {
+
+	private GreaterThanConstraint createTestSubject() {
+		return new GreaterThanConstraint("");
+	}
+
+
+
+	
+
+	
+	@Test
+	public void testGetGreaterThan() throws Exception {
+		GreaterThanConstraint testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGreaterThan();
+	}
+
+	
+	@Test
+	public void testSetGreaterThan() throws Exception {
+		GreaterThanConstraint testSubject;
+		String greaterThan = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGreaterThan(greaterThan);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/InRangeConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/InRangeConstraintTest.java
new file mode 100644
index 0000000000..f7a040cf94
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/InRangeConstraintTest.java
@@ -0,0 +1,61 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.tosca.ToscaType;
+
+
+public class InRangeConstraintTest {
+
+	private InRangeConstraint createTestSubject() {
+		return new InRangeConstraint(null);
+	}
+
+	
+
+
+	
+	@Test
+	public void testGetRangeMinValue() throws Exception {
+		InRangeConstraint testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRangeMinValue();
+	}
+
+	
+	@Test
+	public void testSetRangeMinValue() throws Exception {
+		InRangeConstraint testSubject;
+		String minValue = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRangeMinValue(minValue);
+	}
+
+	
+	@Test
+	public void testGetRangeMaxValue() throws Exception {
+		InRangeConstraint testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRangeMaxValue();
+	}
+
+	
+	@Test
+	public void testSetRangeMaxValue() throws Exception {
+		InRangeConstraint testSubject;
+		String maxValue = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRangeMaxValue(maxValue);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/LengthConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/LengthConstraintTest.java
new file mode 100644
index 0000000000..87781f0260
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/LengthConstraintTest.java
@@ -0,0 +1,38 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class LengthConstraintTest {
+
+	private LengthConstraint createTestSubject() {
+		return new LengthConstraint();
+	}
+
+	
+
+
+	
+	@Test
+	public void testGetLength() throws Exception {
+		LengthConstraint testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLength();
+	}
+
+	
+	@Test
+	public void testSetLength() throws Exception {
+		LengthConstraint testSubject;
+		Integer length = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLength(length);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/LessOrEqualConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/LessOrEqualConstraintTest.java
new file mode 100644
index 0000000000..6430802948
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/LessOrEqualConstraintTest.java
@@ -0,0 +1,41 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.tosca.ToscaType;
+
+
+public class LessOrEqualConstraintTest {
+
+	private LessOrEqualConstraint createTestSubject() {
+		return new LessOrEqualConstraint("");
+	}
+
+	
+
+	
+
+
+	
+	@Test
+	public void testGetLessOrEqual() throws Exception {
+		LessOrEqualConstraint testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLessOrEqual();
+	}
+
+	
+	@Test
+	public void testSetLessOrEqual() throws Exception {
+		LessOrEqualConstraint testSubject;
+		String lessOrEqual = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLessOrEqual(lessOrEqual);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/MaxLengthConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/MaxLengthConstraintTest.java
new file mode 100644
index 0000000000..ae0a50612d
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/MaxLengthConstraintTest.java
@@ -0,0 +1,36 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class MaxLengthConstraintTest {
+
+	private MaxLengthConstraint createTestSubject() {
+		return new MaxLengthConstraint(null);
+	}
+
+	
+	
+	@Test
+	public void testGetMaxLength() throws Exception {
+		MaxLengthConstraint testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMaxLength();
+	}
+
+	
+	@Test
+	public void testSetMaxLength() throws Exception {
+		MaxLengthConstraint testSubject;
+		Integer maxLength = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMaxLength(maxLength);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/MinLengthConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/MinLengthConstraintTest.java
new file mode 100644
index 0000000000..4263a6fe28
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/MinLengthConstraintTest.java
@@ -0,0 +1,38 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class MinLengthConstraintTest {
+
+	private MinLengthConstraint createTestSubject() {
+		return new MinLengthConstraint(null);
+	}
+
+	
+
+
+	
+	@Test
+	public void testGetMinLength() throws Exception {
+		MinLengthConstraint testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMinLength();
+	}
+
+	
+	@Test
+	public void testSetMinLength() throws Exception {
+		MinLengthConstraint testSubject;
+		Integer minLength = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMinLength(minLength);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/PatternConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/PatternConstraintTest.java
new file mode 100644
index 0000000000..1a20abbace
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/PatternConstraintTest.java
@@ -0,0 +1,25 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class PatternConstraintTest {
+
+	private PatternConstraint createTestSubject() {
+		return new PatternConstraint();
+	}
+
+	
+	@Test
+	public void testSetPattern() throws Exception {
+		PatternConstraint testSubject;
+		String pattern = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPattern(pattern);
+	}
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ValidValuesConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ValidValuesConstraintTest.java
new file mode 100644
index 0000000000..93622300c4
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ValidValuesConstraintTest.java
@@ -0,0 +1,43 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.tosca.ToscaType;
+
+
+public class ValidValuesConstraintTest {
+
+	private ValidValuesConstraint createTestSubject() {
+		return new ValidValuesConstraint(null);
+	}
+
+	
+
+	
+
+
+	
+	@Test
+	public void testGetValidValues() throws Exception {
+		ValidValuesConstraint testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValidValues();
+	}
+
+	
+	@Test
+	public void testSetValidValues() throws Exception {
+		ValidValuesConstraint testSubject;
+		List<String> validValues = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValidValues(validValues);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/BooleanConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/BooleanConverterTest.java
new file mode 100644
index 0000000000..a37e8f6b4f
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/BooleanConverterTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class BooleanConverterTest {
+
+	private BooleanConverter createTestSubject() {
+		return BooleanConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		BooleanConverter result;
+
+		// default test
+		result = BooleanConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testConvertToToscaValue() throws Exception {
+		BooleanConverter testSubject;
+		String value = "";
+		String innerType = "";
+		Map<String, DataTypeDefinition> dataTypes = null;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convertToToscaValue(value, innerType, dataTypes);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverterTest.java
index 84f2254bbb..ebb7566611 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverterTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverterTest.java
@@ -1,5 +1,8 @@
 package org.openecomp.sdc.be.model.tosca.converters;
 
+import static org.junit.Assert.*;
+
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import org.junit.Before;
 import org.junit.Test;
@@ -14,174 +17,225 @@ import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import java.util.*;
+import org.junit.Assert;
 
 public class DataTypePropertyConverterTest {
 
-    private static final String EMPTY_JSON_STR = "{}";
-    public static final String PROPERTY2_DEFAULT = "{\"prop1\":\"def1\",\"prop3\":\"def3\"}";
-    private DataTypePropertyConverter testInstance = DataTypePropertyConverter.getInstance();
-    private Map<String, DataTypeDefinition> dataTypes;
-    private DataTypeDefinition noDefaultValue, dataType1, dataType2, dataType3;
-    private PropertyDefinition prop1, prop2, prop3, noDefaultProp;
-
-    @Before
-    public void setUp() throws Exception {
-        dataTypes = new HashMap<>();
-
-        prop1 = new PropertyDefinition();
-        prop1.setDefaultValue("def1");
-        prop1.setName("prop1");
-
-        prop2 = new PropertyDefinition();
-        prop2.setType("dataType1");
-        prop2.setName("prop2");
-
-        prop3 = new PropertyDefinition();
-        prop3.setDefaultValue("def3");
-        prop3.setName("prop3");
-
-        noDefaultProp = new PropertyDefinition();
-        noDefaultProp.setName("noDefaultProp");
-
-        noDefaultValue = new DataTypeDefinition();
-        noDefaultValue.setProperties(Collections.singletonList(noDefaultProp));
-
-        dataType1 = new DataTypeDefinition();
-        dataType1.setProperties(Arrays.asList(prop1, prop3));
-
-        dataType2 = new DataTypeDefinition();
-        dataType2.setDerivedFrom(dataType1);
-
-        dataType3 = new DataTypeDefinition();
-        dataType3.setProperties(Collections.singletonList(prop2));
-        dataType3.setDerivedFrom(noDefaultValue);
-
-        dataTypes.put("noDefault", noDefaultValue);
-        dataTypes.put("dataType1", dataType1);
-        dataTypes.put("dataType2", dataType2);
-        dataTypes.put("dataType3", dataType3);
-    }
-
-    @Test
-    public void testGetPropertyDefaultValuesRec_dataTypeNotExist() throws Exception {
-        String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("someType", dataTypes);
-        assertEquals(EMPTY_JSON_STR, defaultValue);
-    }
-
-    @Test
-    public void testGetPropertyDefaultValuesRec_NoDefaultValue() throws Exception {
-        String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("noDefault", dataTypes);
-        assertEquals(EMPTY_JSON_STR, defaultValue);
-    }
-
-    @Test
-    public void testGetPropertyDefaultValuesRec() throws Exception {
-        String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType1", dataTypes);
-        assertEquals(PROPERTY2_DEFAULT, defaultValue);
-    }
-
-    @Test
-    public void testGetPropertyDefaultValuesRec_defaultFromDerivedDataType_derivedDataTypeHasNoDefaults() throws Exception {
-        dataType2.setDerivedFrom(noDefaultValue);
-        String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType2", dataTypes);
-        assertEquals(EMPTY_JSON_STR, defaultValue);
-    }
-
-    @Test
-    public void testGetPropertyDefaultValuesRec_defaultFromDerivedDataType() throws Exception {
-        String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType2", dataTypes);
-        assertEquals(PROPERTY2_DEFAULT, defaultValue);
-    }
-
-    @Test
-    public void testGetPropertyDefaultValuesRec_defaultFromDataTypesOfProperties_dataTypeOfPropertyHasNoDefault() throws Exception {
-        dataType3.getProperties().get(0).setType(noDefaultValue.getName());
-        String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType3", dataTypes);
-        assertEquals(EMPTY_JSON_STR, defaultValue);
-    }
-
-    @Test
-    public void testGetPropertyDefaultValuesRec_defaultFromDataTypesOfProperties() throws Exception {
-        String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType3", dataTypes);
-        assertEquals("{\"prop2\":" + PROPERTY2_DEFAULT + "}", defaultValue);//data type 3 has property prop2 which has a data type with property prop1 which has a default value
-    }
-
-    @Test
-    public void testMergeDefaultValues_allDefaultValuesAreOverridden() throws Exception {
-        JsonObject value = new JsonObject();
-        value.addProperty(noDefaultProp.getName(), "override1");
-
-        JsonObject prop1Val = new JsonObject();
-        prop1Val.addProperty(prop1.getName(), "prop1Override");
-
-        JsonObject prop3Val = new JsonObject();
-        prop3Val.addProperty(prop3.getName(), "prop3Override");
-
-        JsonObject prop2Value = new JsonObject();
-        prop2Value.add(prop3.getName(), prop3Val);
-        prop2Value.add(prop1.getName(), prop1Val);
-
-        value.add(prop2.getName(), prop2Value);
-
-        String valBeforeMerge = value.toString();
-
-        testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
-        assertEquals(valBeforeMerge, value.toString());
-    }
-
-    @Test
-    public void testMergeDefaultValues() throws Exception {
-        JsonObject value = new JsonObject();
-        value.addProperty(noDefaultProp.getName(), "override1");
-
-        JsonObject prop1Val = new JsonObject();
-        prop1Val.addProperty(prop1.getName(), "prop1Override");
-
-        value.add(prop2.getName(), prop1Val);
-
-        testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
-
-        assertEquals("{\"noDefaultProp\":\"override1\",\"prop2\":{\"prop1\":\"prop1Override\",\"prop3\":\"def3\"}}",
-                      value.toString());//expect to merge prop 3 default as it was not overridden
-    }
-
-    @Test
-    public void testMergeDefaultValues_mergeAll() throws Exception {
-        JsonObject value = new JsonObject();
-        testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
+	private static final String EMPTY_JSON_STR = "{}";
+	public static final String PROPERTY2_DEFAULT = "{\"prop1\":\"def1\",\"prop3\":\"def3\"}";
+	private DataTypePropertyConverter testInstance = DataTypePropertyConverter.getInstance();
+	private Map<String, DataTypeDefinition> dataTypes;
+	private DataTypeDefinition noDefaultValue, dataType1, dataType2, dataType3;
+	private PropertyDefinition prop1, prop2, prop3, noDefaultProp;
+
+	@Before
+	public void setUp() throws Exception {
+		dataTypes = new HashMap<>();
+
+		prop1 = new PropertyDefinition();
+		prop1.setDefaultValue("def1");
+		prop1.setName("prop1");
+
+		prop2 = new PropertyDefinition();
+		prop2.setType("dataType1");
+		prop2.setName("prop2");
+
+		prop3 = new PropertyDefinition();
+		prop3.setDefaultValue("def3");
+		prop3.setName("prop3");
+
+		noDefaultProp = new PropertyDefinition();
+		noDefaultProp.setName("noDefaultProp");
+
+		noDefaultValue = new DataTypeDefinition();
+		noDefaultValue.setProperties(Collections.singletonList(noDefaultProp));
+
+		dataType1 = new DataTypeDefinition();
+		dataType1.setProperties(Arrays.asList(prop1, prop3));
+
+		dataType2 = new DataTypeDefinition();
+		dataType2.setDerivedFrom(dataType1);
+
+		dataType3 = new DataTypeDefinition();
+		dataType3.setProperties(Collections.singletonList(prop2));
+		dataType3.setDerivedFrom(noDefaultValue);
+
+		dataTypes.put("noDefault", noDefaultValue);
+		dataTypes.put("dataType1", dataType1);
+		dataTypes.put("dataType2", dataType2);
+		dataTypes.put("dataType3", dataType3);
+	}
+
+	@Test
+	public void testGetPropertyDefaultValuesRec_dataTypeNotExist() throws Exception {
+		String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("someType", dataTypes);
+		assertEquals(EMPTY_JSON_STR, defaultValue);
+	}
+
+	@Test
+	public void testGetPropertyDefaultValuesRec_NoDefaultValue() throws Exception {
+		String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("noDefault", dataTypes);
+		assertEquals(EMPTY_JSON_STR, defaultValue);
+	}
+
+	@Test
+	public void testGetPropertyDefaultValuesRec() throws Exception {
+		String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType1", dataTypes);
+		assertEquals(PROPERTY2_DEFAULT, defaultValue);
+	}
+
+	@Test
+	public void testGetPropertyDefaultValuesRec_defaultFromDerivedDataType_derivedDataTypeHasNoDefaults()
+			throws Exception {
+		dataType2.setDerivedFrom(noDefaultValue);
+		String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType2", dataTypes);
+		assertEquals(EMPTY_JSON_STR, defaultValue);
+	}
+
+	@Test
+	public void testGetPropertyDefaultValuesRec_defaultFromDerivedDataType() throws Exception {
+		String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType2", dataTypes);
+		assertEquals(PROPERTY2_DEFAULT, defaultValue);
+	}
+
+	@Test
+	public void testGetPropertyDefaultValuesRec_defaultFromDataTypesOfProperties_dataTypeOfPropertyHasNoDefault()
+			throws Exception {
+		dataType3.getProperties().get(0).setType(noDefaultValue.getName());
+		String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType3", dataTypes);
+		assertEquals(EMPTY_JSON_STR, defaultValue);
+	}
+
+	@Test
+	public void testGetPropertyDefaultValuesRec_defaultFromDataTypesOfProperties() throws Exception {
+		String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType3", dataTypes);
+		assertEquals("{\"prop2\":" + PROPERTY2_DEFAULT + "}", defaultValue);// data
+																			// type
+																			// 3
+																			// has
+																			// property
+																			// prop2
+																			// which
+																			// has
+																			// a
+																			// data
+																			// type
+																			// with
+																			// property
+																			// prop1
+																			// which
+																			// has
+																			// a
+																			// default
+																			// value
+	}
+
+	@Test
+	public void testMergeDefaultValues_allDefaultValuesAreOverridden() throws Exception {
+		JsonObject value = new JsonObject();
+		value.addProperty(noDefaultProp.getName(), "override1");
+
+		JsonObject prop1Val = new JsonObject();
+		prop1Val.addProperty(prop1.getName(), "prop1Override");
+
+		JsonObject prop3Val = new JsonObject();
+		prop3Val.addProperty(prop3.getName(), "prop3Override");
+
+		JsonObject prop2Value = new JsonObject();
+		prop2Value.add(prop3.getName(), prop3Val);
+		prop2Value.add(prop1.getName(), prop1Val);
+
+		value.add(prop2.getName(), prop2Value);
+
+		String valBeforeMerge = value.toString();
+
+		testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
+		assertEquals(valBeforeMerge, value.toString());
+	}
+
+	@Test
+	public void testMergeDefaultValues() throws Exception {
+		JsonObject value = new JsonObject();
+		value.addProperty(noDefaultProp.getName(), "override1");
+
+		JsonObject prop1Val = new JsonObject();
+		prop1Val.addProperty(prop1.getName(), "prop1Override");
+
+		value.add(prop2.getName(), prop1Val);
+
+		testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
+
+		assertEquals("{\"noDefaultProp\":\"override1\",\"prop2\":{\"prop1\":\"prop1Override\",\"prop3\":\"def3\"}}",
+				value.toString());// expect to merge prop 3 default as it was
+									// not overridden
+	}
+
+	@Test
+	public void testMergeDefaultValues_mergeAll() throws Exception {
+		JsonObject value = new JsonObject();
+		testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
+
+		assertEquals("{\"prop2\":" + PROPERTY2_DEFAULT + "}", value.toString());// expect
+																				// to
+																				// merge
+																				// prop
+																				// 3
+																				// default
+																				// as
+																				// it
+																				// was
+																				// not
+																				// overridden
+	}
+
+	@Test
+	public void testMergeDefaultValues_doNotAddDefaultsForGetInputValues() throws Exception {
+
+		JsonObject getInputValue = new JsonObject();
+		getInputValue.addProperty("get_input", "in1");
+
+		JsonObject value = new JsonObject();
+		value.add(prop2.getName(), getInputValue);
+
+		testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
+
+		assertEquals("{\"prop2\":{\"get_input\":\"in1\"}}", value.toString());
+	}
+
+	@Test
+	public void testMergeDefaultValues_doNotAddDefaultsForGetInputInnerValues() throws Exception {
+		JsonObject getInputValue = new JsonObject();
+		getInputValue.addProperty("get_input", "in1");
 
-        assertEquals("{\"prop2\":" + PROPERTY2_DEFAULT + "}",
-                     value.toString());//expect to merge prop 3 default as it was not overridden
-    }
+		JsonObject prop1Val = new JsonObject();
+		prop1Val.add(prop1.getName(), getInputValue);
 
-    @Test
-    public void testMergeDefaultValues_doNotAddDefaultsForGetInputValues() throws Exception {
+		JsonObject value = new JsonObject();
+		value.add(prop2.getName(), prop1Val);
 
-        JsonObject getInputValue = new JsonObject();
-        getInputValue.addProperty("get_input", "in1");
+		testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
 
-        JsonObject value = new JsonObject();
-        value.add(prop2.getName(), getInputValue);
+		assertEquals("{\"prop2\":{\"prop1\":{\"get_input\":\"in1\"},\"prop3\":\"def3\"}}", value.toString());
 
-        testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
+	}
 
-        assertEquals("{\"prop2\":{\"get_input\":\"in1\"}}", value.toString());
-    }
+	private DataTypePropertyConverter createTestSubject() {
+		return DataTypePropertyConverter.getInstance();
+	}
 
-    @Test
-    public void testMergeDefaultValues_doNotAddDefaultsForGetInputInnerValues() throws Exception {
-        JsonObject getInputValue = new JsonObject();
-        getInputValue.addProperty("get_input", "in1");
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		DataTypePropertyConverter result;
 
-        JsonObject prop1Val = new JsonObject();
-        prop1Val.add(prop1.getName(), getInputValue);
+		// default test
+		result = DataTypePropertyConverter.getInstance();
+	}
 
-        JsonObject value = new JsonObject();
-        value.add(prop2.getName(), prop1Val);
+	
 
-        testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
 
-        assertEquals("{\"prop2\":{\"prop1\":{\"get_input\":\"in1\"},\"prop3\":\"def3\"}}", value.toString());
+	
 
-    }
 }
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DefaultConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DefaultConverterTest.java
new file mode 100644
index 0000000000..111c4f84f1
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DefaultConverterTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class DefaultConverterTest {
+
+	private DefaultConverter createTestSubject() {
+		return DefaultConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		DefaultConverter result;
+
+		// default test
+		result = DefaultConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testConvert() throws Exception {
+		DefaultConverter testSubject;
+		String value = "";
+		String innerType = "";
+		Map<String, DataTypeDefinition> dataTypes = null;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convert(value, innerType, dataTypes);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/FloatConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/FloatConverterTest.java
new file mode 100644
index 0000000000..d66182b966
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/FloatConverterTest.java
@@ -0,0 +1,27 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class FloatConverterTest {
+
+	private FloatConverter createTestSubject() {
+		return FloatConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		FloatConverter result;
+
+		// default test
+		result = FloatConverter.getInstance();
+	}
+
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatBooleanConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatBooleanConverterTest.java
new file mode 100644
index 0000000000..8f7aa6d849
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatBooleanConverterTest.java
@@ -0,0 +1,29 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class HeatBooleanConverterTest {
+
+	private HeatBooleanConverter createTestSubject() {
+		return HeatBooleanConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		HeatBooleanConverter result;
+
+		// default test
+		result = HeatBooleanConverter.getInstance();
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatCommaDelimitedListConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatCommaDelimitedListConverterTest.java
new file mode 100644
index 0000000000..9b3cb57028
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatCommaDelimitedListConverterTest.java
@@ -0,0 +1,29 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class HeatCommaDelimitedListConverterTest {
+
+	private HeatCommaDelimitedListConverter createTestSubject() {
+		return HeatCommaDelimitedListConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		HeatCommaDelimitedListConverter result;
+
+		// default test
+		result = HeatCommaDelimitedListConverter.getInstance();
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatJsonConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatJsonConverterTest.java
new file mode 100644
index 0000000000..4e5ee49b6d
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatJsonConverterTest.java
@@ -0,0 +1,29 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class HeatJsonConverterTest {
+
+	private HeatJsonConverter createTestSubject() {
+		return HeatJsonConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		HeatJsonConverter result;
+
+		// default test
+		result = HeatJsonConverter.getInstance();
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatNumberConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatNumberConverterTest.java
new file mode 100644
index 0000000000..1594b00c77
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatNumberConverterTest.java
@@ -0,0 +1,29 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class HeatNumberConverterTest {
+
+	private HeatNumberConverter createTestSubject() {
+		return HeatNumberConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		HeatNumberConverter result;
+
+		// default test
+		result = HeatNumberConverter.getInstance();
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatStringConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatStringConverterTest.java
index 285dd9a965..3844bc81af 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatStringConverterTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatStringConverterTest.java
@@ -1,16 +1,36 @@
 package org.openecomp.sdc.be.model.tosca.converters;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
 public class HeatStringConverterTest {
 
-    @Test
-    public void convertString_strWithQuotes_returnStringAsIs()  {
-        String str = "'i'm string with \"quote\"'";
-        String convert = HeatStringConverter.getInstance().convert(str, null, null);
-        assertEquals(str, convert);
-    }
+	@Test
+	public void convertString_strWithQuotes_returnStringAsIs() {
+		String str = "'i'm string with \"quote\"'";
+		String convert = HeatStringConverter.getInstance().convert(str, null, null);
+		assertEquals(str, convert);
+	}
+
+	private HeatStringConverter createTestSubject() {
+		return HeatStringConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		HeatStringConverter result;
+
+		// default test
+		result = HeatStringConverter.getInstance();
+	}
+
+	
+
 
 }
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/IntegerConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/IntegerConverterTest.java
new file mode 100644
index 0000000000..00bb834faf
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/IntegerConverterTest.java
@@ -0,0 +1,48 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class IntegerConverterTest {
+
+	private IntegerConverter createTestSubject() {
+		return IntegerConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		IntegerConverter result;
+
+		// default test
+		result = IntegerConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testConvertToToscaValue() throws Exception {
+		IntegerConverter testSubject;
+		String value = "";
+		String innerType = "";
+		Map<String, DataTypeDefinition> dataTypes = null;
+		Object result;
+
+		// test 1
+		testSubject = createTestSubject();
+		value = null;
+		result = testSubject.convertToToscaValue(value, innerType, dataTypes);
+		Assert.assertEquals(null, result);
+
+		// test 2
+		testSubject = createTestSubject();
+		value = "";
+		result = testSubject.convertToToscaValue(value, innerType, dataTypes);
+		Assert.assertEquals(null, result);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/JsonConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/JsonConverterTest.java
new file mode 100644
index 0000000000..431443ab80
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/JsonConverterTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class JsonConverterTest {
+
+	private JsonConverter createTestSubject() {
+		return JsonConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		JsonConverter result;
+
+		// default test
+		result = JsonConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testConvert() throws Exception {
+		JsonConverter testSubject;
+		String value = "";
+		String innerType = "";
+		Map<String, DataTypeDefinition> dataTypes = null;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convert(value, innerType, dataTypes);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ListConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ListConverterTest.java
new file mode 100644
index 0000000000..a253ef07e8
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ListConverterTest.java
@@ -0,0 +1,36 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+import fj.data.Either;
+
+
+public class ListConverterTest {
+
+	private ListConverter createTestSubject() {
+		return new ListConverter();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		ListConverter result;
+
+		// default test
+		result = ListConverter.getInstance();
+	}
+
+	
+
+	
+	
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/MapConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/MapConverterTest.java
new file mode 100644
index 0000000000..99f5e2716f
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/MapConverterTest.java
@@ -0,0 +1,48 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+import fj.data.Either;
+
+
+public class MapConverterTest {
+
+	private MapConverter createTestSubject() {
+		return new MapConverter();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		MapConverter result;
+
+		// default test
+		result = MapConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testConvert() throws Exception {
+		MapConverter testSubject;
+		String value = "";
+		String innerType = "";
+		Map<String, DataTypeDefinition> dataTypes = null;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convert(value, innerType, dataTypes);
+	}
+
+	
+
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/StringConvertorTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/StringConvertorTest.java
new file mode 100644
index 0000000000..a3a142d668
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/StringConvertorTest.java
@@ -0,0 +1,28 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+public class StringConvertorTest {
+
+	private StringConvertor createTestSubject() {
+		return  StringConvertor.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		StringConvertor result;
+
+		// default test
+		result = StringConvertor.getInstance();
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaBooleanConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaBooleanConverterTest.java
new file mode 100644
index 0000000000..c96c1244b6
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaBooleanConverterTest.java
@@ -0,0 +1,27 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+public class ToscaBooleanConverterTest {
+
+	private ToscaBooleanConverter createTestSubject() {
+		return  ToscaBooleanConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		ToscaBooleanConverter result;
+
+		// default test
+		result = ToscaBooleanConverter.getInstance();
+	}
+
+	
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaFloatConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaFloatConverterTest.java
new file mode 100644
index 0000000000..a8c5aeef66
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaFloatConverterTest.java
@@ -0,0 +1,29 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class ToscaFloatConverterTest {
+
+	private ToscaFloatConverter createTestSubject() {
+		return  ToscaFloatConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		ToscaFloatConverter result;
+
+		// default test
+		result = ToscaFloatConverter.getInstance();
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaJsonValueConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaJsonValueConverterTest.java
new file mode 100644
index 0000000000..34eae243f7
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaJsonValueConverterTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class ToscaJsonValueConverterTest {
+
+	private ToscaJsonValueConverter createTestSubject() {
+		return ToscaJsonValueConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		ToscaJsonValueConverter result;
+
+		// default test
+		result = ToscaJsonValueConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testConvertToToscaValue() throws Exception {
+		ToscaJsonValueConverter testSubject;
+		String value = "";
+		String innerType = "";
+		Map<String, DataTypeDefinition> dataTypes = null;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convertToToscaValue(value, innerType, dataTypes);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaListValueConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaListValueConverterTest.java
new file mode 100644
index 0000000000..a713c4ce6c
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaListValueConverterTest.java
@@ -0,0 +1,29 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class ToscaListValueConverterTest {
+
+	private ToscaListValueConverter createTestSubject() {
+		return  ToscaListValueConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		ToscaListValueConverter result;
+
+		// default test
+		result = ToscaListValueConverter.getInstance();
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaStringConvertorTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaStringConvertorTest.java
new file mode 100644
index 0000000000..8365c0345a
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaStringConvertorTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class ToscaStringConvertorTest {
+
+	private ToscaStringConvertor createTestSubject() {
+		return ToscaStringConvertor.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		ToscaStringConvertor result;
+
+		// default test
+		result = ToscaStringConvertor.getInstance();
+	}
+
+	
+	@Test
+	public void testConvertToToscaValue() throws Exception {
+		ToscaStringConvertor testSubject;
+		String value = "";
+		String innerType = "";
+		Map<String, DataTypeDefinition> dataTypes = null;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convertToToscaValue(value, innerType, dataTypes);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueDefaultConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueDefaultConverterTest.java
new file mode 100644
index 0000000000..b9ae07cb76
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueDefaultConverterTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class ToscaValueDefaultConverterTest {
+
+	private ToscaValueDefaultConverter createTestSubject() {
+		return ToscaValueDefaultConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		ToscaValueDefaultConverter result;
+
+		// default test
+		result = ToscaValueDefaultConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testConvertToToscaValue() throws Exception {
+		ToscaValueDefaultConverter testSubject;
+		String value = "";
+		String innerType = "";
+		Map<String, DataTypeDefinition> dataTypes = null;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convertToToscaValue(value, innerType, dataTypes);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/version/ComparableVersionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/version/ComparableVersionTest.java
new file mode 100644
index 0000000000..5d0c34d037
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/version/ComparableVersionTest.java
@@ -0,0 +1,64 @@
+package org.openecomp.sdc.be.model.tosca.version;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ComparableVersionTest {
+
+	private ComparableVersion createTestSubject() {
+		return new ComparableVersion("");
+	}
+
+	
+	@Test
+	public void testParseVersion() throws Exception {
+		ComparableVersion testSubject;
+		String version = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.parseVersion(version);
+	}
+
+	
+
+
+	
+
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ComparableVersion testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		ComparableVersion testSubject;
+		Object o = null;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.equals(o);
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		ComparableVersion testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+}
\ No newline at end of file