34 files changed, 3884 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