add more unit tests to BE components

Change-Id: Ic14375454aac2960cd9b250e98991ca073e17a24
Issue-Id: SDC-467
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
(cherry picked from commit 8c4c1dd56dedace1c59d32f5c51c285da05301bf)

69 files changed, 3638 insertions, 260 deletions

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/ServiceBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/ServiceBusinessLogicTest.java
index d8b82da396..95845c3660 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/ServiceBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/ServiceBusinessLogicTest.java
@@ -20,7 +20,19 @@
 
 package org.openecomp.sdc.be.components;
 
-import fj.data.Either;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -70,15 +82,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 
-import javax.servlet.ServletContext;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.when;
+import fj.data.Either;
 
 public class ServiceBusinessLogicTest {
 
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/CsarBuildServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/CsarBuildServletTest.java
new file mode 100644
index 0000000000..daacb79de5
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/CsarBuildServletTest.java
@@ -0,0 +1,49 @@
+package org.openecomp.sdc.be.servlets;
+
+import javax.annotation.Generated;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Response;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.resources.data.ESArtifactData;
+
+import ch.qos.logback.classic.Logger;
+
+
+public class CsarBuildServletTest {
+
+	private CsarBuildServlet createTestSubject() {
+		return new CsarBuildServlet();
+	}
+
+	
+	@Test
+	public void testGetDefaultTemplate() throws Exception {
+		CsarBuildServlet testSubject;
+		HttpServletRequest request = null;
+		String serviceName = "";
+		String serviceVersion = "";
+		Response result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDefaultTemplate(request, serviceName, serviceVersion);
+	}
+
+	
+	@Test
+	public void testGetToscaCsarTemplate() throws Exception {
+		CsarBuildServlet testSubject;
+		HttpServletRequest request = null;
+		String serviceName = "";
+		String serviceVersion = "";
+		Response result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getToscaCsarTemplate(request, serviceName, serviceVersion);
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/RepresentationUtilsTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/RepresentationUtilsTest.java
new file mode 100644
index 0000000000..c56fd474b4
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/RepresentationUtilsTest.java
@@ -0,0 +1,48 @@
+package org.openecomp.sdc.be.servlets;
+
+import javax.annotation.Generated;
+
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.ArtifactDefinition;
+
+public class RepresentationUtilsTest {
+
+	private RepresentationUtils createTestSubject() {
+		return new RepresentationUtils();
+	}
+
+	
+	@Test
+	public void testConvertJsonToArtifactDefinitionForUpdate() throws Exception {
+		String content = "";
+		Class<ArtifactDefinition> clazz = null;
+		ArtifactDefinition result;
+
+		// default test
+		result = RepresentationUtils.convertJsonToArtifactDefinitionForUpdate(content, clazz);
+	}
+
+	
+	@Test
+	public void testToRepresentation() throws Exception {
+		T elementToRepresent = null;
+		Object result;
+
+		// default test
+		result = RepresentationUtils.toRepresentation(elementToRepresent);
+	}
+
+	
+
+	
+	@Test
+	public void testConvertJsonToArtifactDefinition() throws Exception {
+		String content = "";
+		Class<ArtifactDefinition> clazz = null;
+		ArtifactDefinition result;
+
+		// default test
+		result = RepresentationUtils.convertJsonToArtifactDefinition(content, clazz);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ArtifactTypesTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ArtifactTypesTest.java
new file mode 100644
index 0000000000..dec4e78008
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ArtifactTypesTest.java
@@ -0,0 +1,38 @@
+package org.openecomp.sdc.be.tosca;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.generator.data.ArtifactType;
+
+
+public class ArtifactTypesTest {
+
+	private ArtifactTypes createTestSubject() {
+		return new ArtifactTypes();
+	}
+
+	
+	@Test
+	public void testGetArtifactTypes() throws Exception {
+		ArtifactTypes testSubject;
+		List<ArtifactType> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactTypes();
+	}
+
+	
+	@Test
+	public void testSetArtifactTypes() throws Exception {
+		ArtifactTypes testSubject;
+		List<ArtifactType> artifactTypes = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactTypes(artifactTypes);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaRepresentationTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaRepresentationTest.java
new file mode 100644
index 0000000000..9af90bb9e4
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaRepresentationTest.java
@@ -0,0 +1,61 @@
+package org.openecomp.sdc.be.tosca;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.Triple;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.Component;
+
+
+public class ToscaRepresentationTest {
+
+	private ToscaRepresentation createTestSubject() {
+		return new ToscaRepresentation();
+	}
+
+	
+	@Test
+	public void testGetMainYaml() throws Exception {
+		ToscaRepresentation testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMainYaml();
+	}
+
+	
+	@Test
+	public void testSetMainYaml() throws Exception {
+		ToscaRepresentation testSubject;
+		String mainYaml = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMainYaml(mainYaml);
+	}
+
+	
+	@Test
+	public void testGetDependencies() throws Exception {
+		ToscaRepresentation testSubject;
+		List<Triple<String, String, Component>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDependencies();
+	}
+
+	
+	@Test
+	public void testSetDependencies() throws Exception {
+		ToscaRepresentation testSubject;
+		List<Triple<String, String, Component>> dependancies = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDependencies(dependancies);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ArtifactTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ArtifactTableDescriptionTest.java
new file mode 100644
index 0000000000..e0e1adac6c
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ArtifactTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class ArtifactTableDescriptionTest {
+
+	private ArtifactTableDescription createTestSubject() {
+		return new ArtifactTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		ArtifactTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		ArtifactTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		ArtifactTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		ArtifactTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		ArtifactTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/AuthEventTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/AuthEventTableDescriptionTest.java
new file mode 100644
index 0000000000..95000492c0
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/AuthEventTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class AuthEventTableDescriptionTest {
+
+	private AuthEventTableDescription createTestSubject() {
+		return new AuthEventTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		AuthEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		AuthEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		AuthEventTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		AuthEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		AuthEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/CategoryEventTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/CategoryEventTableDescriptionTest.java
new file mode 100644
index 0000000000..c83595d591
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/CategoryEventTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class CategoryEventTableDescriptionTest {
+
+	private CategoryEventTableDescription createTestSubject() {
+		return new CategoryEventTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		CategoryEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		CategoryEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		CategoryEventTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		CategoryEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		CategoryEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ComponentCacheTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ComponentCacheTableDescriptionTest.java
new file mode 100644
index 0000000000..72117731d0
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ComponentCacheTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class ComponentCacheTableDescriptionTest {
+
+	private ComponentCacheTableDescription createTestSubject() {
+		return new ComponentCacheTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		ComponentCacheTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		ComponentCacheTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		ComponentCacheTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		ComponentCacheTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		ComponentCacheTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ConsumerEventTableDefinitionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ConsumerEventTableDefinitionTest.java
new file mode 100644
index 0000000000..61c1c17565
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ConsumerEventTableDefinitionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class ConsumerEventTableDefinitionTest {
+
+	private ConsumerEventTableDefinition createTestSubject() {
+		return new ConsumerEventTableDefinition();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		ConsumerEventTableDefinition testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		ConsumerEventTableDefinition testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		ConsumerEventTableDefinition testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		ConsumerEventTableDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		ConsumerEventTableDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribDeployEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribDeployEventTableDescTest.java
new file mode 100644
index 0000000000..430d408a72
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribDeployEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class DistribDeployEventTableDescTest {
+
+	private DistribDeployEventTableDesc createTestSubject() {
+		return new DistribDeployEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		DistribDeployEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		DistribDeployEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		DistribDeployEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		DistribDeployEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		DistribDeployEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribDownloadEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribDownloadEventTableDescTest.java
new file mode 100644
index 0000000000..28fed8c6aa
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribDownloadEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class DistribDownloadEventTableDescTest {
+
+	private DistribDownloadEventTableDesc createTestSubject() {
+		return new DistribDownloadEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		DistribDownloadEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		DistribDownloadEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		DistribDownloadEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		DistribDownloadEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		DistribDownloadEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribEngineEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribEngineEventTableDescTest.java
new file mode 100644
index 0000000000..6904aea64c
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribEngineEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class DistribEngineEventTableDescTest {
+
+	private DistribEngineEventTableDesc createTestSubject() {
+		return new DistribEngineEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		DistribEngineEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		DistribEngineEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		DistribEngineEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		DistribEngineEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		DistribEngineEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribNotifEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribNotifEventTableDescTest.java
new file mode 100644
index 0000000000..97f587976e
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribNotifEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class DistribNotifEventTableDescTest {
+
+	private DistribNotifEventTableDesc createTestSubject() {
+		return new DistribNotifEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		DistribNotifEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		DistribNotifEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		DistribNotifEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		DistribNotifEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		DistribNotifEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribStatusEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribStatusEventTableDescTest.java
new file mode 100644
index 0000000000..23b7301a68
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribStatusEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class DistribStatusEventTableDescTest {
+
+	private DistribStatusEventTableDesc createTestSubject() {
+		return new DistribStatusEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		DistribStatusEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		DistribStatusEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		DistribStatusEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		DistribStatusEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		DistribStatusEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ExternalApiEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ExternalApiEventTableDescTest.java
new file mode 100644
index 0000000000..eb23b88363
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ExternalApiEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class ExternalApiEventTableDescTest {
+
+	private ExternalApiEventTableDesc createTestSubject() {
+		return new ExternalApiEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		ExternalApiEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		ExternalApiEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		ExternalApiEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		ExternalApiEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		ExternalApiEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetCatHierEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetCatHierEventTableDescTest.java
new file mode 100644
index 0000000000..ce858ee33f
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetCatHierEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class GetCatHierEventTableDescTest {
+
+	private GetCatHierEventTableDesc createTestSubject() {
+		return new GetCatHierEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		GetCatHierEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		GetCatHierEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		GetCatHierEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		GetCatHierEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		GetCatHierEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetUebClusterEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetUebClusterEventTableDescTest.java
new file mode 100644
index 0000000000..559c8c9280
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetUebClusterEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class GetUebClusterEventTableDescTest {
+
+	private GetUebClusterEventTableDesc createTestSubject() {
+		return new GetUebClusterEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		GetUebClusterEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		GetUebClusterEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		GetUebClusterEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		GetUebClusterEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		GetUebClusterEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetUsersListEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetUsersListEventTableDescTest.java
new file mode 100644
index 0000000000..26a8788e5c
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetUsersListEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class GetUsersListEventTableDescTest {
+
+	private GetUsersListEventTableDesc createTestSubject() {
+		return new GetUsersListEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		GetUsersListEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		GetUsersListEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		GetUsersListEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		GetUsersListEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		GetUsersListEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/MigrationTasksTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/MigrationTasksTableDescriptionTest.java
new file mode 100644
index 0000000000..ad2b5c8a0d
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/MigrationTasksTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class MigrationTasksTableDescriptionTest {
+
+	private MigrationTasksTableDescription createTestSubject() {
+		return new MigrationTasksTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		MigrationTasksTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		MigrationTasksTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		MigrationTasksTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		MigrationTasksTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		MigrationTasksTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OldExternalApiEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OldExternalApiEventTableDescTest.java
new file mode 100644
index 0000000000..31ae8b5549
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OldExternalApiEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class OldExternalApiEventTableDescTest {
+
+	private OldExternalApiEventTableDesc createTestSubject() {
+		return new OldExternalApiEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		OldExternalApiEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		OldExternalApiEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		OldExternalApiEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		OldExternalApiEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		OldExternalApiEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ResAdminEventTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ResAdminEventTableDescriptionTest.java
new file mode 100644
index 0000000000..68b06e1b66
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ResAdminEventTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class ResAdminEventTableDescriptionTest {
+
+	private ResAdminEventTableDescription createTestSubject() {
+		return new ResAdminEventTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		ResAdminEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		ResAdminEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		ResAdminEventTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		ResAdminEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		ResAdminEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/SdcSchemaFilesTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/SdcSchemaFilesTableDescriptionTest.java
new file mode 100644
index 0000000000..b323c0fabe
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/SdcSchemaFilesTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class SdcSchemaFilesTableDescriptionTest {
+
+	private SdcSchemaFilesTableDescription createTestSubject() {
+		return new SdcSchemaFilesTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		SdcSchemaFilesTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		SdcSchemaFilesTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		SdcSchemaFilesTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		SdcSchemaFilesTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		SdcSchemaFilesTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/UserAccessEventTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/UserAccessEventTableDescriptionTest.java
new file mode 100644
index 0000000000..da90309e34
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/UserAccessEventTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class UserAccessEventTableDescriptionTest {
+
+	private UserAccessEventTableDescription createTestSubject() {
+		return new UserAccessEventTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		UserAccessEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		UserAccessEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		UserAccessEventTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		UserAccessEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		UserAccessEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/UserAdminEventTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/UserAdminEventTableDescriptionTest.java
new file mode 100644
index 0000000000..1efb68c1a9
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/UserAdminEventTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class UserAdminEventTableDescriptionTest {
+
+	private UserAdminEventTableDescription createTestSubject() {
+		return new UserAdminEventTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		UserAdminEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		UserAdminEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		UserAdminEventTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		UserAdminEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		UserAdminEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/MatchFilterTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/MatchFilterTest.java
new file mode 100644
index 0000000000..529f642fb2
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/MatchFilterTest.java
@@ -0,0 +1,50 @@
+package org.openecomp.sdc.be.dao.neo4j.filters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class MatchFilterTest {
+
+	private MatchFilter createTestSubject() {
+		return new MatchFilter();
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		MatchFilter testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		MatchFilter testSubject;
+		Map<String, Object> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testAddToMatch() throws Exception {
+		MatchFilter testSubject;
+		String propName = "";
+		Object value = null;
+		MatchFilter result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.addToMatch(propName, value);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/RecursiveByRelationFilterTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/RecursiveByRelationFilterTest.java
new file mode 100644
index 0000000000..76b36d2a97
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/RecursiveByRelationFilterTest.java
@@ -0,0 +1,93 @@
+package org.openecomp.sdc.be.dao.neo4j.filters;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.dao.graph.datatype.GraphNode;
+
+
+public class RecursiveByRelationFilterTest {
+
+	private RecursiveByRelationFilter createTestSubject() {
+		return new RecursiveByRelationFilter();
+	}
+
+	
+	@Test
+	public void testAddNode() throws Exception {
+		RecursiveByRelationFilter testSubject;
+		GraphNode node = null;
+		RecursiveByRelationFilter result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.addNode(node);
+	}
+
+	
+	@Test
+	public void testAddRelation() throws Exception {
+		RecursiveByRelationFilter testSubject;
+		String relationType = "";
+		RecursiveByRelationFilter result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.addRelation(relationType);
+	}
+
+	
+	@Test
+	public void testGetNode() throws Exception {
+		RecursiveByRelationFilter testSubject;
+		GraphNode result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNode();
+	}
+
+	
+	@Test
+	public void testSetNode() throws Exception {
+		RecursiveByRelationFilter testSubject;
+		GraphNode node = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNode(node);
+	}
+
+	
+	@Test
+	public void testGetRelationType() throws Exception {
+		RecursiveByRelationFilter testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRelationType();
+	}
+
+	
+	@Test
+	public void testSetRelationType() throws Exception {
+		RecursiveByRelationFilter testSubject;
+		String relationType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRelationType(relationType);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RecursiveByRelationFilter testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/RecursiveFilterTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/RecursiveFilterTest.java
new file mode 100644
index 0000000000..990a2b4972
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/RecursiveFilterTest.java
@@ -0,0 +1,83 @@
+package org.openecomp.sdc.be.dao.neo4j.filters;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
+
+
+public class RecursiveFilterTest {
+
+	private RecursiveFilter createTestSubject() {
+		return new RecursiveFilter();
+	}
+
+	
+	@Test
+	public void testAddChildRelationType() throws Exception {
+		RecursiveFilter testSubject;
+		String type = "";
+		RecursiveFilter result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.addChildRelationType(type);
+	}
+
+	
+	@Test
+	public void testGetChildRelationTypes() throws Exception {
+		RecursiveFilter testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getChildRelationTypes();
+	}
+
+	
+	@Test
+	public void testSetChildRelationTypes() throws Exception {
+		RecursiveFilter testSubject;
+		List<String> childRelationTypes = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setChildRelationTypes(childRelationTypes);
+	}
+
+	
+	@Test
+	public void testGetNodeType() throws Exception {
+		RecursiveFilter testSubject;
+		NodeTypeEnum result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNodeType();
+	}
+
+	
+	@Test
+	public void testSetNodeType() throws Exception {
+		RecursiveFilter testSubject;
+		NodeTypeEnum nodeType = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNodeType(nodeType);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RecursiveFilter testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/UpdateFilterTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/UpdateFilterTest.java
new file mode 100644
index 0000000000..55a9255d31
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/UpdateFilterTest.java
@@ -0,0 +1,40 @@
+package org.openecomp.sdc.be.dao.neo4j.filters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class UpdateFilterTest {
+
+	private UpdateFilter createTestSubject() {
+		return new UpdateFilter(null);
+	}
+
+	
+	@Test
+	public void testGetToUpdate() throws Exception {
+		UpdateFilter testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getToUpdate();
+	}
+
+	
+	@Test
+	public void testSetToUpdate() throws Exception {
+		UpdateFilter testSubject;
+		Map<String, Object> toUpdate = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setToUpdate(toUpdate);
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/rest/RestConfigurationInfoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/rest/RestConfigurationInfoTest.java
new file mode 100644
index 0000000000..5ce78c2c95
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/rest/RestConfigurationInfoTest.java
@@ -0,0 +1,134 @@
+package org.openecomp.sdc.be.dao.rest;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class RestConfigurationInfoTest {
+
+	private RestConfigurationInfo createTestSubject() {
+		return new RestConfigurationInfo();
+	}
+
+	
+	@Test
+	public void testGetReadTimeoutInSec() throws Exception {
+		RestConfigurationInfo testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getReadTimeoutInSec();
+	}
+
+	
+	@Test
+	public void testSetReadTimeoutInSec() throws Exception {
+		RestConfigurationInfo testSubject;
+		Integer readTimeoutInSec = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setReadTimeoutInSec(readTimeoutInSec);
+	}
+
+	
+	@Test
+	public void testGetIgnoreCertificate() throws Exception {
+		RestConfigurationInfo testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIgnoreCertificate();
+	}
+
+	
+	@Test
+	public void testSetIgnoreCertificate() throws Exception {
+		RestConfigurationInfo testSubject;
+		Boolean ignoreCertificate = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIgnoreCertificate(ignoreCertificate);
+	}
+
+	
+	@Test
+	public void testGetConnectionPoolSize() throws Exception {
+		RestConfigurationInfo testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConnectionPoolSize();
+	}
+
+	
+	@Test
+	public void testSetConnectionPoolSize() throws Exception {
+		RestConfigurationInfo testSubject;
+		Integer connectionPoolSize = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConnectionPoolSize(connectionPoolSize);
+	}
+
+	
+	@Test
+	public void testGetConnectTimeoutInSec() throws Exception {
+		RestConfigurationInfo testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConnectTimeoutInSec();
+	}
+
+	
+	@Test
+	public void testSetConnectTimeoutInSec() throws Exception {
+		RestConfigurationInfo testSubject;
+		Integer connectTimeoutInSec = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConnectTimeoutInSec(connectTimeoutInSec);
+	}
+
+	
+	@Test
+	public void testGetSocketTimeoutInSec() throws Exception {
+		RestConfigurationInfo testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getSocketTimeoutInSec();
+	}
+
+	
+	@Test
+	public void testSetSocketTimeoutInSec() throws Exception {
+		RestConfigurationInfo testSubject;
+		Integer socketTimeoutInSec = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setSocketTimeoutInSec(socketTimeoutInSec);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RestConfigurationInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/MapEntryTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/MapEntryTest.java
new file mode 100644
index 0000000000..bb6afc4153
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/MapEntryTest.java
@@ -0,0 +1,44 @@
+package org.openecomp.sdc.be.dao.utils;
+
+import javax.annotation.Generated;
+
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.elasticsearch.common.recycler.Recycler.V;
+import org.junit.Test;
+
+
+public class MapEntryTest {
+
+	private MapEntry createTestSubject() {
+		return new MapEntry();
+	}
+
+	
+
+
+
+	
+	@Test
+	public void testSetKey() throws Exception {
+		MapEntry testSubject;
+		T key = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setKey(key);
+	}
+
+	
+
+
+	
+	@Test
+	public void testSetValue() throws Exception {
+		MapEntry testSubject;
+		V value = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValue(value);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEventTest.java
index c6de8d16c5..5172fc31dc 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEventTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEventTest.java
@@ -1,17 +1,13 @@
 package org.openecomp.sdc.be.resources.data.auditing;
 
-import javax.annotation.Generated;
-
 import org.junit.Test;
 
-
 public class AuditingGenericEventTest {
 
 	private AuditingGenericEvent createTestSubject() {
 		return new AuditingGenericEvent();
 	}
 
-	
 	@Test
 	public void testGetRequestId() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -22,7 +18,6 @@ public class AuditingGenericEventTest {
 		result = testSubject.getRequestId();
 	}
 
-	
 	@Test
 	public void testSetRequestId() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -33,7 +28,6 @@ public class AuditingGenericEventTest {
 		testSubject.setRequestId(requestId);
 	}
 
-	
 	@Test
 	public void testGetServiceInstanceId() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -44,7 +38,6 @@ public class AuditingGenericEventTest {
 		result = testSubject.getServiceInstanceId();
 	}
 
-	
 	@Test
 	public void testSetServiceInstanceId() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -55,7 +48,6 @@ public class AuditingGenericEventTest {
 		testSubject.setServiceInstanceId(serviceInstanceId);
 	}
 
-	
 	@Test
 	public void testGetAction() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -66,7 +58,6 @@ public class AuditingGenericEventTest {
 		result = testSubject.getAction();
 	}
 
-	
 	@Test
 	public void testSetAction() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -77,7 +68,6 @@ public class AuditingGenericEventTest {
 		testSubject.setAction(action);
 	}
 
-	
 	@Test
 	public void testGetStatus() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -88,7 +78,6 @@ public class AuditingGenericEventTest {
 		result = testSubject.getStatus();
 	}
 
-	
 	@Test
 	public void testSetStatus() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -99,7 +88,6 @@ public class AuditingGenericEventTest {
 		testSubject.setStatus(status);
 	}
 
-	
 	@Test
 	public void testGetDesc() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -110,7 +98,6 @@ public class AuditingGenericEventTest {
 		result = testSubject.getDesc();
 	}
 
-	
 	@Test
 	public void testSetDesc() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -121,7 +108,6 @@ public class AuditingGenericEventTest {
 		testSubject.setDesc(desc);
 	}
 
-	
 	@Test
 	public void testFillFields() throws Exception {
 		AuditingGenericEvent testSubject;
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEventTest.java
index 7940ae182a..72ccc52b88 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEventTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEventTest.java
@@ -3,18 +3,14 @@ package org.openecomp.sdc.be.resources.data.auditing;
 import java.util.Date;
 import java.util.UUID;
 
-import javax.annotation.Generated;
-
 import org.junit.Test;
 
-
 public class AuditingGetUebClusterEventTest {
 
 	private AuditingGetUebClusterEvent createTestSubject() {
 		return new AuditingGetUebClusterEvent();
 	}
 
-	
 	@Test
 	public void testFillFields() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -24,7 +20,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.fillFields();
 	}
 
-	
 	@Test
 	public void testGetConsumerId() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -35,7 +30,6 @@ public class AuditingGetUebClusterEventTest {
 		result = testSubject.getConsumerId();
 	}
 
-	
 	@Test
 	public void testSetConsumerId() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -46,7 +40,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.setConsumerId(consumerId);
 	}
 
-	
 	@Test
 	public void testGetTimebaseduuid() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -57,7 +50,6 @@ public class AuditingGetUebClusterEventTest {
 		result = testSubject.getTimebaseduuid();
 	}
 
-	
 	@Test
 	public void testSetTimebaseduuid() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -68,7 +60,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.setTimebaseduuid(timebaseduuid);
 	}
 
-	
 	@Test
 	public void testGetTimestamp1() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -79,7 +70,6 @@ public class AuditingGetUebClusterEventTest {
 		result = testSubject.getTimestamp1();
 	}
 
-	
 	@Test
 	public void testSetTimestamp1() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -90,7 +80,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.setTimestamp1(timestamp1);
 	}
 
-	
 	@Test
 	public void testGetRequestId() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -101,7 +90,6 @@ public class AuditingGetUebClusterEventTest {
 		result = testSubject.getRequestId();
 	}
 
-	
 	@Test
 	public void testSetRequestId() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -112,7 +100,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.setRequestId(requestId);
 	}
 
-	
 	@Test
 	public void testGetServiceInstanceId() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -123,7 +110,6 @@ public class AuditingGetUebClusterEventTest {
 		result = testSubject.getServiceInstanceId();
 	}
 
-	
 	@Test
 	public void testSetServiceInstanceId() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -134,7 +120,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.setServiceInstanceId(serviceInstanceId);
 	}
 
-	
 	@Test
 	public void testGetAction() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -145,7 +130,6 @@ public class AuditingGetUebClusterEventTest {
 		result = testSubject.getAction();
 	}
 
-	
 	@Test
 	public void testSetAction() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -156,7 +140,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.setAction(action);
 	}
 
-	
 	@Test
 	public void testGetStatus() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -167,7 +150,6 @@ public class AuditingGetUebClusterEventTest {
 		result = testSubject.getStatus();
 	}
 
-	
 	@Test
 	public void testSetStatus() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -178,7 +160,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.setStatus(status);
 	}
 
-	
 	@Test
 	public void testGetDesc() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -189,7 +170,6 @@ public class AuditingGetUebClusterEventTest {
 		result = testSubject.getDesc();
 	}
 
-	
 	@Test
 	public void testSetDesc() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -200,7 +180,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.setDesc(desc);
 	}
 
-	
 	@Test
 	public void testToString() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuthEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuthEventTest.java
index 42de349d5b..39de467030 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuthEventTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuthEventTest.java
@@ -3,18 +3,14 @@ package org.openecomp.sdc.be.resources.data.auditing;
 import java.util.Date;
 import java.util.UUID;
 
-import javax.annotation.Generated;
-
 import org.junit.Test;
 
-
 public class AuthEventTest {
 
 	private AuthEvent createTestSubject() {
 		return new AuthEvent();
 	}
 
-	
 	@Test
 	public void testGetUrl() throws Exception {
 		AuthEvent testSubject;
@@ -25,7 +21,6 @@ public class AuthEventTest {
 		result = testSubject.getUrl();
 	}
 
-	
 	@Test
 	public void testSetUrl() throws Exception {
 		AuthEvent testSubject;
@@ -36,7 +31,6 @@ public class AuthEventTest {
 		testSubject.setUrl(url);
 	}
 
-	
 	@Test
 	public void testGetUser() throws Exception {
 		AuthEvent testSubject;
@@ -47,7 +41,6 @@ public class AuthEventTest {
 		result = testSubject.getUser();
 	}
 
-	
 	@Test
 	public void testSetUser() throws Exception {
 		AuthEvent testSubject;
@@ -58,7 +51,6 @@ public class AuthEventTest {
 		testSubject.setUser(user);
 	}
 
-	
 	@Test
 	public void testGetAuthStatus() throws Exception {
 		AuthEvent testSubject;
@@ -69,7 +61,6 @@ public class AuthEventTest {
 		result = testSubject.getAuthStatus();
 	}
 
-	
 	@Test
 	public void testSetAuthStatus() throws Exception {
 		AuthEvent testSubject;
@@ -80,7 +71,6 @@ public class AuthEventTest {
 		testSubject.setAuthStatus(authStatus);
 	}
 
-	
 	@Test
 	public void testGetRealm() throws Exception {
 		AuthEvent testSubject;
@@ -91,7 +81,6 @@ public class AuthEventTest {
 		result = testSubject.getRealm();
 	}
 
-	
 	@Test
 	public void testSetRealm() throws Exception {
 		AuthEvent testSubject;
@@ -102,7 +91,6 @@ public class AuthEventTest {
 		testSubject.setRealm(realm);
 	}
 
-	
 	@Test
 	public void testGetTimebaseduuid() throws Exception {
 		AuthEvent testSubject;
@@ -113,7 +101,6 @@ public class AuthEventTest {
 		result = testSubject.getTimebaseduuid();
 	}
 
-	
 	@Test
 	public void testSetTimebaseduuid() throws Exception {
 		AuthEvent testSubject;
@@ -124,7 +111,6 @@ public class AuthEventTest {
 		testSubject.setTimebaseduuid(timebaseduuid);
 	}
 
-	
 	@Test
 	public void testGetTimestamp1() throws Exception {
 		AuthEvent testSubject;
@@ -135,7 +121,6 @@ public class AuthEventTest {
 		result = testSubject.getTimestamp1();
 	}
 
-	
 	@Test
 	public void testSetTimestamp1() throws Exception {
 		AuthEvent testSubject;
@@ -146,7 +131,6 @@ public class AuthEventTest {
 		testSubject.setTimestamp1(timestamp1);
 	}
 
-	
 	@Test
 	public void testGetAction() throws Exception {
 		AuthEvent testSubject;
@@ -157,7 +141,6 @@ public class AuthEventTest {
 		result = testSubject.getAction();
 	}
 
-	
 	@Test
 	public void testSetAction() throws Exception {
 		AuthEvent testSubject;
@@ -168,7 +151,6 @@ public class AuthEventTest {
 		testSubject.setAction(action);
 	}
 
-	
 	@Test
 	public void testGetStatus() throws Exception {
 		AuthEvent testSubject;
@@ -179,7 +161,6 @@ public class AuthEventTest {
 		result = testSubject.getStatus();
 	}
 
-	
 	@Test
 	public void testSetStatus() throws Exception {
 		AuthEvent testSubject;
@@ -190,7 +171,6 @@ public class AuthEventTest {
 		testSubject.setStatus(status);
 	}
 
-	
 	@Test
 	public void testGetDesc() throws Exception {
 		AuthEvent testSubject;
@@ -201,7 +181,6 @@ public class AuthEventTest {
 		result = testSubject.getDesc();
 	}
 
-	
 	@Test
 	public void testSetDesc() throws Exception {
 		AuthEvent testSubject;
@@ -212,7 +191,6 @@ public class AuthEventTest {
 		testSubject.setDesc(desc);
 	}
 
-	
 	@Test
 	public void testGetRequestId() throws Exception {
 		AuthEvent testSubject;
@@ -223,7 +201,6 @@ public class AuthEventTest {
 		result = testSubject.getRequestId();
 	}
 
-	
 	@Test
 	public void testSetRequestId() throws Exception {
 		AuthEvent testSubject;
@@ -234,7 +211,6 @@ public class AuthEventTest {
 		testSubject.setRequestId(requestId);
 	}
 
-	
 	@Test
 	public void testFillFields() throws Exception {
 		AuthEvent testSubject;
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEventTest.java
index 448df507d7..3e508307ed 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEventTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEventTest.java
@@ -3,18 +3,14 @@ package org.openecomp.sdc.be.resources.data.auditing;
 import java.util.Date;
 import java.util.UUID;
 
-import javax.annotation.Generated;
-
 import org.junit.Test;
 
-
 public class CategoryEventTest {
 
 	private CategoryEvent createTestSubject() {
 		return new CategoryEvent();
 	}
 
-	
 	@Test
 	public void testFillFields() throws Exception {
 		CategoryEvent testSubject;
@@ -24,7 +20,6 @@ public class CategoryEventTest {
 		testSubject.fillFields();
 	}
 
-	
 	@Test
 	public void testGetTimebaseduuid() throws Exception {
 		CategoryEvent testSubject;
@@ -35,7 +30,6 @@ public class CategoryEventTest {
 		result = testSubject.getTimebaseduuid();
 	}
 
-	
 	@Test
 	public void testSetTimebaseduuid() throws Exception {
 		CategoryEvent testSubject;
@@ -46,7 +40,6 @@ public class CategoryEventTest {
 		testSubject.setTimebaseduuid(timebaseduuid);
 	}
 
-	
 	@Test
 	public void testGetAction() throws Exception {
 		CategoryEvent testSubject;
@@ -57,7 +50,6 @@ public class CategoryEventTest {
 		result = testSubject.getAction();
 	}
 
-	
 	@Test
 	public void testSetAction() throws Exception {
 		CategoryEvent testSubject;
@@ -68,7 +60,6 @@ public class CategoryEventTest {
 		testSubject.setAction(action);
 	}
 
-	
 	@Test
 	public void testGetStatus() throws Exception {
 		CategoryEvent testSubject;
@@ -79,7 +70,6 @@ public class CategoryEventTest {
 		result = testSubject.getStatus();
 	}
 
-	
 	@Test
 	public void testSetStatus() throws Exception {
 		CategoryEvent testSubject;
@@ -90,7 +80,6 @@ public class CategoryEventTest {
 		testSubject.setStatus(status);
 	}
 
-	
 	@Test
 	public void testGetDesc() throws Exception {
 		CategoryEvent testSubject;
@@ -101,7 +90,6 @@ public class CategoryEventTest {
 		result = testSubject.getDesc();
 	}
 
-	
 	@Test
 	public void testSetDesc() throws Exception {
 		CategoryEvent testSubject;
@@ -112,7 +100,6 @@ public class CategoryEventTest {
 		testSubject.setDesc(desc);
 	}
 
-	
 	@Test
 	public void testGetCategoryName() throws Exception {
 		CategoryEvent testSubject;
@@ -123,7 +110,6 @@ public class CategoryEventTest {
 		result = testSubject.getCategoryName();
 	}
 
-	
 	@Test
 	public void testSetCategoryName() throws Exception {
 		CategoryEvent testSubject;
@@ -134,7 +120,6 @@ public class CategoryEventTest {
 		testSubject.setCategoryName(categoryName);
 	}
 
-	
 	@Test
 	public void testGetSubCategoryName() throws Exception {
 		CategoryEvent testSubject;
@@ -145,7 +130,6 @@ public class CategoryEventTest {
 		result = testSubject.getSubCategoryName();
 	}
 
-	
 	@Test
 	public void testSetSubCategoryName() throws Exception {
 		CategoryEvent testSubject;
@@ -156,7 +140,6 @@ public class CategoryEventTest {
 		testSubject.setSubCategoryName(subCategoryName);
 	}
 
-	
 	@Test
 	public void testGetGroupingName() throws Exception {
 		CategoryEvent testSubject;
@@ -167,7 +150,6 @@ public class CategoryEventTest {
 		result = testSubject.getGroupingName();
 	}
 
-	
 	@Test
 	public void testSetGroupingName() throws Exception {
 		CategoryEvent testSubject;
@@ -178,7 +160,6 @@ public class CategoryEventTest {
 		testSubject.setGroupingName(groupingName);
 	}
 
-	
 	@Test
 	public void testGetTimestamp1() throws Exception {
 		CategoryEvent testSubject;
@@ -189,7 +170,6 @@ public class CategoryEventTest {
 		result = testSubject.getTimestamp1();
 	}
 
-	
 	@Test
 	public void testSetTimestamp1() throws Exception {
 		CategoryEvent testSubject;
@@ -200,7 +180,6 @@ public class CategoryEventTest {
 		testSubject.setTimestamp1(timestamp1);
 	}
 
-	
 	@Test
 	public void testGetModifier() throws Exception {
 		CategoryEvent testSubject;
@@ -211,7 +190,6 @@ public class CategoryEventTest {
 		result = testSubject.getModifier();
 	}
 
-	
 	@Test
 	public void testSetModifier() throws Exception {
 		CategoryEvent testSubject;
@@ -222,7 +200,6 @@ public class CategoryEventTest {
 		testSubject.setModifier(modifier);
 	}
 
-	
 	@Test
 	public void testGetServiceInstanceId() throws Exception {
 		CategoryEvent testSubject;
@@ -233,7 +210,6 @@ public class CategoryEventTest {
 		result = testSubject.getServiceInstanceId();
 	}
 
-	
 	@Test
 	public void testSetServiceInstanceId() throws Exception {
 		CategoryEvent testSubject;
@@ -244,7 +220,6 @@ public class CategoryEventTest {
 		testSubject.setServiceInstanceId(serviceInstanceId);
 	}
 
-	
 	@Test
 	public void testGetResourceType() throws Exception {
 		CategoryEvent testSubject;
@@ -255,7 +230,6 @@ public class CategoryEventTest {
 		result = testSubject.getResourceType();
 	}
 
-	
 	@Test
 	public void testSetResourceType() throws Exception {
 		CategoryEvent testSubject;
@@ -266,7 +240,6 @@ public class CategoryEventTest {
 		testSubject.setResourceType(resourceType);
 	}
 
-	
 	@Test
 	public void testGetRequestId() throws Exception {
 		CategoryEvent testSubject;
@@ -277,7 +250,6 @@ public class CategoryEventTest {
 		result = testSubject.getRequestId();
 	}
 
-	
 	@Test
 	public void testSetRequestId() throws Exception {
 		CategoryEvent testSubject;
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
index 6d0f192d1c..3bb589a976 100644
--- 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
@@ -5,6 +5,8 @@ import java.util.List;
 import javax.annotation.Generated;
 
 import org.junit.Test;
+import java.util.*;
+import org.junit.Assert;
 
 
 public class CategoryDefinitionTest {
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/NodeTypeTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/NodeTypeTest.java
new file mode 100644
index 0000000000..ba7b253463
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/NodeTypeTest.java
@@ -0,0 +1,175 @@
+package org.openecomp.sdc.be.model.jsontitan.datamodel;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.InterfaceDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ListCapabilityDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ListRequirementDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapPropertiesDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+
+
+public class NodeTypeTest {
+
+	private NodeType createTestSubject() {
+		return new NodeType();
+	}
+
+	
+	@Test
+	public void testGetDerivedList() throws Exception {
+		NodeType testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerivedList();
+	}
+
+	
+	@Test
+	public void testSetDerivedList() throws Exception {
+		NodeType testSubject;
+		List<String> derivedList = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerivedList(derivedList);
+	}
+
+	
+	@Test
+	public void testGetDerivedFrom() throws Exception {
+		NodeType testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerivedFrom();
+	}
+
+	
+	@Test
+	public void testSetDerivedFrom() throws Exception {
+		NodeType testSubject;
+		List<String> derivedFrom = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerivedFrom(derivedFrom);
+	}
+
+	
+	@Test
+	public void testGetAttributes() throws Exception {
+		NodeType testSubject;
+		Map<String, PropertyDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAttributes();
+	}
+
+	
+	@Test
+	public void testSetAttributes() throws Exception {
+		NodeType testSubject;
+		Map<String, PropertyDataDefinition> attributes = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAttributes(attributes);
+	}
+
+	
+	@Test
+	public void testGetCapabilties() throws Exception {
+		NodeType testSubject;
+		Map<String, ListCapabilityDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilties();
+	}
+
+	
+	@Test
+	public void testSetCapabilties() throws Exception {
+		NodeType testSubject;
+		Map<String, ListCapabilityDataDefinition> capabilties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilties(capabilties);
+	}
+
+	
+	@Test
+	public void testGetRequirements() throws Exception {
+		NodeType testSubject;
+		Map<String, ListRequirementDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirements();
+	}
+
+	
+	@Test
+	public void testSetRequirements() throws Exception {
+		NodeType testSubject;
+		Map<String, ListRequirementDataDefinition> requirements = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirements(requirements);
+	}
+
+	
+	@Test
+	public void testGetCapabiltiesProperties() throws Exception {
+		NodeType testSubject;
+		Map<String, MapPropertiesDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabiltiesProperties();
+	}
+
+	
+	@Test
+	public void testSetCapabiltiesProperties() throws Exception {
+		NodeType testSubject;
+		Map<String, MapPropertiesDataDefinition> capabiltiesProperties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabiltiesProperties(capabiltiesProperties);
+	}
+
+	
+	@Test
+	public void testGetInterfaceArtifacts() throws Exception {
+		NodeType testSubject;
+		Map<String, InterfaceDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInterfaceArtifacts();
+	}
+
+	
+	@Test
+	public void testSetInterfaceArtifacts() throws Exception {
+		NodeType testSubject;
+		Map<String, InterfaceDataDefinition> interfaceArtifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInterfaceArtifacts(interfaceArtifacts);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElementTypeEnumTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElementTypeEnumTest.java
new file mode 100644
index 0000000000..671eeb2219
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElementTypeEnumTest.java
@@ -0,0 +1,28 @@
+package org.openecomp.sdc.be.model.jsontitan.datamodel;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
+
+
+public class ToscaElementTypeEnumTest {
+
+	private ToscaElementTypeEnum createTestSubject() {
+		return  ToscaElementTypeEnum.TopologyTemplate;
+	}
+
+	
+
+
+	
+	@Test
+	public void testGetValue() throws Exception {
+		ToscaElementTypeEnum testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValue();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/enums/JsonConstantKeysEnumTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/enums/JsonConstantKeysEnumTest.java
new file mode 100644
index 0000000000..11faa42b79
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/enums/JsonConstantKeysEnumTest.java
@@ -0,0 +1,24 @@
+package org.openecomp.sdc.be.model.jsontitan.enums;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class JsonConstantKeysEnumTest {
+
+	private JsonConstantKeysEnum createTestSubject() {
+		return  JsonConstantKeysEnum.COMPOSITION;
+	}
+
+	
+	@Test
+	public void testGetValue() throws Exception {
+		JsonConstantKeysEnum testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValue();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/EqualConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/EqualConstraintTest.java
new file mode 100644
index 0000000000..8978c405b0
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/EqualConstraintTest.java
@@ -0,0 +1,31 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.tosca.ToscaType;
+
+
+public class EqualConstraintTest {
+
+	private EqualConstraint createTestSubject() {
+		return new EqualConstraint("");
+	}
+
+	
+
+	
+	@Test
+	public void testValidate() throws Exception {
+		EqualConstraint testSubject;
+		Object propertyValue = null;
+
+		// test 1
+		testSubject = createTestSubject();
+		propertyValue = null;
+		testSubject.validate(propertyValue);
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/GreaterThanConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/GreaterThanConstraintTest.java
new file mode 100644
index 0000000000..001b09c517
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/GreaterThanConstraintTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.tosca.ToscaType;
+
+public class GreaterThanConstraintTest {
+
+	private GreaterThanConstraint createTestSubject() {
+		return new GreaterThanConstraint("");
+	}
+
+
+
+	
+
+	
+	@Test
+	public void testGetGreaterThan() throws Exception {
+		GreaterThanConstraint testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGreaterThan();
+	}
+
+	
+	@Test
+	public void testSetGreaterThan() throws Exception {
+		GreaterThanConstraint testSubject;
+		String greaterThan = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGreaterThan(greaterThan);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/InRangeConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/InRangeConstraintTest.java
new file mode 100644
index 0000000000..f7a040cf94
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/InRangeConstraintTest.java
@@ -0,0 +1,61 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.tosca.ToscaType;
+
+
+public class InRangeConstraintTest {
+
+	private InRangeConstraint createTestSubject() {
+		return new InRangeConstraint(null);
+	}
+
+	
+
+
+	
+	@Test
+	public void testGetRangeMinValue() throws Exception {
+		InRangeConstraint testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRangeMinValue();
+	}
+
+	
+	@Test
+	public void testSetRangeMinValue() throws Exception {
+		InRangeConstraint testSubject;
+		String minValue = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRangeMinValue(minValue);
+	}
+
+	
+	@Test
+	public void testGetRangeMaxValue() throws Exception {
+		InRangeConstraint testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRangeMaxValue();
+	}
+
+	
+	@Test
+	public void testSetRangeMaxValue() throws Exception {
+		InRangeConstraint testSubject;
+		String maxValue = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRangeMaxValue(maxValue);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/LengthConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/LengthConstraintTest.java
new file mode 100644
index 0000000000..87781f0260
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/LengthConstraintTest.java
@@ -0,0 +1,38 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class LengthConstraintTest {
+
+	private LengthConstraint createTestSubject() {
+		return new LengthConstraint();
+	}
+
+	
+
+
+	
+	@Test
+	public void testGetLength() throws Exception {
+		LengthConstraint testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLength();
+	}
+
+	
+	@Test
+	public void testSetLength() throws Exception {
+		LengthConstraint testSubject;
+		Integer length = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLength(length);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/LessOrEqualConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/LessOrEqualConstraintTest.java
new file mode 100644
index 0000000000..6430802948
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/LessOrEqualConstraintTest.java
@@ -0,0 +1,41 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.tosca.ToscaType;
+
+
+public class LessOrEqualConstraintTest {
+
+	private LessOrEqualConstraint createTestSubject() {
+		return new LessOrEqualConstraint("");
+	}
+
+	
+
+	
+
+
+	
+	@Test
+	public void testGetLessOrEqual() throws Exception {
+		LessOrEqualConstraint testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLessOrEqual();
+	}
+
+	
+	@Test
+	public void testSetLessOrEqual() throws Exception {
+		LessOrEqualConstraint testSubject;
+		String lessOrEqual = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLessOrEqual(lessOrEqual);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/MaxLengthConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/MaxLengthConstraintTest.java
new file mode 100644
index 0000000000..ae0a50612d
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/MaxLengthConstraintTest.java
@@ -0,0 +1,36 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class MaxLengthConstraintTest {
+
+	private MaxLengthConstraint createTestSubject() {
+		return new MaxLengthConstraint(null);
+	}
+
+	
+	
+	@Test
+	public void testGetMaxLength() throws Exception {
+		MaxLengthConstraint testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMaxLength();
+	}
+
+	
+	@Test
+	public void testSetMaxLength() throws Exception {
+		MaxLengthConstraint testSubject;
+		Integer maxLength = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMaxLength(maxLength);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/MinLengthConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/MinLengthConstraintTest.java
new file mode 100644
index 0000000000..4263a6fe28
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/MinLengthConstraintTest.java
@@ -0,0 +1,38 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class MinLengthConstraintTest {
+
+	private MinLengthConstraint createTestSubject() {
+		return new MinLengthConstraint(null);
+	}
+
+	
+
+
+	
+	@Test
+	public void testGetMinLength() throws Exception {
+		MinLengthConstraint testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMinLength();
+	}
+
+	
+	@Test
+	public void testSetMinLength() throws Exception {
+		MinLengthConstraint testSubject;
+		Integer minLength = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMinLength(minLength);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/PatternConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/PatternConstraintTest.java
new file mode 100644
index 0000000000..1a20abbace
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/PatternConstraintTest.java
@@ -0,0 +1,25 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class PatternConstraintTest {
+
+	private PatternConstraint createTestSubject() {
+		return new PatternConstraint();
+	}
+
+	
+	@Test
+	public void testSetPattern() throws Exception {
+		PatternConstraint testSubject;
+		String pattern = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPattern(pattern);
+	}
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ValidValuesConstraintTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ValidValuesConstraintTest.java
new file mode 100644
index 0000000000..93622300c4
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/ValidValuesConstraintTest.java
@@ -0,0 +1,43 @@
+package org.openecomp.sdc.be.model.tosca.constraints;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.tosca.ToscaType;
+
+
+public class ValidValuesConstraintTest {
+
+	private ValidValuesConstraint createTestSubject() {
+		return new ValidValuesConstraint(null);
+	}
+
+	
+
+	
+
+
+	
+	@Test
+	public void testGetValidValues() throws Exception {
+		ValidValuesConstraint testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValidValues();
+	}
+
+	
+	@Test
+	public void testSetValidValues() throws Exception {
+		ValidValuesConstraint testSubject;
+		List<String> validValues = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValidValues(validValues);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/BooleanConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/BooleanConverterTest.java
new file mode 100644
index 0000000000..a37e8f6b4f
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/BooleanConverterTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class BooleanConverterTest {
+
+	private BooleanConverter createTestSubject() {
+		return BooleanConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		BooleanConverter result;
+
+		// default test
+		result = BooleanConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testConvertToToscaValue() throws Exception {
+		BooleanConverter testSubject;
+		String value = "";
+		String innerType = "";
+		Map<String, DataTypeDefinition> dataTypes = null;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convertToToscaValue(value, innerType, dataTypes);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverterTest.java
index 84f2254bbb..ebb7566611 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverterTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverterTest.java
@@ -1,5 +1,8 @@
 package org.openecomp.sdc.be.model.tosca.converters;
 
+import static org.junit.Assert.*;
+
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import org.junit.Before;
 import org.junit.Test;
@@ -14,174 +17,225 @@ import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import java.util.*;
+import org.junit.Assert;
 
 public class DataTypePropertyConverterTest {
 
-    private static final String EMPTY_JSON_STR = "{}";
-    public static final String PROPERTY2_DEFAULT = "{\"prop1\":\"def1\",\"prop3\":\"def3\"}";
-    private DataTypePropertyConverter testInstance = DataTypePropertyConverter.getInstance();
-    private Map<String, DataTypeDefinition> dataTypes;
-    private DataTypeDefinition noDefaultValue, dataType1, dataType2, dataType3;
-    private PropertyDefinition prop1, prop2, prop3, noDefaultProp;
-
-    @Before
-    public void setUp() throws Exception {
-        dataTypes = new HashMap<>();
-
-        prop1 = new PropertyDefinition();
-        prop1.setDefaultValue("def1");
-        prop1.setName("prop1");
-
-        prop2 = new PropertyDefinition();
-        prop2.setType("dataType1");
-        prop2.setName("prop2");
-
-        prop3 = new PropertyDefinition();
-        prop3.setDefaultValue("def3");
-        prop3.setName("prop3");
-
-        noDefaultProp = new PropertyDefinition();
-        noDefaultProp.setName("noDefaultProp");
-
-        noDefaultValue = new DataTypeDefinition();
-        noDefaultValue.setProperties(Collections.singletonList(noDefaultProp));
-
-        dataType1 = new DataTypeDefinition();
-        dataType1.setProperties(Arrays.asList(prop1, prop3));
-
-        dataType2 = new DataTypeDefinition();
-        dataType2.setDerivedFrom(dataType1);
-
-        dataType3 = new DataTypeDefinition();
-        dataType3.setProperties(Collections.singletonList(prop2));
-        dataType3.setDerivedFrom(noDefaultValue);
-
-        dataTypes.put("noDefault", noDefaultValue);
-        dataTypes.put("dataType1", dataType1);
-        dataTypes.put("dataType2", dataType2);
-        dataTypes.put("dataType3", dataType3);
-    }
-
-    @Test
-    public void testGetPropertyDefaultValuesRec_dataTypeNotExist() throws Exception {
-        String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("someType", dataTypes);
-        assertEquals(EMPTY_JSON_STR, defaultValue);
-    }
-
-    @Test
-    public void testGetPropertyDefaultValuesRec_NoDefaultValue() throws Exception {
-        String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("noDefault", dataTypes);
-        assertEquals(EMPTY_JSON_STR, defaultValue);
-    }
-
-    @Test
-    public void testGetPropertyDefaultValuesRec() throws Exception {
-        String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType1", dataTypes);
-        assertEquals(PROPERTY2_DEFAULT, defaultValue);
-    }
-
-    @Test
-    public void testGetPropertyDefaultValuesRec_defaultFromDerivedDataType_derivedDataTypeHasNoDefaults() throws Exception {
-        dataType2.setDerivedFrom(noDefaultValue);
-        String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType2", dataTypes);
-        assertEquals(EMPTY_JSON_STR, defaultValue);
-    }
-
-    @Test
-    public void testGetPropertyDefaultValuesRec_defaultFromDerivedDataType() throws Exception {
-        String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType2", dataTypes);
-        assertEquals(PROPERTY2_DEFAULT, defaultValue);
-    }
-
-    @Test
-    public void testGetPropertyDefaultValuesRec_defaultFromDataTypesOfProperties_dataTypeOfPropertyHasNoDefault() throws Exception {
-        dataType3.getProperties().get(0).setType(noDefaultValue.getName());
-        String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType3", dataTypes);
-        assertEquals(EMPTY_JSON_STR, defaultValue);
-    }
-
-    @Test
-    public void testGetPropertyDefaultValuesRec_defaultFromDataTypesOfProperties() throws Exception {
-        String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType3", dataTypes);
-        assertEquals("{\"prop2\":" + PROPERTY2_DEFAULT + "}", defaultValue);//data type 3 has property prop2 which has a data type with property prop1 which has a default value
-    }
-
-    @Test
-    public void testMergeDefaultValues_allDefaultValuesAreOverridden() throws Exception {
-        JsonObject value = new JsonObject();
-        value.addProperty(noDefaultProp.getName(), "override1");
-
-        JsonObject prop1Val = new JsonObject();
-        prop1Val.addProperty(prop1.getName(), "prop1Override");
-
-        JsonObject prop3Val = new JsonObject();
-        prop3Val.addProperty(prop3.getName(), "prop3Override");
-
-        JsonObject prop2Value = new JsonObject();
-        prop2Value.add(prop3.getName(), prop3Val);
-        prop2Value.add(prop1.getName(), prop1Val);
-
-        value.add(prop2.getName(), prop2Value);
-
-        String valBeforeMerge = value.toString();
-
-        testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
-        assertEquals(valBeforeMerge, value.toString());
-    }
-
-    @Test
-    public void testMergeDefaultValues() throws Exception {
-        JsonObject value = new JsonObject();
-        value.addProperty(noDefaultProp.getName(), "override1");
-
-        JsonObject prop1Val = new JsonObject();
-        prop1Val.addProperty(prop1.getName(), "prop1Override");
-
-        value.add(prop2.getName(), prop1Val);
-
-        testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
-
-        assertEquals("{\"noDefaultProp\":\"override1\",\"prop2\":{\"prop1\":\"prop1Override\",\"prop3\":\"def3\"}}",
-                      value.toString());//expect to merge prop 3 default as it was not overridden
-    }
-
-    @Test
-    public void testMergeDefaultValues_mergeAll() throws Exception {
-        JsonObject value = new JsonObject();
-        testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
+	private static final String EMPTY_JSON_STR = "{}";
+	public static final String PROPERTY2_DEFAULT = "{\"prop1\":\"def1\",\"prop3\":\"def3\"}";
+	private DataTypePropertyConverter testInstance = DataTypePropertyConverter.getInstance();
+	private Map<String, DataTypeDefinition> dataTypes;
+	private DataTypeDefinition noDefaultValue, dataType1, dataType2, dataType3;
+	private PropertyDefinition prop1, prop2, prop3, noDefaultProp;
+
+	@Before
+	public void setUp() throws Exception {
+		dataTypes = new HashMap<>();
+
+		prop1 = new PropertyDefinition();
+		prop1.setDefaultValue("def1");
+		prop1.setName("prop1");
+
+		prop2 = new PropertyDefinition();
+		prop2.setType("dataType1");
+		prop2.setName("prop2");
+
+		prop3 = new PropertyDefinition();
+		prop3.setDefaultValue("def3");
+		prop3.setName("prop3");
+
+		noDefaultProp = new PropertyDefinition();
+		noDefaultProp.setName("noDefaultProp");
+
+		noDefaultValue = new DataTypeDefinition();
+		noDefaultValue.setProperties(Collections.singletonList(noDefaultProp));
+
+		dataType1 = new DataTypeDefinition();
+		dataType1.setProperties(Arrays.asList(prop1, prop3));
+
+		dataType2 = new DataTypeDefinition();
+		dataType2.setDerivedFrom(dataType1);
+
+		dataType3 = new DataTypeDefinition();
+		dataType3.setProperties(Collections.singletonList(prop2));
+		dataType3.setDerivedFrom(noDefaultValue);
+
+		dataTypes.put("noDefault", noDefaultValue);
+		dataTypes.put("dataType1", dataType1);
+		dataTypes.put("dataType2", dataType2);
+		dataTypes.put("dataType3", dataType3);
+	}
+
+	@Test
+	public void testGetPropertyDefaultValuesRec_dataTypeNotExist() throws Exception {
+		String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("someType", dataTypes);
+		assertEquals(EMPTY_JSON_STR, defaultValue);
+	}
+
+	@Test
+	public void testGetPropertyDefaultValuesRec_NoDefaultValue() throws Exception {
+		String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("noDefault", dataTypes);
+		assertEquals(EMPTY_JSON_STR, defaultValue);
+	}
+
+	@Test
+	public void testGetPropertyDefaultValuesRec() throws Exception {
+		String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType1", dataTypes);
+		assertEquals(PROPERTY2_DEFAULT, defaultValue);
+	}
+
+	@Test
+	public void testGetPropertyDefaultValuesRec_defaultFromDerivedDataType_derivedDataTypeHasNoDefaults()
+			throws Exception {
+		dataType2.setDerivedFrom(noDefaultValue);
+		String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType2", dataTypes);
+		assertEquals(EMPTY_JSON_STR, defaultValue);
+	}
+
+	@Test
+	public void testGetPropertyDefaultValuesRec_defaultFromDerivedDataType() throws Exception {
+		String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType2", dataTypes);
+		assertEquals(PROPERTY2_DEFAULT, defaultValue);
+	}
+
+	@Test
+	public void testGetPropertyDefaultValuesRec_defaultFromDataTypesOfProperties_dataTypeOfPropertyHasNoDefault()
+			throws Exception {
+		dataType3.getProperties().get(0).setType(noDefaultValue.getName());
+		String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType3", dataTypes);
+		assertEquals(EMPTY_JSON_STR, defaultValue);
+	}
+
+	@Test
+	public void testGetPropertyDefaultValuesRec_defaultFromDataTypesOfProperties() throws Exception {
+		String defaultValue = testInstance.getDataTypePropertiesDefaultValuesRec("dataType3", dataTypes);
+		assertEquals("{\"prop2\":" + PROPERTY2_DEFAULT + "}", defaultValue);// data
+																			// type
+																			// 3
+																			// has
+																			// property
+																			// prop2
+																			// which
+																			// has
+																			// a
+																			// data
+																			// type
+																			// with
+																			// property
+																			// prop1
+																			// which
+																			// has
+																			// a
+																			// default
+																			// value
+	}
+
+	@Test
+	public void testMergeDefaultValues_allDefaultValuesAreOverridden() throws Exception {
+		JsonObject value = new JsonObject();
+		value.addProperty(noDefaultProp.getName(), "override1");
+
+		JsonObject prop1Val = new JsonObject();
+		prop1Val.addProperty(prop1.getName(), "prop1Override");
+
+		JsonObject prop3Val = new JsonObject();
+		prop3Val.addProperty(prop3.getName(), "prop3Override");
+
+		JsonObject prop2Value = new JsonObject();
+		prop2Value.add(prop3.getName(), prop3Val);
+		prop2Value.add(prop1.getName(), prop1Val);
+
+		value.add(prop2.getName(), prop2Value);
+
+		String valBeforeMerge = value.toString();
+
+		testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
+		assertEquals(valBeforeMerge, value.toString());
+	}
+
+	@Test
+	public void testMergeDefaultValues() throws Exception {
+		JsonObject value = new JsonObject();
+		value.addProperty(noDefaultProp.getName(), "override1");
+
+		JsonObject prop1Val = new JsonObject();
+		prop1Val.addProperty(prop1.getName(), "prop1Override");
+
+		value.add(prop2.getName(), prop1Val);
+
+		testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
+
+		assertEquals("{\"noDefaultProp\":\"override1\",\"prop2\":{\"prop1\":\"prop1Override\",\"prop3\":\"def3\"}}",
+				value.toString());// expect to merge prop 3 default as it was
+									// not overridden
+	}
+
+	@Test
+	public void testMergeDefaultValues_mergeAll() throws Exception {
+		JsonObject value = new JsonObject();
+		testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
+
+		assertEquals("{\"prop2\":" + PROPERTY2_DEFAULT + "}", value.toString());// expect
+																				// to
+																				// merge
+																				// prop
+																				// 3
+																				// default
+																				// as
+																				// it
+																				// was
+																				// not
+																				// overridden
+	}
+
+	@Test
+	public void testMergeDefaultValues_doNotAddDefaultsForGetInputValues() throws Exception {
+
+		JsonObject getInputValue = new JsonObject();
+		getInputValue.addProperty("get_input", "in1");
+
+		JsonObject value = new JsonObject();
+		value.add(prop2.getName(), getInputValue);
+
+		testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
+
+		assertEquals("{\"prop2\":{\"get_input\":\"in1\"}}", value.toString());
+	}
+
+	@Test
+	public void testMergeDefaultValues_doNotAddDefaultsForGetInputInnerValues() throws Exception {
+		JsonObject getInputValue = new JsonObject();
+		getInputValue.addProperty("get_input", "in1");
 
-        assertEquals("{\"prop2\":" + PROPERTY2_DEFAULT + "}",
-                     value.toString());//expect to merge prop 3 default as it was not overridden
-    }
+		JsonObject prop1Val = new JsonObject();
+		prop1Val.add(prop1.getName(), getInputValue);
 
-    @Test
-    public void testMergeDefaultValues_doNotAddDefaultsForGetInputValues() throws Exception {
+		JsonObject value = new JsonObject();
+		value.add(prop2.getName(), prop1Val);
 
-        JsonObject getInputValue = new JsonObject();
-        getInputValue.addProperty("get_input", "in1");
+		testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
 
-        JsonObject value = new JsonObject();
-        value.add(prop2.getName(), getInputValue);
+		assertEquals("{\"prop2\":{\"prop1\":{\"get_input\":\"in1\"},\"prop3\":\"def3\"}}", value.toString());
 
-        testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
+	}
 
-        assertEquals("{\"prop2\":{\"get_input\":\"in1\"}}", value.toString());
-    }
+	private DataTypePropertyConverter createTestSubject() {
+		return DataTypePropertyConverter.getInstance();
+	}
 
-    @Test
-    public void testMergeDefaultValues_doNotAddDefaultsForGetInputInnerValues() throws Exception {
-        JsonObject getInputValue = new JsonObject();
-        getInputValue.addProperty("get_input", "in1");
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		DataTypePropertyConverter result;
 
-        JsonObject prop1Val = new JsonObject();
-        prop1Val.add(prop1.getName(), getInputValue);
+		// default test
+		result = DataTypePropertyConverter.getInstance();
+	}
 
-        JsonObject value = new JsonObject();
-        value.add(prop2.getName(), prop1Val);
+	
 
-        testInstance.mergeDataTypeDefaultValuesWithPropertyValue(value, "dataType3", dataTypes);
 
-        assertEquals("{\"prop2\":{\"prop1\":{\"get_input\":\"in1\"},\"prop3\":\"def3\"}}", value.toString());
+	
 
-    }
 }
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DefaultConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DefaultConverterTest.java
new file mode 100644
index 0000000000..111c4f84f1
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/DefaultConverterTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class DefaultConverterTest {
+
+	private DefaultConverter createTestSubject() {
+		return DefaultConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		DefaultConverter result;
+
+		// default test
+		result = DefaultConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testConvert() throws Exception {
+		DefaultConverter testSubject;
+		String value = "";
+		String innerType = "";
+		Map<String, DataTypeDefinition> dataTypes = null;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convert(value, innerType, dataTypes);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/FloatConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/FloatConverterTest.java
new file mode 100644
index 0000000000..d66182b966
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/FloatConverterTest.java
@@ -0,0 +1,27 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class FloatConverterTest {
+
+	private FloatConverter createTestSubject() {
+		return FloatConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		FloatConverter result;
+
+		// default test
+		result = FloatConverter.getInstance();
+	}
+
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatBooleanConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatBooleanConverterTest.java
new file mode 100644
index 0000000000..8f7aa6d849
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatBooleanConverterTest.java
@@ -0,0 +1,29 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class HeatBooleanConverterTest {
+
+	private HeatBooleanConverter createTestSubject() {
+		return HeatBooleanConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		HeatBooleanConverter result;
+
+		// default test
+		result = HeatBooleanConverter.getInstance();
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatCommaDelimitedListConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatCommaDelimitedListConverterTest.java
new file mode 100644
index 0000000000..9b3cb57028
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatCommaDelimitedListConverterTest.java
@@ -0,0 +1,29 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class HeatCommaDelimitedListConverterTest {
+
+	private HeatCommaDelimitedListConverter createTestSubject() {
+		return HeatCommaDelimitedListConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		HeatCommaDelimitedListConverter result;
+
+		// default test
+		result = HeatCommaDelimitedListConverter.getInstance();
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatJsonConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatJsonConverterTest.java
new file mode 100644
index 0000000000..4e5ee49b6d
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatJsonConverterTest.java
@@ -0,0 +1,29 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class HeatJsonConverterTest {
+
+	private HeatJsonConverter createTestSubject() {
+		return HeatJsonConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		HeatJsonConverter result;
+
+		// default test
+		result = HeatJsonConverter.getInstance();
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatNumberConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatNumberConverterTest.java
new file mode 100644
index 0000000000..1594b00c77
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatNumberConverterTest.java
@@ -0,0 +1,29 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class HeatNumberConverterTest {
+
+	private HeatNumberConverter createTestSubject() {
+		return HeatNumberConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		HeatNumberConverter result;
+
+		// default test
+		result = HeatNumberConverter.getInstance();
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatStringConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatStringConverterTest.java
index 285dd9a965..3844bc81af 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatStringConverterTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatStringConverterTest.java
@@ -1,16 +1,36 @@
 package org.openecomp.sdc.be.model.tosca.converters;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
 public class HeatStringConverterTest {
 
-    @Test
-    public void convertString_strWithQuotes_returnStringAsIs()  {
-        String str = "'i'm string with \"quote\"'";
-        String convert = HeatStringConverter.getInstance().convert(str, null, null);
-        assertEquals(str, convert);
-    }
+	@Test
+	public void convertString_strWithQuotes_returnStringAsIs() {
+		String str = "'i'm string with \"quote\"'";
+		String convert = HeatStringConverter.getInstance().convert(str, null, null);
+		assertEquals(str, convert);
+	}
+
+	private HeatStringConverter createTestSubject() {
+		return HeatStringConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		HeatStringConverter result;
+
+		// default test
+		result = HeatStringConverter.getInstance();
+	}
+
+	
+
 
 }
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/IntegerConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/IntegerConverterTest.java
new file mode 100644
index 0000000000..00bb834faf
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/IntegerConverterTest.java
@@ -0,0 +1,48 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class IntegerConverterTest {
+
+	private IntegerConverter createTestSubject() {
+		return IntegerConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		IntegerConverter result;
+
+		// default test
+		result = IntegerConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testConvertToToscaValue() throws Exception {
+		IntegerConverter testSubject;
+		String value = "";
+		String innerType = "";
+		Map<String, DataTypeDefinition> dataTypes = null;
+		Object result;
+
+		// test 1
+		testSubject = createTestSubject();
+		value = null;
+		result = testSubject.convertToToscaValue(value, innerType, dataTypes);
+		Assert.assertEquals(null, result);
+
+		// test 2
+		testSubject = createTestSubject();
+		value = "";
+		result = testSubject.convertToToscaValue(value, innerType, dataTypes);
+		Assert.assertEquals(null, result);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/JsonConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/JsonConverterTest.java
new file mode 100644
index 0000000000..431443ab80
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/JsonConverterTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class JsonConverterTest {
+
+	private JsonConverter createTestSubject() {
+		return JsonConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		JsonConverter result;
+
+		// default test
+		result = JsonConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testConvert() throws Exception {
+		JsonConverter testSubject;
+		String value = "";
+		String innerType = "";
+		Map<String, DataTypeDefinition> dataTypes = null;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convert(value, innerType, dataTypes);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ListConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ListConverterTest.java
new file mode 100644
index 0000000000..a253ef07e8
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ListConverterTest.java
@@ -0,0 +1,36 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+import fj.data.Either;
+
+
+public class ListConverterTest {
+
+	private ListConverter createTestSubject() {
+		return new ListConverter();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		ListConverter result;
+
+		// default test
+		result = ListConverter.getInstance();
+	}
+
+	
+
+	
+	
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/MapConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/MapConverterTest.java
new file mode 100644
index 0000000000..99f5e2716f
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/MapConverterTest.java
@@ -0,0 +1,48 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+import fj.data.Either;
+
+
+public class MapConverterTest {
+
+	private MapConverter createTestSubject() {
+		return new MapConverter();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		MapConverter result;
+
+		// default test
+		result = MapConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testConvert() throws Exception {
+		MapConverter testSubject;
+		String value = "";
+		String innerType = "";
+		Map<String, DataTypeDefinition> dataTypes = null;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convert(value, innerType, dataTypes);
+	}
+
+	
+
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/StringConvertorTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/StringConvertorTest.java
new file mode 100644
index 0000000000..a3a142d668
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/StringConvertorTest.java
@@ -0,0 +1,28 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+public class StringConvertorTest {
+
+	private StringConvertor createTestSubject() {
+		return  StringConvertor.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		StringConvertor result;
+
+		// default test
+		result = StringConvertor.getInstance();
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaBooleanConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaBooleanConverterTest.java
new file mode 100644
index 0000000000..c96c1244b6
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaBooleanConverterTest.java
@@ -0,0 +1,27 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+public class ToscaBooleanConverterTest {
+
+	private ToscaBooleanConverter createTestSubject() {
+		return  ToscaBooleanConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		ToscaBooleanConverter result;
+
+		// default test
+		result = ToscaBooleanConverter.getInstance();
+	}
+
+	
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaFloatConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaFloatConverterTest.java
new file mode 100644
index 0000000000..a8c5aeef66
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaFloatConverterTest.java
@@ -0,0 +1,29 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class ToscaFloatConverterTest {
+
+	private ToscaFloatConverter createTestSubject() {
+		return  ToscaFloatConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		ToscaFloatConverter result;
+
+		// default test
+		result = ToscaFloatConverter.getInstance();
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaJsonValueConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaJsonValueConverterTest.java
new file mode 100644
index 0000000000..34eae243f7
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaJsonValueConverterTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class ToscaJsonValueConverterTest {
+
+	private ToscaJsonValueConverter createTestSubject() {
+		return ToscaJsonValueConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		ToscaJsonValueConverter result;
+
+		// default test
+		result = ToscaJsonValueConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testConvertToToscaValue() throws Exception {
+		ToscaJsonValueConverter testSubject;
+		String value = "";
+		String innerType = "";
+		Map<String, DataTypeDefinition> dataTypes = null;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convertToToscaValue(value, innerType, dataTypes);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaListValueConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaListValueConverterTest.java
new file mode 100644
index 0000000000..a713c4ce6c
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaListValueConverterTest.java
@@ -0,0 +1,29 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class ToscaListValueConverterTest {
+
+	private ToscaListValueConverter createTestSubject() {
+		return  ToscaListValueConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		ToscaListValueConverter result;
+
+		// default test
+		result = ToscaListValueConverter.getInstance();
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaStringConvertorTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaStringConvertorTest.java
new file mode 100644
index 0000000000..8365c0345a
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaStringConvertorTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class ToscaStringConvertorTest {
+
+	private ToscaStringConvertor createTestSubject() {
+		return ToscaStringConvertor.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		ToscaStringConvertor result;
+
+		// default test
+		result = ToscaStringConvertor.getInstance();
+	}
+
+	
+	@Test
+	public void testConvertToToscaValue() throws Exception {
+		ToscaStringConvertor testSubject;
+		String value = "";
+		String innerType = "";
+		Map<String, DataTypeDefinition> dataTypes = null;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convertToToscaValue(value, innerType, dataTypes);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueDefaultConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueDefaultConverterTest.java
new file mode 100644
index 0000000000..b9ae07cb76
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueDefaultConverterTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.model.tosca.converters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+
+
+public class ToscaValueDefaultConverterTest {
+
+	private ToscaValueDefaultConverter createTestSubject() {
+		return ToscaValueDefaultConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testGetInstance() throws Exception {
+		ToscaValueDefaultConverter result;
+
+		// default test
+		result = ToscaValueDefaultConverter.getInstance();
+	}
+
+	
+	@Test
+	public void testConvertToToscaValue() throws Exception {
+		ToscaValueDefaultConverter testSubject;
+		String value = "";
+		String innerType = "";
+		Map<String, DataTypeDefinition> dataTypes = null;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convertToToscaValue(value, innerType, dataTypes);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/version/ComparableVersionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/version/ComparableVersionTest.java
new file mode 100644
index 0000000000..5d0c34d037
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/version/ComparableVersionTest.java
@@ -0,0 +1,64 @@
+package org.openecomp.sdc.be.model.tosca.version;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ComparableVersionTest {
+
+	private ComparableVersion createTestSubject() {
+		return new ComparableVersion("");
+	}
+
+	
+	@Test
+	public void testParseVersion() throws Exception {
+		ComparableVersion testSubject;
+		String version = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.parseVersion(version);
+	}
+
+	
+
+
+	
+
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ComparableVersion testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		ComparableVersion testSubject;
+		Object o = null;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.equals(o);
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		ComparableVersion testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+}
\ No newline at end of file