49 files changed, 3582 insertions, 0 deletions
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..dc801581b9
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ArtifactUiDownloadDataTest.java
@@ -0,0 +1,54 @@
+package org.openecomp.sdc.be.model;
+
+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/FunctionalMenuInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/FunctionalMenuInfoTest.java
new file mode 100644
index 0000000000..ca5d1a2ec8
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/FunctionalMenuInfoTest.java
@@ -0,0 +1,44 @@
+package org.openecomp.sdc.be.model;
+
+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/NodeTypeInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/NodeTypeInfoTest.java
new file mode 100644
index 0000000000..d6d39ae825
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/NodeTypeInfoTest.java
@@ -0,0 +1,135 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+import java.util.Map;
+
+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/RequirementImplDefTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementImplDefTest.java
new file mode 100644
index 0000000000..58bccbefda
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementImplDefTest.java
@@ -0,0 +1,112 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.Map;
+
+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..83472b0db5
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementInstanceTest.java
@@ -0,0 +1,66 @@
+package org.openecomp.sdc.be.model;
+
+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/UploadCapInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadCapInfoTest.java
new file mode 100644
index 0000000000..92075ba128
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadCapInfoTest.java
@@ -0,0 +1,79 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+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..9cc0d1c3d9
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadPropInfoTest.java
@@ -0,0 +1,102 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+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..9aebec85fe
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadReqInfoTest.java
@@ -0,0 +1,55 @@
+package org.openecomp.sdc.be.model;
+
+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/category/CategoryDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/CategoryDefinitionTest.java
new file mode 100644
index 0000000000..cac17ef798
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/CategoryDefinitionTest.java
@@ -0,0 +1,57 @@
+package org.openecomp.sdc.be.model.category;
+
+import java.util.List;
+
+import org.junit.Test;
+
+
+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..4349ca24e3
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/SubCategoryDefinitionTest.java
@@ -0,0 +1,57 @@
+package org.openecomp.sdc.be.model.category;
+
+import java.util.List;
+
+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..aae9d6f2a0
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/NodeTypeTest.java
@@ -0,0 +1,173 @@
+package org.openecomp.sdc.be.model.jsontitan.datamodel;
+
+import java.util.List;
+import java.util.Map;
+
+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..72ca0c0cab
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/TopologyTemplateTest.java
@@ -0,0 +1,403 @@
+package org.openecomp.sdc.be.model.jsontitan.datamodel;
+
+import java.util.Map;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.*;
+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, MapListCapabilityDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCalculatedCapabilities();
+	}
+
+	
+	@Test
+	public void testSetCalculatedCapabilities() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListCapabilityDataDefinition> 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, MapListCapabilityDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFullfilledCapabilities();
+	}
+
+	
+	@Test
+	public void testSetFullfilledCapabilities() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListCapabilityDataDefinition> 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, MapCapabilityProperty> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCalculatedCapabilitiesProperties();
+	}
+
+	
+	@Test
+	public void testSetCalculatedCapabilitiesProperties() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapCapabilityProperty> 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..918b0328a9
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElementTypeEnumTest.java
@@ -0,0 +1,25 @@
+package org.openecomp.sdc.be.model.jsontitan.datamodel;
+
+import org.junit.Test;
+
+
+public class ToscaElementTypeEnumTest {
+
+	private ToscaElementTypeEnum createTestSubject() {
+		return  ToscaElementTypeEnum.TOPOLOGY_TEMPLATE;
+	}
+
+	
+
+
+	
+	@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..b00b13e162
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/enums/JsonConstantKeysEnumTest.java
@@ -0,0 +1,22 @@
+package org.openecomp.sdc.be.model.jsontitan.enums;
+
+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/ToscaTypeTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/ToscaTypeTest.java
new file mode 100644
index 0000000000..9e6605b8a9
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/ToscaTypeTest.java
@@ -0,0 +1,49 @@
+package org.openecomp.sdc.be.model.tosca;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class ToscaTypeTest {
+
+	private ToscaType createTestSubject() {
+		return  ToscaType.BOOLEAN;
+	}
+
+
+	
+	@Test
+	public void testIsValidValue() throws Exception {
+		ToscaType testSubject;
+		String value = "";
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isValidValue(value);
+	}
+
+
+	
+	@Test
+	public void testConvert() throws Exception {
+		ToscaType testSubject;
+		String value = "";
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convert(value);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ToscaType 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/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..af8f28dd25
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/EqualConstraintTest.java
@@ -0,0 +1,28 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import org.junit.Test;
+
+
+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..7d959d4016
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/GreaterThanConstraintTest.java
@@ -0,0 +1,36 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import org.junit.Test;
+
+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..e1df65ef34
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/InRangeConstraintTest.java
@@ -0,0 +1,58 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import org.junit.Test;
+
+
+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..46a273b892
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/LengthConstraintTest.java
@@ -0,0 +1,36 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+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..54d8725914
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/LessOrEqualConstraintTest.java
@@ -0,0 +1,38 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import org.junit.Test;
+
+
+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..55c70c51c3
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/MaxLengthConstraintTest.java
@@ -0,0 +1,34 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+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..1b8694f49e
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/MinLengthConstraintTest.java
@@ -0,0 +1,36 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+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..07c657ceac
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/PatternConstraintTest.java
@@ -0,0 +1,23 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+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..9b4c6b932d
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ValidValuesConstraintTest.java
@@ -0,0 +1,40 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import java.util.List;
+
+import org.junit.Test;
+
+
+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..384c2d94ef
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/BooleanConverterTest.java
@@ -0,0 +1,37 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+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/DefaultConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DefaultConverterTest.java
new file mode 100644
index 0000000000..d151f2aa27
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DefaultConverterTest.java
@@ -0,0 +1,37 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+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..1fb5c8cbf7
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/FloatConverterTest.java
@@ -0,0 +1,22 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import org.junit.Test;
+
+
+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..41a08b3e66
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatBooleanConverterTest.java
@@ -0,0 +1,23 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import org.junit.Test;
+
+
+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..636170601f
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatCommaDelimitedListConverterTest.java
@@ -0,0 +1,23 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import org.junit.Test;
+
+
+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..1d13834748
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatJsonConverterTest.java
@@ -0,0 +1,23 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import org.junit.Test;
+
+
+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..93a54a7168
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatNumberConverterTest.java
@@ -0,0 +1,23 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import org.junit.Test;
+
+
+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/IntegerConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/IntegerConverterTest.java
new file mode 100644
index 0000000000..8691ba00c5
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/IntegerConverterTest.java
@@ -0,0 +1,46 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+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..537b89509b
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/JsonConverterTest.java
@@ -0,0 +1,37 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+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..7002f813c1
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ListConverterTest.java
@@ -0,0 +1,28 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import org.junit.Test;
+
+
+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..c837baa0ab
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/MapConverterTest.java
@@ -0,0 +1,43 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+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..0cfdba83d2
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/StringConvertorTest.java
@@ -0,0 +1,22 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import org.junit.Test;
+
+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..d5eab58653
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaBooleanConverterTest.java
@@ -0,0 +1,21 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import org.junit.Test;
+
+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/ToscaJsonValueConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaJsonValueConverterTest.java
new file mode 100644
index 0000000000..dc7526eb0e
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaJsonValueConverterTest.java
@@ -0,0 +1,37 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+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..04ae0696a7
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaListValueConverterTest.java
@@ -0,0 +1,23 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import org.junit.Test;
+
+
+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..a9909b882f
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaStringConvertorTest.java
@@ -0,0 +1,37 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+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..ea9a4a8eb7
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueDefaultConverterTest.java
@@ -0,0 +1,37 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+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..5e1d37851e
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/version/ComparableVersionTest.java
@@ -0,0 +1,62 @@
+package org.openecomp.sdc.be.model.tosca.version;
+
+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
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/version/VersionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/version/VersionTest.java
new file mode 100644
index 0000000000..cf848901e5
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/version/VersionTest.java
@@ -0,0 +1,129 @@
+package org.openecomp.sdc.be.model.tosca.version;
+
+import org.junit.Test;
+
+public class VersionTest {
+
+	private Version createTestSubject() {
+		return new Version("");
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		Version testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		Version testSubject;
+		Object other = null;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.equals(other);
+	}
+
+	
+	@Test
+	public void testCompareTo() throws Exception {
+		Version testSubject;
+		Version otherVersion = null;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+	}
+
+	
+	@Test
+	public void testGetMajorVersion() throws Exception {
+		Version testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMajorVersion();
+	}
+
+	
+	@Test
+	public void testGetMinorVersion() throws Exception {
+		Version testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMinorVersion();
+	}
+
+	
+	@Test
+	public void testGetIncrementalVersion() throws Exception {
+		Version testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIncrementalVersion();
+	}
+
+	
+	@Test
+	public void testGetBuildNumber() throws Exception {
+		Version testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getBuildNumber();
+	}
+
+	
+	@Test
+	public void testGetQualifier() throws Exception {
+		Version testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getQualifier();
+	}
+
+	
+	@Test
+	public void testParseVersion() throws Exception {
+		Version testSubject;
+		String version = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.parseVersion(version);
+	}
+
+	
+	@Test
+	public void testGetNextIntegerToken() throws Exception {
+		Integer result;
+
+		// default test
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		Version 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/ui/model/UiCategoriesTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiCategoriesTest.java
new file mode 100644
index 0000000000..c0d69fae76
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiCategoriesTest.java
@@ -0,0 +1,80 @@
+package org.openecomp.sdc.be.ui.model;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+
+
+public class UiCategoriesTest {
+
+	private UiCategories createTestSubject() {
+		return new UiCategories();
+	}
+
+	
+	@Test
+	public void testGetResourceCategories() throws Exception {
+		UiCategories testSubject;
+		List<CategoryDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceCategories();
+	}
+
+	
+	@Test
+	public void testSetResourceCategories() throws Exception {
+		UiCategories testSubject;
+		List<CategoryDefinition> resourceCategories = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceCategories(resourceCategories);
+	}
+
+	
+	@Test
+	public void testGetServiceCategories() throws Exception {
+		UiCategories testSubject;
+		List<CategoryDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceCategories();
+	}
+
+	
+	@Test
+	public void testSetServiceCategories() throws Exception {
+		UiCategories testSubject;
+		List<CategoryDefinition> serviceCategories = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceCategories(serviceCategories);
+	}
+
+	
+	@Test
+	public void testGetProductCategories() throws Exception {
+		UiCategories testSubject;
+		List<CategoryDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProductCategories();
+	}
+
+	
+	@Test
+	public void testSetProductCategories() throws Exception {
+		UiCategories testSubject;
+		List<CategoryDefinition> productCategories = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProductCategories(productCategories);
+	}
+}
+\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiComponentDataTransferTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiComponentDataTransferTest.java
new file mode 100644
index 0000000000..4fd0ccc944
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiComponentDataTransferTest.java
@@ -0,0 +1,444 @@
+package org.openecomp.sdc.be.ui.model;
+
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.AdditionalInformationDefinition;
+import org.openecomp.sdc.be.model.ArtifactDefinition;
+import org.openecomp.sdc.be.model.CapabilityDefinition;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.ComponentInstanceInput;
+import org.openecomp.sdc.be.model.ComponentInstanceProperty;
+import org.openecomp.sdc.be.model.GroupDefinition;
+import org.openecomp.sdc.be.model.InputDefinition;
+import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
+import org.openecomp.sdc.be.model.RequirementDefinition;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+
+
+public class UiComponentDataTransferTest {
+
+	private UiComponentDataTransfer createTestSubject() {
+		return new UiComponentDataTransfer();
+	}
+
+	
+	@Test
+	public void testGetArtifacts() throws Exception {
+		UiComponentDataTransfer testSubject;
+		Map<String, ArtifactDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifacts();
+	}
+
+	
+	@Test
+	public void testSetArtifacts() throws Exception {
+		UiComponentDataTransfer testSubject;
+		Map<String, ArtifactDefinition> artifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifacts(artifacts);
+	}
+
+	
+	@Test
+	public void testGetDeploymentArtifacts() throws Exception {
+		UiComponentDataTransfer testSubject;
+		Map<String, ArtifactDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDeploymentArtifacts();
+	}
+
+	
+	@Test
+	public void testSetDeploymentArtifacts() throws Exception {
+		UiComponentDataTransfer testSubject;
+		Map<String, ArtifactDefinition> deploymentArtifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDeploymentArtifacts(deploymentArtifacts);
+	}
+
+	
+	@Test
+	public void testGetToscaArtifacts() throws Exception {
+		UiComponentDataTransfer testSubject;
+		Map<String, ArtifactDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getToscaArtifacts();
+	}
+
+	
+	@Test
+	public void testSetToscaArtifacts() throws Exception {
+		UiComponentDataTransfer testSubject;
+		Map<String, ArtifactDefinition> toscaArtifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setToscaArtifacts(toscaArtifacts);
+	}
+
+	
+	@Test
+	public void testGetCategories() throws Exception {
+		UiComponentDataTransfer testSubject;
+		List<CategoryDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCategories();
+	}
+
+	
+	@Test
+	public void testSetCategories() throws Exception {
+		UiComponentDataTransfer testSubject;
+		List<CategoryDefinition> categories = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCategories(categories);
+	}
+
+	
+	@Test
+	public void testGetCreatorUserId() throws Exception {
+		UiComponentDataTransfer testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreatorUserId();
+	}
+
+	
+	@Test
+	public void testSetCreatorUserId() throws Exception {
+		UiComponentDataTransfer testSubject;
+		String creatorUserId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreatorUserId(creatorUserId);
+	}
+
+	
+	@Test
+	public void testGetCreatorFullName() throws Exception {
+		UiComponentDataTransfer testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreatorFullName();
+	}
+
+	
+	@Test
+	public void testSetCreatorFullName() throws Exception {
+		UiComponentDataTransfer testSubject;
+		String creatorFullName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreatorFullName(creatorFullName);
+	}
+
+	
+	@Test
+	public void testGetLastUpdaterUserId() throws Exception {
+		UiComponentDataTransfer testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastUpdaterUserId();
+	}
+
+	
+	@Test
+	public void testSetLastUpdaterUserId() throws Exception {
+		UiComponentDataTransfer testSubject;
+		String lastUpdaterUserId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastUpdaterUserId(lastUpdaterUserId);
+	}
+
+	
+	@Test
+	public void testGetLastUpdaterFullName() throws Exception {
+		UiComponentDataTransfer testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastUpdaterFullName();
+	}
+
+	
+	@Test
+	public void testSetLastUpdaterFullName() throws Exception {
+		UiComponentDataTransfer testSubject;
+		String lastUpdaterFullName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastUpdaterFullName(lastUpdaterFullName);
+	}
+
+	
+	@Test
+	public void testGetComponentType() throws Exception {
+		UiComponentDataTransfer testSubject;
+		ComponentTypeEnum result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentType();
+	}
+
+	
+	@Test
+	public void testSetComponentType() throws Exception {
+		UiComponentDataTransfer testSubject;
+		ComponentTypeEnum componentType = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentType(componentType);
+	}
+
+	
+	@Test
+	public void testGetComponentInstances() throws Exception {
+		UiComponentDataTransfer testSubject;
+		List<ComponentInstance> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstances();
+	}
+
+	
+	@Test
+	public void testSetComponentInstances() throws Exception {
+		UiComponentDataTransfer testSubject;
+		List<ComponentInstance> componentInstances = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstances(componentInstances);
+	}
+
+	
+	@Test
+	public void testGetComponentInstancesRelations() throws Exception {
+		UiComponentDataTransfer testSubject;
+		List<RequirementCapabilityRelDef> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstancesRelations();
+	}
+
+	
+	@Test
+	public void testSetComponentInstancesRelations() throws Exception {
+		UiComponentDataTransfer testSubject;
+		List<RequirementCapabilityRelDef> componentInstancesRelations = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstancesRelations(componentInstancesRelations);
+	}
+
+	
+	@Test
+	public void testGetComponentInstancesInputs() throws Exception {
+		UiComponentDataTransfer testSubject;
+		Map<String, List<ComponentInstanceInput>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstancesInputs();
+	}
+
+	
+	@Test
+	public void testSetComponentInstancesInputs() throws Exception {
+		UiComponentDataTransfer testSubject;
+		Map<String, List<ComponentInstanceInput>> componentInstancesInputs = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstancesInputs(componentInstancesInputs);
+	}
+
+	
+	@Test
+	public void testGetComponentInstancesProperties() throws Exception {
+		UiComponentDataTransfer testSubject;
+		Map<String, List<ComponentInstanceProperty>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstancesProperties();
+	}
+
+	
+	@Test
+	public void testSetComponentInstancesProperties() throws Exception {
+		UiComponentDataTransfer testSubject;
+		Map<String, List<ComponentInstanceProperty>> componentInstancesProperties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstancesProperties(componentInstancesProperties);
+	}
+
+	
+	@Test
+	public void testGetComponentInstancesAttributes() throws Exception {
+		UiComponentDataTransfer testSubject;
+		Map<String, List<ComponentInstanceProperty>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstancesAttributes();
+	}
+
+	
+	@Test
+	public void testSetComponentInstancesAttributes() throws Exception {
+		UiComponentDataTransfer testSubject;
+		Map<String, List<ComponentInstanceProperty>> componentInstancesAttributes = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstancesAttributes(componentInstancesAttributes);
+	}
+
+	
+	@Test
+	public void testGetCapabilities() throws Exception {
+		UiComponentDataTransfer testSubject;
+		Map<String, List<CapabilityDefinition>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilities();
+	}
+
+	
+	@Test
+	public void testSetCapabilities() throws Exception {
+		UiComponentDataTransfer testSubject;
+		Map<String, List<CapabilityDefinition>> capabilities = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilities(capabilities);
+	}
+
+	
+	@Test
+	public void testGetRequirements() throws Exception {
+		UiComponentDataTransfer testSubject;
+		Map<String, List<RequirementDefinition>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirements();
+	}
+
+	
+	@Test
+	public void testSetRequirements() throws Exception {
+		UiComponentDataTransfer testSubject;
+		Map<String, List<RequirementDefinition>> requirements = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirements(requirements);
+	}
+
+	
+	@Test
+	public void testGetInputs() throws Exception {
+		UiComponentDataTransfer testSubject;
+		List<InputDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInputs();
+	}
+
+	
+	@Test
+	public void testSetInputs() throws Exception {
+		UiComponentDataTransfer testSubject;
+		List<InputDefinition> inputs = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInputs(inputs);
+	}
+
+	
+	@Test
+	public void testGetGroups() throws Exception {
+		UiComponentDataTransfer testSubject;
+		List<GroupDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroups();
+	}
+
+	
+	@Test
+	public void testSetGroups() throws Exception {
+		UiComponentDataTransfer testSubject;
+		List<GroupDefinition> groups = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroups(groups);
+	}
+
+	
+	@Test
+	public void testGetAdditionalInformation() throws Exception {
+		UiComponentDataTransfer testSubject;
+		List<AdditionalInformationDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAdditionalInformation();
+	}
+
+	
+	@Test
+	public void testSetAdditionalInformation() throws Exception {
+		UiComponentDataTransfer testSubject;
+		List<AdditionalInformationDefinition> additionalInformation = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAdditionalInformation(additionalInformation);
+	}
+}
+\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiResourceDataTransferTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiResourceDataTransferTest.java
new file mode 100644
index 0000000000..e50b6c4633
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiResourceDataTransferTest.java
@@ -0,0 +1,193 @@
+package org.openecomp.sdc.be.ui.model;
+
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.AdditionalInformationDefinition;
+import org.openecomp.sdc.be.model.InterfaceDefinition;
+import org.openecomp.sdc.be.model.PropertyDefinition;
+
+
+public class UiResourceDataTransferTest {
+
+	private UiResourceDataTransfer createTestSubject() {
+		return new UiResourceDataTransfer();
+	}
+
+	
+	@Test
+	public void testGetAdditionalInformation() throws Exception {
+		UiResourceDataTransfer testSubject;
+		List<AdditionalInformationDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAdditionalInformation();
+	}
+
+	
+	@Test
+	public void testSetAdditionalInformation() throws Exception {
+		UiResourceDataTransfer testSubject;
+		List<AdditionalInformationDefinition> additionalInformation = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAdditionalInformation(additionalInformation);
+	}
+
+	
+	@Test
+	public void testGetMetadata() throws Exception {
+		UiResourceDataTransfer testSubject;
+		UiResourceMetadata result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMetadata();
+	}
+
+	
+	@Test
+	public void testSetMetadata() throws Exception {
+		UiResourceDataTransfer testSubject;
+		UiResourceMetadata metadata = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMetadata(metadata);
+	}
+
+	
+	@Test
+	public void testGetDerivedFrom() throws Exception {
+		UiResourceDataTransfer testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerivedFrom();
+	}
+
+	
+	@Test
+	public void testSetDerivedFrom() throws Exception {
+		UiResourceDataTransfer testSubject;
+		List<String> derivedFrom = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerivedFrom(derivedFrom);
+	}
+
+	
+	@Test
+	public void testGetDerivedList() throws Exception {
+		UiResourceDataTransfer testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerivedList();
+	}
+
+	
+	@Test
+	public void testSetDerivedList() throws Exception {
+		UiResourceDataTransfer testSubject;
+		List<String> derivedList = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerivedList(derivedList);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		UiResourceDataTransfer testSubject;
+		List<PropertyDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		UiResourceDataTransfer testSubject;
+		List<PropertyDefinition> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testGetAttributes() throws Exception {
+		UiResourceDataTransfer testSubject;
+		List<PropertyDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAttributes();
+	}
+
+	
+	@Test
+	public void testSetAttributes() throws Exception {
+		UiResourceDataTransfer testSubject;
+		List<PropertyDefinition> attributes = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAttributes(attributes);
+	}
+
+	
+	@Test
+	public void testGetInterfaces() throws Exception {
+		UiResourceDataTransfer testSubject;
+		Map<String, InterfaceDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInterfaces();
+	}
+
+	
+	@Test
+	public void testSetInterfaces() throws Exception {
+		UiResourceDataTransfer testSubject;
+		Map<String, InterfaceDefinition> interfaces = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInterfaces(interfaces);
+	}
+
+	
+	@Test
+	public void testGetDefaultCapabilities() throws Exception {
+		UiResourceDataTransfer testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDefaultCapabilities();
+	}
+
+	
+	@Test
+	public void testSetDefaultCapabilities() throws Exception {
+		UiResourceDataTransfer testSubject;
+		List<String> defaultCapabilities = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDefaultCapabilities(defaultCapabilities);
+	}
+}
+\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiResourceMetadataTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiResourceMetadataTest.java
new file mode 100644
index 0000000000..eb5ccff438
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiResourceMetadataTest.java
@@ -0,0 +1,213 @@
+package org.openecomp.sdc.be.ui.model;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.components.ResourceMetadataDataDefinition;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+
+
+public class UiResourceMetadataTest {
+
+	private UiResourceMetadata createTestSubject() {
+		return new UiResourceMetadata(null, null, new ResourceMetadataDataDefinition());
+	}
+
+	
+	@Test
+	public void testGetDerivedFrom() throws Exception {
+		UiResourceMetadata testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerivedFrom();
+	}
+
+	
+	@Test
+	public void testSetDerivedFrom() throws Exception {
+		UiResourceMetadata testSubject;
+		List<String> derivedFrom = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerivedFrom(derivedFrom);
+	}
+
+	
+	@Test
+	public void testGetVendorName() throws Exception {
+		UiResourceMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVendorName();
+	}
+
+	
+	@Test
+	public void testSetVendorName() throws Exception {
+		UiResourceMetadata testSubject;
+		String vendorName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setVendorName(vendorName);
+	}
+
+	
+	@Test
+	public void testGetVendorRelease() throws Exception {
+		UiResourceMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVendorRelease();
+	}
+
+	
+	@Test
+	public void testSetVendorRelease() throws Exception {
+		UiResourceMetadata testSubject;
+		String vendorRelease = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setVendorRelease(vendorRelease);
+	}
+
+	
+	@Test
+	public void testGetResourceVendorModelNumber() throws Exception {
+		UiResourceMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceVendorModelNumber();
+	}
+
+	
+	@Test
+	public void testSetResourceVendorModelNumber() throws Exception {
+		UiResourceMetadata testSubject;
+		String resourceVendorModelNumber = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceVendorModelNumber(resourceVendorModelNumber);
+	}
+
+	
+	@Test
+	public void testGetResourceType() throws Exception {
+		UiResourceMetadata testSubject;
+		ResourceTypeEnum result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceType();
+	}
+
+	
+	@Test
+	public void testSetResourceType() throws Exception {
+		UiResourceMetadata testSubject;
+		ResourceTypeEnum resourceType = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceType(resourceType);
+	}
+
+	
+	@Test
+	public void testGetIsAbstract() throws Exception {
+		UiResourceMetadata testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIsAbstract();
+	}
+
+	
+	@Test
+	public void testSetIsAbstract() throws Exception {
+		UiResourceMetadata testSubject;
+		Boolean isAbstract = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIsAbstract(isAbstract);
+	}
+
+	
+	@Test
+	public void testGetCost() throws Exception {
+		UiResourceMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCost();
+	}
+
+	
+	@Test
+	public void testSetCost() throws Exception {
+		UiResourceMetadata testSubject;
+		String cost = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCost(cost);
+	}
+
+	
+	@Test
+	public void testGetLicenseType() throws Exception {
+		UiResourceMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLicenseType();
+	}
+
+	
+	@Test
+	public void testSetLicenseType() throws Exception {
+		UiResourceMetadata testSubject;
+		String licenseType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLicenseType(licenseType);
+	}
+
+	
+	@Test
+	public void testGetToscaResourceName() throws Exception {
+		UiResourceMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getToscaResourceName();
+	}
+
+	
+	@Test
+	public void testSetToscaResourceName() throws Exception {
+		UiResourceMetadata testSubject;
+		String toscaResourceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setToscaResourceName(toscaResourceName);
+	}
+}
+\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiServiceDataTransferTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiServiceDataTransferTest.java
new file mode 100644
index 0000000000..3bb5aa10b0
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiServiceDataTransferTest.java
@@ -0,0 +1,58 @@
+package org.openecomp.sdc.be.ui.model;
+
+import java.util.Map;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.ArtifactDefinition;
+
+
+public class UiServiceDataTransferTest {
+
+	private UiServiceDataTransfer createTestSubject() {
+		return new UiServiceDataTransfer();
+	}
+
+	
+	@Test
+	public void testGetMetadata() throws Exception {
+		UiServiceDataTransfer testSubject;
+		UiServiceMetadata result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMetadata();
+	}
+
+	
+	@Test
+	public void testSetMetadata() throws Exception {
+		UiServiceDataTransfer testSubject;
+		UiServiceMetadata metadata = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMetadata(metadata);
+	}
+
+	
+	@Test
+	public void testGetServiceApiArtifacts() throws Exception {
+		UiServiceDataTransfer testSubject;
+		Map<String, ArtifactDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceApiArtifacts();
+	}
+
+	
+	@Test
+	public void testSetServiceApiArtifacts() throws Exception {
+		UiServiceDataTransfer testSubject;
+		Map<String, ArtifactDefinition> serviceApiArtifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceApiArtifacts(serviceApiArtifacts);
+	}
+}
+\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiServiceMetadataTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiServiceMetadataTest.java
new file mode 100644
index 0000000000..712053c2f6
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/ui/model/UiServiceMetadataTest.java
@@ -0,0 +1,122 @@
+package org.openecomp.sdc.be.ui.model;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.components.ServiceMetadataDataDefinition;
+
+
+public class UiServiceMetadataTest {
+
+	private UiServiceMetadata createTestSubject() {
+		return new UiServiceMetadata(null, new ServiceMetadataDataDefinition());
+	}
+
+	
+	@Test
+	public void testGetDistributionStatus() throws Exception {
+		UiServiceMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDistributionStatus();
+	}
+
+	
+	@Test
+	public void testSetDistributionStatus() throws Exception {
+		UiServiceMetadata testSubject;
+		String distributionStatus = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDistributionStatus(distributionStatus);
+	}
+
+	
+	@Test
+	public void testGetEcompGeneratedNaming() throws Exception {
+		UiServiceMetadata testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getEcompGeneratedNaming();
+	}
+
+	
+	@Test
+	public void testSetEcompGeneratedNaming() throws Exception {
+		UiServiceMetadata testSubject;
+		Boolean ecompGeneratedNaming = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setEcompGeneratedNaming(ecompGeneratedNaming);
+	}
+
+	
+	@Test
+	public void testGetNamingPolicy() throws Exception {
+		UiServiceMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNamingPolicy();
+	}
+
+	
+	@Test
+	public void testSetNamingPolicy() throws Exception {
+		UiServiceMetadata testSubject;
+		String namingPolicy = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNamingPolicy(namingPolicy);
+	}
+
+	
+	@Test
+	public void testGetServiceType() throws Exception {
+		UiServiceMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceType();
+	}
+
+	
+	@Test
+	public void testSetServiceType() throws Exception {
+		UiServiceMetadata testSubject;
+		String serviceType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceType(serviceType);
+	}
+
+	
+	@Test
+	public void testGetServiceRole() throws Exception {
+		UiServiceMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceRole();
+	}
+
+	
+	@Test
+	public void testSetServiceRole() throws Exception {
+		UiServiceMetadata testSubject;
+		String serviceRole = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceRole(serviceRole);
+	}
+}
+\ No newline at end of file