GET query to toscaMode fails -bug fixed

Change-Id: I9558bd14bdd4ea8d06863d11aa972e3c86b830b3
Issue-Id: SDC-300
Signed-off-by: Yuli Shlosberg <ys9693@att.com>

51 files changed, 7703 insertions, 7 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java
index 33180cd35e..a34bf00a7a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java
@@ -38,11 +38,7 @@ import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.datamodel.api.HighestFilterEnum;
 import org.openecomp.sdc.be.datatypes.components.ServiceMetadataDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
-import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
-import org.openecomp.sdc.be.datatypes.enums.FilterKeyEnum;
-import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
-import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
-import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.*;
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
 import org.openecomp.sdc.be.model.CapReqDef;
@@ -686,8 +682,11 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
 	}
 
 	public Either<ImmutablePair<String, byte[]>, ResponseFormat> getToscaModelByComponentUuid(ComponentTypeEnum componentType, String uuid, EnumMap<AuditingFieldsKeysEnum, Object> additionalParam) {
-		
-		Either<List<Component>, StorageOperationStatus> latestVersionEither = toscaOperationFacade.getComponentListByUuid(uuid, null);
+
+		Map<GraphPropertyEnum, Object> additionalPropertiesToMatch = new EnumMap<>(GraphPropertyEnum.class);
+		additionalPropertiesToMatch.put(GraphPropertyEnum.COMPONENT_TYPE, componentType.name());
+
+		Either<List<Component>, StorageOperationStatus> latestVersionEither = toscaOperationFacade.getComponentListByUuid(uuid, additionalPropertiesToMatch);
 		
 		if (latestVersionEither.isRight()) {
 			ResponseFormat response = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(latestVersionEither.right().value(), componentType));
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactDefinitionInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactDefinitionInfoTest.java
new file mode 100644
index 0000000000..a9b9352673
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactDefinitionInfoTest.java
@@ -0,0 +1,124 @@
+package org.openecomp.sdc.be.info;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.ArtifactDefinition;
+
+
+public class ArtifactDefinitionInfoTest {
+
+	private ArtifactDefinitionInfo createTestSubject() {
+		return new ArtifactDefinitionInfo(new ArtifactDefinition());
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		ArtifactDefinitionInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		ArtifactDefinitionInfo testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetArtifactName() throws Exception {
+		ArtifactDefinitionInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactName();
+	}
+
+	
+	@Test
+	public void testSetArtifactName() throws Exception {
+		ArtifactDefinitionInfo testSubject;
+		String artifactName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactName(artifactName);
+	}
+
+	
+	@Test
+	public void testGetArtifactDisplayName() throws Exception {
+		ArtifactDefinitionInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactDisplayName();
+	}
+
+	
+	@Test
+	public void testSetArtifactDisplayName() throws Exception {
+		ArtifactDefinitionInfo testSubject;
+		String artifactDisplayName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactDisplayName(artifactDisplayName);
+	}
+
+	
+	@Test
+	public void testGetArtifactVersion() throws Exception {
+		ArtifactDefinitionInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactVersion();
+	}
+
+	
+	@Test
+	public void testSetArtifactVersion() throws Exception {
+		ArtifactDefinitionInfo testSubject;
+		String artifactVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactVersion(artifactVersion);
+	}
+
+	
+	@Test
+	public void testGetArtifactUUID() throws Exception {
+		ArtifactDefinitionInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactUUID();
+	}
+
+	
+	@Test
+	public void testSetArtifactUUID() throws Exception {
+		ArtifactDefinitionInfo testSubject;
+		String artifactUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactUUID(artifactUUID);
+	}
+}
\ 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
new file mode 100644
index 0000000000..36644c5ff7
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupDefinitionInfoTest.java
@@ -0,0 +1,247 @@
+package org.openecomp.sdc.be.info;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.model.GroupProperty;
+
+
+public class GroupDefinitionInfoTest {
+
+	private GroupDefinitionInfo createTestSubject() {
+		return new GroupDefinitionInfo();
+	}
+
+	
+	@Test
+	public void testGetInvariantUUID() throws Exception {
+		GroupDefinitionInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInvariantUUID();
+	}
+
+	
+	@Test
+	public void testSetInvariantUUID() throws Exception {
+		GroupDefinitionInfo testSubject;
+		String invariantUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInvariantUUID(invariantUUID);
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		GroupDefinitionInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		GroupDefinitionInfo testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		GroupDefinitionInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		GroupDefinitionInfo testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetGroupUUID() throws Exception {
+		GroupDefinitionInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupUUID();
+	}
+
+	
+	@Test
+	public void testSetGroupUUID() throws Exception {
+		GroupDefinitionInfo testSubject;
+		String groupUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupUUID(groupUUID);
+	}
+
+	
+	@Test
+	public void testGetVersion() throws Exception {
+		GroupDefinitionInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVersion();
+	}
+
+	
+	@Test
+	public void testSetVersion() throws Exception {
+		GroupDefinitionInfo testSubject;
+		String version = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setVersion(version);
+	}
+
+	
+	@Test
+	public void testGetCustomizationUUID() throws Exception {
+		GroupDefinitionInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCustomizationUUID();
+	}
+
+	
+	@Test
+	public void testSetCustomizationUUID() throws Exception {
+		GroupDefinitionInfo testSubject;
+		String customizationUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCustomizationUUID(customizationUUID);
+	}
+
+	
+	@Test
+	public void testGetIsBase() throws Exception {
+		GroupDefinitionInfo testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIsBase();
+	}
+
+	
+	@Test
+	public void testSetIsBase() throws Exception {
+		GroupDefinitionInfo testSubject;
+		Boolean isBase = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIsBase(isBase);
+	}
+
+	
+	@Test
+	public void testGetArtifacts() throws Exception {
+		GroupDefinitionInfo testSubject;
+		List<ArtifactDefinitionInfo> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifacts();
+	}
+
+	
+	@Test
+	public void testSetArtifacts() throws Exception {
+		GroupDefinitionInfo testSubject;
+		List<ArtifactDefinitionInfo> artifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifacts(artifacts);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		GroupDefinitionInfo testSubject;
+		List<? extends GroupProperty> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		GroupDefinitionInfo testSubject;
+		List<? extends GroupProperty> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testGetGroupInstanceUniqueId() throws Exception {
+		GroupDefinitionInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupInstanceUniqueId();
+	}
+
+	
+	@Test
+	public void testSetGroupInstanceUniqueId() throws Exception {
+		GroupDefinitionInfo testSubject;
+		String groupInstanceUniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupInstanceUniqueId(groupInstanceUniqueId);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GroupDefinitionInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/AdditionalInformationDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/AdditionalInformationDefinitionTest.java
new file mode 100644
index 0000000000..f20b7f35c4
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/AdditionalInformationDefinitionTest.java
@@ -0,0 +1,46 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class AdditionalInformationDefinitionTest {
+
+	private AdditionalInformationDefinition createTestSubject() {
+		return new AdditionalInformationDefinition();
+	}
+
+	
+	@Test
+	public void testGetParentUniqueId() throws Exception {
+		AdditionalInformationDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getParentUniqueId();
+	}
+
+	
+	@Test
+	public void testSetParentUniqueId() throws Exception {
+		AdditionalInformationDefinition testSubject;
+		String parentUniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setParentUniqueId(parentUniqueId);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		AdditionalInformationDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ArtifactDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ArtifactDefinitionTest.java
new file mode 100644
index 0000000000..ae347cabc3
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ArtifactDefinitionTest.java
@@ -0,0 +1,111 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ArtifactDefinitionTest {
+
+	private ArtifactDefinition createTestSubject() {
+		return new ArtifactDefinition();
+	}
+
+	
+	@Test
+	public void testGetPayloadData() throws Exception {
+		ArtifactDefinition testSubject;
+		byte[] result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPayloadData();
+	}
+
+	
+	@Test
+	public void testSetPayload() throws Exception {
+		ArtifactDefinition testSubject;
+		byte[] payloadData = new byte[] { ' ' };
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPayload(payloadData);
+	}
+
+	
+	@Test
+	public void testSetPayloadData() throws Exception {
+		ArtifactDefinition testSubject;
+		String payloadData = "";
+
+		// test 1
+		testSubject = createTestSubject();
+		payloadData = null;
+		testSubject.setPayloadData(payloadData);
+
+		// test 2
+		testSubject = createTestSubject();
+		payloadData = "";
+		testSubject.setPayloadData(payloadData);
+	}
+
+	
+	@Test
+	public void testGetListHeatParameters() throws Exception {
+		ArtifactDefinition testSubject;
+		List<HeatParameterDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getListHeatParameters();
+	}
+
+	
+	@Test
+	public void testSetListHeatParameters() throws Exception {
+		ArtifactDefinition testSubject;
+		List<HeatParameterDefinition> properties = null;
+
+		// test 1
+		testSubject = createTestSubject();
+		properties = null;
+		testSubject.setListHeatParameters(properties);
+	}
+
+	
+	@Test
+	public void testCheckEsIdExist() throws Exception {
+		ArtifactDefinition testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.checkEsIdExist();
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		ArtifactDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		ArtifactDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.equals(obj);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityDefinitionTest.java
new file mode 100644
index 0000000000..7286bee4a0
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityDefinitionTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class CapabilityDefinitionTest {
+
+	private CapabilityDefinition createTestSubject() {
+		return new CapabilityDefinition();
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		CapabilityDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		CapabilityDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.equals(obj);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		CapabilityDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		CapabilityDefinition testSubject;
+		List<ComponentInstanceProperty> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		CapabilityDefinition testSubject;
+		List<ComponentInstanceProperty> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityTypeDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityTypeDefinitionTest.java
new file mode 100644
index 0000000000..75cc2054e5
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityTypeDefinitionTest.java
@@ -0,0 +1,70 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class CapabilityTypeDefinitionTest {
+
+	private CapabilityTypeDefinition createTestSubject() {
+		return new CapabilityTypeDefinition();
+	}
+
+	
+	@Test
+	public void testGetDerivedFrom() throws Exception {
+		CapabilityTypeDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerivedFrom();
+	}
+
+	
+	@Test
+	public void testSetDerivedFrom() throws Exception {
+		CapabilityTypeDefinition testSubject;
+		String derivedFrom = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerivedFrom(derivedFrom);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		CapabilityTypeDefinition testSubject;
+		Map<String, PropertyDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		CapabilityTypeDefinition testSubject;
+		Map<String, PropertyDefinition> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		CapabilityTypeDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentMetadataDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentMetadataDefinitionTest.java
new file mode 100644
index 0000000000..f728aac968
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentMetadataDefinitionTest.java
@@ -0,0 +1,51 @@
+package org.openecomp.sdc.be.model;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.components.ComponentMetadataDataDefinition;
+
+
+public class ComponentMetadataDefinitionTest {
+
+	private ComponentMetadataDefinition createTestSubject() {
+		return new ComponentMetadataDefinition();
+	}
+
+	
+	@Test
+	public void testGetMetadataDataDefinition() throws Exception {
+		ComponentMetadataDefinition testSubject;
+		ComponentMetadataDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMetadataDataDefinition();
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		ComponentMetadataDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		ComponentMetadataDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		obj = null;
+		result = testSubject.equals(obj);
+		Assert.assertEquals(false, result);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/DataTypeDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/DataTypeDefinitionTest.java
new file mode 100644
index 0000000000..26db09fb4f
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/DataTypeDefinitionTest.java
@@ -0,0 +1,92 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class DataTypeDefinitionTest {
+
+	private DataTypeDefinition createTestSubject() {
+		return new DataTypeDefinition();
+	}
+
+	
+	@Test
+	public void testGetConstraints() throws Exception {
+		DataTypeDefinition testSubject;
+		List<PropertyConstraint> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConstraints();
+	}
+
+	
+	@Test
+	public void testSetConstraints() throws Exception {
+		DataTypeDefinition testSubject;
+		List<PropertyConstraint> constraints = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConstraints(constraints);
+	}
+
+	
+	@Test
+	public void testGetDerivedFrom() throws Exception {
+		DataTypeDefinition testSubject;
+		DataTypeDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerivedFrom();
+	}
+
+	
+	@Test
+	public void testSetDerivedFrom() throws Exception {
+		DataTypeDefinition testSubject;
+		DataTypeDefinition derivedFrom = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerivedFrom(derivedFrom);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		DataTypeDefinition testSubject;
+		List<PropertyDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		DataTypeDefinition testSubject;
+		List<PropertyDefinition> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		DataTypeDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupDefinitionTest.java
new file mode 100644
index 0000000000..6cae685644
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupDefinitionTest.java
@@ -0,0 +1,50 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class GroupDefinitionTest {
+
+	private GroupDefinition createTestSubject() {
+		return new GroupDefinition();
+	}
+
+	
+	@Test
+	public void testConvertToGroupProperties() throws Exception {
+		GroupDefinition testSubject;
+		List<GroupProperty> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.convertToGroupProperties();
+	}
+
+	
+	@Test
+	public void testConvertFromGroupProperties() throws Exception {
+		GroupDefinition testSubject;
+		List<GroupProperty> properties = null;
+
+		// test 1
+		testSubject = createTestSubject();
+		properties = null;
+		testSubject.convertFromGroupProperties(properties);
+	}
+
+	
+	@Test
+	public void testIsSamePrefix() throws Exception {
+		GroupDefinition testSubject;
+		String resourceName = "";
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isSamePrefix(resourceName);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupTypeDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupTypeDefinitionTest.java
new file mode 100644
index 0000000000..4fe180970b
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupTypeDefinitionTest.java
@@ -0,0 +1,48 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class GroupTypeDefinitionTest {
+
+	private GroupTypeDefinition createTestSubject() {
+		return new GroupTypeDefinition();
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		GroupTypeDefinition testSubject;
+		List<PropertyDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		GroupTypeDefinition testSubject;
+		List<PropertyDefinition> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GroupTypeDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/InputDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/InputDefinitionTest.java
new file mode 100644
index 0000000000..68ff7ed6d3
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/InputDefinitionTest.java
@@ -0,0 +1,59 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class InputDefinitionTest {
+
+	private InputDefinition createTestSubject() {
+		return new InputDefinition();
+	}
+
+	
+	@Test
+	public void testGetInputs() throws Exception {
+		InputDefinition testSubject;
+		List<ComponentInstanceInput> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInputs();
+	}
+
+	
+	@Test
+	public void testSetInputs() throws Exception {
+		InputDefinition testSubject;
+		List<ComponentInstanceInput> inputs = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInputs(inputs);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		InputDefinition testSubject;
+		List<ComponentInstanceProperty> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		InputDefinition testSubject;
+		List<ComponentInstanceProperty> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/InterfaceDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/InterfaceDefinitionTest.java
new file mode 100644
index 0000000000..88c253360c
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/InterfaceDefinitionTest.java
@@ -0,0 +1,57 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class InterfaceDefinitionTest {
+
+	private InterfaceDefinition createTestSubject() {
+		return new InterfaceDefinition();
+	}
+
+	@Test
+	public void testIsDefinition() throws Exception {
+		InterfaceDefinition testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isDefinition();
+	}
+
+	@Test
+	public void testSetDefinition() throws Exception {
+		InterfaceDefinition testSubject;
+		boolean definition = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDefinition(definition);
+	}
+
+	@Test
+	public void testGetOperationsMap() throws Exception {
+		InterfaceDefinition testSubject;
+		Map<String, Operation> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getOperationsMap();
+	}
+
+
+
+	@Test
+	public void testToString() throws Exception {
+		InterfaceDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/PolicyTypeDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PolicyTypeDefinitionTest.java
new file mode 100644
index 0000000000..3ba8f61826
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PolicyTypeDefinitionTest.java
@@ -0,0 +1,48 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class PolicyTypeDefinitionTest {
+
+	private PolicyTypeDefinition createTestSubject() {
+		return new PolicyTypeDefinition();
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		PolicyTypeDefinition testSubject;
+		List<PropertyDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		PolicyTypeDefinition testSubject;
+		List<PropertyDefinition> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		PolicyTypeDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/PropertyDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PropertyDefinitionTest.java
new file mode 100644
index 0000000000..81df0e223d
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PropertyDefinitionTest.java
@@ -0,0 +1,86 @@
+package org.openecomp.sdc.be.model;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class PropertyDefinitionTest {
+
+	private PropertyDefinition createTestSubject() {
+		return new PropertyDefinition();
+	}
+
+	@Test
+	public void testGetConstraints() throws Exception {
+		PropertyDefinition testSubject;
+		List<PropertyConstraint> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConstraints();
+	}
+
+	@Test
+	public void testSetConstraints() throws Exception {
+		PropertyDefinition testSubject;
+		List<PropertyConstraint> constraints = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConstraints(constraints);
+	}
+
+	@Test
+	public void testToString() throws Exception {
+		PropertyDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	@Test
+	public void testIsDefinition() throws Exception {
+		PropertyDefinition testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isDefinition();
+	}
+
+	@Test
+	public void testSetDefinition() throws Exception {
+		PropertyDefinition testSubject;
+		boolean definition = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDefinition(definition);
+	}
+
+	@Test
+	public void testHashCode() throws Exception {
+		PropertyDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	@Test
+	public void testEquals() throws Exception {
+		PropertyDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.equals(obj);
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/CategoryDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/CategoryDefinitionTest.java
new file mode 100644
index 0000000000..6d0f192d1c
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/CategoryDefinitionTest.java
@@ -0,0 +1,59 @@
+package org.openecomp.sdc.be.model.category;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class CategoryDefinitionTest {
+
+	private CategoryDefinition createTestSubject() {
+		return new CategoryDefinition();
+	}
+
+	
+	@Test
+	public void testGetSubcategories() throws Exception {
+		CategoryDefinition testSubject;
+		List<SubCategoryDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getSubcategories();
+	}
+
+	
+	@Test
+	public void testSetSubcategories() throws Exception {
+		CategoryDefinition testSubject;
+		List<SubCategoryDefinition> subcategories = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setSubcategories(subcategories);
+	}
+
+	
+	@Test
+	public void testAddSubCategory() throws Exception {
+		CategoryDefinition testSubject;
+		SubCategoryDefinition subcategory = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.addSubCategory(subcategory);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		CategoryDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/SubCategoryDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/SubCategoryDefinitionTest.java
new file mode 100644
index 0000000000..f9acabdc4b
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/SubCategoryDefinitionTest.java
@@ -0,0 +1,59 @@
+package org.openecomp.sdc.be.model.category;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class SubCategoryDefinitionTest {
+
+	private SubCategoryDefinition createTestSubject() {
+		return new SubCategoryDefinition();
+	}
+
+	
+	@Test
+	public void testGetGroupings() throws Exception {
+		SubCategoryDefinition testSubject;
+		List<GroupingDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupings();
+	}
+
+	
+	@Test
+	public void testSetGroupings() throws Exception {
+		SubCategoryDefinition testSubject;
+		List<GroupingDefinition> groupingDefinitions = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupings(groupingDefinitions);
+	}
+
+	
+	@Test
+	public void testAddGrouping() throws Exception {
+		SubCategoryDefinition testSubject;
+		GroupingDefinition groupingDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.addGrouping(groupingDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		SubCategoryDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/CategoryDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/CategoryDataDefinitionTest.java
new file mode 100644
index 0000000000..af950ee45f
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/CategoryDataDefinitionTest.java
@@ -0,0 +1,140 @@
+package org.openecomp.sdc.be.datatypes.category;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class CategoryDataDefinitionTest {
+
+	private CategoryDataDefinition createTestSubject() {
+		return new CategoryDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		CategoryDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		CategoryDataDefinition testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetNormalizedName() throws Exception {
+		CategoryDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNormalizedName();
+	}
+
+	
+	@Test
+	public void testSetNormalizedName() throws Exception {
+		CategoryDataDefinition testSubject;
+		String normalizedName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNormalizedName(normalizedName);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		CategoryDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		CategoryDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetIcons() throws Exception {
+		CategoryDataDefinition testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIcons();
+	}
+
+	
+	@Test
+	public void testSetIcons() throws Exception {
+		CategoryDataDefinition testSubject;
+		List<String> icons = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIcons(icons);
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		CategoryDataDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		CategoryDataDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		obj = null;
+		result = testSubject.equals(obj);
+		Assert.assertEquals(false, result);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		CategoryDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/GroupingDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/GroupingDataDefinitionTest.java
new file mode 100644
index 0000000000..be109eab7c
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/GroupingDataDefinitionTest.java
@@ -0,0 +1,116 @@
+package org.openecomp.sdc.be.datatypes.category;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class GroupingDataDefinitionTest {
+
+	private GroupingDataDefinition createTestSubject() {
+		return new GroupingDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		GroupingDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		GroupingDataDefinition testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetNormalizedName() throws Exception {
+		GroupingDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNormalizedName();
+	}
+
+	
+	@Test
+	public void testSetNormalizedName() throws Exception {
+		GroupingDataDefinition testSubject;
+		String normalizedName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNormalizedName(normalizedName);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		GroupingDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		GroupingDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		GroupingDataDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		GroupingDataDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		obj = null;
+		result = testSubject.equals(obj);
+		Assert.assertEquals(false, result);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GroupingDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/SubCategoryDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/SubCategoryDataDefinitionTest.java
new file mode 100644
index 0000000000..73d0865fe9
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/SubCategoryDataDefinitionTest.java
@@ -0,0 +1,140 @@
+package org.openecomp.sdc.be.datatypes.category;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class SubCategoryDataDefinitionTest {
+
+	private SubCategoryDataDefinition createTestSubject() {
+		return new SubCategoryDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		SubCategoryDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		SubCategoryDataDefinition testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetNormalizedName() throws Exception {
+		SubCategoryDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNormalizedName();
+	}
+
+	
+	@Test
+	public void testSetNormalizedName() throws Exception {
+		SubCategoryDataDefinition testSubject;
+		String normalizedName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNormalizedName(normalizedName);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		SubCategoryDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		SubCategoryDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetIcons() throws Exception {
+		SubCategoryDataDefinition testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIcons();
+	}
+
+	
+	@Test
+	public void testSetIcons() throws Exception {
+		SubCategoryDataDefinition testSubject;
+		List<String> icons = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIcons(icons);
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		SubCategoryDataDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		SubCategoryDataDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		obj = null;
+		result = testSubject.equals(obj);
+		Assert.assertEquals(false, result);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		SubCategoryDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/components/ResourceMetadataDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/components/ResourceMetadataDataDefinitionTest.java
new file mode 100644
index 0000000000..249a844c9c
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/components/ResourceMetadataDataDefinitionTest.java
@@ -0,0 +1,224 @@
+package org.openecomp.sdc.be.datatypes.components;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+
+
+public class ResourceMetadataDataDefinitionTest {
+
+	private ResourceMetadataDataDefinition createTestSubject() {
+		return new ResourceMetadataDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetVendorName() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVendorName();
+	}
+
+	
+	@Test
+	public void testSetVendorName() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		String vendorName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setVendorName(vendorName);
+	}
+
+	
+	@Test
+	public void testGetVendorRelease() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVendorRelease();
+	}
+
+	
+	@Test
+	public void testSetVendorRelease() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		String vendorRelease = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setVendorRelease(vendorRelease);
+	}
+
+	
+	@Test
+	public void testGetResourceVendorModelNumber() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceVendorModelNumber();
+	}
+
+	
+	@Test
+	public void testSetResourceVendorModelNumber() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		String resourceVendorModelNumber = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceVendorModelNumber(resourceVendorModelNumber);
+	}
+
+	
+	@Test
+	public void testGetResourceType() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		ResourceTypeEnum result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceType();
+	}
+
+	
+	@Test
+	public void testSetResourceType() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		ResourceTypeEnum resourceType = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceType(resourceType);
+	}
+
+	
+	@Test
+	public void testIsAbstract() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isAbstract();
+	}
+
+	
+	@Test
+	public void testSetAbstract() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		Boolean isAbstract = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAbstract(isAbstract);
+	}
+
+	
+	@Test
+	public void testGetCost() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCost();
+	}
+
+	
+	@Test
+	public void testSetCost() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		String cost = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCost(cost);
+	}
+
+	
+	@Test
+	public void testGetLicenseType() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLicenseType();
+	}
+
+	
+	@Test
+	public void testSetLicenseType() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		String licenseType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLicenseType(licenseType);
+	}
+
+	
+	@Test
+	public void testGetToscaResourceName() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getToscaResourceName();
+	}
+
+	
+	@Test
+	public void testSetToscaResourceName() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		String toscaResourceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setToscaResourceName(toscaResourceName);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		ResourceMetadataDataDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.equals(obj);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/components/ServiceMetadataDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/components/ServiceMetadataDataDefinitionTest.java
new file mode 100644
index 0000000000..4fc110350c
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/components/ServiceMetadataDataDefinitionTest.java
@@ -0,0 +1,160 @@
+package org.openecomp.sdc.be.datatypes.components;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class ServiceMetadataDataDefinitionTest {
+
+	private ServiceMetadataDataDefinition createTestSubject() {
+		return new ServiceMetadataDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetDistributionStatus() throws Exception {
+		ServiceMetadataDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDistributionStatus();
+	}
+
+	
+	@Test
+	public void testSetDistributionStatus() throws Exception {
+		ServiceMetadataDataDefinition testSubject;
+		String distributionStatus = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDistributionStatus(distributionStatus);
+	}
+
+	
+	@Test
+	public void testGetServiceType() throws Exception {
+		ServiceMetadataDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceType();
+	}
+
+	
+	@Test
+	public void testSetServiceType() throws Exception {
+		ServiceMetadataDataDefinition testSubject;
+		String serviceType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceType(serviceType);
+	}
+
+	
+	@Test
+	public void testGetServiceRole() throws Exception {
+		ServiceMetadataDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceRole();
+	}
+
+	
+	@Test
+	public void testSetServiceRole() throws Exception {
+		ServiceMetadataDataDefinition testSubject;
+		String serviceRole = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceRole(serviceRole);
+	}
+
+	
+	@Test
+	public void testIsEcompGeneratedNaming() throws Exception {
+		ServiceMetadataDataDefinition testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isEcompGeneratedNaming();
+	}
+
+	
+	@Test
+	public void testSetEcompGeneratedNaming() throws Exception {
+		ServiceMetadataDataDefinition testSubject;
+		Boolean ecompGeneratedNaming = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setEcompGeneratedNaming(ecompGeneratedNaming);
+	}
+
+	
+	@Test
+	public void testGetNamingPolicy() throws Exception {
+		ServiceMetadataDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNamingPolicy();
+	}
+
+	
+	@Test
+	public void testSetNamingPolicy() throws Exception {
+		ServiceMetadataDataDefinition testSubject;
+		String namingPolicy = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNamingPolicy(namingPolicy);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ServiceMetadataDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		ServiceMetadataDataDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		ServiceMetadataDataDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		obj = null;
+		result = testSubject.equals(obj);
+		Assert.assertEquals(false, result);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/AdditionalInfoParameterDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/AdditionalInfoParameterDataDefinitionTest.java
new file mode 100644
index 0000000000..94ec9166ee
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/AdditionalInfoParameterDataDefinitionTest.java
@@ -0,0 +1,136 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class AdditionalInfoParameterDataDefinitionTest {
+
+	private AdditionalInfoParameterDataDefinition createTestSubject() {
+		return new AdditionalInfoParameterDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		AdditionalInfoParameterDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		AdditionalInfoParameterDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		AdditionalInfoParameterDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		AdditionalInfoParameterDataDefinition testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		AdditionalInfoParameterDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		AdditionalInfoParameterDataDefinition testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testGetLastCreatedCounter() throws Exception {
+		AdditionalInfoParameterDataDefinition testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastCreatedCounter();
+	}
+
+	
+	@Test
+	public void testSetLastCreatedCounter() throws Exception {
+		AdditionalInfoParameterDataDefinition testSubject;
+		Integer lastCreatedCounter = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastCreatedCounter(lastCreatedCounter);
+	}
+
+	
+	@Test
+	public void testGetParameters() throws Exception {
+		AdditionalInfoParameterDataDefinition testSubject;
+		List<AdditionalInfoParameterInfo> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getParameters();
+	}
+
+	
+	@Test
+	public void testSetParameters() throws Exception {
+		AdditionalInfoParameterDataDefinition testSubject;
+		List<AdditionalInfoParameterInfo> parameters = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setParameters(parameters);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		AdditionalInfoParameterDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ArtifactDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ArtifactDataDefinitionTest.java
new file mode 100644
index 0000000000..315067d8a9
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ArtifactDataDefinitionTest.java
@@ -0,0 +1,736 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
+
+
+public class ArtifactDataDefinitionTest {
+
+	private ArtifactDataDefinition createTestSubject() {
+		return new ArtifactDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetArtifactName() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactName();
+	}
+
+	
+	@Test
+	public void testGetArtifactType() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactType();
+	}
+
+	
+	@Test
+	public void testSetArtifactType() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String artifactType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactType(artifactType);
+	}
+
+	
+	@Test
+	public void testGetArtifactRef() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactRef();
+	}
+
+	
+	@Test
+	public void testSetArtifactRef() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String artifactRef = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactRef(artifactRef);
+	}
+
+	
+	@Test
+	public void testGetArtifactRepository() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactRepository();
+	}
+
+	
+	@Test
+	public void testSetArtifactRepository() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String artifactRepository = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactRepository(artifactRepository);
+	}
+
+	
+	@Test
+	public void testSetArtifactName() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String artifactName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactName(artifactName);
+	}
+
+	
+	@Test
+	public void testGetArtifactChecksum() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactChecksum();
+	}
+
+	
+	@Test
+	public void testSetArtifactChecksum() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String artifactChecksum = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactChecksum(artifactChecksum);
+	}
+
+	
+	@Test
+	public void testGetUserIdCreator() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUserIdCreator();
+	}
+
+	
+	@Test
+	public void testSetUserIdCreator() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String userIdCreator = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUserIdCreator(userIdCreator);
+	}
+
+	
+	@Test
+	public void testGetUserIdLastUpdater() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUserIdLastUpdater();
+	}
+
+	
+	@Test
+	public void testSetUserIdLastUpdater() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String userIdLastUpdater = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUserIdLastUpdater(userIdLastUpdater);
+	}
+
+	
+	@Test
+	public void testGetCreatorFullName() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreatorFullName();
+	}
+
+	
+	@Test
+	public void testSetCreatorFullName() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String creatorFullName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreatorFullName(creatorFullName);
+	}
+
+	
+	@Test
+	public void testGetUpdaterFullName() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUpdaterFullName();
+	}
+
+	
+	@Test
+	public void testSetUpdaterFullName() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String updaterFullName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUpdaterFullName(updaterFullName);
+	}
+
+	
+	@Test
+	public void testGetCreationDate() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationDate();
+	}
+
+	
+	@Test
+	public void testSetCreationDate() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Long creationDate = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationDate(creationDate);
+	}
+
+	
+	@Test
+	public void testGetLastUpdateDate() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastUpdateDate();
+	}
+
+	
+	@Test
+	public void testSetLastUpdateDate() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Long lastUpdateDate = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastUpdateDate(lastUpdateDate);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetArtifactLabel() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactLabel();
+	}
+
+	
+	@Test
+	public void testSetArtifactLabel() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String artifactLabel = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactLabel(artifactLabel);
+	}
+
+	
+	@Test
+	public void testGetEsId() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getEsId();
+	}
+
+	
+	@Test
+	public void testSetEsId() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String esId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setEsId(esId);
+	}
+
+	
+	@Test
+	public void testGetArtifactCreator() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactCreator();
+	}
+
+	
+	@Test
+	public void testSetArtifactCreator() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String artifactCreator = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactCreator(artifactCreator);
+	}
+
+	
+	@Test
+	public void testGetMandatory() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMandatory();
+	}
+
+	
+	@Test
+	public void testSetMandatory() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Boolean mandatory = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMandatory(mandatory);
+	}
+
+	
+	@Test
+	public void testGetArtifactDisplayName() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactDisplayName();
+	}
+
+	
+	@Test
+	public void testSetArtifactDisplayName() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String artifactDisplayName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactDisplayName(artifactDisplayName);
+	}
+
+	
+	@Test
+	public void testGetApiUrl() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getApiUrl();
+	}
+
+	
+	@Test
+	public void testSetApiUrl() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String apiUrl = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setApiUrl(apiUrl);
+	}
+
+	
+	@Test
+	public void testGetServiceApi() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceApi();
+	}
+
+	
+	@Test
+	public void testSetServiceApi() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Boolean serviceApi = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceApi(serviceApi);
+	}
+
+	
+	@Test
+	public void testGetArtifactGroupType() throws Exception {
+		ArtifactDataDefinition testSubject;
+		ArtifactGroupTypeEnum result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactGroupType();
+	}
+
+	
+	@Test
+	public void testSetArtifactGroupType() throws Exception {
+		ArtifactDataDefinition testSubject;
+		ArtifactGroupTypeEnum artifactGroupType = null;
+
+		// test 1
+		testSubject = createTestSubject();
+		artifactGroupType = null;
+		testSubject.setArtifactGroupType(artifactGroupType);
+	}
+
+	
+	@Test
+	public void testGetTimeout() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimeout();
+	}
+
+	
+	@Test
+	public void testSetTimeout() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Integer timeout = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimeout(timeout);
+	}
+
+	
+	@Test
+	public void testGetArtifactVersion() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactVersion();
+	}
+
+	
+	@Test
+	public void testSetArtifactVersion() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String artifactVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactVersion(artifactVersion);
+	}
+
+	
+	@Test
+	public void testGetArtifactUUID() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactUUID();
+	}
+
+	
+	@Test
+	public void testSetArtifactUUID() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String artifactUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactUUID(artifactUUID);
+	}
+
+	
+	@Test
+	public void testGetPayloadUpdateDate() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPayloadUpdateDate();
+	}
+
+	
+	@Test
+	public void testSetPayloadUpdateDate() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Long payloadUpdateDate = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPayloadUpdateDate(payloadUpdateDate);
+	}
+
+	
+	@Test
+	public void testGetHeatParamsUpdateDate() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getHeatParamsUpdateDate();
+	}
+
+	
+	@Test
+	public void testSetHeatParamsUpdateDate() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Long heatParamsUpdateDate = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setHeatParamsUpdateDate(heatParamsUpdateDate);
+	}
+
+	
+	@Test
+	public void testGetRequiredArtifacts() throws Exception {
+		ArtifactDataDefinition testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequiredArtifacts();
+	}
+
+	
+	@Test
+	public void testSetRequiredArtifacts() throws Exception {
+		ArtifactDataDefinition testSubject;
+		List<String> requiredArtifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequiredArtifacts(requiredArtifacts);
+	}
+
+	
+	@Test
+	public void testGetGenerated() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGenerated();
+	}
+
+	
+	@Test
+	public void testSetGenerated() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Boolean generated = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGenerated(generated);
+	}
+
+	
+	@Test
+	public void testGetDuplicated() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDuplicated();
+	}
+
+	
+	@Test
+	public void testSetDuplicated() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Boolean duplicated = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDuplicated(duplicated);
+	}
+
+	
+	@Test
+	public void testGetHeatParameters() throws Exception {
+		ArtifactDataDefinition testSubject;
+		List<HeatParameterDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getHeatParameters();
+	}
+
+	
+	@Test
+	public void testSetHeatParameters() throws Exception {
+		ArtifactDataDefinition testSubject;
+		List<HeatParameterDataDefinition> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setHeatParameters(properties);
+	}
+
+	
+	@Test
+	public void testGetGeneratedFromId() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGeneratedFromId();
+	}
+
+	
+	@Test
+	public void testSetGeneratedFromId() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String generatedFromId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGeneratedFromId(generatedFromId);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		ArtifactDataDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		ArtifactDataDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		obj = null;
+		result = testSubject.equals(obj);
+		Assert.assertEquals(false, result);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/CapabilityDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/CapabilityDataDefinitionTest.java
new file mode 100644
index 0000000000..218ca8d74f
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/CapabilityDataDefinitionTest.java
@@ -0,0 +1,371 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class CapabilityDataDefinitionTest {
+
+	private CapabilityDataDefinition createTestSubject() {
+		return new CapabilityDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetOwnerId() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getOwnerId();
+	}
+
+	
+	@Test
+	public void testSetOwnerId() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String ownerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setOwnerId(ownerId);
+	}
+
+	
+	@Test
+	public void testGetOwnerName() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getOwnerName();
+	}
+
+	
+	@Test
+	public void testSetOwnerName() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String ownerName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setOwnerName(ownerName);
+	}
+
+	
+	@Test
+	public void testGetMinOccurrences() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMinOccurrences();
+	}
+
+	
+	@Test
+	public void testSetMinOccurrences() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String minOccurrences = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMinOccurrences(minOccurrences);
+	}
+
+	
+	@Test
+	public void testGetMaxOccurrences() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMaxOccurrences();
+	}
+
+	
+	@Test
+	public void testSetMaxOccurrences() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String maxOccurrences = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMaxOccurrences(maxOccurrences);
+	}
+
+	
+	@Test
+	public void testGetLeftOccurrences() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLeftOccurrences();
+	}
+
+	
+	@Test
+	public void testSetLeftOccurrences() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String leftOccurrences = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLeftOccurrences(leftOccurrences);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetParentName() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getParentName();
+	}
+
+	
+	@Test
+	public void testSetParentName() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String parentName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setParentName(parentName);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetValidSourceTypes() throws Exception {
+		CapabilityDataDefinition testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValidSourceTypes();
+	}
+
+	
+	@Test
+	public void testSetValidSourceTypes() throws Exception {
+		CapabilityDataDefinition testSubject;
+		List<String> validSourceTypes = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValidSourceTypes(validSourceTypes);
+	}
+
+	
+	@Test
+	public void testGetCapabilitySources() throws Exception {
+		CapabilityDataDefinition testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilitySources();
+	}
+
+	
+	@Test
+	public void testSetCapabilitySources() throws Exception {
+		CapabilityDataDefinition testSubject;
+		List<String> capabilitySources = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilitySources(capabilitySources);
+	}
+
+	
+	@Test
+	public void testSetPath() throws Exception {
+		CapabilityDataDefinition testSubject;
+		List<String> path = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPath(path);
+	}
+
+	
+	@Test
+	public void testGetPath() throws Exception {
+		CapabilityDataDefinition testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPath();
+	}
+
+	
+	@Test
+	public void testSetSource() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String source = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setSource(source);
+	}
+
+	
+	@Test
+	public void testGetSource() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getSource();
+	}
+
+	
+	@Test
+	public void testAddToPath() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String elementInPath = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.addToPath(elementInPath);
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		CapabilityDataDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		CapabilityDataDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		obj = null;
+		result = testSubject.equals(obj);
+		Assert.assertEquals(false, result);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		CapabilityDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinitionTest.java
new file mode 100644
index 0000000000..a6faeb3d30
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinitionTest.java
@@ -0,0 +1,444 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
+
+
+public class ComponentInstanceDataDefinitionTest {
+
+	private ComponentInstanceDataDefinition createTestSubject() {
+		return new ComponentInstanceDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetIcon() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIcon();
+	}
+
+	
+	@Test
+	public void testSetIcon() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String icon = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIcon(icon);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetPosX() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPosX();
+	}
+
+	
+	@Test
+	public void testSetPosX() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String posX = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPosX(posX);
+	}
+
+	
+	@Test
+	public void testGetPosY() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPosY();
+	}
+
+	
+	@Test
+	public void testSetPosY() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String posY = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPosY(posY);
+	}
+
+	
+	@Test
+	public void testGetComponentUid() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentUid();
+	}
+
+	
+	@Test
+	public void testSetComponentUid() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String resourceUid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentUid(resourceUid);
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetInvariantName() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInvariantName();
+	}
+
+	
+	@Test
+	public void testSetInvariantName() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String invariantName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInvariantName(invariantName);
+	}
+
+	
+	@Test
+	public void testGetPropertyValueCounter() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPropertyValueCounter();
+	}
+
+	
+	@Test
+	public void testSetPropertyValueCounter() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		Integer propertyValueCounter = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPropertyValueCounter(propertyValueCounter);
+	}
+
+	
+	@Test
+	public void testGetNormalizedName() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNormalizedName();
+	}
+
+	
+	@Test
+	public void testSetNormalizedName() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String normalizedName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNormalizedName(normalizedName);
+	}
+
+	
+	@Test
+	public void testGetOriginType() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		OriginTypeEnum result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getOriginType();
+	}
+
+	
+	@Test
+	public void testSetOriginType() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		OriginTypeEnum originType = null;
+
+		// test 1
+		testSubject = createTestSubject();
+		originType = null;
+		testSubject.setOriginType(originType);
+	}
+
+	
+	@Test
+	public void testGetAttributeValueCounter() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAttributeValueCounter();
+	}
+
+	
+	@Test
+	public void testSetAttributeValueCounter() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		Integer attributeValueCounter = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAttributeValueCounter(attributeValueCounter);
+	}
+
+	
+	@Test
+	public void testGetInputValueCounter() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInputValueCounter();
+	}
+
+	
+	@Test
+	public void testSetInputValueCounter() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		Integer inputValueCounter = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInputValueCounter(inputValueCounter);
+	}
+
+	
+	@Test
+	public void testGetCustomizationUUID() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCustomizationUUID();
+	}
+
+	
+	@Test
+	public void testSetCustomizationUUID() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String customizationUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCustomizationUUID(customizationUUID);
+	}
+
+	
+	@Test
+	public void testGetComponentName() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentName();
+	}
+
+	
+	@Test
+	public void testSetComponentName() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String resourceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentName(resourceName);
+	}
+
+	
+	@Test
+	public void testGetComponentVersion() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentVersion();
+	}
+
+	
+	@Test
+	public void testGetToscaComponentName() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getToscaComponentName();
+	}
+
+	
+	@Test
+	public void testSetToscaComponentName() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String toscaComponentName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setToscaComponentName(toscaComponentName);
+	}
+
+	
+	@Test
+	public void testSetComponentVersion() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String resourceVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentVersion(resourceVersion);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ComponentInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/CompositionDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/CompositionDataDefinitionTest.java
new file mode 100644
index 0000000000..3418265183
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/CompositionDataDefinitionTest.java
@@ -0,0 +1,83 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class CompositionDataDefinitionTest {
+
+	private CompositionDataDefinition createTestSubject() {
+		return new CompositionDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetComponentInstances() throws Exception {
+		CompositionDataDefinition testSubject;
+		Map<String, ComponentInstanceDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstances();
+	}
+
+	
+	@Test
+	public void testSetComponentInstances() throws Exception {
+		CompositionDataDefinition testSubject;
+		Map<String, ComponentInstanceDataDefinition> componentInstances = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstances(componentInstances);
+	}
+
+	
+	@Test
+	public void testGetRelations() throws Exception {
+		CompositionDataDefinition testSubject;
+		Map<String, RelationshipInstDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRelations();
+	}
+
+	
+	@Test
+	public void testSetRelations() throws Exception {
+		CompositionDataDefinition testSubject;
+		Map<String, RelationshipInstDataDefinition> relations = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRelations(relations);
+	}
+
+	
+	@Test
+	public void testAddInstance() throws Exception {
+		CompositionDataDefinition testSubject;
+		String key = "";
+		ComponentInstanceDataDefinition instance = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.addInstance(key, instance);
+	}
+
+	
+	@Test
+	public void testAddRelation() throws Exception {
+		CompositionDataDefinition testSubject;
+		String key = "";
+		RelationshipInstDataDefinition relation = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.addRelation(key, relation);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ConsumerDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ConsumerDataDefinitionTest.java
new file mode 100644
index 0000000000..7d5a73333c
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ConsumerDataDefinitionTest.java
@@ -0,0 +1,182 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class ConsumerDataDefinitionTest {
+
+	private ConsumerDataDefinition createTestSubject() {
+		return new ConsumerDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetConsumerName() throws Exception {
+		ConsumerDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerName();
+	}
+
+	
+	@Test
+	public void testSetConsumerName() throws Exception {
+		ConsumerDataDefinition testSubject;
+		String consumerName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConsumerName(consumerName);
+	}
+
+	
+	@Test
+	public void testGetConsumerPassword() throws Exception {
+		ConsumerDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerPassword();
+	}
+
+	
+	@Test
+	public void testSetConsumerPassword() throws Exception {
+		ConsumerDataDefinition testSubject;
+		String consumerPassword = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConsumerPassword(consumerPassword);
+	}
+
+	
+	@Test
+	public void testGetConsumerSalt() throws Exception {
+		ConsumerDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerSalt();
+	}
+
+	
+	@Test
+	public void testSetConsumerSalt() throws Exception {
+		ConsumerDataDefinition testSubject;
+		String consumerSalt = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConsumerSalt(consumerSalt);
+	}
+
+	
+	@Test
+	public void testGetConsumerLastAuthenticationTime() throws Exception {
+		ConsumerDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerLastAuthenticationTime();
+	}
+
+	
+	@Test
+	public void testSetConsumerLastAuthenticationTime() throws Exception {
+		ConsumerDataDefinition testSubject;
+		Long consumerLastAuthenticationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConsumerLastAuthenticationTime(consumerLastAuthenticationTime);
+	}
+
+	
+	@Test
+	public void testGetConsumerDetailsLastupdatedtime() throws Exception {
+		ConsumerDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerDetailsLastupdatedtime();
+	}
+
+	
+	@Test
+	public void testSetConsumerDetailsLastupdatedtime() throws Exception {
+		ConsumerDataDefinition testSubject;
+		Long consumerDetailsLastupdatedtime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConsumerDetailsLastupdatedtime(consumerDetailsLastupdatedtime);
+	}
+
+	
+	@Test
+	public void testGetLastModfierAtuid() throws Exception {
+		ConsumerDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastModfierAtuid();
+	}
+
+	
+	@Test
+	public void testSetLastModfierAtuid() throws Exception {
+		ConsumerDataDefinition testSubject;
+		String lastModfierAtuid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastModfierAtuid(lastModfierAtuid);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ConsumerDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		ConsumerDataDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		ConsumerDataDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		obj = null;
+		result = testSubject.equals(obj);
+		Assert.assertEquals(false, result);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/DataTypeDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/DataTypeDataDefinitionTest.java
new file mode 100644
index 0000000000..54d9bdac36
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/DataTypeDataDefinitionTest.java
@@ -0,0 +1,156 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class DataTypeDataDefinitionTest {
+
+	private DataTypeDataDefinition createTestSubject() {
+		return new DataTypeDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		DataTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		DataTypeDataDefinition testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetDerivedFromName() throws Exception {
+		DataTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerivedFromName();
+	}
+
+	
+	@Test
+	public void testSetDerivedFromName() throws Exception {
+		DataTypeDataDefinition testSubject;
+		String derivedFromName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerivedFromName(derivedFromName);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		DataTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		DataTypeDataDefinition testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		DataTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		DataTypeDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		DataTypeDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		DataTypeDataDefinition testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		DataTypeDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		DataTypeDataDefinition testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		DataTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GetInputValueDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GetInputValueDataDefinitionTest.java
new file mode 100644
index 0000000000..2ac0fda57b
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GetInputValueDataDefinitionTest.java
@@ -0,0 +1,182 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class GetInputValueDataDefinitionTest {
+
+	private GetInputValueDataDefinition createTestSubject() {
+		return new GetInputValueDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetPropName() throws Exception {
+		GetInputValueDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPropName();
+	}
+
+	
+	@Test
+	public void testSetPropName() throws Exception {
+		GetInputValueDataDefinition testSubject;
+		String propName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPropName(propName);
+	}
+
+	
+	@Test
+	public void testGetInputName() throws Exception {
+		GetInputValueDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInputName();
+	}
+
+	
+	@Test
+	public void testSetInputName() throws Exception {
+		GetInputValueDataDefinition testSubject;
+		String inputName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInputName(inputName);
+	}
+
+	
+	@Test
+	public void testGetIndexValue() throws Exception {
+		GetInputValueDataDefinition testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIndexValue();
+	}
+
+	
+	@Test
+	public void testSetIndexValue() throws Exception {
+		GetInputValueDataDefinition testSubject;
+		Integer indexValue = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIndexValue(indexValue);
+	}
+
+	
+	@Test
+	public void testGetGetInputIndex() throws Exception {
+		GetInputValueDataDefinition testSubject;
+		GetInputValueDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGetInputIndex();
+	}
+
+	
+	@Test
+	public void testSetGetInputIndex() throws Exception {
+		GetInputValueDataDefinition testSubject;
+		GetInputValueDataDefinition getInputIndex = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGetInputIndex(getInputIndex);
+	}
+
+	
+	@Test
+	public void testIsList() throws Exception {
+		GetInputValueDataDefinition testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isList();
+	}
+
+	
+	@Test
+	public void testSetList() throws Exception {
+		GetInputValueDataDefinition testSubject;
+		boolean isList = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setList(isList);
+	}
+
+	
+	@Test
+	public void testGetInputId() throws Exception {
+		GetInputValueDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInputId();
+	}
+
+	
+	@Test
+	public void testSetInputId() throws Exception {
+		GetInputValueDataDefinition testSubject;
+		String inputId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInputId(inputId);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GetInputValueDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		GetInputValueDataDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		GetInputValueDataDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		obj = null;
+		result = testSubject.equals(obj);
+		Assert.assertEquals(false, result);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupDataDefinitionTest.java
new file mode 100644
index 0000000000..74e1bf3a47
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupDataDefinitionTest.java
@@ -0,0 +1,313 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class GroupDataDefinitionTest {
+
+	private GroupDataDefinition createTestSubject() {
+		return new GroupDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		GroupDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		GroupDataDefinition testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		GroupDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		GroupDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		GroupDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		GroupDataDefinition testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetVersion() throws Exception {
+		GroupDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVersion();
+	}
+
+	
+	@Test
+	public void testSetVersion() throws Exception {
+		GroupDataDefinition testSubject;
+		String version = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setVersion(version);
+	}
+
+	
+	@Test
+	public void testGetInvariantUUID() throws Exception {
+		GroupDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInvariantUUID();
+	}
+
+	
+	@Test
+	public void testSetInvariantUUID() throws Exception {
+		GroupDataDefinition testSubject;
+		String invariantUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInvariantUUID(invariantUUID);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		GroupDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		GroupDataDefinition testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetPropertyValueCounter() throws Exception {
+		GroupDataDefinition testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPropertyValueCounter();
+	}
+
+	
+	@Test
+	public void testSetPropertyValueCounter() throws Exception {
+		GroupDataDefinition testSubject;
+		Integer propertyValueCounter = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPropertyValueCounter(propertyValueCounter);
+	}
+
+	
+	@Test
+	public void testGetGroupUUID() throws Exception {
+		GroupDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupUUID();
+	}
+
+	
+	@Test
+	public void testSetGroupUUID() throws Exception {
+		GroupDataDefinition testSubject;
+		String groupUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupUUID(groupUUID);
+	}
+
+	
+	@Test
+	public void testGetMembers() throws Exception {
+		GroupDataDefinition testSubject;
+		Map<String, String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMembers();
+	}
+
+	
+	@Test
+	public void testSetMembers() throws Exception {
+		GroupDataDefinition testSubject;
+		Map<String, String> members = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMembers(members);
+	}
+
+	
+	@Test
+	public void testGetArtifacts() throws Exception {
+		GroupDataDefinition testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifacts();
+	}
+
+	
+	@Test
+	public void testSetArtifacts() throws Exception {
+		GroupDataDefinition testSubject;
+		List<String> artifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifacts(artifacts);
+	}
+
+	
+	@Test
+	public void testGetArtifactsUuid() throws Exception {
+		GroupDataDefinition testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactsUuid();
+	}
+
+	
+	@Test
+	public void testSetArtifactsUuid() throws Exception {
+		GroupDataDefinition testSubject;
+		List<String> artifactsUuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactsUuid(artifactsUuid);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		GroupDataDefinition testSubject;
+		List<PropertyDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		GroupDataDefinition testSubject;
+		List<PropertyDataDefinition> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testGetTypeUid() throws Exception {
+		GroupDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTypeUid();
+	}
+
+	
+	@Test
+	public void testSetTypeUid() throws Exception {
+		GroupDataDefinition testSubject;
+		String typeUid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTypeUid(typeUid);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GroupDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupInstanceDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupInstanceDataDefinitionTest.java
new file mode 100644
index 0000000000..4fc8d2417c
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupInstanceDataDefinitionTest.java
@@ -0,0 +1,486 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class GroupInstanceDataDefinitionTest {
+
+	private GroupInstanceDataDefinition createTestSubject() {
+		return new GroupInstanceDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetNormalizedName() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNormalizedName();
+	}
+
+	
+	@Test
+	public void testSetNormalizedName() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String normalizedName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNormalizedName(normalizedName);
+	}
+
+	
+	@Test
+	public void testGetGroupUid() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupUid();
+	}
+
+	
+	@Test
+	public void testSetGroupUid() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String groupUid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupUid(groupUid);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testGetPosX() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPosX();
+	}
+
+	
+	@Test
+	public void testSetPosX() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String posX = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPosX(posX);
+	}
+
+	
+	@Test
+	public void testGetPosY() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPosY();
+	}
+
+	
+	@Test
+	public void testSetPosY() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String posY = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPosY(posY);
+	}
+
+	
+	@Test
+	public void testGetPropertyValueCounter() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPropertyValueCounter();
+	}
+
+	
+	@Test
+	public void testSetPropertyValueCounter() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		Integer propertyValueCounter = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPropertyValueCounter(propertyValueCounter);
+	}
+
+	
+	@Test
+	public void testGetCustomizationUUID() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCustomizationUUID();
+	}
+
+	
+	@Test
+	public void testSetCustomizationUUID() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String customizationUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCustomizationUUID(customizationUUID);
+	}
+
+	
+	@Test
+	public void testGetGroupName() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupName();
+	}
+
+	
+	@Test
+	public void testSetGroupName() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String groupName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupName(groupName);
+	}
+
+	
+	@Test
+	public void testGetInvariantUUID() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInvariantUUID();
+	}
+
+	
+	@Test
+	public void testSetInvariantUUID() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String invariantUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInvariantUUID(invariantUUID);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetGroupUUID() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupUUID();
+	}
+
+	
+	@Test
+	public void testSetGroupUUID() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String groupUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupUUID(groupUUID);
+	}
+
+	
+	@Test
+	public void testGetVersion() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVersion();
+	}
+
+	
+	@Test
+	public void testSetVersion() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String version = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setVersion(version);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetArtifacts() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifacts();
+	}
+
+	
+	@Test
+	public void testSetArtifacts() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		List<String> artifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifacts(artifacts);
+	}
+
+	
+	@Test
+	public void testGetArtifactsUuid() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactsUuid();
+	}
+
+	
+	@Test
+	public void testSetArtifactsUuid() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		List<String> artifactsUuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactsUuid(artifactsUuid);
+	}
+
+	
+	@Test
+	public void testGetGroupInstanceArtifacts() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupInstanceArtifacts();
+	}
+
+	
+	@Test
+	public void testSetGroupInstanceArtifacts() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		List<String> groupInstanceArtifacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupInstanceArtifacts(groupInstanceArtifacts);
+	}
+
+	
+	@Test
+	public void testGetGroupInstanceArtifactsUuid() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupInstanceArtifactsUuid();
+	}
+
+	
+	@Test
+	public void testSetGroupInstanceArtifactsUuid() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		List<String> groupInstanceArtifactsUuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupInstanceArtifactsUuid(groupInstanceArtifactsUuid);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		List<PropertyDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		GroupInstanceDataDefinition testSubject;
+		List<PropertyDataDefinition> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testGetSerialversionuid() throws Exception {
+		long result;
+
+		// default test
+		result = GroupInstanceDataDefinition.getSerialversionuid();
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupTypeDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupTypeDataDefinitionTest.java
new file mode 100644
index 0000000000..aec794abd0
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupTypeDataDefinitionTest.java
@@ -0,0 +1,247 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class GroupTypeDataDefinitionTest {
+
+	private GroupTypeDataDefinition createTestSubject() {
+		return new GroupTypeDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetVersion() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVersion();
+	}
+
+	
+	@Test
+	public void testSetVersion() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		String version = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setVersion(version);
+	}
+
+	
+	@Test
+	public void testGetMembers() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMembers();
+	}
+
+	
+	@Test
+	public void testSetMembers() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		List<String> members = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMembers(members);
+	}
+
+	
+	@Test
+	public void testGetMetadata() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		Map<String, String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMetadata();
+	}
+
+	
+	@Test
+	public void testSetMetadata() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		Map<String, String> metadata = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMetadata(metadata);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetDerivedFrom() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerivedFrom();
+	}
+
+	
+	@Test
+	public void testSetDerivedFrom() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		String derivedFrom = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerivedFrom(derivedFrom);
+	}
+
+	
+	@Test
+	public void testIsHighestVersion() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isHighestVersion();
+	}
+
+	
+	@Test
+	public void testSetHighestVersion() throws Exception {
+		GroupTypeDataDefinition testSubject;
+		boolean isLatestVersion = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setHighestVersion(isLatestVersion);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/HeatParameterDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/HeatParameterDataDefinitionTest.java
new file mode 100644
index 0000000000..b4d98363a9
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/HeatParameterDataDefinitionTest.java
@@ -0,0 +1,182 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class HeatParameterDataDefinitionTest {
+
+	private HeatParameterDataDefinition createTestSubject() {
+		return new HeatParameterDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		HeatParameterDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		HeatParameterDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		HeatParameterDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		HeatParameterDataDefinition testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		HeatParameterDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		HeatParameterDataDefinition testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		HeatParameterDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		HeatParameterDataDefinition testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetCurrentValue() throws Exception {
+		HeatParameterDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrentValue();
+	}
+
+	
+	@Test
+	public void testSetCurrentValue() throws Exception {
+		HeatParameterDataDefinition testSubject;
+		String currentValue = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrentValue(currentValue);
+	}
+
+	
+	@Test
+	public void testGetDefaultValue() throws Exception {
+		HeatParameterDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDefaultValue();
+	}
+
+	
+	@Test
+	public void testSetDefaultValue() throws Exception {
+		HeatParameterDataDefinition testSubject;
+		String defaultValue = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDefaultValue(defaultValue);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		HeatParameterDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		HeatParameterDataDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		HeatParameterDataDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		obj = null;
+		result = testSubject.equals(obj);
+		Assert.assertEquals(false, result);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InputDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InputDataDefinitionTest.java
new file mode 100644
index 0000000000..05e0372b83
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InputDataDefinitionTest.java
@@ -0,0 +1,79 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class InputDataDefinitionTest {
+
+	private InputDataDefinition createTestSubject() {
+		return new InputDataDefinition();
+	}
+
+	
+	@Test
+	public void testIsHidden() throws Exception {
+		InputDataDefinition testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isHidden();
+	}
+
+	
+	@Test
+	public void testSetHidden() throws Exception {
+		InputDataDefinition testSubject;
+		Boolean hidden = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setHidden(hidden);
+	}
+
+	
+	@Test
+	public void testIsImmutable() throws Exception {
+		InputDataDefinition testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isImmutable();
+	}
+
+	
+	@Test
+	public void testSetImmutable() throws Exception {
+		InputDataDefinition testSubject;
+		Boolean immutable = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setImmutable(immutable);
+	}
+
+	
+	@Test
+	public void testGetLabel() throws Exception {
+		InputDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLabel();
+	}
+
+	
+	@Test
+	public void testSetLabel() throws Exception {
+		InputDataDefinition testSubject;
+		String label = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLabel(label);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InputsValueDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InputsValueDataDefinitionTest.java
new file mode 100644
index 0000000000..fa37a425b9
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InputsValueDataDefinitionTest.java
@@ -0,0 +1,79 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class InputsValueDataDefinitionTest {
+
+	private InputsValueDataDefinition createTestSubject() {
+		return new InputsValueDataDefinition("", "");
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		InputsValueDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		InputsValueDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		InputsValueDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		InputsValueDataDefinition testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetValue() throws Exception {
+		InputsValueDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValue();
+	}
+
+	
+	@Test
+	public void testSetValue() throws Exception {
+		InputsValueDataDefinition testSubject;
+		String value = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValue(value);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InterfaceDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InterfaceDataDefinitionTest.java
new file mode 100644
index 0000000000..e54ba4b175
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InterfaceDataDefinitionTest.java
@@ -0,0 +1,147 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class InterfaceDataDefinitionTest {
+
+	private InterfaceDataDefinition createTestSubject() {
+		return new InterfaceDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		InterfaceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		InterfaceDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		InterfaceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		InterfaceDataDefinition testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetCreationDate() throws Exception {
+		InterfaceDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationDate();
+	}
+
+	
+	@Test
+	public void testSetCreationDate() throws Exception {
+		InterfaceDataDefinition testSubject;
+		Long creationDate = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationDate(creationDate);
+	}
+
+	
+	@Test
+	public void testGetLastUpdateDate() throws Exception {
+		InterfaceDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastUpdateDate();
+	}
+
+	
+	@Test
+	public void testSetLastUpdateDate() throws Exception {
+		InterfaceDataDefinition testSubject;
+		Long lastUpdateDate = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastUpdateDate(lastUpdateDate);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		InterfaceDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		InterfaceDataDefinition testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetOperations() throws Exception {
+		InterfaceDataDefinition testSubject;
+		Map<String, OperationDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getOperations();
+	}
+
+	
+	@Test
+	public void testSetOperations() throws Exception {
+		InterfaceDataDefinition testSubject;
+		Map<String, OperationDataDefinition> operations = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setOperations(operations);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListCapabilityDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListCapabilityDataDefinitionTest.java
new file mode 100644
index 0000000000..5ee6d81c09
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListCapabilityDataDefinitionTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ListCapabilityDataDefinitionTest {
+
+	private ListCapabilityDataDefinition createTestSubject() {
+		List list = new ArrayList<>();
+		return new ListCapabilityDataDefinition(list);
+	}
+
+	
+	@Test
+	public void testGetListToscaDataDefinition() throws Exception {
+		ListCapabilityDataDefinition testSubject;
+		List<CapabilityDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getListToscaDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetListToscaDataDefinition() throws Exception {
+		ListCapabilityDataDefinition testSubject;
+		List<CapabilityDataDefinition> listToscaDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setListToscaDataDefinition(listToscaDataDefinition);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListDataDefinitionTest.java
new file mode 100644
index 0000000000..29d465b074
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListDataDefinitionTest.java
@@ -0,0 +1,47 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ListDataDefinitionTest {
+
+	private ListDataDefinition createTestSubject() {
+		List list = new ArrayList<>();
+		return new ListDataDefinition(list);
+	}
+
+	
+	
+
+
+	
+	@Test
+	public void testSetOwnerIdIfEmpty() throws Exception {
+		ListDataDefinition testSubject;
+		String ownerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setOwnerIdIfEmpty(ownerId);
+	}
+
+	
+
+
+	
+	@Test
+	public void testFindUidMatch() throws Exception {
+		ListDataDefinition testSubject;
+		String uid = "";
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.findUidMatch(uid);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListMapPropertiesDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListMapPropertiesDataDefinitionTest.java
new file mode 100644
index 0000000000..102990e0c0
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListMapPropertiesDataDefinitionTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ListMapPropertiesDataDefinitionTest {
+
+	private ListMapPropertiesDataDefinition createTestSubject() {
+		List list = new ArrayList<>();
+		return new ListMapPropertiesDataDefinition(list);
+	}
+
+	
+	@Test
+	public void testGetListToscaDataDefinition() throws Exception {
+		ListMapPropertiesDataDefinition testSubject;
+		List<MapPropertiesDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getListToscaDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetMapToscaDataDefinition() throws Exception {
+		ListMapPropertiesDataDefinition testSubject;
+		List<MapPropertiesDataDefinition> listToscaDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMapToscaDataDefinition(listToscaDataDefinition);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListRequirementDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListRequirementDataDefinitionTest.java
new file mode 100644
index 0000000000..645b25d010
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListRequirementDataDefinitionTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ListRequirementDataDefinitionTest {
+
+	private ListRequirementDataDefinition createTestSubject() {
+		List list = new ArrayList<>();
+		return new ListRequirementDataDefinition(list);
+	}
+
+	
+	@Test
+	public void testGetListToscaDataDefinition() throws Exception {
+		ListRequirementDataDefinition testSubject;
+		List<RequirementDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getListToscaDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetListToscaDataDefinition() throws Exception {
+		ListRequirementDataDefinition testSubject;
+		List<RequirementDataDefinition> listToscaDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setListToscaDataDefinition(listToscaDataDefinition);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapArtifactDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapArtifactDataDefinitionTest.java
new file mode 100644
index 0000000000..bc026ff085
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapArtifactDataDefinitionTest.java
@@ -0,0 +1,63 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class MapArtifactDataDefinitionTest {
+
+	private MapArtifactDataDefinition createTestSubject() {
+		
+		Map map = new HashMap<>();
+		
+		return new MapArtifactDataDefinition(new MapDataDefinition(map), "");
+	}
+
+	
+	@Test
+	public void testGetMapToscaDataDefinition() throws Exception {
+		MapArtifactDataDefinition testSubject;
+		Map<String, ArtifactDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMapToscaDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetMapToscaDataDefinition() throws Exception {
+		MapArtifactDataDefinition testSubject;
+		Map<String, ArtifactDataDefinition> mapToscaDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMapToscaDataDefinition(mapToscaDataDefinition);
+	}
+
+	
+	@Test
+	public void testGetParentName() throws Exception {
+		MapArtifactDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getParentName();
+	}
+
+	
+	@Test
+	public void testSetParentName() throws Exception {
+		MapArtifactDataDefinition testSubject;
+		String parentName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setParentName(parentName);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapDataDefinitionTest.java
new file mode 100644
index 0000000000..5c7b071f47
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapDataDefinitionTest.java
@@ -0,0 +1,60 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class MapDataDefinitionTest {
+
+	private MapDataDefinition createTestSubject() {
+		Map myMap = new HashMap<>();
+		return new MapDataDefinition(myMap);
+	}
+
+	
+
+
+	
+
+
+	
+	@Test
+	public void testDelete() throws Exception {
+		MapDataDefinition testSubject;
+		String key = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.delete(key);
+	}
+
+	
+
+
+	
+	@Test
+	public void testSetOwnerIdIfEmpty() throws Exception {
+		MapDataDefinition testSubject;
+		String ownerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setOwnerIdIfEmpty(ownerId);
+	}
+
+	
+	@Test
+	public void testFindKeyByItemUidMatch() throws Exception {
+		MapDataDefinition testSubject;
+		String uid = "";
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.findKeyByItemUidMatch(uid);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapListCapabiltyDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapListCapabiltyDataDefinitionTest.java
new file mode 100644
index 0000000000..b0ecee8d05
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapListCapabiltyDataDefinitionTest.java
@@ -0,0 +1,40 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class MapListCapabiltyDataDefinitionTest {
+
+	private MapListCapabiltyDataDefinition createTestSubject() {
+		Map map = new HashMap<>();
+		return new MapListCapabiltyDataDefinition(map);
+	}
+
+	
+	@Test
+	public void testGetMapToscaDataDefinition() throws Exception {
+		MapListCapabiltyDataDefinition testSubject;
+		Map<String, ListCapabilityDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMapToscaDataDefinition();
+	}
+
+	
+	@Test
+	public void testAdd() throws Exception {
+		MapListCapabiltyDataDefinition testSubject;
+		String key = "";
+		CapabilityDataDefinition value = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.add(key, value);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapListRequirementDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapListRequirementDataDefinitionTest.java
new file mode 100644
index 0000000000..8c352b5337
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapListRequirementDataDefinitionTest.java
@@ -0,0 +1,42 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class MapListRequirementDataDefinitionTest {
+
+	private MapListRequirementDataDefinition createTestSubject() {
+		Map map = new HashMap<>();
+		return new MapListRequirementDataDefinition(map);
+	}
+
+	
+	@Test
+	public void testGetMapToscaDataDefinition() throws Exception {
+		MapListRequirementDataDefinition testSubject;
+		Map<String, ListRequirementDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMapToscaDataDefinition();
+	}
+
+	
+	@Test
+	public void testAdd() throws Exception {
+		MapListRequirementDataDefinition testSubject;
+		String key = "";
+		RequirementDataDefinition value = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.add(key, value);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapPropertiesDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapPropertiesDataDefinitionTest.java
new file mode 100644
index 0000000000..97027b3d33
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapPropertiesDataDefinitionTest.java
@@ -0,0 +1,61 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class MapPropertiesDataDefinitionTest {
+
+	private MapPropertiesDataDefinition createTestSubject() {
+		Map map = new HashMap<>();
+		return new MapPropertiesDataDefinition(new MapDataDefinition(map), "");
+	}
+
+	
+	@Test
+	public void testGetMapToscaDataDefinition() throws Exception {
+		MapPropertiesDataDefinition testSubject;
+		Map<String, PropertyDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMapToscaDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetMapToscaDataDefinition() throws Exception {
+		MapPropertiesDataDefinition testSubject;
+		Map<String, PropertyDataDefinition> mapToscaDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMapToscaDataDefinition(mapToscaDataDefinition);
+	}
+
+	
+	@Test
+	public void testGetParentName() throws Exception {
+		MapPropertiesDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getParentName();
+	}
+
+	
+	@Test
+	public void testSetParentName() throws Exception {
+		MapPropertiesDataDefinition testSubject;
+		String parentName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setParentName(parentName);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/OperationDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/OperationDataDefinitionTest.java
new file mode 100644
index 0000000000..9169cdf019
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/OperationDataDefinitionTest.java
@@ -0,0 +1,147 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class OperationDataDefinitionTest {
+
+	private OperationDataDefinition createTestSubject() {
+		return new OperationDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		OperationDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		OperationDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetCreationDate() throws Exception {
+		OperationDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationDate();
+	}
+
+	
+	@Test
+	public void testSetCreationDate() throws Exception {
+		OperationDataDefinition testSubject;
+		Long creationDate = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationDate(creationDate);
+	}
+
+	
+	@Test
+	public void testGetLastUpdateDate() throws Exception {
+		OperationDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastUpdateDate();
+	}
+
+	
+	@Test
+	public void testSetLastUpdateDate() throws Exception {
+		OperationDataDefinition testSubject;
+		Long lastUpdateDate = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastUpdateDate(lastUpdateDate);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		OperationDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		OperationDataDefinition testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetImplementation() throws Exception {
+		OperationDataDefinition testSubject;
+		ArtifactDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getImplementation();
+	}
+
+	
+	@Test
+	public void testSetImplementation() throws Exception {
+		OperationDataDefinition testSubject;
+		ArtifactDataDefinition implementation = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setImplementation(implementation);
+	}
+
+	
+	@Test
+	public void testGetInputs() throws Exception {
+		OperationDataDefinition testSubject;
+		Map<String, PropertyDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInputs();
+	}
+
+	
+	@Test
+	public void testSetInputs() throws Exception {
+		OperationDataDefinition testSubject;
+		Map<String, PropertyDataDefinition> inputs = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInputs(inputs);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PolicyTypeDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PolicyTypeDataDefinitionTest.java
new file mode 100644
index 0000000000..57fda65334
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PolicyTypeDataDefinitionTest.java
@@ -0,0 +1,247 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class PolicyTypeDataDefinitionTest {
+
+	private PolicyTypeDataDefinition createTestSubject() {
+		return new PolicyTypeDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetVersion() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getVersion();
+	}
+
+	
+	@Test
+	public void testSetVersion() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		String version = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setVersion(version);
+	}
+
+	
+	@Test
+	public void testGetTargets() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTargets();
+	}
+
+	
+	@Test
+	public void testSetTargets() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		List<String> members = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTargets(members);
+	}
+
+	
+	@Test
+	public void testGetMetadata() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		Map<String, String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMetadata();
+	}
+
+	
+	@Test
+	public void testSetMetadata() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		Map<String, String> metadata = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMetadata(metadata);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetDerivedFrom() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDerivedFrom();
+	}
+
+	
+	@Test
+	public void testSetDerivedFrom() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		String derivedFrom = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDerivedFrom(derivedFrom);
+	}
+
+	
+	@Test
+	public void testIsHighestVersion() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isHighestVersion();
+	}
+
+	
+	@Test
+	public void testSetHighestVersion() throws Exception {
+		PolicyTypeDataDefinition testSubject;
+		boolean isLatestVersion = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setHighestVersion(isLatestVersion);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ProductMetadataDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ProductMetadataDataDefinitionTest.java
new file mode 100644
index 0000000000..49ad568e3a
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ProductMetadataDataDefinitionTest.java
@@ -0,0 +1,132 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ProductMetadataDataDefinitionTest {
+
+	private ProductMetadataDataDefinition createTestSubject() {
+		return new ProductMetadataDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetIsActive() throws Exception {
+		ProductMetadataDataDefinition testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIsActive();
+	}
+
+	
+	@Test
+	public void testSetIsActive() throws Exception {
+		ProductMetadataDataDefinition testSubject;
+		Boolean active = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIsActive(active);
+	}
+
+	
+	@Test
+	public void testGetContacts() throws Exception {
+		ProductMetadataDataDefinition testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getContacts();
+	}
+
+	
+	@Test
+	public void testSetContacts() throws Exception {
+		ProductMetadataDataDefinition testSubject;
+		List<String> contacts = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setContacts(contacts);
+	}
+
+	
+	@Test
+	public void testAddContact() throws Exception {
+		ProductMetadataDataDefinition testSubject;
+		String contact = "";
+
+		// test 1
+		testSubject = createTestSubject();
+		contact = null;
+		testSubject.addContact(contact);
+
+		// test 2
+		testSubject = createTestSubject();
+		contact = "";
+		testSubject.addContact(contact);
+	}
+
+	
+	@Test
+	public void testGetFullName() throws Exception {
+		ProductMetadataDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFullName();
+	}
+
+	
+	@Test
+	public void testSetFullName() throws Exception {
+		ProductMetadataDataDefinition testSubject;
+		String fullName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setFullName(fullName);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ProductMetadataDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		ProductMetadataDataDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		ProductMetadataDataDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.equals(obj);
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinitionTest.java
new file mode 100644
index 0000000000..d03a44d384
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinitionTest.java
@@ -0,0 +1,511 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
+
+
+public class PropertyDataDefinitionTest {
+
+	private PropertyDataDefinition createTestSubject() {
+		return new PropertyDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetInputPath() throws Exception {
+		PropertyDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInputPath();
+	}
+
+	
+	@Test
+	public void testSetInputPath() throws Exception {
+		PropertyDataDefinition testSubject;
+		String inputPath = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInputPath(inputPath);
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		PropertyDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		PropertyDataDefinition testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetValue() throws Exception {
+		PropertyDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValue();
+	}
+
+	
+	@Test
+	public void testSetValue() throws Exception {
+		PropertyDataDefinition testSubject;
+		String value = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValue(value);
+	}
+
+	
+	@Test
+	public void testIsDefinition() throws Exception {
+		PropertyDataDefinition testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isDefinition();
+	}
+
+	
+	@Test
+	public void testSetDefinition() throws Exception {
+		PropertyDataDefinition testSubject;
+		boolean definition = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDefinition(definition);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		PropertyDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testGetDefaultValue() throws Exception {
+		PropertyDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDefaultValue();
+	}
+
+	
+	@Test
+	public void testSetDefaultValue() throws Exception {
+		PropertyDataDefinition testSubject;
+		String defaultValue = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDefaultValue(defaultValue);
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		PropertyDataDefinition testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testIsRequired() throws Exception {
+		PropertyDataDefinition testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isRequired();
+	}
+
+	
+	@Test
+	public void testSetRequired() throws Exception {
+		PropertyDataDefinition testSubject;
+		Boolean required = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequired(required);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		PropertyDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		PropertyDataDefinition testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testIsPassword() throws Exception {
+		PropertyDataDefinition testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isPassword();
+	}
+
+	
+	@Test
+	public void testSetPassword() throws Exception {
+		PropertyDataDefinition testSubject;
+		boolean password = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPassword(password);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		PropertyDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		PropertyDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetSchema() throws Exception {
+		PropertyDataDefinition testSubject;
+		SchemaDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getSchema();
+	}
+
+	
+	@Test
+	public void testSetSchema() throws Exception {
+		PropertyDataDefinition testSubject;
+		SchemaDefinition entrySchema = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setSchema(entrySchema);
+	}
+
+	
+	@Test
+	public void testGetLabel() throws Exception {
+		PropertyDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLabel();
+	}
+
+	
+	@Test
+	public void testSetLabel() throws Exception {
+		PropertyDataDefinition testSubject;
+		String label = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLabel(label);
+	}
+
+	
+	@Test
+	public void testIsHidden() throws Exception {
+		PropertyDataDefinition testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isHidden();
+	}
+
+	
+	@Test
+	public void testSetHidden() throws Exception {
+		PropertyDataDefinition testSubject;
+		Boolean hidden = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setHidden(hidden);
+	}
+
+	
+	@Test
+	public void testIsImmutable() throws Exception {
+		PropertyDataDefinition testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isImmutable();
+	}
+
+	
+	@Test
+	public void testSetImmutable() throws Exception {
+		PropertyDataDefinition testSubject;
+		Boolean immutable = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setImmutable(immutable);
+	}
+
+	
+	@Test
+	public void testGetParentUniqueId() throws Exception {
+		PropertyDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getParentUniqueId();
+	}
+
+	
+	@Test
+	public void testSetParentUniqueId() throws Exception {
+		PropertyDataDefinition testSubject;
+		String parentUniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setParentUniqueId(parentUniqueId);
+	}
+
+	
+	@Test
+	public void testGetGetInputValues() throws Exception {
+		PropertyDataDefinition testSubject;
+		List<GetInputValueDataDefinition> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGetInputValues();
+	}
+
+	
+	@Test
+	public void testSetGetInputValues() throws Exception {
+		PropertyDataDefinition testSubject;
+		List<GetInputValueDataDefinition> getInputValues = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGetInputValues(getInputValues);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		PropertyDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		PropertyDataDefinition testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetInputId() throws Exception {
+		PropertyDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInputId();
+	}
+
+	
+	@Test
+	public void testSetInputId() throws Exception {
+		PropertyDataDefinition testSubject;
+		String inputId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInputId(inputId);
+	}
+
+	
+	@Test
+	public void testGetInstanceUniqueId() throws Exception {
+		PropertyDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInstanceUniqueId();
+	}
+
+	
+	@Test
+	public void testSetInstanceUniqueId() throws Exception {
+		PropertyDataDefinition testSubject;
+		String instanceUniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInstanceUniqueId(instanceUniqueId);
+	}
+
+	
+	@Test
+	public void testGetPropertyId() throws Exception {
+		PropertyDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPropertyId();
+	}
+
+	
+	@Test
+	public void testSetPropertyId() throws Exception {
+		PropertyDataDefinition testSubject;
+		String propertyId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPropertyId(propertyId);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		PropertyDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		PropertyDataDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		PropertyDataDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		obj = null;
+		result = testSubject.equals(obj);
+		Assert.assertEquals(false, result);
+	}
+
+	
+
+	
+
+
+	
+
+
+	
+	@Test
+	public void testConvertPropertyDataToInstancePropertyData() throws Exception {
+		PropertyDataDefinition testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.convertPropertyDataToInstancePropertyData();
+	}
+}
\ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/RequirementDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/RequirementDataDefinitionTest.java
new file mode 100644
index 0000000000..e5da90f2ee
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/RequirementDataDefinitionTest.java
@@ -0,0 +1,349 @@
+package org.openecomp.sdc.be.datatypes.elements;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class RequirementDataDefinitionTest {
+
+	private RequirementDataDefinition createTestSubject() {
+		return new RequirementDataDefinition();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		RequirementDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		RequirementDataDefinition testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		RequirementDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		RequirementDataDefinition testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetParentName() throws Exception {
+		RequirementDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getParentName();
+	}
+
+	
+	@Test
+	public void testSetParentName() throws Exception {
+		RequirementDataDefinition testSubject;
+		String parentName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setParentName(parentName);
+	}
+
+	
+	@Test
+	public void testGetCapability() throws Exception {
+		RequirementDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapability();
+	}
+
+	
+	@Test
+	public void testSetCapability() throws Exception {
+		RequirementDataDefinition testSubject;
+		String capability = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapability(capability);
+	}
+
+	
+	@Test
+	public void testGetNode() throws Exception {
+		RequirementDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNode();
+	}
+
+	
+	@Test
+	public void testSetNode() throws Exception {
+		RequirementDataDefinition testSubject;
+		String node = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNode(node);
+	}
+
+	
+	@Test
+	public void testGetRelationship() throws Exception {
+		RequirementDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRelationship();
+	}
+
+	
+	@Test
+	public void testSetRelationship() throws Exception {
+		RequirementDataDefinition testSubject;
+		String relationship = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRelationship(relationship);
+	}
+
+	
+	@Test
+	public void testGetOwnerId() throws Exception {
+		RequirementDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getOwnerId();
+	}
+
+	
+	@Test
+	public void testSetOwnerId() throws Exception {
+		RequirementDataDefinition testSubject;
+		String ownerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setOwnerId(ownerId);
+	}
+
+	
+	@Test
+	public void testGetOwnerName() throws Exception {
+		RequirementDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getOwnerName();
+	}
+
+	
+	@Test
+	public void testSetOwnerName() throws Exception {
+		RequirementDataDefinition testSubject;
+		String ownerName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setOwnerName(ownerName);
+	}
+
+	
+	@Test
+	public void testGetMinOccurrences() throws Exception {
+		RequirementDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMinOccurrences();
+	}
+
+	
+	@Test
+	public void testSetMinOccurrences() throws Exception {
+		RequirementDataDefinition testSubject;
+		String minOccurrences = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMinOccurrences(minOccurrences);
+	}
+
+	
+	@Test
+	public void testGetLeftOccurrences() throws Exception {
+		RequirementDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLeftOccurrences();
+	}
+
+	
+	@Test
+	public void testSetLeftOccurrences() throws Exception {
+		RequirementDataDefinition testSubject;
+		String leftOccurrences = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLeftOccurrences(leftOccurrences);
+	}
+
+	
+	@Test
+	public void testGetMaxOccurrences() throws Exception {
+		RequirementDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMaxOccurrences();
+	}
+
+	
+	@Test
+	public void testSetMaxOccurrences() throws Exception {
+		RequirementDataDefinition testSubject;
+		String maxOccurrences = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMaxOccurrences(maxOccurrences);
+	}
+
+	
+	@Test
+	public void testSetPath() throws Exception {
+		RequirementDataDefinition testSubject;
+		List<String> path = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPath(path);
+	}
+
+	
+	@Test
+	public void testGetPath() throws Exception {
+		RequirementDataDefinition testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPath();
+	}
+
+	
+	@Test
+	public void testSetSource() throws Exception {
+		RequirementDataDefinition testSubject;
+		String source = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setSource(source);
+	}
+
+	
+	@Test
+	public void testGetSource() throws Exception {
+		RequirementDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getSource();
+	}
+
+	
+	@Test
+	public void testAddToPath() throws Exception {
+		RequirementDataDefinition testSubject;
+		String elementInPath = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.addToPath(elementInPath);
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		RequirementDataDefinition testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		RequirementDataDefinition testSubject;
+		Object obj = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		obj = null;
+		result = testSubject.equals(obj);
+		Assert.assertEquals(false, result);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RequirementDataDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file