110 files changed, 14688 insertions, 0 deletions

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ArtifactMetadataTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ArtifactMetadataTest.java
new file mode 100644
index 0000000000..673964e264
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ArtifactMetadataTest.java
@@ -0,0 +1,255 @@
+package org.openecomp.sdc.be.externalapi.servlet.representation;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ArtifactMetadataTest {
+
+	private ArtifactMetadata createTestSubject() {
+		return new ArtifactMetadata();
+	}
+
+	
+	@Test
+	public void testGetArtifactName() throws Exception {
+		ArtifactMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactName();
+	}
+
+	
+	@Test
+	public void testSetArtifactName() throws Exception {
+		ArtifactMetadata testSubject;
+		String artifactName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactName(artifactName);
+	}
+
+	
+	@Test
+	public void testGetArtifactType() throws Exception {
+		ArtifactMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactType();
+	}
+
+	
+	@Test
+	public void testSetArtifactType() throws Exception {
+		ArtifactMetadata testSubject;
+		String artifactType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactType(artifactType);
+	}
+
+	
+	@Test
+	public void testGetArtifactURL() throws Exception {
+		ArtifactMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactURL();
+	}
+
+	
+	@Test
+	public void testSetArtifactURL() throws Exception {
+		ArtifactMetadata testSubject;
+		String artifactURL = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactURL(artifactURL);
+	}
+
+	
+	@Test
+	public void testGetArtifactDescription() throws Exception {
+		ArtifactMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactDescription();
+	}
+
+	
+	@Test
+	public void testSetArtifactDescription() throws Exception {
+		ArtifactMetadata testSubject;
+		String artifactDescription = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactDescription(artifactDescription);
+	}
+
+	
+	@Test
+	public void testGetArtifactTimeout() throws Exception {
+		ArtifactMetadata testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactTimeout();
+	}
+
+	
+	@Test
+	public void testSetArtifactTimeout() throws Exception {
+		ArtifactMetadata testSubject;
+		Integer artifactTimeout = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactTimeout(artifactTimeout);
+	}
+
+	
+	@Test
+	public void testGetArtifactChecksum() throws Exception {
+		ArtifactMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactChecksum();
+	}
+
+	
+	@Test
+	public void testSetArtifactChecksum() throws Exception {
+		ArtifactMetadata testSubject;
+		String artifactChecksum = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactChecksum(artifactChecksum);
+	}
+
+	
+	@Test
+	public void testGetArtifactUUID() throws Exception {
+		ArtifactMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactUUID();
+	}
+
+	
+	@Test
+	public void testSetArtifactUUID() throws Exception {
+		ArtifactMetadata testSubject;
+		String artifactUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactUUID(artifactUUID);
+	}
+
+	
+	@Test
+	public void testGetArtifactVersion() throws Exception {
+		ArtifactMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactVersion();
+	}
+
+	
+	@Test
+	public void testSetArtifactVersion() throws Exception {
+		ArtifactMetadata testSubject;
+		String artifactVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactVersion(artifactVersion);
+	}
+
+	
+	@Test
+	public void testGetGeneratedFromUUID() throws Exception {
+		ArtifactMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGeneratedFromUUID();
+	}
+
+	
+	@Test
+	public void testSetGeneratedFromUUID() throws Exception {
+		ArtifactMetadata testSubject;
+		String generatedFromUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGeneratedFromUUID(generatedFromUUID);
+	}
+
+	
+	@Test
+	public void testGetArtifactLabel() throws Exception {
+		ArtifactMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactLabel();
+	}
+
+	
+	@Test
+	public void testSetArtifactLabel() throws Exception {
+		ArtifactMetadata testSubject;
+		String artifactLabel = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactLabel(artifactLabel);
+	}
+
+	
+	@Test
+	public void testGetArtifactGroupType() throws Exception {
+		ArtifactMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactGroupType();
+	}
+
+	
+	@Test
+	public void testSetArtifactGroupType() throws Exception {
+		ArtifactMetadata testSubject;
+		String artifactGroupType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactGroupType(artifactGroupType);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ProductAssetMetadataTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ProductAssetMetadataTest.java
new file mode 100644
index 0000000000..1102dea900
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ProductAssetMetadataTest.java
@@ -0,0 +1,125 @@
+package org.openecomp.sdc.be.externalapi.servlet.representation;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ProductAssetMetadataTest {
+
+	private ProductAssetMetadata createTestSubject() {
+		return new ProductAssetMetadata();
+	}
+
+	
+	@Test
+	public void testGetLifecycleState() throws Exception {
+		ProductAssetMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLifecycleState();
+	}
+
+	
+	@Test
+	public void testSetLifecycleState() throws Exception {
+		ProductAssetMetadata testSubject;
+		String lifecycleState = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLifecycleState(lifecycleState);
+	}
+
+	
+	@Test
+	public void testGetLastUpdaterUserId() throws Exception {
+		ProductAssetMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastUpdaterUserId();
+	}
+
+	
+	@Test
+	public void testSetLastUpdaterUserId() throws Exception {
+		ProductAssetMetadata testSubject;
+		String lastUpdaterUserId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastUpdaterUserId(lastUpdaterUserId);
+	}
+
+	
+	@Test
+	public void testIsActive() throws Exception {
+		ProductAssetMetadata testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isActive();
+	}
+
+	
+	@Test
+	public void testSetActive() throws Exception {
+		ProductAssetMetadata testSubject;
+		boolean isActive = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setActive(isActive);
+	}
+
+	
+	@Test
+	public void testGetContacts() throws Exception {
+		ProductAssetMetadata testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getContacts();
+	}
+
+	
+	@Test
+	public void testSetContacts() throws Exception {
+		ProductAssetMetadata testSubject;
+		List<String> contacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setContacts(contacts);
+	}
+
+	
+	@Test
+	public void testGetProductGroupings() throws Exception {
+		ProductAssetMetadata testSubject;
+		List<ProductCategoryGroupMetadata> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProductGroupings();
+	}
+
+	
+	@Test
+	public void testSetProductGroupings() throws Exception {
+		ProductAssetMetadata testSubject;
+		List<ProductCategoryGroupMetadata> productGroupings = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProductGroupings(productGroupings);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ProductCategoryGroupMetadataTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ProductCategoryGroupMetadataTest.java
new file mode 100644
index 0000000000..0d931e15df
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ProductCategoryGroupMetadataTest.java
@@ -0,0 +1,79 @@
+package org.openecomp.sdc.be.externalapi.servlet.representation;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ProductCategoryGroupMetadataTest {
+
+	private ProductCategoryGroupMetadata createTestSubject() {
+		return new ProductCategoryGroupMetadata("", "", "");
+	}
+
+	
+	@Test
+	public void testGetCategory() throws Exception {
+		ProductCategoryGroupMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCategory();
+	}
+
+	
+	@Test
+	public void testSetCategory() throws Exception {
+		ProductCategoryGroupMetadata testSubject;
+		String category = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCategory(category);
+	}
+
+	
+	@Test
+	public void testGetSubCategory() throws Exception {
+		ProductCategoryGroupMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getSubCategory();
+	}
+
+	
+	@Test
+	public void testSetSubCategory() throws Exception {
+		ProductCategoryGroupMetadata testSubject;
+		String subCategory = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setSubCategory(subCategory);
+	}
+
+	
+	@Test
+	public void testGetGroup() throws Exception {
+		ProductCategoryGroupMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroup();
+	}
+
+	
+	@Test
+	public void testSetGroup() throws Exception {
+		ProductCategoryGroupMetadata testSubject;
+		String group = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroup(group);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ResourceAssetDetailedMetadataTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ResourceAssetDetailedMetadataTest.java
new file mode 100644
index 0000000000..83d048ae6b
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ResourceAssetDetailedMetadataTest.java
@@ -0,0 +1,124 @@
+package org.openecomp.sdc.be.externalapi.servlet.representation;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+public class ResourceAssetDetailedMetadataTest {
+
+	private ResourceAssetDetailedMetadata createTestSubject() {
+		return new ResourceAssetDetailedMetadata();
+	}
+
+	
+	@Test
+	public void testGetLastUpdaterFullName() throws Exception {
+		ResourceAssetDetailedMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastUpdaterFullName();
+	}
+
+	
+	@Test
+	public void testSetLastUpdaterFullName() throws Exception {
+		ResourceAssetDetailedMetadata testSubject;
+		String lastUpdaterFullName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastUpdaterFullName(lastUpdaterFullName);
+	}
+
+	
+	@Test
+	public void testGetToscaResourceName() throws Exception {
+		ResourceAssetDetailedMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getToscaResourceName();
+	}
+
+	
+	@Test
+	public void testSetToscaResourceName() throws Exception {
+		ResourceAssetDetailedMetadata testSubject;
+		String toscaResourceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setToscaResourceName(toscaResourceName);
+	}
+
+	
+	@Test
+	public void testGetResources() throws Exception {
+		ResourceAssetDetailedMetadata testSubject;
+		List<ResourceInstanceMetadata> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResources();
+	}
+
+	
+	@Test
+	public void testSetResources() throws Exception {
+		ResourceAssetDetailedMetadata testSubject;
+		List<ResourceInstanceMetadata> resources = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResources(resources);
+	}
+
+	
+	@Test
+	public void testGetArtifacts() throws Exception {
+		ResourceAssetDetailedMetadata testSubject;
+		List<ArtifactMetadata> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifacts();
+	}
+
+	
+	@Test
+	public void testSetArtifacts() throws Exception {
+		ResourceAssetDetailedMetadata testSubject;
+		List<ArtifactMetadata> artifactMetaList = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifacts(artifactMetaList);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		ResourceAssetDetailedMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		ResourceAssetDetailedMetadata testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ResourceAssetMetadataTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ResourceAssetMetadataTest.java
new file mode 100644
index 0000000000..d0d784f5a8
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ResourceAssetMetadataTest.java
@@ -0,0 +1,123 @@
+package org.openecomp.sdc.be.externalapi.servlet.representation;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ResourceAssetMetadataTest {
+
+	private ResourceAssetMetadata createTestSubject() {
+		return new ResourceAssetMetadata();
+	}
+
+	
+	@Test
+	public void testGetCategory() throws Exception {
+		ResourceAssetMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCategory();
+	}
+
+	
+	@Test
+	public void testSetCategory() throws Exception {
+		ResourceAssetMetadata testSubject;
+		String category = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCategory(category);
+	}
+
+	
+	@Test
+	public void testGetSubCategory() throws Exception {
+		ResourceAssetMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getSubCategory();
+	}
+
+	
+	@Test
+	public void testSetSubCategory() throws Exception {
+		ResourceAssetMetadata testSubject;
+		String subCategory = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setSubCategory(subCategory);
+	}
+
+	
+	@Test
+	public void testGetResourceType() throws Exception {
+		ResourceAssetMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceType();
+	}
+
+	
+	@Test
+	public void testSetResourceType() throws Exception {
+		ResourceAssetMetadata testSubject;
+		String resourceType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceType(resourceType);
+	}
+
+	
+	@Test
+	public void testGetLifecycleState() throws Exception {
+		ResourceAssetMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLifecycleState();
+	}
+
+	
+	@Test
+	public void testSetLifecycleState() throws Exception {
+		ResourceAssetMetadata testSubject;
+		String lifecycleState = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLifecycleState(lifecycleState);
+	}
+
+	
+	@Test
+	public void testGetLastUpdaterUserId() throws Exception {
+		ResourceAssetMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastUpdaterUserId();
+	}
+
+	
+	@Test
+	public void testSetLastUpdaterUserId() throws Exception {
+		ResourceAssetMetadata testSubject;
+		String lastUpdaterUserId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastUpdaterUserId(lastUpdaterUserId);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ResourceInstanceMetadataTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ResourceInstanceMetadataTest.java
new file mode 100644
index 0000000000..ba9897c7dc
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ResourceInstanceMetadataTest.java
@@ -0,0 +1,169 @@
+package org.openecomp.sdc.be.externalapi.servlet.representation;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ResourceInstanceMetadataTest {
+
+	private ResourceInstanceMetadata createTestSubject() {
+		return new ResourceInstanceMetadata();
+	}
+
+	
+	@Test
+	public void testGetResourceInstanceName() throws Exception {
+		ResourceInstanceMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceInstanceName();
+	}
+
+	
+	@Test
+	public void testSetResourceInstanceName() throws Exception {
+		ResourceInstanceMetadata testSubject;
+		String resourceInstanceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceInstanceName(resourceInstanceName);
+	}
+
+	
+	@Test
+	public void testGetResourceName() throws Exception {
+		ResourceInstanceMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceName();
+	}
+
+	
+	@Test
+	public void testSetResourceName() throws Exception {
+		ResourceInstanceMetadata testSubject;
+		String resourceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceName(resourceName);
+	}
+
+	
+	@Test
+	public void testGetResourceInvariantUUID() throws Exception {
+		ResourceInstanceMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceInvariantUUID();
+	}
+
+	
+	@Test
+	public void testSetResourceInvariantUUID() throws Exception {
+		ResourceInstanceMetadata testSubject;
+		String resourceInvariantUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceInvariantUUID(resourceInvariantUUID);
+	}
+
+	
+	@Test
+	public void testGetResourceVersion() throws Exception {
+		ResourceInstanceMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceVersion();
+	}
+
+	
+	@Test
+	public void testSetResourceVersion() throws Exception {
+		ResourceInstanceMetadata testSubject;
+		String resourceVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceVersion(resourceVersion);
+	}
+
+	
+	@Test
+	public void testGetResoucreType() throws Exception {
+		ResourceInstanceMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResoucreType();
+	}
+
+	
+	@Test
+	public void testSetResoucreType() throws Exception {
+		ResourceInstanceMetadata testSubject;
+		String resoucreType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResoucreType(resoucreType);
+	}
+
+	
+	@Test
+	public void testGetResourceUUID() throws Exception {
+		ResourceInstanceMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceUUID();
+	}
+
+	
+	@Test
+	public void testSetResourceUUID() throws Exception {
+		ResourceInstanceMetadata testSubject;
+		String resourceUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceUUID(resourceUUID);
+	}
+
+	
+	@Test
+	public void testGetArtifacts() throws Exception {
+		ResourceInstanceMetadata testSubject;
+		List<ArtifactMetadata> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifacts();
+	}
+
+	
+	@Test
+	public void testSetArtifacts() throws Exception {
+		ResourceInstanceMetadata testSubject;
+		List<ArtifactMetadata> artifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifacts(artifacts);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ServiceAssetDetailedMetadataTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ServiceAssetDetailedMetadataTest.java
new file mode 100644
index 0000000000..29825a6e60
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ServiceAssetDetailedMetadataTest.java
@@ -0,0 +1,81 @@
+package org.openecomp.sdc.be.externalapi.servlet.representation;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ServiceAssetDetailedMetadataTest {
+
+	private ServiceAssetDetailedMetadata createTestSubject() {
+		return new ServiceAssetDetailedMetadata();
+	}
+
+	
+	@Test
+	public void testGetLastUpdaterFullName() throws Exception {
+		ServiceAssetDetailedMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastUpdaterFullName();
+	}
+
+	
+	@Test
+	public void testSetLastUpdaterFullName() throws Exception {
+		ServiceAssetDetailedMetadata testSubject;
+		String lastUpdaterFullName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastUpdaterFullName(lastUpdaterFullName);
+	}
+
+	
+	@Test
+	public void testGetResources() throws Exception {
+		ServiceAssetDetailedMetadata testSubject;
+		List<ResourceInstanceMetadata> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResources();
+	}
+
+	
+	@Test
+	public void testSetResources() throws Exception {
+		ServiceAssetDetailedMetadata testSubject;
+		List<ResourceInstanceMetadata> resources = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResources(resources);
+	}
+
+	
+	@Test
+	public void testGetArtifacts() throws Exception {
+		ServiceAssetDetailedMetadata testSubject;
+		List<ArtifactMetadata> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifacts();
+	}
+
+	
+	@Test
+	public void testSetArtifacts() throws Exception {
+		ServiceAssetDetailedMetadata testSubject;
+		List<ArtifactMetadata> artifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifacts(artifacts);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ServiceAssetMetadataTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ServiceAssetMetadataTest.java
new file mode 100644
index 0000000000..6a4a38a02f
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/representation/ServiceAssetMetadataTest.java
@@ -0,0 +1,101 @@
+package org.openecomp.sdc.be.externalapi.servlet.representation;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ServiceAssetMetadataTest {
+
+	private ServiceAssetMetadata createTestSubject() {
+		return new ServiceAssetMetadata();
+	}
+
+	
+	@Test
+	public void testGetCategory() throws Exception {
+		ServiceAssetMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCategory();
+	}
+
+	
+	@Test
+	public void testSetCategory() throws Exception {
+		ServiceAssetMetadata testSubject;
+		String category = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCategory(category);
+	}
+
+	
+	@Test
+	public void testGetLifecycleState() throws Exception {
+		ServiceAssetMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLifecycleState();
+	}
+
+	
+	@Test
+	public void testSetLifecycleState() throws Exception {
+		ServiceAssetMetadata testSubject;
+		String lifecycleState = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLifecycleState(lifecycleState);
+	}
+
+	
+	@Test
+	public void testGetLastUpdaterUserId() throws Exception {
+		ServiceAssetMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastUpdaterUserId();
+	}
+
+	
+	@Test
+	public void testSetLastUpdaterUserId() throws Exception {
+		ServiceAssetMetadata testSubject;
+		String lastUpdaterUserId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastUpdaterUserId(lastUpdaterUserId);
+	}
+
+	
+	@Test
+	public void testGetDistributionStatus() throws Exception {
+		ServiceAssetMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDistributionStatus();
+	}
+
+	
+	@Test
+	public void testSetDistributionStatus() throws Exception {
+		ServiceAssetMetadata testSubject;
+		String distributionStatus = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDistributionStatus(distributionStatus);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactAccessInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactAccessInfoTest.java
new file mode 100644
index 0000000000..096bb4dca2
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactAccessInfoTest.java
@@ -0,0 +1,233 @@
+package org.openecomp.sdc.be.info;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ArtifactAccessInfoTest {
+
+	private ArtifactAccessInfo createTestSubject() {
+		return new ArtifactAccessInfo();
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetUrl() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUrl();
+	}
+
+	
+	@Test
+	public void testSetUrl() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String url = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUrl(url);
+	}
+
+	
+	@Test
+	public void testGetId() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getId();
+	}
+
+	
+	@Test
+	public void testSetId() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String id = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setId(id);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetCreator() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreator();
+	}
+
+	
+	@Test
+	public void testSetCreator() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String creator = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreator(creator);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String creationTime = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetLastUpdater() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastUpdater();
+	}
+
+	
+	@Test
+	public void testSetLastUpdater() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String lastUpdater = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastUpdater(lastUpdater);
+	}
+
+	
+	@Test
+	public void testGetLastUpdateTime() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastUpdateTime();
+	}
+
+	
+	@Test
+	public void testSetLastUpdateTime() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String lastUpdateTime = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastUpdateTime(lastUpdateTime);
+	}
+
+	
+	@Test
+	public void testGetChecksum() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getChecksum();
+	}
+
+	
+	@Test
+	public void testSetChecksum() throws Exception {
+		ArtifactAccessInfo testSubject;
+		String checksum = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setChecksum(checksum);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactAccessListTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactAccessListTest.java
new file mode 100644
index 0000000000..2164b91542
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactAccessListTest.java
@@ -0,0 +1,37 @@
+package org.openecomp.sdc.be.info;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ArtifactAccessListTest {
+
+	private ArtifactAccessList createTestSubject() {
+		return new ArtifactAccessList(null);
+	}
+
+	
+	@Test
+	public void testGetArtifacts() throws Exception {
+		ArtifactAccessList testSubject;
+		List<ArtifactAccessInfo> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifacts();
+	}
+
+	
+	@Test
+	public void testSetArtifacts() throws Exception {
+		ArtifactAccessList testSubject;
+		List<ArtifactAccessInfo> artifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifacts(artifacts);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactTemplateInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactTemplateInfoTest.java
new file mode 100644
index 0000000000..379959628c
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactTemplateInfoTest.java
@@ -0,0 +1,182 @@
+package org.openecomp.sdc.be.info;
+
+import static org.junit.Assert.*;
+import java.util.*;
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class ArtifactTemplateInfoTest {
+
+	private ArtifactTemplateInfo createTestSubject() {
+		return new ArtifactTemplateInfo();
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		ArtifactTemplateInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		ArtifactTemplateInfo testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetFileName() throws Exception {
+		ArtifactTemplateInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFileName();
+	}
+
+	
+	@Test
+	public void testSetFileName() throws Exception {
+		ArtifactTemplateInfo testSubject;
+		String fileName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setFileName(fileName);
+	}
+
+	
+	@Test
+	public void testGetEnv() throws Exception {
+		ArtifactTemplateInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getEnv();
+	}
+
+	
+	@Test
+	public void testSetEnv() throws Exception {
+		ArtifactTemplateInfo testSubject;
+		String env = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setEnv(env);
+	}
+
+	
+	@Test
+	public void testGetRelatedArtifactsInfo() throws Exception {
+		ArtifactTemplateInfo testSubject;
+		List<ArtifactTemplateInfo> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRelatedArtifactsInfo();
+	}
+
+	
+	@Test
+	public void testSetRelatedArtifactsInfo() throws Exception {
+		ArtifactTemplateInfo testSubject;
+		List<ArtifactTemplateInfo> relatedArtifactsInfo = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRelatedArtifactsInfo(relatedArtifactsInfo);
+	}
+
+	
+	@Test
+	public void testGetGroupName() throws Exception {
+		ArtifactTemplateInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupName();
+	}
+
+	
+	@Test
+	public void testSetGroupName() throws Exception {
+		ArtifactTemplateInfo testSubject;
+		String groupName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupName(groupName);
+	}
+
+	
+	@Test
+	public void testIsBase() throws Exception {
+		ArtifactTemplateInfo testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isBase();
+	}
+
+	
+	@Test
+	public void testSetBase() throws Exception {
+		ArtifactTemplateInfo testSubject;
+		boolean isBase = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setBase(isBase);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		ArtifactTemplateInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		ArtifactTemplateInfo testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ArtifactTemplateInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/CreateAndAssotiateInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/CreateAndAssotiateInfoTest.java
new file mode 100644
index 0000000000..ad8e21bb84
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/CreateAndAssotiateInfoTest.java
@@ -0,0 +1,59 @@
+package org.openecomp.sdc.be.info;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
+
+
+public class CreateAndAssotiateInfoTest {
+
+	private CreateAndAssotiateInfo createTestSubject() {
+		return new CreateAndAssotiateInfo(new ComponentInstance(), new RequirementCapabilityRelDef());
+	}
+
+	
+	@Test
+	public void testGetNode() throws Exception {
+		CreateAndAssotiateInfo testSubject;
+		ComponentInstance result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNode();
+	}
+
+	
+	@Test
+	public void testSetNode() throws Exception {
+		CreateAndAssotiateInfo testSubject;
+		ComponentInstance node = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNode(node);
+	}
+
+	
+	@Test
+	public void testGetAssociate() throws Exception {
+		CreateAndAssotiateInfo testSubject;
+		RequirementCapabilityRelDef result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAssociate();
+	}
+
+	
+	@Test
+	public void testSetAssociate() throws Exception {
+		CreateAndAssotiateInfo testSubject;
+		RequirementCapabilityRelDef associate = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAssociate(associate);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusInfoTest.java
new file mode 100644
index 0000000000..dd8a3e6eee
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusInfoTest.java
@@ -0,0 +1,124 @@
+package org.openecomp.sdc.be.info;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.common.datastructure.ESTimeBasedEvent;
+
+
+public class DistributionStatusInfoTest {
+
+	private DistributionStatusInfo createTestSubject() {
+		return new DistributionStatusInfo(new ESTimeBasedEvent());
+	}
+
+	
+	@Test
+	public void testGetOmfComponentID() throws Exception {
+		DistributionStatusInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getOmfComponentID();
+	}
+
+	
+	@Test
+	public void testSetOmfComponentID() throws Exception {
+		DistributionStatusInfo testSubject;
+		String omfComponentID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setOmfComponentID(omfComponentID);
+	}
+
+	
+	@Test
+	public void testGetTimestamp() throws Exception {
+		DistributionStatusInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp();
+	}
+
+	
+	@Test
+	public void testSetTimestamp() throws Exception {
+		DistributionStatusInfo testSubject;
+		String timestamp = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp(timestamp);
+	}
+
+	
+	@Test
+	public void testGetUrl() throws Exception {
+		DistributionStatusInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUrl();
+	}
+
+	
+	@Test
+	public void testSetUrl() throws Exception {
+		DistributionStatusInfo testSubject;
+		String url = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUrl(url);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		DistributionStatusInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		DistributionStatusInfo testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetErrorReason() throws Exception {
+		DistributionStatusInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getErrorReason();
+	}
+
+	
+	@Test
+	public void testSetErrorReason() throws Exception {
+		DistributionStatusInfo testSubject;
+		String errorReason = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setErrorReason(errorReason);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusOfServiceInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusOfServiceInfoTest.java
new file mode 100644
index 0000000000..62b1bcbe0f
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusOfServiceInfoTest.java
@@ -0,0 +1,101 @@
+package org.openecomp.sdc.be.info;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class DistributionStatusOfServiceInfoTest {
+
+	private DistributionStatusOfServiceInfo createTestSubject() {
+		return new DistributionStatusOfServiceInfo();
+	}
+
+	
+	@Test
+	public void testGetDistributionID() throws Exception {
+		DistributionStatusOfServiceInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDistributionID();
+	}
+
+	
+	@Test
+	public void testSetDistributionID() throws Exception {
+		DistributionStatusOfServiceInfo testSubject;
+		String distributionID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDistributionID(distributionID);
+	}
+
+	
+	@Test
+	public void testGetTimestamp() throws Exception {
+		DistributionStatusOfServiceInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp();
+	}
+
+	
+	@Test
+	public void testSetTimestamp() throws Exception {
+		DistributionStatusOfServiceInfo testSubject;
+		String timestamp = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp(timestamp);
+	}
+
+	
+	@Test
+	public void testGetUserId() throws Exception {
+		DistributionStatusOfServiceInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUserId();
+	}
+
+	
+	@Test
+	public void testSetUserId() throws Exception {
+		DistributionStatusOfServiceInfo testSubject;
+		String userId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUserId(userId);
+	}
+
+	
+	@Test
+	public void testGetDeployementStatus() throws Exception {
+		DistributionStatusOfServiceInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDeployementStatus();
+	}
+
+	
+	@Test
+	public void testSetDeployementStatus() throws Exception {
+		DistributionStatusOfServiceInfo testSubject;
+		String deployementStatus = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDeployementStatus(deployementStatus);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupDefinitionInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupDefinitionInfoTest.java
index 36644c5ff7..b2895d099c 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupDefinitionInfoTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupDefinitionInfoTest.java
@@ -6,6 +6,8 @@ import javax.annotation.Generated;
 
 import org.junit.Test;
 import org.openecomp.sdc.be.model.GroupProperty;
+import java.util.*;
+import org.junit.Assert;
 
 
 public class GroupDefinitionInfoTest {
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupTemplateInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupTemplateInfoTest.java
new file mode 100644
index 0000000000..727a1f25d4
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupTemplateInfoTest.java
@@ -0,0 +1,79 @@
+package org.openecomp.sdc.be.info;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class GroupTemplateInfoTest {
+
+	private GroupTemplateInfo createTestSubject() {
+		return new GroupTemplateInfo();
+	}
+
+	
+	@Test
+	public void testGetGroupName() throws Exception {
+		GroupTemplateInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupName();
+	}
+
+	
+	@Test
+	public void testSetGroupName() throws Exception {
+		GroupTemplateInfo testSubject;
+		String groupName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupName(groupName);
+	}
+
+	
+	@Test
+	public void testIsBase() throws Exception {
+		GroupTemplateInfo testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isBase();
+	}
+
+	
+	@Test
+	public void testSetBase() throws Exception {
+		GroupTemplateInfo testSubject;
+		boolean isBase = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setBase(isBase);
+	}
+
+	
+	@Test
+	public void testGetArtifactTemplateInfo() throws Exception {
+		GroupTemplateInfo testSubject;
+		ArtifactTemplateInfo result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactTemplateInfo();
+	}
+
+	
+	@Test
+	public void testSetArtifactTemplateInfo() throws Exception {
+		GroupTemplateInfo testSubject;
+		ArtifactTemplateInfo artifactTemplateInfo = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactTemplateInfo(artifactTemplateInfo);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceInfoTest.java
new file mode 100644
index 0000000000..569b04d982
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceInfoTest.java
@@ -0,0 +1,59 @@
+package org.openecomp.sdc.be.info;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ServiceInfoTest {
+
+	private ServiceInfo createTestSubject() {
+		return new ServiceInfo("", null);
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		ServiceInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		ServiceInfo testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetVersions() throws Exception {
+		ServiceInfo testSubject;
+		List<ServiceVersionInfo> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVersions();
+	}
+
+	
+	@Test
+	public void testSetVersions() throws Exception {
+		ServiceInfo testSubject;
+		List<ServiceVersionInfo> versions = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setVersions(versions);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceVersionInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceVersionInfoTest.java
new file mode 100644
index 0000000000..2b5e97e86d
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceVersionInfoTest.java
@@ -0,0 +1,56 @@
+package org.openecomp.sdc.be.info;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+public class ServiceVersionInfoTest {
+
+	private ServiceVersionInfo createTestSubject() {
+		return new ServiceVersionInfo("", "", "");
+	}
+
+	
+	@Test
+	public void testGetVersion() throws Exception {
+		ServiceVersionInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVersion();
+	}
+
+	
+	@Test
+	public void testSetVersion() throws Exception {
+		ServiceVersionInfo testSubject;
+		String serviceVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setVersion(serviceVersion);
+	}
+
+	
+	@Test
+	public void testGetUrl() throws Exception {
+		ServiceVersionInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUrl();
+	}
+
+	
+	@Test
+	public void testSetUrl() throws Exception {
+		ServiceVersionInfo testSubject;
+		String url = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUrl(url);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServletJsonResponseTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServletJsonResponseTest.java
new file mode 100644
index 0000000000..43144113ea
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServletJsonResponseTest.java
@@ -0,0 +1,57 @@
+package org.openecomp.sdc.be.info;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ServletJsonResponseTest {
+
+	private ServletJsonResponse createTestSubject() {
+		return new ServletJsonResponse();
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		ServletJsonResponse testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		ServletJsonResponse testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetSource() throws Exception {
+		ServletJsonResponse testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getSource();
+	}
+
+	
+	@Test
+	public void testSetSource() throws Exception {
+		ServletJsonResponse testSubject;
+		String source = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setSource(source);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ToscaNodeTypeInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ToscaNodeTypeInfoTest.java
new file mode 100644
index 0000000000..c96f71b8fd
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ToscaNodeTypeInfoTest.java
@@ -0,0 +1,114 @@
+package org.openecomp.sdc.be.info;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ToscaNodeTypeInfoTest {
+
+	private ToscaNodeTypeInfo createTestSubject() {
+		return new ToscaNodeTypeInfo();
+	}
+
+	
+	@Test
+	public void testGetNodeName() throws Exception {
+		ToscaNodeTypeInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNodeName();
+	}
+
+	
+	@Test
+	public void testSetNodeName() throws Exception {
+		ToscaNodeTypeInfo testSubject;
+		String nodeName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNodeName(nodeName);
+	}
+
+	
+	@Test
+	public void testGetTemplateVersion() throws Exception {
+		ToscaNodeTypeInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTemplateVersion();
+	}
+
+	
+	@Test
+	public void testSetTemplateVersion() throws Exception {
+		ToscaNodeTypeInfo testSubject;
+		String templateVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTemplateVersion(templateVersion);
+	}
+
+	
+	@Test
+	public void testGetInterfaces() throws Exception {
+		ToscaNodeTypeInfo testSubject;
+		List<ToscaNodeTypeInterface> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInterfaces();
+	}
+
+	
+	@Test
+	public void testSetInterfaces() throws Exception {
+		ToscaNodeTypeInfo testSubject;
+		List<ToscaNodeTypeInterface> interfaces = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInterfaces(interfaces);
+	}
+
+	
+	@Test
+	public void testGetIconPath() throws Exception {
+		ToscaNodeTypeInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIconPath();
+	}
+
+	
+	@Test
+	public void testSetIconPath() throws Exception {
+		ToscaNodeTypeInfo testSubject;
+		String iconPath = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIconPath(iconPath);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ToscaNodeTypeInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/EntrySchemaTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/EntrySchemaTest.java
new file mode 100644
index 0000000000..ca3cd411dc
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/EntrySchemaTest.java
@@ -0,0 +1,57 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class EntrySchemaTest {
+
+	private EntrySchema createTestSubject() {
+		return new EntrySchema();
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		EntrySchema testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		EntrySchema testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		EntrySchema testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		EntrySchema testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/SubstitutionMappingTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/SubstitutionMappingTest.java
new file mode 100644
index 0000000000..f2e3e167df
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/SubstitutionMappingTest.java
@@ -0,0 +1,81 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class SubstitutionMappingTest {
+
+	private SubstitutionMapping createTestSubject() {
+		return new SubstitutionMapping();
+	}
+
+	
+	@Test
+	public void testGetNode_type() throws Exception {
+		SubstitutionMapping testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNode_type();
+	}
+
+	
+	@Test
+	public void testSetNode_type() throws Exception {
+		SubstitutionMapping testSubject;
+		String node_type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNode_type(node_type);
+	}
+
+	
+	@Test
+	public void testGetCapabilities() throws Exception {
+		SubstitutionMapping testSubject;
+		Map<String, String[]> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilities();
+	}
+
+	
+	@Test
+	public void testSetCapabilities() throws Exception {
+		SubstitutionMapping testSubject;
+		Map<String, String[]> capabilities = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilities(capabilities);
+	}
+
+	
+	@Test
+	public void testGetRequirements() throws Exception {
+		SubstitutionMapping testSubject;
+		Map<String, String[]> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirements();
+	}
+
+	
+	@Test
+	public void testSetRequirements() throws Exception {
+		SubstitutionMapping testSubject;
+		Map<String, String[]> requirements = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirements(requirements);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaCapabilityTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaCapabilityTest.java
new file mode 100644
index 0000000000..01d65939d2
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaCapabilityTest.java
@@ -0,0 +1,126 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ToscaCapabilityTest {
+
+	private ToscaCapability createTestSubject() {
+		return new ToscaCapability();
+	}
+
+	
+	@Test
+	public void testGetValid_source_types() throws Exception {
+		ToscaCapability testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValid_source_types();
+	}
+
+	
+	@Test
+	public void testSetValid_source_types() throws Exception {
+		ToscaCapability testSubject;
+		List<String> valid_source_types = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValid_source_types(valid_source_types);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		ToscaCapability testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		ToscaCapability testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		ToscaCapability testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		ToscaCapability testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetOccurrences() throws Exception {
+		ToscaCapability testSubject;
+		List<Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getOccurrences();
+	}
+
+	
+	@Test
+	public void testSetOccurrences() throws Exception {
+		ToscaCapability testSubject;
+		List<Object> occurrences = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setOccurrences(occurrences);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		ToscaCapability testSubject;
+		Map<String, ToscaProperty> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		ToscaCapability testSubject;
+		Map<String, ToscaProperty> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaGroupTemplateTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaGroupTemplateTest.java
new file mode 100644
index 0000000000..06ff881988
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaGroupTemplateTest.java
@@ -0,0 +1,104 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ToscaGroupTemplateTest {
+
+	private ToscaGroupTemplate createTestSubject() {
+		return new ToscaGroupTemplate();
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		ToscaGroupTemplate testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		ToscaGroupTemplate testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetMembers() throws Exception {
+		ToscaGroupTemplate testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMembers();
+	}
+
+	
+	@Test
+	public void testSetMembers() throws Exception {
+		ToscaGroupTemplate testSubject;
+		List<String> members = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMembers(members);
+	}
+
+	
+	@Test
+	public void testGetMetadata() throws Exception {
+		ToscaGroupTemplate testSubject;
+		IToscaMetadata result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMetadata();
+	}
+
+	
+	@Test
+	public void testSetMetadata() throws Exception {
+		ToscaGroupTemplate testSubject;
+		IToscaMetadata metadata = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMetadata(metadata);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		ToscaGroupTemplate testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		ToscaGroupTemplate testSubject;
+		Map<String, Object> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaMetadataTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaMetadataTest.java
new file mode 100644
index 0000000000..6a4dc4583d
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaMetadataTest.java
@@ -0,0 +1,387 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ToscaMetadataTest {
+
+	private ToscaMetadata createTestSubject() {
+		return new ToscaMetadata();
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		ToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		ToscaMetadata testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetInvariantUUID() throws Exception {
+		ToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInvariantUUID();
+	}
+
+	
+	@Test
+	public void testSetInvariantUUID() throws Exception {
+		ToscaMetadata testSubject;
+		String invariantUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInvariantUUID(invariantUUID);
+	}
+
+	
+	@Test
+	public void testGetUUID() throws Exception {
+		ToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUUID();
+	}
+
+	
+	@Test
+	public void testSetUUID() throws Exception {
+		ToscaMetadata testSubject;
+		String uUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUUID(uUID);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		ToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		ToscaMetadata testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		ToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		ToscaMetadata testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetCategory() throws Exception {
+		ToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCategory();
+	}
+
+	
+	@Test
+	public void testSetCategory() throws Exception {
+		ToscaMetadata testSubject;
+		String category = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCategory(category);
+	}
+
+	
+	@Test
+	public void testGetSubcategory() throws Exception {
+		ToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getSubcategory();
+	}
+
+	
+	@Test
+	public void testSetSubcategory() throws Exception {
+		ToscaMetadata testSubject;
+		String subcategory = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setSubcategory(subcategory);
+	}
+
+	
+	@Test
+	public void testGetResourceVendor() throws Exception {
+		ToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceVendor();
+	}
+
+	
+	@Test
+	public void testSetResourceVendor() throws Exception {
+		ToscaMetadata testSubject;
+		String resourceVendor = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceVendor(resourceVendor);
+	}
+
+	
+	@Test
+	public void testGetResourceVendorRelease() throws Exception {
+		ToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceVendorRelease();
+	}
+
+	
+	@Test
+	public void testSetResourceVendorRelease() throws Exception {
+		ToscaMetadata testSubject;
+		String resourceVendorRelease = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceVendorRelease(resourceVendorRelease);
+	}
+
+	
+	@Test
+	public void testGetResourceVendorModelNumber() throws Exception {
+		ToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceVendorModelNumber();
+	}
+
+	
+	@Test
+	public void testSetResourceVendorModelNumber() throws Exception {
+		ToscaMetadata testSubject;
+		String resourceVendorModelNumber = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceVendorModelNumber(resourceVendorModelNumber);
+	}
+
+	
+	@Test
+	public void testGetServiceType() throws Exception {
+		ToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceType();
+	}
+
+	
+	@Test
+	public void testSetServiceType() throws Exception {
+		ToscaMetadata testSubject;
+		String serviceType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceType(serviceType);
+	}
+
+	
+	@Test
+	public void testGetServiceRole() throws Exception {
+		ToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceRole();
+	}
+
+	
+	@Test
+	public void testSetServiceRole() throws Exception {
+		ToscaMetadata testSubject;
+		String serviceRole = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceRole(serviceRole);
+	}
+
+	
+	@Test
+	public void testIsEcompGeneratedNaming() throws Exception {
+		ToscaMetadata testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isEcompGeneratedNaming();
+	}
+
+	
+	@Test
+	public void testSetEcompGeneratedNaming() throws Exception {
+		ToscaMetadata testSubject;
+		Boolean ecompGeneratedNaming = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setEcompGeneratedNaming(ecompGeneratedNaming);
+	}
+
+	
+	@Test
+	public void testIsNamingPolicy() throws Exception {
+		ToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isNamingPolicy();
+	}
+
+	
+	@Test
+	public void testSetNamingPolicy() throws Exception {
+		ToscaMetadata testSubject;
+		String namingPolicy = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNamingPolicy(namingPolicy);
+	}
+
+	
+	@Test
+	public void testGetServiceEcompNaming() throws Exception {
+		ToscaMetadata testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceEcompNaming();
+	}
+
+	
+	@Test
+	public void testSetServiceEcompNaming() throws Exception {
+		ToscaMetadata testSubject;
+		Boolean serviceEcompNaming = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceEcompNaming(serviceEcompNaming);
+	}
+
+	
+	@Test
+	public void testGetVersion() throws Exception {
+		ToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVersion();
+	}
+
+	
+	@Test
+	public void testSetVersion() throws Exception {
+		ToscaMetadata testSubject;
+		String version = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setVersion(version);
+	}
+
+	
+	@Test
+	public void testGetCustomizationUUID() throws Exception {
+		ToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCustomizationUUID();
+	}
+
+	
+	@Test
+	public void testSetCustomizationUUID() throws Exception {
+		ToscaMetadata testSubject;
+		String customizationUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCustomizationUUID(customizationUUID);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaNodeTemplateTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaNodeTemplateTest.java
new file mode 100644
index 0000000000..599f118b32
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaNodeTemplateTest.java
@@ -0,0 +1,126 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ToscaNodeTemplateTest {
+
+	private ToscaNodeTemplate createTestSubject() {
+		return new ToscaNodeTemplate();
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		ToscaNodeTemplate testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		ToscaNodeTemplate testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		ToscaNodeTemplate testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		ToscaNodeTemplate testSubject;
+		Map<String, Object> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testGetRequirements() throws Exception {
+		ToscaNodeTemplate testSubject;
+		List<Map<String, ToscaTemplateRequirement>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirements();
+	}
+
+	
+	@Test
+	public void testSetRequirements() throws Exception {
+		ToscaNodeTemplate testSubject;
+		List<Map<String, ToscaTemplateRequirement>> requirements = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirements(requirements);
+	}
+
+	
+	@Test
+	public void testGetCapabilities() throws Exception {
+		ToscaNodeTemplate testSubject;
+		Map<String, ToscaTemplateCapability> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilities();
+	}
+
+	
+	@Test
+	public void testSetCapabilities() throws Exception {
+		ToscaNodeTemplate testSubject;
+		Map<String, ToscaTemplateCapability> capabilities = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilities(capabilities);
+	}
+
+	
+	@Test
+	public void testGetMetadata() throws Exception {
+		ToscaNodeTemplate testSubject;
+		ToscaMetadata result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMetadata();
+	}
+
+	
+	@Test
+	public void testSetMetadata() throws Exception {
+		ToscaNodeTemplate testSubject;
+		ToscaMetadata metadata = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMetadata(metadata);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaNodeTypeTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaNodeTypeTest.java
new file mode 100644
index 0000000000..b4cccbdbf5
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaNodeTypeTest.java
@@ -0,0 +1,148 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ToscaNodeTypeTest {
+
+	private ToscaNodeType createTestSubject() {
+		return new ToscaNodeType();
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		ToscaNodeType testSubject;
+		Map<String, ToscaProperty> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		ToscaNodeType testSubject;
+		Map<String, ToscaProperty> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testGetCapabilities() throws Exception {
+		ToscaNodeType testSubject;
+		Map<String, ToscaCapability> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilities();
+	}
+
+	
+	@Test
+	public void testSetCapabilities() throws Exception {
+		ToscaNodeType testSubject;
+		Map<String, ToscaCapability> capabilities = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilities(capabilities);
+	}
+
+	
+	@Test
+	public void testGetRequirements() throws Exception {
+		ToscaNodeType testSubject;
+		List<Map<String, ToscaRequirement>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirements();
+	}
+
+	
+	@Test
+	public void testSetRequirements() throws Exception {
+		ToscaNodeType testSubject;
+		List<Map<String, ToscaRequirement>> requirements = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirements(requirements);
+	}
+
+	
+	@Test
+	public void testGetDerived_from() throws Exception {
+		ToscaNodeType testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerived_from();
+	}
+
+	
+	@Test
+	public void testSetDerived_from() throws Exception {
+		ToscaNodeType testSubject;
+		String derived_from = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerived_from(derived_from);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		ToscaNodeType testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		ToscaNodeType testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetMetadata() throws Exception {
+		ToscaNodeType testSubject;
+		ToscaMetadata result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMetadata();
+	}
+
+	
+	@Test
+	public void testSetMetadata() throws Exception {
+		ToscaNodeType testSubject;
+		ToscaMetadata metadata = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMetadata(metadata);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaPropertyTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaPropertyTest.java
new file mode 100644
index 0000000000..75bf7ddd75
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaPropertyTest.java
@@ -0,0 +1,145 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ToscaPropertyTest {
+
+	private ToscaProperty createTestSubject() {
+		return new ToscaProperty();
+	}
+
+	
+	@Test
+	public void testGetEntry_schema() throws Exception {
+		ToscaProperty testSubject;
+		EntrySchema result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getEntry_schema();
+	}
+
+	
+	@Test
+	public void testSetEntry_schema() throws Exception {
+		ToscaProperty testSubject;
+		EntrySchema entry_schema = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setEntry_schema(entry_schema);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		ToscaProperty testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		ToscaProperty testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetDefaultp() throws Exception {
+		ToscaProperty testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDefaultp();
+	}
+
+	
+	@Test
+	public void testSetDefaultp() throws Exception {
+		ToscaProperty testSubject;
+		Object defaultp = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDefaultp(defaultp);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		ToscaProperty testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		ToscaProperty testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetRequired() throws Exception {
+		ToscaProperty testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequired();
+	}
+
+	
+	@Test
+	public void testSetRequired() throws Exception {
+		ToscaProperty testSubject;
+		Boolean required = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequired(required);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		ToscaProperty testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		ToscaProperty testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaRequirementTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaRequirementTest.java
new file mode 100644
index 0000000000..639f634d7f
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaRequirementTest.java
@@ -0,0 +1,49 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ToscaRequirementTest {
+
+	private ToscaRequirement createTestSubject() {
+		return new ToscaRequirement();
+	}
+
+	
+	@Test
+	public void testGetOccurrences() throws Exception {
+		ToscaRequirement testSubject;
+		List<Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getOccurrences();
+	}
+
+	
+	@Test
+	public void testSetOccurrences() throws Exception {
+		ToscaRequirement testSubject;
+		List<Object> occurrences = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setOccurrences(occurrences);
+	}
+
+	
+	@Test
+	public void testToMap() throws Exception {
+		ToscaRequirement testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toMap();
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaTemplateCapabilityTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaTemplateCapabilityTest.java
new file mode 100644
index 0000000000..788361862b
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaTemplateCapabilityTest.java
@@ -0,0 +1,60 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ToscaTemplateCapabilityTest {
+
+	private ToscaTemplateCapability createTestSubject() {
+		return new ToscaTemplateCapability();
+	}
+
+	
+	@Test
+	public void testGetValid_source_types() throws Exception {
+		ToscaTemplateCapability testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValid_source_types();
+	}
+
+	
+	@Test
+	public void testSetValid_source_types() throws Exception {
+		ToscaTemplateCapability testSubject;
+		List<String> valid_source_types = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValid_source_types(valid_source_types);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		ToscaTemplateCapability testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		ToscaTemplateCapability testSubject;
+		Map<String, Object> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaTemplateRequirementTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaTemplateRequirementTest.java
new file mode 100644
index 0000000000..5ae2a37b37
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaTemplateRequirementTest.java
@@ -0,0 +1,92 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ToscaTemplateRequirementTest {
+
+	private ToscaTemplateRequirement createTestSubject() {
+		return new ToscaTemplateRequirement();
+	}
+
+	
+	@Test
+	public void testGetCapability() throws Exception {
+		ToscaTemplateRequirement testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapability();
+	}
+
+	
+	@Test
+	public void testSetCapability() throws Exception {
+		ToscaTemplateRequirement testSubject;
+		String capability = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapability(capability);
+	}
+
+	
+	@Test
+	public void testGetNode() throws Exception {
+		ToscaTemplateRequirement testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNode();
+	}
+
+	
+	@Test
+	public void testSetNode() throws Exception {
+		ToscaTemplateRequirement testSubject;
+		String node = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNode(node);
+	}
+
+	
+	@Test
+	public void testGetRelationship() throws Exception {
+		ToscaTemplateRequirement testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRelationship();
+	}
+
+	
+	@Test
+	public void testSetRelationship() throws Exception {
+		ToscaTemplateRequirement testSubject;
+		String relationship = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRelationship(relationship);
+	}
+
+	
+	@Test
+	public void testToMap() throws Exception {
+		ToscaTemplateRequirement testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toMap();
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaTemplateTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaTemplateTest.java
new file mode 100644
index 0000000000..3c60e96ffb
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaTemplateTest.java
@@ -0,0 +1,132 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ToscaTemplateTest {
+
+	private ToscaTemplate createTestSubject() {
+		return new ToscaTemplate("");
+	}
+
+	
+	@Test
+	public void testGetNode_types() throws Exception {
+		ToscaTemplate testSubject;
+		Map<String, ToscaNodeType> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNode_types();
+	}
+
+	
+	@Test
+	public void testSetNode_types() throws Exception {
+		ToscaTemplate testSubject;
+		Map<String, ToscaNodeType> node_types = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNode_types(node_types);
+	}
+
+	
+	@Test
+	public void testGetImports() throws Exception {
+		ToscaTemplate testSubject;
+		List<Map<String, Map<String, String>>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getImports();
+	}
+
+	
+	@Test
+	public void testSetImports() throws Exception {
+		ToscaTemplate testSubject;
+		List<Map<String, Map<String, String>>> imports = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setImports(imports);
+	}
+
+	
+	@Test
+	public void testGetTosca_definitions_version() throws Exception {
+		ToscaTemplate testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTosca_definitions_version();
+	}
+
+	
+	@Test
+	public void testSetTosca_definitions_version() throws Exception {
+		ToscaTemplate testSubject;
+		String tosca_definitions_version = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTosca_definitions_version(tosca_definitions_version);
+	}
+
+	
+	@Test
+	public void testGetMetadata() throws Exception {
+		ToscaTemplate testSubject;
+		ToscaMetadata result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMetadata();
+	}
+
+	
+	@Test
+	public void testSetMetadata() throws Exception {
+		ToscaTemplate testSubject;
+		ToscaMetadata metadata = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMetadata(metadata);
+	}
+
+	
+	@Test
+	public void testGetTopology_template() throws Exception {
+		ToscaTemplate testSubject;
+		ToscaTopolgyTemplate result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTopology_template();
+	}
+
+	
+	@Test
+	public void testSetTopology_template() throws Exception {
+		ToscaTemplate testSubject;
+		ToscaTopolgyTemplate topology_template = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTopology_template(topology_template);
+	}
+
+	
+
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaTopolgyTemplateTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaTopolgyTemplateTest.java
new file mode 100644
index 0000000000..71fe9ce8e4
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ToscaTopolgyTemplateTest.java
@@ -0,0 +1,94 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ToscaTopolgyTemplateTest {
+
+	private ToscaTopolgyTemplate createTestSubject() {
+		return new ToscaTopolgyTemplate();
+	}
+
+	
+	@Test
+	public void testGetNode_templates() throws Exception {
+		ToscaTopolgyTemplate testSubject;
+		Map<String, ToscaNodeTemplate> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNode_templates();
+	}
+
+	
+	@Test
+	public void testSetNode_templates() throws Exception {
+		ToscaTopolgyTemplate testSubject;
+		Map<String, ToscaNodeTemplate> node_templates = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNode_templates(node_templates);
+	}
+
+	
+	@Test
+	public void testGetGroups() throws Exception {
+		ToscaTopolgyTemplate testSubject;
+		Map<String, ToscaGroupTemplate> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroups();
+	}
+
+
+
+	
+	@Test
+	public void testGetSubstitution_mappings() throws Exception {
+		ToscaTopolgyTemplate testSubject;
+		SubstitutionMapping result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getSubstitution_mappings();
+	}
+
+	
+	@Test
+	public void testSetSubstitution_mappings() throws Exception {
+		ToscaTopolgyTemplate testSubject;
+		SubstitutionMapping substitution_mapping = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setSubstitution_mappings(substitution_mapping);
+	}
+
+	
+	@Test
+	public void testGetInputs() throws Exception {
+		ToscaTopolgyTemplate testSubject;
+		Map<String, ToscaProperty> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInputs();
+	}
+
+	
+	@Test
+	public void testSetInputs() throws Exception {
+		ToscaTopolgyTemplate testSubject;
+		Map<String, ToscaProperty> inputs = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInputs(inputs);
+	}
+}
\ No newline at end of file
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/VfModuleToscaMetadataTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/VfModuleToscaMetadataTest.java
new file mode 100644
index 0000000000..90be98bc9c
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/VfModuleToscaMetadataTest.java
@@ -0,0 +1,123 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class VfModuleToscaMetadataTest {
+
+	private VfModuleToscaMetadata createTestSubject() {
+		return new VfModuleToscaMetadata();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		VfModuleToscaMetadata testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testSetInvariantUUID() throws Exception {
+		VfModuleToscaMetadata testSubject;
+		String invariantUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInvariantUUID(invariantUUID);
+	}
+
+	
+	@Test
+	public void testSetUUID() throws Exception {
+		VfModuleToscaMetadata testSubject;
+		String uUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUUID(uUID);
+	}
+
+	
+	@Test
+	public void testSetVersion() throws Exception {
+		VfModuleToscaMetadata testSubject;
+		String version = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setVersion(version);
+	}
+
+	
+	@Test
+	public void testGetVfModuleModelName() throws Exception {
+		VfModuleToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVfModuleModelName();
+	}
+
+	
+	@Test
+	public void testGetVfModuleModelInvariantUUID() throws Exception {
+		VfModuleToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVfModuleModelInvariantUUID();
+	}
+
+	
+	@Test
+	public void testGetVfModuleModelUUID() throws Exception {
+		VfModuleToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVfModuleModelUUID();
+	}
+
+	
+	@Test
+	public void testGetVfModuleModelVersion() throws Exception {
+		VfModuleToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVfModuleModelVersion();
+	}
+
+	
+	@Test
+	public void testGetVfModuleModelCustomizationUUID() throws Exception {
+		VfModuleToscaMetadata testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVfModuleModelCustomizationUUID();
+	}
+
+	
+	@Test
+	public void testSetCustomizationUUID() throws Exception {
+		VfModuleToscaMetadata testSubject;
+		String customizationUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCustomizationUUID(customizationUUID);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterDataTest.java
new file mode 100644
index 0000000000..7624c059c9
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterDataTest.java
@@ -0,0 +1,115 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterDataDefinition;
+
+
+public class AdditionalInfoParameterDataTest {
+
+	private AdditionalInfoParameterData createTestSubject() {
+		return new AdditionalInfoParameterData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetAdditionalInfoParameterDataDefinition() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		AdditionalInfoParameterDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAdditionalInfoParameterDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetAdditionalInfoParameterDataDefinition() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		AdditionalInfoParameterDataDefinition additionalInfoParameterDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAdditionalInfoParameterDataDefinition(additionalInfoParameterDataDefinition);
+	}
+
+	
+	@Test
+	public void testGetParameters() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		Map<String, String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getParameters();
+	}
+
+	
+	@Test
+	public void testSetParameters() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		Map<String, String> parameters = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setParameters(parameters);
+	}
+
+	
+	@Test
+	public void testGetIdToKey() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		Map<String, String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIdToKey();
+	}
+
+	
+	@Test
+	public void testSetIdToKey() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		Map<String, String> idToKey = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIdToKey(idToKey);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		AdditionalInfoParameterData 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/resources/data/ArtifactDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ArtifactDataTest.java
new file mode 100644
index 0000000000..4d6bfbf4cd
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ArtifactDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
+
+
+public class ArtifactDataTest {
+
+	private ArtifactData createTestSubject() {
+		return new ArtifactData();
+	}
+
+	
+	@Test
+	public void testGetArtifactDataDefinition() throws Exception {
+		ArtifactData testSubject;
+		ArtifactDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetArtifactDataDefinition() throws Exception {
+		ArtifactData testSubject;
+		ArtifactDataDefinition artifactDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactDataDefinition(artifactDataDefinition);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		ArtifactData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		ArtifactData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ArtifactData 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/resources/data/AttributeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeDataTest.java
new file mode 100644
index 0000000000..4d684f7f46
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+
+
+public class AttributeDataTest {
+
+	private AttributeData createTestSubject() {
+		return new AttributeData();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		AttributeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		AttributeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetAttributeDataDefinition() throws Exception {
+		AttributeData testSubject;
+		PropertyDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAttributeDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetAttributeDataDefinition() throws Exception {
+		AttributeData testSubject;
+		PropertyDataDefinition attributeDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAttributeDataDefinition(attributeDataDefinition);
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		AttributeData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeValueDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeValueDataTest.java
new file mode 100644
index 0000000000..dcfdb52024
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeValueDataTest.java
@@ -0,0 +1,169 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class AttributeValueDataTest {
+
+	private AttributeValueData createTestSubject() {
+		return new AttributeValueData();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		AttributeValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		AttributeValueData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		AttributeValueData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		AttributeValueData testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		AttributeValueData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		AttributeValueData testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		AttributeValueData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		AttributeValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testIsHidden() throws Exception {
+		AttributeValueData testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isHidden();
+	}
+
+	
+	@Test
+	public void testSetHidden() throws Exception {
+		AttributeValueData testSubject;
+		Boolean hidden = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setHidden(hidden);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		AttributeValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		AttributeValueData testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetValue() throws Exception {
+		AttributeValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValue();
+	}
+
+	
+	@Test
+	public void testSetValue() throws Exception {
+		AttributeValueData testSubject;
+		String value = "";
+
+		// 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/CapabilityDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityDataTest.java
new file mode 100644
index 0000000000..5e709812ac
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityDataTest.java
@@ -0,0 +1,226 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class CapabilityDataTest {
+
+	private CapabilityData createTestSubject() {
+		return new CapabilityData();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		CapabilityData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		CapabilityData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		CapabilityData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		CapabilityData testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		CapabilityData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		CapabilityData testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetValidSourceTypes() throws Exception {
+		CapabilityData testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValidSourceTypes();
+	}
+
+	
+	@Test
+	public void testSetValidSourceTypes() throws Exception {
+		CapabilityData testSubject;
+		List<String> validSourceTypes = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValidSourceTypes(validSourceTypes);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		CapabilityData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		CapabilityData testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		CapabilityData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		CapabilityData testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testGetMinOccurrences() throws Exception {
+		CapabilityData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMinOccurrences();
+	}
+
+	
+	@Test
+	public void testSetMinOccurrences() throws Exception {
+		CapabilityData testSubject;
+		String minOccurrences = "";
+
+		// test 1
+		testSubject = createTestSubject();
+		minOccurrences = null;
+		testSubject.setMinOccurrences(minOccurrences);
+
+		// test 2
+		testSubject = createTestSubject();
+		minOccurrences = "";
+		testSubject.setMinOccurrences(minOccurrences);
+	}
+
+	
+	@Test
+	public void testGetMaxOccurrences() throws Exception {
+		CapabilityData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMaxOccurrences();
+	}
+
+	
+	@Test
+	public void testSetMaxOccurrences() throws Exception {
+		CapabilityData testSubject;
+		String maxOccurrences = "";
+
+		// test 1
+		testSubject = createTestSubject();
+		maxOccurrences = null;
+		testSubject.setMaxOccurrences(maxOccurrences);
+
+		// test 2
+		testSubject = createTestSubject();
+		maxOccurrences = "";
+		testSubject.setMaxOccurrences(maxOccurrences);
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		CapabilityData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		CapabilityData 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/resources/data/CapabilityInstDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityInstDataTest.java
new file mode 100644
index 0000000000..ca86edf0f2
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityInstDataTest.java
@@ -0,0 +1,126 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class CapabilityInstDataTest {
+
+	private CapabilityInstData createTestSubject() {
+		return new CapabilityInstData();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		CapabilityInstData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		CapabilityInstData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		CapabilityInstData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		CapabilityInstData testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		CapabilityInstData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		CapabilityInstData testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		CapabilityInstData testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		CapabilityInstData testSubject;
+		List<String> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		CapabilityInstData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		CapabilityInstData 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/resources/data/CapabilityTypeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityTypeDataTest.java
new file mode 100644
index 0000000000..7d4cc5b29b
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityTypeDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.CapabilityTypeDataDefinition;
+
+
+public class CapabilityTypeDataTest {
+
+	private CapabilityTypeData createTestSubject() {
+		return new CapabilityTypeData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		CapabilityTypeData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetCapabilityTypeDataDefinition() throws Exception {
+		CapabilityTypeData testSubject;
+		CapabilityTypeDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilityTypeDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetCapabilityTypeDataDefinition() throws Exception {
+		CapabilityTypeData testSubject;
+		CapabilityTypeDataDefinition capabilityTypeDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilityTypeDataDefinition(capabilityTypeDataDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		CapabilityTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		CapabilityTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentCacheDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentCacheDataTest.java
new file mode 100644
index 0000000000..0c9ff52d69
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentCacheDataTest.java
@@ -0,0 +1,156 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Date;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ComponentCacheDataTest {
+
+	private ComponentCacheData createTestSubject() {
+		return new ComponentCacheData();
+	}
+
+	
+	@Test
+	public void testGetDataAsArray() throws Exception {
+		ComponentCacheData testSubject;
+		byte[] result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDataAsArray();
+	}
+
+	
+	@Test
+	public void testSetDataAsArray() throws Exception {
+		ComponentCacheData testSubject;
+		byte[] data = new byte[] { ' ' };
+
+		// test 1
+		testSubject = createTestSubject();
+		data = null;
+		testSubject.setDataAsArray(data);
+
+		// test 2
+		testSubject = createTestSubject();
+		data = new byte[] { ' ' };
+		testSubject.setDataAsArray(data);
+	}
+
+	
+
+
+	
+	@Test
+	public void testGetId() throws Exception {
+		ComponentCacheData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getId();
+	}
+
+	
+	@Test
+	public void testSetId() throws Exception {
+		ComponentCacheData testSubject;
+		String id = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setId(id);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		ComponentCacheData testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		ComponentCacheData testSubject;
+		Date modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		ComponentCacheData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		ComponentCacheData testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetIsDirty() throws Exception {
+		ComponentCacheData testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIsDirty();
+	}
+
+	
+	@Test
+	public void testSetIsDirty() throws Exception {
+		ComponentCacheData testSubject;
+		boolean isDirty = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIsDirty(isDirty);
+	}
+
+	
+	@Test
+	public void testGetIsZipped() throws Exception {
+		ComponentCacheData testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIsZipped();
+	}
+
+	
+	@Test
+	public void testSetIsZipped() throws Exception {
+		ComponentCacheData testSubject;
+		boolean isZipped = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIsZipped(isZipped);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentInstanceDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentInstanceDataTest.java
new file mode 100644
index 0000000000..761f113511
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentInstanceDataTest.java
@@ -0,0 +1,126 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.ComponentInstanceDataDefinition;
+
+
+public class ComponentInstanceDataTest {
+
+	private ComponentInstanceData createTestSubject() {
+		return new ComponentInstanceData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		ComponentInstanceData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		ComponentInstanceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		ComponentInstanceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testGetUniqueIdKey() throws Exception {
+		ComponentInstanceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueIdKey();
+	}
+
+	
+	@Test
+	public void testGetComponentInstDataDefinition() throws Exception {
+		ComponentInstanceData testSubject;
+		ComponentInstanceDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetComponentInstDataDefinition() throws Exception {
+		ComponentInstanceData testSubject;
+		ComponentInstanceDataDefinition componentInstDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstDataDefinition(componentInstDataDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ComponentInstanceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetGroupInstanceCounter() throws Exception {
+		ComponentInstanceData testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupInstanceCounter();
+	}
+
+	
+	@Test
+	public void testSetGroupInstanceCounter() throws Exception {
+		ComponentInstanceData testSubject;
+		Integer componentInstanceCounter = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupInstanceCounter(componentInstanceCounter);
+	}
+
+	
+	@Test
+	public void testIncreaseAndGetGroupInstanceCounter() throws Exception {
+		ComponentInstanceData testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.increaseAndGetGroupInstanceCounter();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ConsumerDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ConsumerDataTest.java
new file mode 100644
index 0000000000..68dddbfe25
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ConsumerDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
+
+
+public class ConsumerDataTest {
+
+	private ConsumerData createTestSubject() {
+		return new ConsumerData();
+	}
+
+	
+	@Test
+	public void testGetUniqueIdKey() throws Exception {
+		ConsumerData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueIdKey();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		ConsumerData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetConsumerDataDefinition() throws Exception {
+		ConsumerData testSubject;
+		ConsumerDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerDataDefinition();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		ConsumerData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ConsumerData 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/resources/data/DataTypeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/DataTypeDataTest.java
new file mode 100644
index 0000000000..5766b36e8b
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/DataTypeDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.DataTypeDataDefinition;
+
+
+public class DataTypeDataTest {
+
+	private DataTypeData createTestSubject() {
+		return new DataTypeData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		DataTypeData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetDataTypeDataDefinition() throws Exception {
+		DataTypeData testSubject;
+		DataTypeDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDataTypeDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetDataTypeDataDefinition() throws Exception {
+		DataTypeData testSubject;
+		DataTypeDataDefinition dataTypeDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDataTypeDataDefinition(dataTypeDataDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		DataTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		DataTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupDataTest.java
new file mode 100644
index 0000000000..4095336e4c
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition;
+
+
+public class GroupDataTest {
+
+	private GroupData createTestSubject() {
+		return new GroupData();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		GroupData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		GroupData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetGroupDataDefinition() throws Exception {
+		GroupData testSubject;
+		GroupDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetGroupDataDefinition() throws Exception {
+		GroupData testSubject;
+		GroupDataDefinition groupDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupDataDefinition(groupDataDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GroupData 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/resources/data/GroupInstanceDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupInstanceDataTest.java
new file mode 100644
index 0000000000..99b54f7f42
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupInstanceDataTest.java
@@ -0,0 +1,93 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.GroupInstanceDataDefinition;
+
+
+public class GroupInstanceDataTest {
+
+	private GroupInstanceData createTestSubject() {
+		return new GroupInstanceData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		GroupInstanceData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		GroupInstanceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		GroupInstanceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testGetUniqueIdKey() throws Exception {
+		GroupInstanceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueIdKey();
+	}
+
+	
+	@Test
+	public void testGetGroupDataDefinition() throws Exception {
+		GroupInstanceData testSubject;
+		GroupInstanceDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetComponentInstDataDefinition() throws Exception {
+		GroupInstanceData testSubject;
+		GroupInstanceDataDefinition groupDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstDataDefinition(groupDataDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GroupInstanceData 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/resources/data/GroupTypeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupTypeDataTest.java
new file mode 100644
index 0000000000..070f2708e2
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupTypeDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.GroupTypeDataDefinition;
+
+
+public class GroupTypeDataTest {
+
+	private GroupTypeData createTestSubject() {
+		return new GroupTypeData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		GroupTypeData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetGroupTypeDataDefinition() throws Exception {
+		GroupTypeData testSubject;
+		GroupTypeDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupTypeDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetGroupTypeDataDefinition() throws Exception {
+		GroupTypeData testSubject;
+		GroupTypeDataDefinition groupTypeDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupTypeDataDefinition(groupTypeDataDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GroupTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		GroupTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterDataTest.java
new file mode 100644
index 0000000000..db3db02c0b
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterDataTest.java
@@ -0,0 +1,173 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.HeatParameterDataDefinition;
+
+
+public class HeatParameterDataTest {
+
+	private HeatParameterData createTestSubject() {
+		return new HeatParameterData();
+	}
+
+	
+
+	
+	@Test
+	public void testGetHeatDataDefinition() throws Exception {
+		HeatParameterData testSubject;
+		HeatParameterDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getHeatDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetHeatDataDefinition() throws Exception {
+		HeatParameterData testSubject;
+		HeatParameterDataDefinition heatDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setHeatDataDefinition(heatDataDefinition);
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		HeatParameterData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		HeatParameterData testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		HeatParameterData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		HeatParameterData testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		HeatParameterData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		HeatParameterData testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetCurrentValue() throws Exception {
+		HeatParameterData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrentValue();
+	}
+
+	
+	@Test
+	public void testSetCurrentValue() throws Exception {
+		HeatParameterData testSubject;
+		String currentValue = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrentValue(currentValue);
+	}
+
+	
+	@Test
+	public void testGetDefaultValue() throws Exception {
+		HeatParameterData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDefaultValue();
+	}
+
+	
+	@Test
+	public void testSetDefaultValue() throws Exception {
+		HeatParameterData testSubject;
+		String defaultValue = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDefaultValue(defaultValue);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		HeatParameterData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		HeatParameterData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterValueDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterValueDataTest.java
new file mode 100644
index 0000000000..55b4719b79
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterValueDataTest.java
@@ -0,0 +1,81 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class HeatParameterValueDataTest {
+
+	private HeatParameterValueData createTestSubject() {
+		return new HeatParameterValueData();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		HeatParameterValueData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetValue() throws Exception {
+		HeatParameterValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValue();
+	}
+
+	
+	@Test
+	public void testSetValue() throws Exception {
+		HeatParameterValueData testSubject;
+		String value = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValue(value);
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		HeatParameterValueData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		HeatParameterValueData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		HeatParameterValueData 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/resources/data/InputValueDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputValueDataTest.java
new file mode 100644
index 0000000000..0099f9a149
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputValueDataTest.java
@@ -0,0 +1,169 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class InputValueDataTest {
+
+	private InputValueData createTestSubject() {
+		return new InputValueData();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		InputValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		InputValueData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		InputValueData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		InputValueData testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		InputValueData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		InputValueData testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		InputValueData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		InputValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testIsHidden() throws Exception {
+		InputValueData testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isHidden();
+	}
+
+	
+	@Test
+	public void testSetHidden() throws Exception {
+		InputValueData testSubject;
+		Boolean hidden = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setHidden(hidden);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		InputValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		InputValueData testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetValue() throws Exception {
+		InputValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValue();
+	}
+
+	
+	@Test
+	public void testSetValue() throws Exception {
+		InputValueData testSubject;
+		String value = "";
+
+		// 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/InputsDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputsDataTest.java
new file mode 100644
index 0000000000..193d53762a
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputsDataTest.java
@@ -0,0 +1,94 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+
+
+public class InputsDataTest {
+
+	private InputsData createTestSubject() {
+		return new InputsData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		InputsData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetConstraints() throws Exception {
+		InputsData testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConstraints();
+	}
+
+	
+	@Test
+	public void testSetConstraints() throws Exception {
+		InputsData testSubject;
+		List<String> constraints = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConstraints(constraints);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		InputsData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetPropertyDataDefinition() throws Exception {
+		InputsData testSubject;
+		PropertyDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPropertyDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetPropertyDataDefinition() throws Exception {
+		InputsData testSubject;
+		PropertyDataDefinition propertyDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPropertyDataDefinition(propertyDataDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		InputsData 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/resources/data/InterfaceDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InterfaceDataTest.java
new file mode 100644
index 0000000000..59f28c860e
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InterfaceDataTest.java
@@ -0,0 +1,60 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.InterfaceDataDefinition;
+
+
+public class InterfaceDataTest {
+
+	private InterfaceData createTestSubject() {
+		return new InterfaceData();
+	}
+
+	
+	@Test
+	public void testGetInterfaceDataDefinition() throws Exception {
+		InterfaceData testSubject;
+		InterfaceDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInterfaceDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetInterfaceDataDefinition() throws Exception {
+		InterfaceData testSubject;
+		InterfaceDataDefinition interfaceDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInterfaceDataDefinition(interfaceDataDefinition);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		InterfaceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		InterfaceData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/MigrationTaskEntryTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/MigrationTaskEntryTest.java
new file mode 100644
index 0000000000..45bd2e176c
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/MigrationTaskEntryTest.java
@@ -0,0 +1,191 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Date;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class MigrationTaskEntryTest {
+
+	private MigrationTaskEntry createTestSubject() {
+		return new MigrationTaskEntry();
+	}
+
+	
+	@Test
+	public void testSetMajorVersion() throws Exception {
+		MigrationTaskEntry testSubject;
+		Long majorVersion = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMajorVersion(majorVersion);
+	}
+
+	
+	@Test
+	public void testSetMinorVersion() throws Exception {
+		MigrationTaskEntry testSubject;
+		Long minorVersion = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMinorVersion(minorVersion);
+	}
+
+	
+	@Test
+	public void testSetTimestamp() throws Exception {
+		MigrationTaskEntry testSubject;
+		Date timestamp = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp(timestamp);
+	}
+
+	
+	@Test
+	public void testSetTaskName() throws Exception {
+		MigrationTaskEntry testSubject;
+		String taskName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTaskName(taskName);
+	}
+
+	
+	@Test
+	public void testSetTaskStatus() throws Exception {
+		MigrationTaskEntry testSubject;
+		String taskStatus = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTaskStatus(taskStatus);
+	}
+
+	
+	@Test
+	public void testSetMessage() throws Exception {
+		MigrationTaskEntry testSubject;
+		String message = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMessage(message);
+	}
+
+	
+	@Test
+	public void testSetExecutionTime() throws Exception {
+		MigrationTaskEntry testSubject;
+		double executionTime = 0.0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setExecutionTime(executionTime);
+	}
+
+	
+	@Test
+	public void testGetMajorVersion() throws Exception {
+		MigrationTaskEntry testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMajorVersion();
+	}
+
+	
+	@Test
+	public void testGetMinorVersion() throws Exception {
+		MigrationTaskEntry testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMinorVersion();
+	}
+
+	
+	@Test
+	public void testGetTimestamp() throws Exception {
+		MigrationTaskEntry testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp();
+	}
+
+	
+	@Test
+	public void testGetTaskName() throws Exception {
+		MigrationTaskEntry testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTaskName();
+	}
+
+	
+	@Test
+	public void testGetTaskStatus() throws Exception {
+		MigrationTaskEntry testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTaskStatus();
+	}
+
+	
+	@Test
+	public void testGetMessage() throws Exception {
+		MigrationTaskEntry testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMessage();
+	}
+
+	
+	@Test
+	public void testGetExecutionTime() throws Exception {
+		MigrationTaskEntry testSubject;
+		double result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getExecutionTime();
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		MigrationTaskEntry testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		MigrationTaskEntry testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/OperationDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/OperationDataTest.java
new file mode 100644
index 0000000000..776c5c3909
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/OperationDataTest.java
@@ -0,0 +1,60 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.OperationDataDefinition;
+
+
+public class OperationDataTest {
+
+	private OperationData createTestSubject() {
+		return new OperationData();
+	}
+
+	
+	@Test
+	public void testGetOperationDataDefinition() throws Exception {
+		OperationData testSubject;
+		OperationDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getOperationDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetOperationDataDefinition() throws Exception {
+		OperationData testSubject;
+		OperationDataDefinition operationDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setOperationDataDefinition(operationDataDefinition);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		OperationData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		OperationData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PolicyTypeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PolicyTypeDataTest.java
new file mode 100644
index 0000000000..c2551b0356
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PolicyTypeDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.PolicyTypeDataDefinition;
+
+
+public class PolicyTypeDataTest {
+
+	private PolicyTypeData createTestSubject() {
+		return new PolicyTypeData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		PolicyTypeData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		PolicyTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		PolicyTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetPolicyTypeDataDefinition() throws Exception {
+		PolicyTypeData testSubject;
+		PolicyTypeDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPolicyTypeDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetPolicyTypeDataDefinition() throws Exception {
+		PolicyTypeData testSubject;
+		PolicyTypeDataDefinition policyTypeDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPolicyTypeDataDefinition(policyTypeDataDefinition);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ProductMetadataDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ProductMetadataDataTest.java
new file mode 100644
index 0000000000..382ca38e86
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ProductMetadataDataTest.java
@@ -0,0 +1,48 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ProductMetadataDataTest {
+
+	private ProductMetadataData createTestSubject() {
+		return new ProductMetadataData();
+	}
+
+	
+	@Test
+	public void testGetUniqueIdKey() throws Exception {
+		ProductMetadataData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueIdKey();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		ProductMetadataData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ProductMetadataData 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/resources/data/PropertyDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyDataTest.java
new file mode 100644
index 0000000000..ae582b7383
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyDataTest.java
@@ -0,0 +1,94 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+
+
+public class PropertyDataTest {
+
+	private PropertyData createTestSubject() {
+		return new PropertyData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		PropertyData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetConstraints() throws Exception {
+		PropertyData testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConstraints();
+	}
+
+	
+	@Test
+	public void testSetConstraints() throws Exception {
+		PropertyData testSubject;
+		List<String> constraints = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConstraints(constraints);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		PropertyData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetPropertyDataDefinition() throws Exception {
+		PropertyData testSubject;
+		PropertyDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPropertyDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetPropertyDataDefinition() throws Exception {
+		PropertyData testSubject;
+		PropertyDataDefinition propertyDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPropertyDataDefinition(propertyDataDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		PropertyData 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/resources/data/PropertyValueDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyValueDataTest.java
new file mode 100644
index 0000000000..1151a8387c
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyValueDataTest.java
@@ -0,0 +1,171 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.PropertyRule;
+
+
+public class PropertyValueDataTest {
+
+	private PropertyValueData createTestSubject() {
+		return new PropertyValueData();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		PropertyValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		PropertyValueData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		PropertyValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		PropertyValueData testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		PropertyValueData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		PropertyValueData testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		PropertyValueData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		PropertyValueData testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testGetValue() throws Exception {
+		PropertyValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValue();
+	}
+
+	
+	@Test
+	public void testSetValue() throws Exception {
+		PropertyValueData testSubject;
+		String value = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValue(value);
+	}
+
+	
+	@Test
+	public void testGetRules() throws Exception {
+		PropertyValueData testSubject;
+		List<PropertyRule> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRules();
+	}
+
+	
+	@Test
+	public void testSetRules() throws Exception {
+		PropertyValueData testSubject;
+		List<PropertyRule> rules = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRules(rules);
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		PropertyValueData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		PropertyValueData 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/resources/data/RelationshipInstDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipInstDataTest.java
new file mode 100644
index 0000000000..81b6352b0a
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipInstDataTest.java
@@ -0,0 +1,213 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class RelationshipInstDataTest {
+
+	private RelationshipInstData createTestSubject() {
+		return new RelationshipInstData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		RelationshipInstData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		RelationshipInstData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		RelationshipInstData testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		RelationshipInstData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		RelationshipInstData testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		RelationshipInstData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		RelationshipInstData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		RelationshipInstData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		RelationshipInstData testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetCapabilityOwnerId() throws Exception {
+		RelationshipInstData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilityOwnerId();
+	}
+
+	
+	@Test
+	public void testSetCapabilityOwnerId() throws Exception {
+		RelationshipInstData testSubject;
+		String capabilityOwnerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilityOwnerId(capabilityOwnerId);
+	}
+
+	
+	@Test
+	public void testGetRequirementOwnerId() throws Exception {
+		RelationshipInstData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirementOwnerId();
+	}
+
+	
+	@Test
+	public void testSetRequirementOwnerId() throws Exception {
+		RelationshipInstData testSubject;
+		String requirementOwnerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirementOwnerId(requirementOwnerId);
+	}
+
+	
+	@Test
+	public void testGetCapabiltyId() throws Exception {
+		RelationshipInstData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabiltyId();
+	}
+
+	
+	@Test
+	public void testSetCapabiltyId() throws Exception {
+		RelationshipInstData testSubject;
+		String capabiltyId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabiltyId(capabiltyId);
+	}
+
+	
+	@Test
+	public void testGetRequirementId() throws Exception {
+		RelationshipInstData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirementId();
+	}
+
+	
+	@Test
+	public void testSetRequirementId() throws Exception {
+		RelationshipInstData testSubject;
+		String requirementId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirementId(requirementId);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RelationshipInstData 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/resources/data/RelationshipTypeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipTypeDataTest.java
new file mode 100644
index 0000000000..3f06669e8e
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipTypeDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.RelationshipInstDataDefinition;
+
+
+public class RelationshipTypeDataTest {
+
+	private RelationshipTypeData createTestSubject() {
+		return new RelationshipTypeData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		RelationshipTypeData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetRelationshipTypeDataDefinition() throws Exception {
+		RelationshipTypeData testSubject;
+		RelationshipInstDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRelationshipTypeDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetRelationshipTypeDataDefinition() throws Exception {
+		RelationshipTypeData testSubject;
+		RelationshipInstDataDefinition relationshipTypeDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRelationshipTypeDataDefinition(relationshipTypeDataDefinition);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		RelationshipTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RelationshipTypeData 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/resources/data/RequirementDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementDataTest.java
new file mode 100644
index 0000000000..8251fe82b7
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementDataTest.java
@@ -0,0 +1,203 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class RequirementDataTest {
+
+	private RequirementData createTestSubject() {
+		return new RequirementData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		RequirementData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetNode() throws Exception {
+		RequirementData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNode();
+	}
+
+	
+	@Test
+	public void testSetNode() throws Exception {
+		RequirementData testSubject;
+		String node = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNode(node);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		RequirementData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		RequirementData testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		RequirementData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		RequirementData testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		RequirementData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetRelationshipType() throws Exception {
+		RequirementData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRelationshipType();
+	}
+
+	
+	@Test
+	public void testSetRelationshipType() throws Exception {
+		RequirementData testSubject;
+		String relationshipType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRelationshipType(relationshipType);
+	}
+
+	
+	@Test
+	public void testGetMinOccurrences() throws Exception {
+		RequirementData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMinOccurrences();
+	}
+
+	
+	@Test
+	public void testSetMinOccurrences() throws Exception {
+		RequirementData testSubject;
+		String minOccurrences = "";
+
+		// test 1
+		testSubject = createTestSubject();
+		minOccurrences = null;
+		testSubject.setMinOccurrences(minOccurrences);
+
+		// test 2
+		testSubject = createTestSubject();
+		minOccurrences = "";
+		testSubject.setMinOccurrences(minOccurrences);
+	}
+
+	
+	@Test
+	public void testGetMaxOccurrences() throws Exception {
+		RequirementData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMaxOccurrences();
+	}
+
+	
+	@Test
+	public void testSetMaxOccurrences() throws Exception {
+		RequirementData testSubject;
+		String maxOccurrences = "";
+
+		// test 1
+		testSubject = createTestSubject();
+		maxOccurrences = null;
+		testSubject.setMaxOccurrences(maxOccurrences);
+
+		// test 2
+		testSubject = createTestSubject();
+		maxOccurrences = "";
+		testSubject.setMaxOccurrences(maxOccurrences);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		RequirementData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RequirementData 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/resources/data/RequirementImplDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementImplDataTest.java
new file mode 100644
index 0000000000..9e917a1679
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementImplDataTest.java
@@ -0,0 +1,169 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class RequirementImplDataTest {
+
+	private RequirementImplData createTestSubject() {
+		return new RequirementImplData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		RequirementImplData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		RequirementImplData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		RequirementImplData testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		RequirementImplData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		RequirementImplData testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		RequirementImplData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		RequirementImplData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		RequirementImplData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		RequirementImplData testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetPosX() throws Exception {
+		RequirementImplData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPosX();
+	}
+
+	
+	@Test
+	public void testSetPosX() throws Exception {
+		RequirementImplData testSubject;
+		String posX = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPosX(posX);
+	}
+
+	
+	@Test
+	public void testGetPosY() throws Exception {
+		RequirementImplData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPosY();
+	}
+
+	
+	@Test
+	public void testSetPosY() throws Exception {
+		RequirementImplData testSubject;
+		String posY = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPosY(posY);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RequirementImplData 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/resources/data/ResourceCategoryDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceCategoryDataTest.java
new file mode 100644
index 0000000000..feebd07947
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceCategoryDataTest.java
@@ -0,0 +1,60 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ResourceCategoryDataTest {
+
+	private ResourceCategoryData createTestSubject() {
+		return new ResourceCategoryData();
+	}
+
+	
+	@Test
+	public void testGetCategoryName() throws Exception {
+		ResourceCategoryData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCategoryName();
+	}
+
+	
+	@Test
+	public void testSetCategoryName() throws Exception {
+		ResourceCategoryData testSubject;
+		String categoryName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCategoryName(categoryName);
+	}
+
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ResourceCategoryData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		ResourceCategoryData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesDataTest.java
new file mode 100644
index 0000000000..0581412b3c
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesDataTest.java
@@ -0,0 +1,167 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Date;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class SdcSchemaFilesDataTest {
+
+	private SdcSchemaFilesData createTestSubject() {
+		return new SdcSchemaFilesData();
+	}
+
+	
+	@Test
+	public void testGetSdcReleaseNum() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getSdcReleaseNum();
+	}
+
+	
+	@Test
+	public void testSetSdcReleaseNum() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String sdcReleaseNum = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setSdcReleaseNum(sdcReleaseNum);
+	}
+
+	
+	@Test
+	public void testGetConformanceLevel() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConformanceLevel();
+	}
+
+	
+	@Test
+	public void testSetConformanceLevel() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String conformanceLevel = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConformanceLevel(conformanceLevel);
+	}
+
+	
+	@Test
+	public void testGetFileName() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFileName();
+	}
+
+	
+	@Test
+	public void testSetFileName() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String fileName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setFileName(fileName);
+	}
+
+	
+
+
+	
+	@Test
+	public void testSetPayloadAsArray() throws Exception {
+		SdcSchemaFilesData testSubject;
+		byte[] payload = new byte[] { ' ' };
+
+		// test 1
+		testSubject = createTestSubject();
+		payload = null;
+		testSubject.setPayloadAsArray(payload);
+
+		// test 2
+		testSubject = createTestSubject();
+		payload = new byte[] { ' ' };
+		testSubject.setPayloadAsArray(payload);
+	}
+
+	
+	@Test
+	public void testGetPayloadAsArray() throws Exception {
+		SdcSchemaFilesData testSubject;
+		byte[] result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPayloadAsArray();
+	}
+
+	
+	@Test
+	public void testGetTimestamp() throws Exception {
+		SdcSchemaFilesData testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp();
+	}
+
+	
+	@Test
+	public void testSetTimestamp() throws Exception {
+		SdcSchemaFilesData testSubject;
+		Date timestamp = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp(timestamp);
+	}
+
+	
+	@Test
+	public void testGetChecksum() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getChecksum();
+	}
+
+	
+	@Test
+	public void testSetChecksum() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String checksum = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setChecksum(checksum);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		SdcSchemaFilesData 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/resources/data/ServiceArtifactsDataCollectionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceArtifactsDataCollectionTest.java
new file mode 100644
index 0000000000..0afe7be7ef
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceArtifactsDataCollectionTest.java
@@ -0,0 +1,49 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+public class ServiceArtifactsDataCollectionTest {
+
+	private ServiceArtifactsDataCollection createTestSubject() {
+		return new ServiceArtifactsDataCollection();
+	}
+
+	
+	@Test
+	public void testGetServiceArtifactDataMap() throws Exception {
+		ServiceArtifactsDataCollection testSubject;
+		Map<String, List<ESArtifactData>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceArtifactDataMap();
+	}
+
+	
+	@Test
+	public void testSetServiceArtifactDataMap() throws Exception {
+		ServiceArtifactsDataCollection testSubject;
+		Map<String, List<ESArtifactData>> serviceArtifactDataMap = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceArtifactDataMap(serviceArtifactDataMap);
+	}
+
+	
+	@Test
+	public void testGetNodeTemplateArtifacts() throws Exception {
+		ServiceArtifactsDataCollection testSubject;
+		String nodeTemplateName = "";
+		List<ESArtifactData> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNodeTemplateArtifacts(nodeTemplateName);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceMetadataDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceMetadataDataTest.java
new file mode 100644
index 0000000000..d10db84409
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceMetadataDataTest.java
@@ -0,0 +1,37 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ServiceMetadataDataTest {
+
+	private ServiceMetadataData createTestSubject() {
+		return new ServiceMetadataData();
+	}
+
+	
+	@Test
+	public void testGetUniqueIdKey() throws Exception {
+		ServiceMetadataData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueIdKey();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		ServiceMetadataData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserDataTest.java
new file mode 100644
index 0000000000..b7c051567d
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserDataTest.java
@@ -0,0 +1,260 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class UserDataTest {
+
+	private UserData createTestSubject() {
+		return new UserData("", "", "", "", "", "", null);
+	}
+
+	
+	@Test
+	public void testGetFirstName() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFirstName();
+	}
+
+	
+	@Test
+	public void testSetFirstName() throws Exception {
+		UserData testSubject;
+		String firstName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setFirstName(firstName);
+	}
+
+	
+	@Test
+	public void testGetLastName() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastName();
+	}
+
+	
+	@Test
+	public void testSetLastName() throws Exception {
+		UserData testSubject;
+		String lastName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastName(lastName);
+	}
+
+	
+	@Test
+	public void testGetUserId() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUserId();
+	}
+
+	
+	@Test
+	public void testSetUserId() throws Exception {
+		UserData testSubject;
+		String userId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUserId(userId);
+	}
+
+	
+	@Test
+	public void testGetEmail() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getEmail();
+	}
+
+	
+	@Test
+	public void testSetEmail() throws Exception {
+		UserData testSubject;
+		String email = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setEmail(email);
+	}
+
+	
+	@Test
+	public void testGetRole() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRole();
+	}
+
+	
+	@Test
+	public void testSetRole() throws Exception {
+		UserData testSubject;
+		String role = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRole(role);
+	}
+
+	
+	@Test
+	public void testSetLastLoginTime() throws Exception {
+		UserData testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastLoginTime();
+	}
+
+	
+	@Test
+	public void testSetLastLoginTime_1() throws Exception {
+		UserData testSubject;
+		Long time = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastLoginTime(time);
+	}
+
+	
+	@Test
+	public void testGetLastLoginTime() throws Exception {
+		UserData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastLoginTime();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		UserData testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		UserData testSubject;
+		Object obj = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		obj = null;
+		result = testSubject.equals(obj);
+		Assert.assertEquals(false, result);
+	}
+
+	
+	@Test
+	public void testToJson() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toJson();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		UserData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetUniqueIdKey() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueIdKey();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		UserData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		UserData testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserFunctionalMenuDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserFunctionalMenuDataTest.java
new file mode 100644
index 0000000000..fd493fa54e
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserFunctionalMenuDataTest.java
@@ -0,0 +1,103 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class UserFunctionalMenuDataTest {
+
+	private UserFunctionalMenuData createTestSubject() {
+		return new UserFunctionalMenuData("", "");
+	}
+
+	
+	@Test
+	public void testGetFunctionalMenu() throws Exception {
+		UserFunctionalMenuData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFunctionalMenu();
+	}
+
+	
+	@Test
+	public void testSetFunctionalMenu() throws Exception {
+		UserFunctionalMenuData testSubject;
+		String functionalMenu = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setFunctionalMenu(functionalMenu);
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		UserFunctionalMenuData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		UserFunctionalMenuData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testToJson() throws Exception {
+		UserFunctionalMenuData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toJson();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		UserFunctionalMenuData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetUniqueIdKey() throws Exception {
+		UserFunctionalMenuData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueIdKey();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		UserFunctionalMenuData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+}
\ 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
new file mode 100644
index 0000000000..c6de8d16c5
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEventTest.java
@@ -0,0 +1,133 @@
+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;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		AuditingGenericEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		AuditingGenericEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		AuditingGenericEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		AuditingGenericEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		AuditingGenericEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		AuditingGenericEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		AuditingGenericEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		AuditingGenericEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		AuditingGenericEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		AuditingGenericEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..7940ae182a
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEventTest.java
@@ -0,0 +1,213 @@
+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;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetConsumerId() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerId();
+	}
+
+	
+	@Test
+	public void testSetConsumerId() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String consumerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConsumerId(consumerId);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		AuditingGetUebClusterEvent 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/resources/data/auditing/AuthEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuthEventTest.java
new file mode 100644
index 0000000000..42de349d5b
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuthEventTest.java
@@ -0,0 +1,246 @@
+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;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUrl();
+	}
+
+	
+	@Test
+	public void testSetUrl() throws Exception {
+		AuthEvent testSubject;
+		String url = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUrl(url);
+	}
+
+	
+	@Test
+	public void testGetUser() throws Exception {
+		AuthEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUser();
+	}
+
+	
+	@Test
+	public void testSetUser() throws Exception {
+		AuthEvent testSubject;
+		String user = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUser(user);
+	}
+
+	
+	@Test
+	public void testGetAuthStatus() throws Exception {
+		AuthEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAuthStatus();
+	}
+
+	
+	@Test
+	public void testSetAuthStatus() throws Exception {
+		AuthEvent testSubject;
+		String authStatus = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAuthStatus(authStatus);
+	}
+
+	
+	@Test
+	public void testGetRealm() throws Exception {
+		AuthEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRealm();
+	}
+
+	
+	@Test
+	public void testSetRealm() throws Exception {
+		AuthEvent testSubject;
+		String realm = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRealm(realm);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		AuthEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		AuthEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		AuthEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		AuthEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		AuthEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		AuthEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		AuthEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		AuthEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		AuthEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		AuthEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		AuthEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		AuthEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		AuthEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..448df507d7
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEventTest.java
@@ -0,0 +1,290 @@
+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;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		CategoryEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		CategoryEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		CategoryEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		CategoryEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		CategoryEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetCategoryName() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCategoryName();
+	}
+
+	
+	@Test
+	public void testSetCategoryName() throws Exception {
+		CategoryEvent testSubject;
+		String categoryName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCategoryName(categoryName);
+	}
+
+	
+	@Test
+	public void testGetSubCategoryName() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getSubCategoryName();
+	}
+
+	
+	@Test
+	public void testSetSubCategoryName() throws Exception {
+		CategoryEvent testSubject;
+		String subCategoryName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setSubCategoryName(subCategoryName);
+	}
+
+	
+	@Test
+	public void testGetGroupingName() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupingName();
+	}
+
+	
+	@Test
+	public void testSetGroupingName() throws Exception {
+		CategoryEvent testSubject;
+		String groupingName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupingName(groupingName);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		CategoryEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		CategoryEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		CategoryEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		CategoryEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetResourceType() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceType();
+	}
+
+	
+	@Test
+	public void testSetResourceType() throws Exception {
+		CategoryEvent testSubject;
+		String resourceType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceType(resourceType);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		CategoryEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ConsumerEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ConsumerEventTest.java
new file mode 100644
index 0000000000..2b2bb4d5e9
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ConsumerEventTest.java
@@ -0,0 +1,213 @@
+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 ConsumerEventTest {
+
+	private ConsumerEvent createTestSubject() {
+		return new ConsumerEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		ConsumerEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		ConsumerEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		ConsumerEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetEcompUser() throws Exception {
+		ConsumerEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getEcompUser();
+	}
+
+	
+	@Test
+	public void testSetEcompUser() throws Exception {
+		ConsumerEvent testSubject;
+		String ecompUser = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setEcompUser(ecompUser);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		ConsumerEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		ConsumerEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		ConsumerEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		ConsumerEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		ConsumerEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		ConsumerEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		ConsumerEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		ConsumerEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		ConsumerEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		ConsumerEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		ConsumerEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		ConsumerEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ConsumerEvent 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/resources/data/auditing/DistributionDeployEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDeployEventTest.java
new file mode 100644
index 0000000000..2ea9bf9cf1
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDeployEventTest.java
@@ -0,0 +1,301 @@
+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 DistributionDeployEventTest {
+
+	private DistributionDeployEvent createTestSubject() {
+		return new DistributionDeployEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		DistributionDeployEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetResourceName() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceName();
+	}
+
+	
+	@Test
+	public void testSetResourceName() throws Exception {
+		DistributionDeployEvent testSubject;
+		String resourceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceName(resourceName);
+	}
+
+	
+	@Test
+	public void testGetResourceType() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceType();
+	}
+
+	
+	@Test
+	public void testSetResourceType() throws Exception {
+		DistributionDeployEvent testSubject;
+		String resourceType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceType(resourceType);
+	}
+
+	
+	@Test
+	public void testGetCurrVersion() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrVersion();
+	}
+
+	
+	@Test
+	public void testSetCurrVersion() throws Exception {
+		DistributionDeployEvent testSubject;
+		String currVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrVersion(currVersion);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		DistributionDeployEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		DistributionDeployEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		DistributionDeployEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		DistributionDeployEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		DistributionDeployEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		DistributionDeployEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		DistributionDeployEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		DistributionDeployEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		DistributionDeployEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		DistributionDeployEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetDid() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDid();
+	}
+
+	
+	@Test
+	public void testSetDid() throws Exception {
+		DistributionDeployEvent testSubject;
+		String did = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDid(did);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		DistributionDeployEvent 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/resources/data/auditing/DistributionDownloadEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDownloadEventTest.java
new file mode 100644
index 0000000000..7ab3d8ca1f
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDownloadEventTest.java
@@ -0,0 +1,235 @@
+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 DistributionDownloadEventTest {
+
+	private DistributionDownloadEvent createTestSubject() {
+		return new DistributionDownloadEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		DistributionDownloadEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetConsumerId() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerId();
+	}
+
+	
+	@Test
+	public void testSetConsumerId() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String consumerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConsumerId(consumerId);
+	}
+
+	
+	@Test
+	public void testGetResourceUrl() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceUrl();
+	}
+
+	
+	@Test
+	public void testSetResourceUrl() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String resourceUrl = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceUrl(resourceUrl);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		DistributionDownloadEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		DistributionDownloadEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		DistributionDownloadEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		DistributionDownloadEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		DistributionDownloadEvent 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/resources/data/auditing/DistributionEngineEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionEngineEventTest.java
new file mode 100644
index 0000000000..e4450111c1
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionEngineEventTest.java
@@ -0,0 +1,323 @@
+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 DistributionEngineEventTest {
+
+	private DistributionEngineEvent createTestSubject() {
+		return new DistributionEngineEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		DistributionEngineEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetDstatusTopic() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDstatusTopic();
+	}
+
+	
+	@Test
+	public void testSetDstatusTopic() throws Exception {
+		DistributionEngineEvent testSubject;
+		String dstatusTopic = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDstatusTopic(dstatusTopic);
+	}
+
+	
+	@Test
+	public void testGetDnotifTopic() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDnotifTopic();
+	}
+
+	
+	@Test
+	public void testSetDnotifTopic() throws Exception {
+		DistributionEngineEvent testSubject;
+		String dnotifTopic = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDnotifTopic(dnotifTopic);
+	}
+
+	
+	@Test
+	public void testGetEnvironmentName() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getEnvironmentName();
+	}
+
+	
+	@Test
+	public void testSetEnvironmentName() throws Exception {
+		DistributionEngineEvent testSubject;
+		String environmentName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setEnvironmentName(environmentName);
+	}
+
+	
+	@Test
+	public void testGetRole() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRole();
+	}
+
+	
+	@Test
+	public void testSetRole() throws Exception {
+		DistributionEngineEvent testSubject;
+		String role = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRole(role);
+	}
+
+	
+	@Test
+	public void testGetApiKey() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getApiKey();
+	}
+
+	
+	@Test
+	public void testSetApiKey() throws Exception {
+		DistributionEngineEvent testSubject;
+		String apiKey = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setApiKey(apiKey);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		DistributionEngineEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		DistributionEngineEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		DistributionEngineEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		DistributionEngineEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		DistributionEngineEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		DistributionEngineEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		DistributionEngineEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		DistributionEngineEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		DistributionEngineEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetConsumerId() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerId();
+	}
+
+	
+	@Test
+	public void testSetConsumerId() throws Exception {
+		DistributionEngineEvent testSubject;
+		String consumerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConsumerId(consumerId);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		DistributionEngineEvent 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/resources/data/auditing/DistributionNotificationEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionNotificationEventTest.java
new file mode 100644
index 0000000000..40a46c080b
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionNotificationEventTest.java
@@ -0,0 +1,344 @@
+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 DistributionNotificationEventTest {
+
+	private DistributionNotificationEvent createTestSubject() {
+		return new DistributionNotificationEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		DistributionNotificationEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetResourceName() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceName();
+	}
+
+	
+	@Test
+	public void testSetResourceName() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String resourceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceName(resourceName);
+	}
+
+	
+	@Test
+	public void testGetResourceType() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceType();
+	}
+
+	
+	@Test
+	public void testSetResourceType() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String resourceType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceType(resourceType);
+	}
+
+	
+	@Test
+	public void testGetCurrVersion() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrVersion();
+	}
+
+	
+	@Test
+	public void testSetCurrVersion() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String currVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrVersion(currVersion);
+	}
+
+	
+	@Test
+	public void testGetCurrState() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrState();
+	}
+
+	
+	@Test
+	public void testSetCurrState() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String currState = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrState(currState);
+	}
+
+	
+	@Test
+	public void testGetTopicName() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTopicName();
+	}
+
+	
+	@Test
+	public void testSetTopicName() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String topicName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTopicName(topicName);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		DistributionNotificationEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		DistributionNotificationEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		DistributionNotificationEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		DistributionNotificationEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetDid() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDid();
+	}
+
+	
+	@Test
+	public void testSetDid() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String did = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDid(did);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		DistributionNotificationEvent 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/resources/data/auditing/DistributionStatusEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEventTest.java
new file mode 100644
index 0000000000..b776085746
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEventTest.java
@@ -0,0 +1,301 @@
+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 DistributionStatusEventTest {
+
+	private DistributionStatusEvent createTestSubject() {
+		return new DistributionStatusEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		DistributionStatusEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetDid() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDid();
+	}
+
+	
+	@Test
+	public void testSetDid() throws Exception {
+		DistributionStatusEvent testSubject;
+		String did = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDid(did);
+	}
+
+	
+	@Test
+	public void testGetConsumerId() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerId();
+	}
+
+	
+	@Test
+	public void testSetConsumerId() throws Exception {
+		DistributionStatusEvent testSubject;
+		String consumerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConsumerId(consumerId);
+	}
+
+	
+	@Test
+	public void testGetTopicName() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTopicName();
+	}
+
+	
+	@Test
+	public void testSetTopicName() throws Exception {
+		DistributionStatusEvent testSubject;
+		String topicName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTopicName(topicName);
+	}
+
+	
+	@Test
+	public void testGetResoureURL() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResoureURL();
+	}
+
+	
+	@Test
+	public void testSetResoureURL() throws Exception {
+		DistributionStatusEvent testSubject;
+		String resoureURL = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResoureURL(resoureURL);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		DistributionStatusEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		DistributionStatusEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		DistributionStatusEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		DistributionStatusEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		DistributionStatusEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		DistributionStatusEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		DistributionStatusEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		DistributionStatusEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		DistributionStatusEvent testSubject;
+		Date timestamp = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp);
+	}
+
+	
+	@Test
+	public void testGetStatusTime() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatusTime();
+	}
+
+	
+	@Test
+	public void testSetStatusTime() throws Exception {
+		DistributionStatusEvent testSubject;
+		String statusTime = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatusTime(statusTime);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		DistributionStatusEvent 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/resources/data/auditing/ExternalApiEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ExternalApiEventTest.java
new file mode 100644
index 0000000000..d4988dae3c
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ExternalApiEventTest.java
@@ -0,0 +1,455 @@
+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 ExternalApiEventTest {
+
+	private ExternalApiEvent createTestSubject() {
+		return new ExternalApiEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		ExternalApiEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		ExternalApiEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		ExternalApiEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		ExternalApiEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		ExternalApiEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		ExternalApiEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		ExternalApiEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		ExternalApiEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetConsumerId() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerId();
+	}
+
+	
+	@Test
+	public void testSetConsumerId() throws Exception {
+		ExternalApiEvent testSubject;
+		String consumerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConsumerId(consumerId);
+	}
+
+	
+	@Test
+	public void testGetResourceURL() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceURL();
+	}
+
+	
+	@Test
+	public void testSetResourceURL() throws Exception {
+		ExternalApiEvent testSubject;
+		String resourceURL = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceURL(resourceURL);
+	}
+
+	
+	@Test
+	public void testGetResourceName() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceName();
+	}
+
+	
+	@Test
+	public void testSetResourceName() throws Exception {
+		ExternalApiEvent testSubject;
+		String resourceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceName(resourceName);
+	}
+
+	
+	@Test
+	public void testGetResourceType() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceType();
+	}
+
+	
+	@Test
+	public void testSetResourceType() throws Exception {
+		ExternalApiEvent testSubject;
+		String resourceType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceType(resourceType);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		ExternalApiEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetInvariantUuid() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInvariantUuid();
+	}
+
+	
+	@Test
+	public void testSetInvariantUuid() throws Exception {
+		ExternalApiEvent testSubject;
+		String invariantUuid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInvariantUuid(invariantUuid);
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		ExternalApiEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetPrevArtifactUuid() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPrevArtifactUuid();
+	}
+
+	
+	@Test
+	public void testSetPrevArtifactUuid() throws Exception {
+		ExternalApiEvent testSubject;
+		String prevArtifactUuid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPrevArtifactUuid(prevArtifactUuid);
+	}
+
+	
+	@Test
+	public void testGetCurrArtifactUuid() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrArtifactUuid();
+	}
+
+	
+	@Test
+	public void testSetCurrArtifactUuid() throws Exception {
+		ExternalApiEvent testSubject;
+		String currArtifactUuid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrArtifactUuid(currArtifactUuid);
+	}
+
+	
+	@Test
+	public void testGetArtifactData() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactData();
+	}
+
+	
+	@Test
+	public void testSetArtifactData() throws Exception {
+		ExternalApiEvent testSubject;
+		String artifactData = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactData(artifactData);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetPrevVersion() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPrevVersion();
+	}
+
+	
+	@Test
+	public void testSetPrevVersion() throws Exception {
+		ExternalApiEvent testSubject;
+		String prevVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPrevVersion(prevVersion);
+	}
+
+	
+	@Test
+	public void testGetCurrVersion() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrVersion();
+	}
+
+	
+	@Test
+	public void testSetCurrVersion() throws Exception {
+		ExternalApiEvent testSubject;
+		String currVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrVersion(currVersion);
+	}
+
+	
+	@Test
+	public void testGetPrevState() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPrevState();
+	}
+
+	
+	@Test
+	public void testSetPrevState() throws Exception {
+		ExternalApiEvent testSubject;
+		String prevState = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPrevState(prevState);
+	}
+
+	
+	@Test
+	public void testGetCurrState() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrState();
+	}
+
+	
+	@Test
+	public void testSetCurrState() throws Exception {
+		ExternalApiEvent testSubject;
+		String currState = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrState(currState);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetCategoryHierarchyEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetCategoryHierarchyEventTest.java
new file mode 100644
index 0000000000..e60747d7c9
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetCategoryHierarchyEventTest.java
@@ -0,0 +1,213 @@
+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 GetCategoryHierarchyEventTest {
+
+	private GetCategoryHierarchyEvent createTestSubject() {
+		return new GetCategoryHierarchyEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetDetails() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDetails();
+	}
+
+	
+	@Test
+	public void testSetDetails() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String details = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDetails(details);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GetCategoryHierarchyEvent 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/resources/data/auditing/GetUsersListEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetUsersListEventTest.java
new file mode 100644
index 0000000000..bd51b61d92
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetUsersListEventTest.java
@@ -0,0 +1,213 @@
+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 GetUsersListEventTest {
+
+	private GetUsersListEvent createTestSubject() {
+		return new GetUsersListEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		GetUsersListEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		GetUsersListEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		GetUsersListEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		GetUsersListEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		GetUsersListEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		GetUsersListEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		GetUsersListEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		GetUsersListEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		GetUsersListEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		GetUsersListEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		GetUsersListEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		GetUsersListEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		GetUsersListEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		GetUsersListEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		GetUsersListEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetDetails() throws Exception {
+		GetUsersListEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDetails();
+	}
+
+	
+	@Test
+	public void testSetDetails() throws Exception {
+		GetUsersListEvent testSubject;
+		String details = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDetails(details);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GetUsersListEvent 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/resources/data/auditing/ResourceAdminEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ResourceAdminEventTest.java
new file mode 100644
index 0000000000..a840319367
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ResourceAdminEventTest.java
@@ -0,0 +1,543 @@
+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 ResourceAdminEventTest {
+
+	private ResourceAdminEvent createTestSubject() {
+		return new ResourceAdminEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		ResourceAdminEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetResourceName() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceName();
+	}
+
+	
+	@Test
+	public void testSetResourceName() throws Exception {
+		ResourceAdminEvent testSubject;
+		String resourceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceName(resourceName);
+	}
+
+	
+	@Test
+	public void testGetResourceType() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceType();
+	}
+
+	
+	@Test
+	public void testSetResourceType() throws Exception {
+		ResourceAdminEvent testSubject;
+		String resourceType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceType(resourceType);
+	}
+
+	
+	@Test
+	public void testGetPrevVersion() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPrevVersion();
+	}
+
+	
+	@Test
+	public void testSetPrevVersion() throws Exception {
+		ResourceAdminEvent testSubject;
+		String prevVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPrevVersion(prevVersion);
+	}
+
+	
+	@Test
+	public void testGetCurrVersion() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrVersion();
+	}
+
+	
+	@Test
+	public void testSetCurrVersion() throws Exception {
+		ResourceAdminEvent testSubject;
+		String currVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrVersion(currVersion);
+	}
+
+	
+	@Test
+	public void testGetPrevState() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPrevState();
+	}
+
+	
+	@Test
+	public void testSetPrevState() throws Exception {
+		ResourceAdminEvent testSubject;
+		String prevState = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPrevState(prevState);
+	}
+
+	
+	@Test
+	public void testGetCurrState() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrState();
+	}
+
+	
+	@Test
+	public void testSetCurrState() throws Exception {
+		ResourceAdminEvent testSubject;
+		String currState = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrState(currState);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		ResourceAdminEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		ResourceAdminEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		ResourceAdminEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		ResourceAdminEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		ResourceAdminEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		ResourceAdminEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		ResourceAdminEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		ResourceAdminEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		ResourceAdminEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		ResourceAdminEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetPrevArtifactUUID() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPrevArtifactUUID();
+	}
+
+	
+	@Test
+	public void testSetPrevArtifactUUID() throws Exception {
+		ResourceAdminEvent testSubject;
+		String prevArtifactUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPrevArtifactUUID(prevArtifactUUID);
+	}
+
+	
+	@Test
+	public void testGetCurrArtifactUUID() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrArtifactUUID();
+	}
+
+	
+	@Test
+	public void testSetCurrArtifactUUID() throws Exception {
+		ResourceAdminEvent testSubject;
+		String currArtifactUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrArtifactUUID(currArtifactUUID);
+	}
+
+	
+	@Test
+	public void testGetArtifactData() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactData();
+	}
+
+	
+	@Test
+	public void testSetArtifactData() throws Exception {
+		ResourceAdminEvent testSubject;
+		String artifactData = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactData(artifactData);
+	}
+
+	
+	@Test
+	public void testGetDid() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDid();
+	}
+
+	
+	@Test
+	public void testSetDid() throws Exception {
+		ResourceAdminEvent testSubject;
+		String did = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDid(did);
+	}
+
+	
+	@Test
+	public void testGetDprevStatus() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDprevStatus();
+	}
+
+	
+	@Test
+	public void testSetDprevStatus() throws Exception {
+		ResourceAdminEvent testSubject;
+		String dprevStatus = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDprevStatus(dprevStatus);
+	}
+
+	
+	@Test
+	public void testGetDcurrStatus() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDcurrStatus();
+	}
+
+	
+	@Test
+	public void testSetDcurrStatus() throws Exception {
+		ResourceAdminEvent testSubject;
+		String dcurrStatus = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDcurrStatus(dcurrStatus);
+	}
+
+	
+	@Test
+	public void testGetToscaNodeType() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getToscaNodeType();
+	}
+
+	
+	@Test
+	public void testSetToscaNodeType() throws Exception {
+		ResourceAdminEvent testSubject;
+		String toscaNodeType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setToscaNodeType(toscaNodeType);
+	}
+
+	
+	@Test
+	public void testGetComment() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComment();
+	}
+
+	
+	@Test
+	public void testSetComment() throws Exception {
+		ResourceAdminEvent testSubject;
+		String comment = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComment(comment);
+	}
+
+	
+	@Test
+	public void testGetInvariantUUID() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInvariantUUID();
+	}
+
+	
+	@Test
+	public void testSetInvariantUUID() throws Exception {
+		ResourceAdminEvent testSubject;
+		String invariantUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInvariantUUID(invariantUUID);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ResourceAdminEvent 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/resources/data/auditing/UserAccessEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEventTest.java
new file mode 100644
index 0000000000..efdaeb06ab
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEventTest.java
@@ -0,0 +1,191 @@
+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 UserAccessEventTest {
+
+	private UserAccessEvent createTestSubject() {
+		return new UserAccessEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		UserAccessEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetUserUid() throws Exception {
+		UserAccessEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUserUid();
+	}
+
+	
+	@Test
+	public void testSetUserUid() throws Exception {
+		UserAccessEvent testSubject;
+		String userUid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUserUid(userUid);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		UserAccessEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		UserAccessEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		UserAccessEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		UserAccessEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		UserAccessEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		UserAccessEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		UserAccessEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		UserAccessEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		UserAccessEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		UserAccessEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		UserAccessEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		UserAccessEvent testSubject;
+		Date timestamp = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		UserAccessEvent 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/resources/data/auditing/UserAdminEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAdminEventTest.java
new file mode 100644
index 0000000000..4b66893821
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAdminEventTest.java
@@ -0,0 +1,257 @@
+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 UserAdminEventTest {
+
+	private UserAdminEvent createTestSubject() {
+		return new UserAdminEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		UserAdminEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		UserAdminEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetUserBefore() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUserBefore();
+	}
+
+	
+	@Test
+	public void testSetUserBefore() throws Exception {
+		UserAdminEvent testSubject;
+		String userBeforeName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUserBefore(userBeforeName);
+	}
+
+	
+	@Test
+	public void testGetUserAfter() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUserAfter();
+	}
+
+	
+	@Test
+	public void testSetUserAfter() throws Exception {
+		UserAdminEvent testSubject;
+		String userAfterName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUserAfter(userAfterName);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		UserAdminEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		UserAdminEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		UserAdminEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		UserAdminEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		UserAdminEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		UserAdminEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		UserAdminEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		UserAdminEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		UserAdminEvent testSubject;
+		Date timestamp = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/AdditionalInformationDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/AdditionalInformationDefinitionTest.java
index f20b7f35c4..67e5280f53 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/AdditionalInformationDefinitionTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/AdditionalInformationDefinitionTest.java
@@ -3,6 +3,8 @@ package org.openecomp.sdc.be.model;
 import javax.annotation.Generated;
 
 import org.junit.Test;
+import java.util.*;
+import org.junit.Assert;
 
 
 public class AdditionalInformationDefinitionTest {
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ArtifactUiDownloadDataTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ArtifactUiDownloadDataTest.java
new file mode 100644
index 0000000000..6df1079f4a
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ArtifactUiDownloadDataTest.java
@@ -0,0 +1,56 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+public class ArtifactUiDownloadDataTest {
+
+	private ArtifactUiDownloadData createTestSubject() {
+		return new ArtifactUiDownloadData();
+	}
+
+	
+	@Test
+	public void testSetArtifactName() throws Exception {
+		ArtifactUiDownloadData testSubject;
+		String artifactName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactName(artifactName);
+	}
+
+	
+	@Test
+	public void testSetBase64Contents() throws Exception {
+		ArtifactUiDownloadData testSubject;
+		String base64Contents = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setBase64Contents(base64Contents);
+	}
+
+	
+	@Test
+	public void testGetArtifactName() throws Exception {
+		ArtifactUiDownloadData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactName();
+	}
+
+	
+	@Test
+	public void testGetBase64Contents() throws Exception {
+		ArtifactUiDownloadData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getBase64Contents();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapReqDefTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapReqDefTest.java
new file mode 100644
index 0000000000..d0c121fa5f
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapReqDefTest.java
@@ -0,0 +1,60 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class CapReqDefTest {
+
+	private CapReqDef createTestSubject() {
+		return new CapReqDef();
+	}
+
+	
+	@Test
+	public void testGetCapabilities() throws Exception {
+		CapReqDef testSubject;
+		Map<String, List<CapabilityDefinition>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilities();
+	}
+
+	
+	@Test
+	public void testGetRequirements() throws Exception {
+		CapReqDef testSubject;
+		Map<String, List<RequirementDefinition>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirements();
+	}
+
+	
+	@Test
+	public void testSetCapabilities() throws Exception {
+		CapReqDef testSubject;
+		Map<String, List<CapabilityDefinition>> capabilities = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilities(capabilities);
+	}
+
+	
+	@Test
+	public void testSetRequirements() throws Exception {
+		CapReqDef testSubject;
+		Map<String, List<RequirementDefinition>> requirements = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirements(requirements);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityDefinitionTest.java
index 7286bee4a0..007a64a75d 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityDefinitionTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityDefinitionTest.java
@@ -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 CapabilityDefinitionTest {
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstInputsMapTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstInputsMapTest.java
new file mode 100644
index 0000000000..af9f683193
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstInputsMapTest.java
@@ -0,0 +1,59 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+public class ComponentInstInputsMapTest {
+
+	private ComponentInstInputsMap createTestSubject() {
+		return new ComponentInstInputsMap();
+	}
+
+	
+	@Test
+	public void testGetComponentInstanceInputsMap() throws Exception {
+		ComponentInstInputsMap testSubject;
+		Map<String, List<ComponentInstancePropInput>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstanceInputsMap();
+	}
+
+	
+	@Test
+	public void testSetComponentInstanceInputsMap() throws Exception {
+		ComponentInstInputsMap testSubject;
+		Map<String, List<ComponentInstancePropInput>> componentInstanceInputsMap = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstanceInputsMap(componentInstanceInputsMap);
+	}
+
+	
+	@Test
+	public void testGetComponentInstanceProperties() throws Exception {
+		ComponentInstInputsMap testSubject;
+		Map<String, List<ComponentInstancePropInput>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstanceProperties();
+	}
+
+	
+	@Test
+	public void testSetComponentInstancePropInput() throws Exception {
+		ComponentInstInputsMap testSubject;
+		Map<String, List<ComponentInstancePropInput>> componentInstanceProperties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstancePropInput(componentInstanceProperties);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstanceInputTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstanceInputTest.java
new file mode 100644
index 0000000000..07eea5584c
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstanceInputTest.java
@@ -0,0 +1,137 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.PropertyRule;
+
+
+public class ComponentInstanceInputTest {
+
+	private ComponentInstanceInput createTestSubject() {
+		return new ComponentInstanceInput();
+	}
+
+	
+	@Test
+	public void testGetComponentInstanceName() throws Exception {
+		ComponentInstanceInput testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstanceName();
+	}
+
+	
+	@Test
+	public void testSetComponentInstanceName() throws Exception {
+		ComponentInstanceInput testSubject;
+		String componentInstanceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstanceName(componentInstanceName);
+	}
+
+	
+	@Test
+	public void testGetComponentInstanceId() throws Exception {
+		ComponentInstanceInput testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstanceId();
+	}
+
+	
+	@Test
+	public void testSetComponentInstanceId() throws Exception {
+		ComponentInstanceInput testSubject;
+		String componentInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstanceId(componentInstanceId);
+	}
+
+	
+	@Test
+	public void testGetValueUniqueUid() throws Exception {
+		ComponentInstanceInput testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValueUniqueUid();
+	}
+
+	
+	@Test
+	public void testSetValueUniqueUid() throws Exception {
+		ComponentInstanceInput testSubject;
+		String valueUniqueUid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValueUniqueUid(valueUniqueUid);
+	}
+
+	
+	@Test
+	public void testGetPath() throws Exception {
+		ComponentInstanceInput testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPath();
+	}
+
+	
+	@Test
+	public void testSetPath() throws Exception {
+		ComponentInstanceInput testSubject;
+		List<String> path = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPath(path);
+	}
+
+	
+	@Test
+	public void testGetRules() throws Exception {
+		ComponentInstanceInput testSubject;
+		List<PropertyRule> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRules();
+	}
+
+	
+	@Test
+	public void testSetRules() throws Exception {
+		ComponentInstanceInput testSubject;
+		List<PropertyRule> rules = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRules(rules);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ComponentInstanceInput testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstancePropInputTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstancePropInputTest.java
new file mode 100644
index 0000000000..69b3f25f5e
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstancePropInputTest.java
@@ -0,0 +1,68 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ComponentInstancePropInputTest {
+
+	private ComponentInstancePropInput createTestSubject() {
+		return new ComponentInstancePropInput();
+	}
+
+	
+	@Test
+	public void testGetPropertiesName() throws Exception {
+		ComponentInstancePropInput testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPropertiesName();
+	}
+
+	
+	@Test
+	public void testSetPropertiesName() throws Exception {
+		ComponentInstancePropInput testSubject;
+		String propertiesName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPropertiesName(propertiesName);
+	}
+
+	
+	@Test
+	public void testGetInput() throws Exception {
+		ComponentInstancePropInput testSubject;
+		PropertyDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInput();
+	}
+
+	
+	@Test
+	public void testSetInput() throws Exception {
+		ComponentInstancePropInput testSubject;
+		PropertyDefinition input = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInput(input);
+	}
+
+	
+	@Test
+	public void testGetParsedPropNames() throws Exception {
+		ComponentInstancePropInput testSubject;
+		String[] result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getParsedPropNames();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstancePropertyTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstancePropertyTest.java
new file mode 100644
index 0000000000..4718847559
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentInstancePropertyTest.java
@@ -0,0 +1,137 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.PropertyRule;
+
+
+public class ComponentInstancePropertyTest {
+
+	private ComponentInstanceProperty createTestSubject() {
+		return new ComponentInstanceProperty();
+	}
+
+	
+	@Test
+	public void testGetComponentInstanceName() throws Exception {
+		ComponentInstanceProperty testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstanceName();
+	}
+
+	
+	@Test
+	public void testSetComponentInstanceName() throws Exception {
+		ComponentInstanceProperty testSubject;
+		String componentInstanceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstanceName(componentInstanceName);
+	}
+
+	
+	@Test
+	public void testGetComponentInstanceId() throws Exception {
+		ComponentInstanceProperty testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstanceId();
+	}
+
+	
+	@Test
+	public void testSetComponentInstanceId() throws Exception {
+		ComponentInstanceProperty testSubject;
+		String componentInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstanceId(componentInstanceId);
+	}
+
+	
+	@Test
+	public void testGetValueUniqueUid() throws Exception {
+		ComponentInstanceProperty testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValueUniqueUid();
+	}
+
+	
+	@Test
+	public void testSetValueUniqueUid() throws Exception {
+		ComponentInstanceProperty testSubject;
+		String valueUniqueUid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValueUniqueUid(valueUniqueUid);
+	}
+
+	
+	@Test
+	public void testGetPath() throws Exception {
+		ComponentInstanceProperty testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPath();
+	}
+
+	
+	@Test
+	public void testSetPath() throws Exception {
+		ComponentInstanceProperty testSubject;
+		List<String> path = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPath(path);
+	}
+
+	
+	@Test
+	public void testGetRules() throws Exception {
+		ComponentInstanceProperty testSubject;
+		List<PropertyRule> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRules();
+	}
+
+	
+	@Test
+	public void testSetRules() throws Exception {
+		ComponentInstanceProperty testSubject;
+		List<PropertyRule> rules = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRules(rules);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ComponentInstanceProperty testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/CsarInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CsarInfoTest.java
new file mode 100644
index 0000000000..31864c479c
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CsarInfoTest.java
@@ -0,0 +1,203 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.Map;
+import java.util.Queue;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class CsarInfoTest {
+
+	private CsarInfo createTestSubject() {
+		return new CsarInfo("", new User(), "", null, "", false);
+	}
+
+	
+	@Test
+	public void testGetVfResourceName() throws Exception {
+		CsarInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVfResourceName();
+	}
+
+	
+	@Test
+	public void testSetVfResourceName() throws Exception {
+		CsarInfo testSubject;
+		String vfResourceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setVfResourceName(vfResourceName);
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		CsarInfo testSubject;
+		User result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		CsarInfo testSubject;
+		User modifier = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetCsarUUID() throws Exception {
+		CsarInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCsarUUID();
+	}
+
+	
+	@Test
+	public void testSetCsarUUID() throws Exception {
+		CsarInfo testSubject;
+		String csarUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCsarUUID(csarUUID);
+	}
+
+	
+	@Test
+	public void testGetCsar() throws Exception {
+		CsarInfo testSubject;
+		Map<String, byte[]> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCsar();
+	}
+
+	
+	@Test
+	public void testSetCsar() throws Exception {
+		CsarInfo testSubject;
+		Map<String, byte[]> csar = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCsar(csar);
+	}
+
+	
+	@Test
+	public void testGetMainTemplateContent() throws Exception {
+		CsarInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMainTemplateContent();
+	}
+
+	
+	@Test
+	public void testGetMappedToscaMainTemplate() throws Exception {
+		CsarInfo testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMappedToscaMainTemplate();
+	}
+
+	
+	@Test
+	public void testGetCreatedNodesToscaResourceNames() throws Exception {
+		CsarInfo testSubject;
+		Map<String, String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreatedNodesToscaResourceNames();
+	}
+
+	
+	@Test
+	public void testSetCreatedNodesToscaResourceNames() throws Exception {
+		CsarInfo testSubject;
+		Map<String, String> createdNodesToscaResourceNames = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreatedNodesToscaResourceNames(createdNodesToscaResourceNames);
+	}
+
+	
+	@Test
+	public void testGetCvfcToCreateQueue() throws Exception {
+		CsarInfo testSubject;
+		Queue<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCvfcToCreateQueue();
+	}
+
+	
+	@Test
+	public void testSetCvfcToCreateQueue() throws Exception {
+		CsarInfo testSubject;
+		Queue<String> cvfcToCreateQueue = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCvfcToCreateQueue(cvfcToCreateQueue);
+	}
+
+	
+	@Test
+	public void testIsUpdate() throws Exception {
+		CsarInfo testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isUpdate();
+	}
+
+	
+	@Test
+	public void testSetUpdate() throws Exception {
+		CsarInfo testSubject;
+		boolean isUpdate = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUpdate(isUpdate);
+	}
+
+	
+	@Test
+	public void testGetCreatedNodes() throws Exception {
+		CsarInfo testSubject;
+		Map<String, Resource> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreatedNodes();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/DataTypeDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/DataTypeDefinitionTest.java
index 26db09fb4f..996e3a7bd8 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/DataTypeDefinitionTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/DataTypeDefinitionTest.java
@@ -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 DataTypeDefinitionTest {
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/FunctionalMenuInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/FunctionalMenuInfoTest.java
new file mode 100644
index 0000000000..3df5b58955
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/FunctionalMenuInfoTest.java
@@ -0,0 +1,46 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class FunctionalMenuInfoTest {
+
+	private FunctionalMenuInfo createTestSubject() {
+		return new FunctionalMenuInfo();
+	}
+
+	
+	@Test
+	public void testGetFunctionalMenu() throws Exception {
+		FunctionalMenuInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFunctionalMenu();
+	}
+
+	
+	@Test
+	public void testSetFunctionalMenu() throws Exception {
+		FunctionalMenuInfo testSubject;
+		String functionalMenu = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setFunctionalMenu(functionalMenu);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		FunctionalMenuInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupPropertyTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupPropertyTest.java
new file mode 100644
index 0000000000..6f8f53b991
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupPropertyTest.java
@@ -0,0 +1,46 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class GroupPropertyTest {
+
+	private GroupProperty createTestSubject() {
+		return new GroupProperty();
+	}
+
+	
+	@Test
+	public void testGetValueUniqueUid() throws Exception {
+		GroupProperty testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValueUniqueUid();
+	}
+
+	
+	@Test
+	public void testSetValueUniqueUid() throws Exception {
+		GroupProperty testSubject;
+		String valueUniqueUid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValueUniqueUid(valueUniqueUid);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GroupProperty testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupTypeDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupTypeDefinitionTest.java
index 4fe180970b..63f9e624cb 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupTypeDefinitionTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupTypeDefinitionTest.java
@@ -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 GroupTypeDefinitionTest {
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/NodeTypeInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/NodeTypeInfoTest.java
new file mode 100644
index 0000000000..9a95a879df
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/NodeTypeInfoTest.java
@@ -0,0 +1,137 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class NodeTypeInfoTest {
+
+	private NodeTypeInfo createTestSubject() {
+		return new NodeTypeInfo();
+	}
+
+	
+	@Test
+	public void testGetUnmarkedCopy() throws Exception {
+		NodeTypeInfo testSubject;
+		NodeTypeInfo result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUnmarkedCopy();
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		NodeTypeInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		NodeTypeInfo testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetTemplateFileName() throws Exception {
+		NodeTypeInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTemplateFileName();
+	}
+
+	
+	@Test
+	public void testSetTemplateFileName() throws Exception {
+		NodeTypeInfo testSubject;
+		String templateFileName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTemplateFileName(templateFileName);
+	}
+
+	
+	@Test
+	public void testGetDerivedFrom() throws Exception {
+		NodeTypeInfo testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerivedFrom();
+	}
+
+	
+	@Test
+	public void testSetDerivedFrom() throws Exception {
+		NodeTypeInfo testSubject;
+		List<String> derivedFrom = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerivedFrom(derivedFrom);
+	}
+
+	
+	@Test
+	public void testIsNested() throws Exception {
+		NodeTypeInfo testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isNested();
+	}
+
+	
+	@Test
+	public void testSetNested() throws Exception {
+		NodeTypeInfo testSubject;
+		boolean isNested = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNested(isNested);
+	}
+
+	
+	@Test
+	public void testGetMappedToscaTemplate() throws Exception {
+		NodeTypeInfo testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMappedToscaTemplate();
+	}
+
+	
+	@Test
+	public void testSetMappedToscaTemplate() throws Exception {
+		NodeTypeInfo testSubject;
+		Map<String, Object> mappedToscaTemplate = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMappedToscaTemplate(mappedToscaTemplate);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/PointTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PointTest.java
new file mode 100644
index 0000000000..8f25cfd5e4
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PointTest.java
@@ -0,0 +1,68 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class PointTest {
+
+	private Point createTestSubject() {
+		return new Point();
+	}
+
+	
+	@Test
+	public void testGetX() throws Exception {
+		Point testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getX();
+	}
+
+	
+	@Test
+	public void testSetX() throws Exception {
+		Point testSubject;
+		String x = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setX(x);
+	}
+
+	
+	@Test
+	public void testGetY() throws Exception {
+		Point testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getY();
+	}
+
+	
+	@Test
+	public void testSetY() throws Exception {
+		Point testSubject;
+		String y = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setY(y);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		Point testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ProductTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ProductTest.java
new file mode 100644
index 0000000000..64ee3db41b
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ProductTest.java
@@ -0,0 +1,118 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.ProductMetadataDataDefinition;
+
+
+public class ProductTest {
+
+	private Product createTestSubject() {
+		return new Product();
+	}
+
+	
+	@Test
+	public void testGetFullName() throws Exception {
+		Product testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFullName();
+	}
+
+	
+	@Test
+	public void testSetFullName() throws Exception {
+		Product testSubject;
+		String fullName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setFullName(fullName);
+	}
+
+	
+	@Test
+	public void testGetInvariantUUID() throws Exception {
+		Product testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInvariantUUID();
+	}
+
+	
+	@Test
+	public void testSetInvariantUUID() throws Exception {
+		Product testSubject;
+		String invariantUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInvariantUUID(invariantUUID);
+	}
+
+	
+	@Test
+	public void testGetContacts() throws Exception {
+		Product testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getContacts();
+	}
+
+	
+	@Test
+	public void testSetContacts() throws Exception {
+		Product testSubject;
+		List<String> contacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setContacts(contacts);
+	}
+
+	
+	@Test
+	public void testAddContact() throws Exception {
+		Product testSubject;
+		String contact = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.addContact(contact);
+	}
+
+	
+	@Test
+	public void testGetIsActive() throws Exception {
+		Product testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIsActive();
+	}
+
+	
+	@Test
+	public void testSetIsActive() throws Exception {
+		Product testSubject;
+		Boolean isActive = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIsActive(isActive);
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementAndRelationshipPairTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementAndRelationshipPairTest.java
new file mode 100644
index 0000000000..bc03848b9c
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementAndRelationshipPairTest.java
@@ -0,0 +1,216 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.RelationshipInstDataDefinition;
+
+
+public class RequirementAndRelationshipPairTest {
+
+	private RequirementAndRelationshipPair createTestSubject() {
+		return new RequirementAndRelationshipPair();
+	}
+
+	
+	@Test
+	public void testGetRequirement() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirement();
+	}
+
+	
+	@Test
+	public void testSetRequirement() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String requirement = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirement(requirement);
+	}
+
+	
+	@Test
+	public void testGetCapabilityOwnerId() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilityOwnerId();
+	}
+
+	
+	@Test
+	public void testSetCapabilityOwnerId() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String capabilityOwnerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilityOwnerId(capabilityOwnerId);
+	}
+
+	
+	@Test
+	public void testGetRequirementOwnerId() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirementOwnerId();
+	}
+
+	
+	@Test
+	public void testSetRequirementOwnerId() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String requirementOwnerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirementOwnerId(requirementOwnerId);
+	}
+
+	
+	@Test
+	public void testGetRelationship() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		RelationshipImpl result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRelationship();
+	}
+
+	
+	@Test
+	public void testSetRelationships() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		RelationshipImpl relationship = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRelationships(relationship);
+	}
+
+	
+	@Test
+	public void testGetCapability() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapability();
+	}
+
+	
+	@Test
+	public void testSetCapability() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String capability = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapability(capability);
+	}
+
+	
+	@Test
+	public void testGetCapabilityUid() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilityUid();
+	}
+
+	
+	@Test
+	public void testSetCapabilityUid() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String capabilityUid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilityUid(capabilityUid);
+	}
+
+	
+	@Test
+	public void testGetRequirementUid() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirementUid();
+	}
+
+	
+	@Test
+	public void testSetRequirementUid() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String requirementUid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirementUid(requirementUid);
+	}
+
+	
+	@Test
+	public void testGetId() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getId();
+	}
+
+	
+	@Test
+	public void testSetId() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String id = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setId(id);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testEqualsTo() throws Exception {
+		RequirementAndRelationshipPair testSubject;
+		RelationshipInstDataDefinition savedRelation = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		savedRelation = null;
+		result = testSubject.equalsTo(savedRelation);
+		Assert.assertEquals(false, result);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementImplDefTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementImplDefTest.java
new file mode 100644
index 0000000000..ea747b3a48
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementImplDefTest.java
@@ -0,0 +1,114 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class RequirementImplDefTest {
+
+	private RequirementImplDef createTestSubject() {
+		return new RequirementImplDef();
+	}
+
+	
+	@Test
+	public void testGetNodeId() throws Exception {
+		RequirementImplDef testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNodeId();
+	}
+
+	
+	@Test
+	public void testSetNodeId() throws Exception {
+		RequirementImplDef testSubject;
+		String nodeId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNodeId(nodeId);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		RequirementImplDef testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		RequirementImplDef testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetRequirementProperties() throws Exception {
+		RequirementImplDef testSubject;
+		Map<String, CapabiltyInstance> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirementProperties();
+	}
+
+	
+	@Test
+	public void testSetRequirementProperties() throws Exception {
+		RequirementImplDef testSubject;
+		Map<String, CapabiltyInstance> requirementProperties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirementProperties(requirementProperties);
+	}
+
+	
+	@Test
+	public void testGetPoint() throws Exception {
+		RequirementImplDef testSubject;
+		Point result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPoint();
+	}
+
+	
+	@Test
+	public void testSetPoint() throws Exception {
+		RequirementImplDef testSubject;
+		Point point = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPoint(point);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RequirementImplDef testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementInstanceTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementInstanceTest.java
new file mode 100644
index 0000000000..72f6ee2716
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/RequirementInstanceTest.java
@@ -0,0 +1,68 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class RequirementInstanceTest {
+
+	private RequirementInstance createTestSubject() {
+		return new RequirementInstance();
+	}
+
+	
+	@Test
+	public void testGetNode() throws Exception {
+		RequirementInstance testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNode();
+	}
+
+	
+	@Test
+	public void testSetNode() throws Exception {
+		RequirementInstance testSubject;
+		String node = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNode(node);
+	}
+
+	
+	@Test
+	public void testGetRelationship() throws Exception {
+		RequirementInstance testSubject;
+		RelationshipImpl result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRelationship();
+	}
+
+	
+	@Test
+	public void testSetRelationship() throws Exception {
+		RequirementInstance testSubject;
+		RelationshipImpl relationship = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRelationship(relationship);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RequirementInstance testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceInstanceHeatParameterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceInstanceHeatParameterTest.java
new file mode 100644
index 0000000000..50c423b847
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceInstanceHeatParameterTest.java
@@ -0,0 +1,46 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ResourceInstanceHeatParameterTest {
+
+	private ResourceInstanceHeatParameter createTestSubject() {
+		return new ResourceInstanceHeatParameter();
+	}
+
+	
+	@Test
+	public void testGetValueUniqueId() throws Exception {
+		ResourceInstanceHeatParameter testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValueUniqueId();
+	}
+
+	
+	@Test
+	public void testSetValueUniqueId() throws Exception {
+		ResourceInstanceHeatParameter testSubject;
+		String valueUniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValueUniqueId(valueUniqueId);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ResourceInstanceHeatParameter testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadCapInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadCapInfoTest.java
new file mode 100644
index 0000000000..655df75cc4
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadCapInfoTest.java
@@ -0,0 +1,81 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class UploadCapInfoTest {
+
+	private UploadCapInfo createTestSubject() {
+		return new UploadCapInfo();
+	}
+
+	
+	@Test
+	public void testGetNode() throws Exception {
+		UploadCapInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNode();
+	}
+
+	
+	@Test
+	public void testSetNode() throws Exception {
+		UploadCapInfo testSubject;
+		String node = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNode(node);
+	}
+
+	
+	@Test
+	public void testGetValidSourceTypes() throws Exception {
+		UploadCapInfo testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValidSourceTypes();
+	}
+
+	
+	@Test
+	public void testSetValidSourceTypes() throws Exception {
+		UploadCapInfo testSubject;
+		List<String> validSourceTypes = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValidSourceTypes(validSourceTypes);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		UploadCapInfo testSubject;
+		List<UploadPropInfo> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		UploadCapInfo testSubject;
+		List<UploadPropInfo> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadPropInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadPropInfoTest.java
new file mode 100644
index 0000000000..0b3e9301cd
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadPropInfoTest.java
@@ -0,0 +1,104 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.GetInputValueDataDefinition;
+
+
+public class UploadPropInfoTest {
+
+	private UploadPropInfo createTestSubject() {
+		return new UploadPropInfo();
+	}
+
+	
+	@Test
+	public void testGetGet_input() throws Exception {
+		UploadPropInfo testSubject;
+		List<GetInputValueDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGet_input();
+	}
+
+	
+	@Test
+	public void testSetGet_input() throws Exception {
+		UploadPropInfo testSubject;
+		List<GetInputValueDataDefinition> get_input = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGet_input(get_input);
+	}
+
+	
+	@Test
+	public void testGetValue() throws Exception {
+		UploadPropInfo testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValue();
+	}
+
+	
+	@Test
+	public void testSetValue() throws Exception {
+		UploadPropInfo testSubject;
+		Object value = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValue(value);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		UploadPropInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		UploadPropInfo testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testIsPassword() throws Exception {
+		UploadPropInfo testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isPassword();
+	}
+
+	
+	@Test
+	public void testSetPassword() throws Exception {
+		UploadPropInfo testSubject;
+		boolean password = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPassword(password);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadReqInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadReqInfoTest.java
new file mode 100644
index 0000000000..eb1306c597
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadReqInfoTest.java
@@ -0,0 +1,57 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class UploadReqInfoTest {
+
+	private UploadReqInfo createTestSubject() {
+		return new UploadReqInfo();
+	}
+
+	
+	@Test
+	public void testGetCapabilityName() throws Exception {
+		UploadReqInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilityName();
+	}
+
+	
+	@Test
+	public void testSetCapabilityName() throws Exception {
+		UploadReqInfo testSubject;
+		String capabilityName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilityName(capabilityName);
+	}
+
+	
+	@Test
+	public void testGetNode() throws Exception {
+		UploadReqInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNode();
+	}
+
+	
+	@Test
+	public void testSetNode() throws Exception {
+		UploadReqInfo testSubject;
+		String node = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNode(node);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/DaoInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/DaoInfoTest.java
new file mode 100644
index 0000000000..1428a86342
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/DaoInfoTest.java
@@ -0,0 +1,36 @@
+package org.openecomp.sdc.be.model.cache;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+
+
+public class DaoInfoTest {
+
+	private DaoInfo createTestSubject() {
+		return new DaoInfo(new ToscaOperationFacade(), new ComponentCache());
+	}
+
+	
+	@Test
+	public void testGetToscaOperationFacade() throws Exception {
+		DaoInfo testSubject;
+		ToscaOperationFacade result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getToscaOperationFacade();
+	}
+
+	
+	@Test
+	public void testGetComponentCache() throws Exception {
+		DaoInfo testSubject;
+		ComponentCache result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentCache();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/TopologyTemplateTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/TopologyTemplateTest.java
new file mode 100644
index 0000000000..bd5a16a844
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/TopologyTemplateTest.java
@@ -0,0 +1,416 @@
+package org.openecomp.sdc.be.model.jsontitan.datamodel;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ComponentInstanceDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.CompositionDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapArtifactDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapCapabiltyProperty;
+import org.openecomp.sdc.be.datatypes.elements.MapGroupsDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapListCapabiltyDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapListRequirementDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapPropertiesDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.RelationshipInstDataDefinition;
+import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
+
+
+public class TopologyTemplateTest {
+
+	private TopologyTemplate createTestSubject() {
+		return new TopologyTemplate();
+	}
+
+	
+	@Test
+	public void testGetInputs() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, PropertyDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInputs();
+	}
+
+	
+	@Test
+	public void testSetInputs() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, PropertyDataDefinition> inputs = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInputs(inputs);
+	}
+
+	
+	@Test
+	public void testGetInstInputs() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapPropertiesDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInstInputs();
+	}
+
+	
+	@Test
+	public void testSetInstInputs() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapPropertiesDataDefinition> instInputs = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInstInputs(instInputs);
+	}
+
+	
+	@Test
+	public void testGetHeatParameters() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, ? extends ToscaDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getHeatParameters();
+	}
+
+	
+	@Test
+	public void testSetHeatParameters() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, ? extends ToscaDataDefinition> heatParameters = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setHeatParameters(heatParameters);
+	}
+
+	
+	@Test
+	public void testGetInstAttributes() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapPropertiesDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInstAttributes();
+	}
+
+	
+	@Test
+	public void testSetInstAttributes() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapPropertiesDataDefinition> instAttributes = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInstAttributes(instAttributes);
+	}
+
+	
+	@Test
+	public void testGetInstProperties() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapPropertiesDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInstProperties();
+	}
+
+	
+	@Test
+	public void testSetInstProperties() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapPropertiesDataDefinition> instProperties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInstProperties(instProperties);
+	}
+
+	
+	@Test
+	public void testGetGroups() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, GroupDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroups();
+	}
+
+	
+	@Test
+	public void testSetGroups() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, GroupDataDefinition> groups = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroups(groups);
+	}
+
+	
+	@Test
+	public void testGetInstGroups() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapGroupsDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInstGroups();
+	}
+
+	
+	@Test
+	public void testSetInstGroups() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapGroupsDataDefinition> instGroups = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInstGroups(instGroups);
+	}
+
+	
+	@Test
+	public void testGetServiceApiArtifacts() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, ArtifactDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceApiArtifacts();
+	}
+
+	
+	@Test
+	public void testSetServiceApiArtifacts() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, ArtifactDataDefinition> serviceApiArtifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceApiArtifacts(serviceApiArtifacts);
+	}
+
+	
+	@Test
+	public void testGetCompositions() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, CompositionDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCompositions();
+	}
+
+	
+	@Test
+	public void testSetCompositions() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, CompositionDataDefinition> compositions = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCompositions(compositions);
+	}
+
+	
+	@Test
+	public void testGetCalculatedCapabilities() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListCapabiltyDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCalculatedCapabilities();
+	}
+
+	
+	@Test
+	public void testSetCalculatedCapabilities() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListCapabiltyDataDefinition> calculatedCapabilities = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCalculatedCapabilities(calculatedCapabilities);
+	}
+
+	
+	@Test
+	public void testGetCalculatedRequirements() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListRequirementDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCalculatedRequirements();
+	}
+
+	
+	@Test
+	public void testSetCalculatedRequirements() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListRequirementDataDefinition> calculatedRequirements = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCalculatedRequirements(calculatedRequirements);
+	}
+
+	
+	@Test
+	public void testGetFullfilledCapabilities() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListCapabiltyDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFullfilledCapabilities();
+	}
+
+	
+	@Test
+	public void testSetFullfilledCapabilities() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListCapabiltyDataDefinition> fullfilledCapabilities = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setFullfilledCapabilities(fullfilledCapabilities);
+	}
+
+	
+	@Test
+	public void testGetFullfilledRequirements() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListRequirementDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFullfilledRequirements();
+	}
+
+	
+	@Test
+	public void testSetFullfilledRequirements() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapListRequirementDataDefinition> fullfilledRequirements = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setFullfilledRequirements(fullfilledRequirements);
+	}
+
+	
+	@Test
+	public void testGetInstDeploymentArtifacts() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapArtifactDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInstDeploymentArtifacts();
+	}
+
+	
+	@Test
+	public void testSetInstDeploymentArtifacts() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapArtifactDataDefinition> instDeploymentArtifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInstDeploymentArtifacts(instDeploymentArtifacts);
+	}
+
+	
+	@Test
+	public void testGetCalculatedCapabilitiesProperties() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapCapabiltyProperty> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCalculatedCapabilitiesProperties();
+	}
+
+	
+	@Test
+	public void testSetCalculatedCapabilitiesProperties() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapCapabiltyProperty> calculatedCapabilitiesProperties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCalculatedCapabilitiesProperties(calculatedCapabilitiesProperties);
+	}
+
+	
+	@Test
+	public void testGetInstanceArtifacts() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapArtifactDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInstanceArtifacts();
+	}
+
+	
+	@Test
+	public void testSetInstanceArtifacts() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, MapArtifactDataDefinition> instanceArtifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInstanceArtifacts(instanceArtifacts);
+	}
+
+	
+
+
+	
+	@Test
+	public void testGetComponentInstances() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, ComponentInstanceDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstances();
+	}
+
+	
+	@Test
+	public void testSetComponentInstances() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, ComponentInstanceDataDefinition> instances = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstances(instances);
+	}
+
+	
+	@Test
+	public void testGetRelations() throws Exception {
+		TopologyTemplate testSubject;
+		Map<String, RelationshipInstDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRelations();
+	}
+}
\ No newline at end of file