add unit tests to BE components

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

51 files changed, 8523 insertions, 0 deletions

diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterDataTest.java
new file mode 100644
index 0000000000..7624c059c9
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterDataTest.java
@@ -0,0 +1,115 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterDataDefinition;
+
+
+public class AdditionalInfoParameterDataTest {
+
+	private AdditionalInfoParameterData createTestSubject() {
+		return new AdditionalInfoParameterData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetAdditionalInfoParameterDataDefinition() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		AdditionalInfoParameterDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAdditionalInfoParameterDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetAdditionalInfoParameterDataDefinition() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		AdditionalInfoParameterDataDefinition additionalInfoParameterDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAdditionalInfoParameterDataDefinition(additionalInfoParameterDataDefinition);
+	}
+
+	
+	@Test
+	public void testGetParameters() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		Map<String, String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getParameters();
+	}
+
+	
+	@Test
+	public void testSetParameters() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		Map<String, String> parameters = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setParameters(parameters);
+	}
+
+	
+	@Test
+	public void testGetIdToKey() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		Map<String, String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIdToKey();
+	}
+
+	
+	@Test
+	public void testSetIdToKey() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		Map<String, String> idToKey = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIdToKey(idToKey);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		AdditionalInfoParameterData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ArtifactDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ArtifactDataTest.java
new file mode 100644
index 0000000000..4d6bfbf4cd
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ArtifactDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
+
+
+public class ArtifactDataTest {
+
+	private ArtifactData createTestSubject() {
+		return new ArtifactData();
+	}
+
+	
+	@Test
+	public void testGetArtifactDataDefinition() throws Exception {
+		ArtifactData testSubject;
+		ArtifactDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetArtifactDataDefinition() throws Exception {
+		ArtifactData testSubject;
+		ArtifactDataDefinition artifactDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactDataDefinition(artifactDataDefinition);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		ArtifactData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		ArtifactData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ArtifactData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeDataTest.java
new file mode 100644
index 0000000000..4d684f7f46
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+
+
+public class AttributeDataTest {
+
+	private AttributeData createTestSubject() {
+		return new AttributeData();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		AttributeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		AttributeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetAttributeDataDefinition() throws Exception {
+		AttributeData testSubject;
+		PropertyDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAttributeDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetAttributeDataDefinition() throws Exception {
+		AttributeData testSubject;
+		PropertyDataDefinition attributeDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAttributeDataDefinition(attributeDataDefinition);
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		AttributeData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeValueDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeValueDataTest.java
new file mode 100644
index 0000000000..dcfdb52024
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeValueDataTest.java
@@ -0,0 +1,169 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class AttributeValueDataTest {
+
+	private AttributeValueData createTestSubject() {
+		return new AttributeValueData();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		AttributeValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		AttributeValueData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		AttributeValueData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		AttributeValueData testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		AttributeValueData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		AttributeValueData testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		AttributeValueData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		AttributeValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testIsHidden() throws Exception {
+		AttributeValueData testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isHidden();
+	}
+
+	
+	@Test
+	public void testSetHidden() throws Exception {
+		AttributeValueData testSubject;
+		Boolean hidden = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setHidden(hidden);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		AttributeValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		AttributeValueData testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetValue() throws Exception {
+		AttributeValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValue();
+	}
+
+	
+	@Test
+	public void testSetValue() throws Exception {
+		AttributeValueData testSubject;
+		String value = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValue(value);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityDataTest.java
new file mode 100644
index 0000000000..5e709812ac
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityDataTest.java
@@ -0,0 +1,226 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class CapabilityDataTest {
+
+	private CapabilityData createTestSubject() {
+		return new CapabilityData();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		CapabilityData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		CapabilityData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		CapabilityData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		CapabilityData testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		CapabilityData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		CapabilityData testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetValidSourceTypes() throws Exception {
+		CapabilityData testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValidSourceTypes();
+	}
+
+	
+	@Test
+	public void testSetValidSourceTypes() throws Exception {
+		CapabilityData testSubject;
+		List<String> validSourceTypes = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValidSourceTypes(validSourceTypes);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		CapabilityData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		CapabilityData testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		CapabilityData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		CapabilityData testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testGetMinOccurrences() throws Exception {
+		CapabilityData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMinOccurrences();
+	}
+
+	
+	@Test
+	public void testSetMinOccurrences() throws Exception {
+		CapabilityData testSubject;
+		String minOccurrences = "";
+
+		// test 1
+		testSubject = createTestSubject();
+		minOccurrences = null;
+		testSubject.setMinOccurrences(minOccurrences);
+
+		// test 2
+		testSubject = createTestSubject();
+		minOccurrences = "";
+		testSubject.setMinOccurrences(minOccurrences);
+	}
+
+	
+	@Test
+	public void testGetMaxOccurrences() throws Exception {
+		CapabilityData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMaxOccurrences();
+	}
+
+	
+	@Test
+	public void testSetMaxOccurrences() throws Exception {
+		CapabilityData testSubject;
+		String maxOccurrences = "";
+
+		// test 1
+		testSubject = createTestSubject();
+		maxOccurrences = null;
+		testSubject.setMaxOccurrences(maxOccurrences);
+
+		// test 2
+		testSubject = createTestSubject();
+		maxOccurrences = "";
+		testSubject.setMaxOccurrences(maxOccurrences);
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		CapabilityData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		CapabilityData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityInstDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityInstDataTest.java
new file mode 100644
index 0000000000..ca86edf0f2
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityInstDataTest.java
@@ -0,0 +1,126 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class CapabilityInstDataTest {
+
+	private CapabilityInstData createTestSubject() {
+		return new CapabilityInstData();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		CapabilityInstData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		CapabilityInstData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		CapabilityInstData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		CapabilityInstData testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		CapabilityInstData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		CapabilityInstData testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		CapabilityInstData testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		CapabilityInstData testSubject;
+		List<String> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		CapabilityInstData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		CapabilityInstData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityTypeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityTypeDataTest.java
new file mode 100644
index 0000000000..7d4cc5b29b
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityTypeDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.CapabilityTypeDataDefinition;
+
+
+public class CapabilityTypeDataTest {
+
+	private CapabilityTypeData createTestSubject() {
+		return new CapabilityTypeData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		CapabilityTypeData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetCapabilityTypeDataDefinition() throws Exception {
+		CapabilityTypeData testSubject;
+		CapabilityTypeDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilityTypeDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetCapabilityTypeDataDefinition() throws Exception {
+		CapabilityTypeData testSubject;
+		CapabilityTypeDataDefinition capabilityTypeDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilityTypeDataDefinition(capabilityTypeDataDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		CapabilityTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		CapabilityTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentCacheDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentCacheDataTest.java
new file mode 100644
index 0000000000..0c9ff52d69
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentCacheDataTest.java
@@ -0,0 +1,156 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Date;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ComponentCacheDataTest {
+
+	private ComponentCacheData createTestSubject() {
+		return new ComponentCacheData();
+	}
+
+	
+	@Test
+	public void testGetDataAsArray() throws Exception {
+		ComponentCacheData testSubject;
+		byte[] result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDataAsArray();
+	}
+
+	
+	@Test
+	public void testSetDataAsArray() throws Exception {
+		ComponentCacheData testSubject;
+		byte[] data = new byte[] { ' ' };
+
+		// test 1
+		testSubject = createTestSubject();
+		data = null;
+		testSubject.setDataAsArray(data);
+
+		// test 2
+		testSubject = createTestSubject();
+		data = new byte[] { ' ' };
+		testSubject.setDataAsArray(data);
+	}
+
+	
+
+
+	
+	@Test
+	public void testGetId() throws Exception {
+		ComponentCacheData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getId();
+	}
+
+	
+	@Test
+	public void testSetId() throws Exception {
+		ComponentCacheData testSubject;
+		String id = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setId(id);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		ComponentCacheData testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		ComponentCacheData testSubject;
+		Date modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		ComponentCacheData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		ComponentCacheData testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetIsDirty() throws Exception {
+		ComponentCacheData testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIsDirty();
+	}
+
+	
+	@Test
+	public void testSetIsDirty() throws Exception {
+		ComponentCacheData testSubject;
+		boolean isDirty = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIsDirty(isDirty);
+	}
+
+	
+	@Test
+	public void testGetIsZipped() throws Exception {
+		ComponentCacheData testSubject;
+		boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIsZipped();
+	}
+
+	
+	@Test
+	public void testSetIsZipped() throws Exception {
+		ComponentCacheData testSubject;
+		boolean isZipped = false;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIsZipped(isZipped);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentInstanceDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentInstanceDataTest.java
new file mode 100644
index 0000000000..761f113511
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentInstanceDataTest.java
@@ -0,0 +1,126 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.ComponentInstanceDataDefinition;
+
+
+public class ComponentInstanceDataTest {
+
+	private ComponentInstanceData createTestSubject() {
+		return new ComponentInstanceData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		ComponentInstanceData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		ComponentInstanceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		ComponentInstanceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testGetUniqueIdKey() throws Exception {
+		ComponentInstanceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueIdKey();
+	}
+
+	
+	@Test
+	public void testGetComponentInstDataDefinition() throws Exception {
+		ComponentInstanceData testSubject;
+		ComponentInstanceDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComponentInstDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetComponentInstDataDefinition() throws Exception {
+		ComponentInstanceData testSubject;
+		ComponentInstanceDataDefinition componentInstDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstDataDefinition(componentInstDataDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ComponentInstanceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetGroupInstanceCounter() throws Exception {
+		ComponentInstanceData testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupInstanceCounter();
+	}
+
+	
+	@Test
+	public void testSetGroupInstanceCounter() throws Exception {
+		ComponentInstanceData testSubject;
+		Integer componentInstanceCounter = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupInstanceCounter(componentInstanceCounter);
+	}
+
+	
+	@Test
+	public void testIncreaseAndGetGroupInstanceCounter() throws Exception {
+		ComponentInstanceData testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.increaseAndGetGroupInstanceCounter();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ConsumerDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ConsumerDataTest.java
new file mode 100644
index 0000000000..68dddbfe25
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ConsumerDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
+
+
+public class ConsumerDataTest {
+
+	private ConsumerData createTestSubject() {
+		return new ConsumerData();
+	}
+
+	
+	@Test
+	public void testGetUniqueIdKey() throws Exception {
+		ConsumerData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueIdKey();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		ConsumerData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetConsumerDataDefinition() throws Exception {
+		ConsumerData testSubject;
+		ConsumerDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerDataDefinition();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		ConsumerData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ConsumerData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/DataTypeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/DataTypeDataTest.java
new file mode 100644
index 0000000000..5766b36e8b
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/DataTypeDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.DataTypeDataDefinition;
+
+
+public class DataTypeDataTest {
+
+	private DataTypeData createTestSubject() {
+		return new DataTypeData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		DataTypeData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetDataTypeDataDefinition() throws Exception {
+		DataTypeData testSubject;
+		DataTypeDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDataTypeDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetDataTypeDataDefinition() throws Exception {
+		DataTypeData testSubject;
+		DataTypeDataDefinition dataTypeDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDataTypeDataDefinition(dataTypeDataDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		DataTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		DataTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupDataTest.java
new file mode 100644
index 0000000000..4095336e4c
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition;
+
+
+public class GroupDataTest {
+
+	private GroupData createTestSubject() {
+		return new GroupData();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		GroupData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		GroupData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetGroupDataDefinition() throws Exception {
+		GroupData testSubject;
+		GroupDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetGroupDataDefinition() throws Exception {
+		GroupData testSubject;
+		GroupDataDefinition groupDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupDataDefinition(groupDataDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GroupData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupInstanceDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupInstanceDataTest.java
new file mode 100644
index 0000000000..99b54f7f42
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupInstanceDataTest.java
@@ -0,0 +1,93 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.GroupInstanceDataDefinition;
+
+
+public class GroupInstanceDataTest {
+
+	private GroupInstanceData createTestSubject() {
+		return new GroupInstanceData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		GroupInstanceData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		GroupInstanceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		GroupInstanceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testGetUniqueIdKey() throws Exception {
+		GroupInstanceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueIdKey();
+	}
+
+	
+	@Test
+	public void testGetGroupDataDefinition() throws Exception {
+		GroupInstanceData testSubject;
+		GroupInstanceDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetComponentInstDataDefinition() throws Exception {
+		GroupInstanceData testSubject;
+		GroupInstanceDataDefinition groupDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComponentInstDataDefinition(groupDataDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GroupInstanceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupTypeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupTypeDataTest.java
new file mode 100644
index 0000000000..070f2708e2
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupTypeDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.GroupTypeDataDefinition;
+
+
+public class GroupTypeDataTest {
+
+	private GroupTypeData createTestSubject() {
+		return new GroupTypeData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		GroupTypeData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetGroupTypeDataDefinition() throws Exception {
+		GroupTypeData testSubject;
+		GroupTypeDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupTypeDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetGroupTypeDataDefinition() throws Exception {
+		GroupTypeData testSubject;
+		GroupTypeDataDefinition groupTypeDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupTypeDataDefinition(groupTypeDataDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GroupTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		GroupTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterDataTest.java
new file mode 100644
index 0000000000..db3db02c0b
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterDataTest.java
@@ -0,0 +1,173 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.HeatParameterDataDefinition;
+
+
+public class HeatParameterDataTest {
+
+	private HeatParameterData createTestSubject() {
+		return new HeatParameterData();
+	}
+
+	
+
+	
+	@Test
+	public void testGetHeatDataDefinition() throws Exception {
+		HeatParameterData testSubject;
+		HeatParameterDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getHeatDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetHeatDataDefinition() throws Exception {
+		HeatParameterData testSubject;
+		HeatParameterDataDefinition heatDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setHeatDataDefinition(heatDataDefinition);
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		HeatParameterData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		HeatParameterData testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		HeatParameterData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		HeatParameterData testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		HeatParameterData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		HeatParameterData testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+
+	
+	@Test
+	public void testGetCurrentValue() throws Exception {
+		HeatParameterData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrentValue();
+	}
+
+	
+	@Test
+	public void testSetCurrentValue() throws Exception {
+		HeatParameterData testSubject;
+		String currentValue = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrentValue(currentValue);
+	}
+
+	
+	@Test
+	public void testGetDefaultValue() throws Exception {
+		HeatParameterData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDefaultValue();
+	}
+
+	
+	@Test
+	public void testSetDefaultValue() throws Exception {
+		HeatParameterData testSubject;
+		String defaultValue = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDefaultValue(defaultValue);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		HeatParameterData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		HeatParameterData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterValueDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterValueDataTest.java
new file mode 100644
index 0000000000..55b4719b79
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterValueDataTest.java
@@ -0,0 +1,81 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class HeatParameterValueDataTest {
+
+	private HeatParameterValueData createTestSubject() {
+		return new HeatParameterValueData();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		HeatParameterValueData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetValue() throws Exception {
+		HeatParameterValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValue();
+	}
+
+	
+	@Test
+	public void testSetValue() throws Exception {
+		HeatParameterValueData testSubject;
+		String value = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValue(value);
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		HeatParameterValueData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		HeatParameterValueData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		HeatParameterValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputValueDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputValueDataTest.java
new file mode 100644
index 0000000000..0099f9a149
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputValueDataTest.java
@@ -0,0 +1,169 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class InputValueDataTest {
+
+	private InputValueData createTestSubject() {
+		return new InputValueData();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		InputValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		InputValueData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		InputValueData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		InputValueData testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		InputValueData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		InputValueData testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		InputValueData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		InputValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testIsHidden() throws Exception {
+		InputValueData testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.isHidden();
+	}
+
+	
+	@Test
+	public void testSetHidden() throws Exception {
+		InputValueData testSubject;
+		Boolean hidden = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setHidden(hidden);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		InputValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		InputValueData testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetValue() throws Exception {
+		InputValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValue();
+	}
+
+	
+	@Test
+	public void testSetValue() throws Exception {
+		InputValueData testSubject;
+		String value = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValue(value);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputsDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputsDataTest.java
new file mode 100644
index 0000000000..193d53762a
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputsDataTest.java
@@ -0,0 +1,94 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+
+
+public class InputsDataTest {
+
+	private InputsData createTestSubject() {
+		return new InputsData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		InputsData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetConstraints() throws Exception {
+		InputsData testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConstraints();
+	}
+
+	
+	@Test
+	public void testSetConstraints() throws Exception {
+		InputsData testSubject;
+		List<String> constraints = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConstraints(constraints);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		InputsData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetPropertyDataDefinition() throws Exception {
+		InputsData testSubject;
+		PropertyDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPropertyDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetPropertyDataDefinition() throws Exception {
+		InputsData testSubject;
+		PropertyDataDefinition propertyDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPropertyDataDefinition(propertyDataDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		InputsData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InterfaceDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InterfaceDataTest.java
new file mode 100644
index 0000000000..59f28c860e
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InterfaceDataTest.java
@@ -0,0 +1,60 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.InterfaceDataDefinition;
+
+
+public class InterfaceDataTest {
+
+	private InterfaceData createTestSubject() {
+		return new InterfaceData();
+	}
+
+	
+	@Test
+	public void testGetInterfaceDataDefinition() throws Exception {
+		InterfaceData testSubject;
+		InterfaceDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInterfaceDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetInterfaceDataDefinition() throws Exception {
+		InterfaceData testSubject;
+		InterfaceDataDefinition interfaceDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInterfaceDataDefinition(interfaceDataDefinition);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		InterfaceData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		InterfaceData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/MigrationTaskEntryTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/MigrationTaskEntryTest.java
new file mode 100644
index 0000000000..45bd2e176c
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/MigrationTaskEntryTest.java
@@ -0,0 +1,191 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Date;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class MigrationTaskEntryTest {
+
+	private MigrationTaskEntry createTestSubject() {
+		return new MigrationTaskEntry();
+	}
+
+	
+	@Test
+	public void testSetMajorVersion() throws Exception {
+		MigrationTaskEntry testSubject;
+		Long majorVersion = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMajorVersion(majorVersion);
+	}
+
+	
+	@Test
+	public void testSetMinorVersion() throws Exception {
+		MigrationTaskEntry testSubject;
+		Long minorVersion = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMinorVersion(minorVersion);
+	}
+
+	
+	@Test
+	public void testSetTimestamp() throws Exception {
+		MigrationTaskEntry testSubject;
+		Date timestamp = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp(timestamp);
+	}
+
+	
+	@Test
+	public void testSetTaskName() throws Exception {
+		MigrationTaskEntry testSubject;
+		String taskName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTaskName(taskName);
+	}
+
+	
+	@Test
+	public void testSetTaskStatus() throws Exception {
+		MigrationTaskEntry testSubject;
+		String taskStatus = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTaskStatus(taskStatus);
+	}
+
+	
+	@Test
+	public void testSetMessage() throws Exception {
+		MigrationTaskEntry testSubject;
+		String message = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setMessage(message);
+	}
+
+	
+	@Test
+	public void testSetExecutionTime() throws Exception {
+		MigrationTaskEntry testSubject;
+		double executionTime = 0.0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setExecutionTime(executionTime);
+	}
+
+	
+	@Test
+	public void testGetMajorVersion() throws Exception {
+		MigrationTaskEntry testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMajorVersion();
+	}
+
+	
+	@Test
+	public void testGetMinorVersion() throws Exception {
+		MigrationTaskEntry testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMinorVersion();
+	}
+
+	
+	@Test
+	public void testGetTimestamp() throws Exception {
+		MigrationTaskEntry testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp();
+	}
+
+	
+	@Test
+	public void testGetTaskName() throws Exception {
+		MigrationTaskEntry testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTaskName();
+	}
+
+	
+	@Test
+	public void testGetTaskStatus() throws Exception {
+		MigrationTaskEntry testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTaskStatus();
+	}
+
+	
+	@Test
+	public void testGetMessage() throws Exception {
+		MigrationTaskEntry testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMessage();
+	}
+
+	
+	@Test
+	public void testGetExecutionTime() throws Exception {
+		MigrationTaskEntry testSubject;
+		double result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getExecutionTime();
+	}
+
+	
+	@Test
+	public void testGetDescription() throws Exception {
+		MigrationTaskEntry testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDescription();
+	}
+
+	
+	@Test
+	public void testSetDescription() throws Exception {
+		MigrationTaskEntry testSubject;
+		String description = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDescription(description);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/OperationDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/OperationDataTest.java
new file mode 100644
index 0000000000..776c5c3909
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/OperationDataTest.java
@@ -0,0 +1,60 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.OperationDataDefinition;
+
+
+public class OperationDataTest {
+
+	private OperationData createTestSubject() {
+		return new OperationData();
+	}
+
+	
+	@Test
+	public void testGetOperationDataDefinition() throws Exception {
+		OperationData testSubject;
+		OperationDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getOperationDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetOperationDataDefinition() throws Exception {
+		OperationData testSubject;
+		OperationDataDefinition operationDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setOperationDataDefinition(operationDataDefinition);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		OperationData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		OperationData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PolicyTypeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PolicyTypeDataTest.java
new file mode 100644
index 0000000000..c2551b0356
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PolicyTypeDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.PolicyTypeDataDefinition;
+
+
+public class PolicyTypeDataTest {
+
+	private PolicyTypeData createTestSubject() {
+		return new PolicyTypeData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		PolicyTypeData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		PolicyTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		PolicyTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetPolicyTypeDataDefinition() throws Exception {
+		PolicyTypeData testSubject;
+		PolicyTypeDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPolicyTypeDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetPolicyTypeDataDefinition() throws Exception {
+		PolicyTypeData testSubject;
+		PolicyTypeDataDefinition policyTypeDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPolicyTypeDataDefinition(policyTypeDataDefinition);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ProductMetadataDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ProductMetadataDataTest.java
new file mode 100644
index 0000000000..382ca38e86
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ProductMetadataDataTest.java
@@ -0,0 +1,48 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ProductMetadataDataTest {
+
+	private ProductMetadataData createTestSubject() {
+		return new ProductMetadataData();
+	}
+
+	
+	@Test
+	public void testGetUniqueIdKey() throws Exception {
+		ProductMetadataData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueIdKey();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		ProductMetadataData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ProductMetadataData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyDataTest.java
new file mode 100644
index 0000000000..ae582b7383
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyDataTest.java
@@ -0,0 +1,94 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+
+
+public class PropertyDataTest {
+
+	private PropertyData createTestSubject() {
+		return new PropertyData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		PropertyData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetConstraints() throws Exception {
+		PropertyData testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConstraints();
+	}
+
+	
+	@Test
+	public void testSetConstraints() throws Exception {
+		PropertyData testSubject;
+		List<String> constraints = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConstraints(constraints);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		PropertyData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetPropertyDataDefinition() throws Exception {
+		PropertyData testSubject;
+		PropertyDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPropertyDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetPropertyDataDefinition() throws Exception {
+		PropertyData testSubject;
+		PropertyDataDefinition propertyDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPropertyDataDefinition(propertyDataDefinition);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		PropertyData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyValueDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyValueDataTest.java
new file mode 100644
index 0000000000..1151a8387c
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyValueDataTest.java
@@ -0,0 +1,171 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.PropertyRule;
+
+
+public class PropertyValueDataTest {
+
+	private PropertyValueData createTestSubject() {
+		return new PropertyValueData();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		PropertyValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		PropertyValueData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		PropertyValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		PropertyValueData testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		PropertyValueData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		PropertyValueData testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		PropertyValueData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		PropertyValueData testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testGetValue() throws Exception {
+		PropertyValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getValue();
+	}
+
+	
+	@Test
+	public void testSetValue() throws Exception {
+		PropertyValueData testSubject;
+		String value = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValue(value);
+	}
+
+	
+	@Test
+	public void testGetRules() throws Exception {
+		PropertyValueData testSubject;
+		List<PropertyRule> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRules();
+	}
+
+	
+	@Test
+	public void testSetRules() throws Exception {
+		PropertyValueData testSubject;
+		List<PropertyRule> rules = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRules(rules);
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		PropertyValueData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		PropertyValueData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipInstDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipInstDataTest.java
new file mode 100644
index 0000000000..81b6352b0a
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipInstDataTest.java
@@ -0,0 +1,213 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class RelationshipInstDataTest {
+
+	private RelationshipInstData createTestSubject() {
+		return new RelationshipInstData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		RelationshipInstData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		RelationshipInstData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		RelationshipInstData testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		RelationshipInstData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		RelationshipInstData testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		RelationshipInstData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		RelationshipInstData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetType() throws Exception {
+		RelationshipInstData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getType();
+	}
+
+	
+	@Test
+	public void testSetType() throws Exception {
+		RelationshipInstData testSubject;
+		String type = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setType(type);
+	}
+
+	
+	@Test
+	public void testGetCapabilityOwnerId() throws Exception {
+		RelationshipInstData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabilityOwnerId();
+	}
+
+	
+	@Test
+	public void testSetCapabilityOwnerId() throws Exception {
+		RelationshipInstData testSubject;
+		String capabilityOwnerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabilityOwnerId(capabilityOwnerId);
+	}
+
+	
+	@Test
+	public void testGetRequirementOwnerId() throws Exception {
+		RelationshipInstData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirementOwnerId();
+	}
+
+	
+	@Test
+	public void testSetRequirementOwnerId() throws Exception {
+		RelationshipInstData testSubject;
+		String requirementOwnerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirementOwnerId(requirementOwnerId);
+	}
+
+	
+	@Test
+	public void testGetCapabiltyId() throws Exception {
+		RelationshipInstData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCapabiltyId();
+	}
+
+	
+	@Test
+	public void testSetCapabiltyId() throws Exception {
+		RelationshipInstData testSubject;
+		String capabiltyId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCapabiltyId(capabiltyId);
+	}
+
+	
+	@Test
+	public void testGetRequirementId() throws Exception {
+		RelationshipInstData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequirementId();
+	}
+
+	
+	@Test
+	public void testSetRequirementId() throws Exception {
+		RelationshipInstData testSubject;
+		String requirementId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequirementId(requirementId);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RelationshipInstData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipTypeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipTypeDataTest.java
new file mode 100644
index 0000000000..3f06669e8e
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipTypeDataTest.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.RelationshipInstDataDefinition;
+
+
+public class RelationshipTypeDataTest {
+
+	private RelationshipTypeData createTestSubject() {
+		return new RelationshipTypeData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		RelationshipTypeData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetRelationshipTypeDataDefinition() throws Exception {
+		RelationshipTypeData testSubject;
+		RelationshipInstDataDefinition result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRelationshipTypeDataDefinition();
+	}
+
+	
+	@Test
+	public void testSetRelationshipTypeDataDefinition() throws Exception {
+		RelationshipTypeData testSubject;
+		RelationshipInstDataDefinition relationshipTypeDataDefinition = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRelationshipTypeDataDefinition(relationshipTypeDataDefinition);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		RelationshipTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RelationshipTypeData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementDataTest.java
new file mode 100644
index 0000000000..8251fe82b7
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementDataTest.java
@@ -0,0 +1,203 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class RequirementDataTest {
+
+	private RequirementData createTestSubject() {
+		return new RequirementData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		RequirementData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetNode() throws Exception {
+		RequirementData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNode();
+	}
+
+	
+	@Test
+	public void testSetNode() throws Exception {
+		RequirementData testSubject;
+		String node = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNode(node);
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		RequirementData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		RequirementData testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		RequirementData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		RequirementData testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		RequirementData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetRelationshipType() throws Exception {
+		RequirementData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRelationshipType();
+	}
+
+	
+	@Test
+	public void testSetRelationshipType() throws Exception {
+		RequirementData testSubject;
+		String relationshipType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRelationshipType(relationshipType);
+	}
+
+	
+	@Test
+	public void testGetMinOccurrences() throws Exception {
+		RequirementData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMinOccurrences();
+	}
+
+	
+	@Test
+	public void testSetMinOccurrences() throws Exception {
+		RequirementData testSubject;
+		String minOccurrences = "";
+
+		// test 1
+		testSubject = createTestSubject();
+		minOccurrences = null;
+		testSubject.setMinOccurrences(minOccurrences);
+
+		// test 2
+		testSubject = createTestSubject();
+		minOccurrences = "";
+		testSubject.setMinOccurrences(minOccurrences);
+	}
+
+	
+	@Test
+	public void testGetMaxOccurrences() throws Exception {
+		RequirementData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getMaxOccurrences();
+	}
+
+	
+	@Test
+	public void testSetMaxOccurrences() throws Exception {
+		RequirementData testSubject;
+		String maxOccurrences = "";
+
+		// test 1
+		testSubject = createTestSubject();
+		maxOccurrences = null;
+		testSubject.setMaxOccurrences(maxOccurrences);
+
+		// test 2
+		testSubject = createTestSubject();
+		maxOccurrences = "";
+		testSubject.setMaxOccurrences(maxOccurrences);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		RequirementData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RequirementData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementImplDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementImplDataTest.java
new file mode 100644
index 0000000000..9e917a1679
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementImplDataTest.java
@@ -0,0 +1,169 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class RequirementImplDataTest {
+
+	private RequirementImplData createTestSubject() {
+		return new RequirementImplData();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		RequirementImplData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetCreationTime() throws Exception {
+		RequirementImplData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCreationTime();
+	}
+
+	
+	@Test
+	public void testSetCreationTime() throws Exception {
+		RequirementImplData testSubject;
+		Long creationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCreationTime(creationTime);
+	}
+
+	
+	@Test
+	public void testGetModificationTime() throws Exception {
+		RequirementImplData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModificationTime();
+	}
+
+	
+	@Test
+	public void testSetModificationTime() throws Exception {
+		RequirementImplData testSubject;
+		Long modificationTime = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModificationTime(modificationTime);
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		RequirementImplData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		RequirementImplData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetName() throws Exception {
+		RequirementImplData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getName();
+	}
+
+	
+	@Test
+	public void testSetName() throws Exception {
+		RequirementImplData testSubject;
+		String name = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setName(name);
+	}
+
+	
+	@Test
+	public void testGetPosX() throws Exception {
+		RequirementImplData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPosX();
+	}
+
+	
+	@Test
+	public void testSetPosX() throws Exception {
+		RequirementImplData testSubject;
+		String posX = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPosX(posX);
+	}
+
+	
+	@Test
+	public void testGetPosY() throws Exception {
+		RequirementImplData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPosY();
+	}
+
+	
+	@Test
+	public void testSetPosY() throws Exception {
+		RequirementImplData testSubject;
+		String posY = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPosY(posY);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RequirementImplData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceCategoryDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceCategoryDataTest.java
new file mode 100644
index 0000000000..feebd07947
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceCategoryDataTest.java
@@ -0,0 +1,60 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ResourceCategoryDataTest {
+
+	private ResourceCategoryData createTestSubject() {
+		return new ResourceCategoryData();
+	}
+
+	
+	@Test
+	public void testGetCategoryName() throws Exception {
+		ResourceCategoryData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCategoryName();
+	}
+
+	
+	@Test
+	public void testSetCategoryName() throws Exception {
+		ResourceCategoryData testSubject;
+		String categoryName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCategoryName(categoryName);
+	}
+
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ResourceCategoryData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		ResourceCategoryData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesDataTest.java
new file mode 100644
index 0000000000..0581412b3c
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesDataTest.java
@@ -0,0 +1,167 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Date;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class SdcSchemaFilesDataTest {
+
+	private SdcSchemaFilesData createTestSubject() {
+		return new SdcSchemaFilesData();
+	}
+
+	
+	@Test
+	public void testGetSdcReleaseNum() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getSdcReleaseNum();
+	}
+
+	
+	@Test
+	public void testSetSdcReleaseNum() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String sdcReleaseNum = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setSdcReleaseNum(sdcReleaseNum);
+	}
+
+	
+	@Test
+	public void testGetConformanceLevel() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConformanceLevel();
+	}
+
+	
+	@Test
+	public void testSetConformanceLevel() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String conformanceLevel = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConformanceLevel(conformanceLevel);
+	}
+
+	
+	@Test
+	public void testGetFileName() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFileName();
+	}
+
+	
+	@Test
+	public void testSetFileName() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String fileName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setFileName(fileName);
+	}
+
+	
+
+
+	
+	@Test
+	public void testSetPayloadAsArray() throws Exception {
+		SdcSchemaFilesData testSubject;
+		byte[] payload = new byte[] { ' ' };
+
+		// test 1
+		testSubject = createTestSubject();
+		payload = null;
+		testSubject.setPayloadAsArray(payload);
+
+		// test 2
+		testSubject = createTestSubject();
+		payload = new byte[] { ' ' };
+		testSubject.setPayloadAsArray(payload);
+	}
+
+	
+	@Test
+	public void testGetPayloadAsArray() throws Exception {
+		SdcSchemaFilesData testSubject;
+		byte[] result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPayloadAsArray();
+	}
+
+	
+	@Test
+	public void testGetTimestamp() throws Exception {
+		SdcSchemaFilesData testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp();
+	}
+
+	
+	@Test
+	public void testSetTimestamp() throws Exception {
+		SdcSchemaFilesData testSubject;
+		Date timestamp = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp(timestamp);
+	}
+
+	
+	@Test
+	public void testGetChecksum() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getChecksum();
+	}
+
+	
+	@Test
+	public void testSetChecksum() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String checksum = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setChecksum(checksum);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		SdcSchemaFilesData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceArtifactsDataCollectionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceArtifactsDataCollectionTest.java
new file mode 100644
index 0000000000..0afe7be7ef
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceArtifactsDataCollectionTest.java
@@ -0,0 +1,49 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+public class ServiceArtifactsDataCollectionTest {
+
+	private ServiceArtifactsDataCollection createTestSubject() {
+		return new ServiceArtifactsDataCollection();
+	}
+
+	
+	@Test
+	public void testGetServiceArtifactDataMap() throws Exception {
+		ServiceArtifactsDataCollection testSubject;
+		Map<String, List<ESArtifactData>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceArtifactDataMap();
+	}
+
+	
+	@Test
+	public void testSetServiceArtifactDataMap() throws Exception {
+		ServiceArtifactsDataCollection testSubject;
+		Map<String, List<ESArtifactData>> serviceArtifactDataMap = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceArtifactDataMap(serviceArtifactDataMap);
+	}
+
+	
+	@Test
+	public void testGetNodeTemplateArtifacts() throws Exception {
+		ServiceArtifactsDataCollection testSubject;
+		String nodeTemplateName = "";
+		List<ESArtifactData> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNodeTemplateArtifacts(nodeTemplateName);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceMetadataDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceMetadataDataTest.java
new file mode 100644
index 0000000000..d10db84409
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceMetadataDataTest.java
@@ -0,0 +1,37 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ServiceMetadataDataTest {
+
+	private ServiceMetadataData createTestSubject() {
+		return new ServiceMetadataData();
+	}
+
+	
+	@Test
+	public void testGetUniqueIdKey() throws Exception {
+		ServiceMetadataData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueIdKey();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		ServiceMetadataData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserDataTest.java
new file mode 100644
index 0000000000..b7c051567d
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserDataTest.java
@@ -0,0 +1,260 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class UserDataTest {
+
+	private UserData createTestSubject() {
+		return new UserData("", "", "", "", "", "", null);
+	}
+
+	
+	@Test
+	public void testGetFirstName() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFirstName();
+	}
+
+	
+	@Test
+	public void testSetFirstName() throws Exception {
+		UserData testSubject;
+		String firstName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setFirstName(firstName);
+	}
+
+	
+	@Test
+	public void testGetLastName() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastName();
+	}
+
+	
+	@Test
+	public void testSetLastName() throws Exception {
+		UserData testSubject;
+		String lastName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastName(lastName);
+	}
+
+	
+	@Test
+	public void testGetUserId() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUserId();
+	}
+
+	
+	@Test
+	public void testSetUserId() throws Exception {
+		UserData testSubject;
+		String userId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUserId(userId);
+	}
+
+	
+	@Test
+	public void testGetEmail() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getEmail();
+	}
+
+	
+	@Test
+	public void testSetEmail() throws Exception {
+		UserData testSubject;
+		String email = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setEmail(email);
+	}
+
+	
+	@Test
+	public void testGetRole() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRole();
+	}
+
+	
+	@Test
+	public void testSetRole() throws Exception {
+		UserData testSubject;
+		String role = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRole(role);
+	}
+
+	
+	@Test
+	public void testSetLastLoginTime() throws Exception {
+		UserData testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastLoginTime();
+	}
+
+	
+	@Test
+	public void testSetLastLoginTime_1() throws Exception {
+		UserData testSubject;
+		Long time = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setLastLoginTime(time);
+	}
+
+	
+	@Test
+	public void testGetLastLoginTime() throws Exception {
+		UserData testSubject;
+		Long result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getLastLoginTime();
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testHashCode() throws Exception {
+		UserData testSubject;
+		int result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.hashCode();
+	}
+
+	
+	@Test
+	public void testEquals() throws Exception {
+		UserData testSubject;
+		Object obj = null;
+		boolean result;
+
+		// test 1
+		testSubject = createTestSubject();
+		obj = null;
+		result = testSubject.equals(obj);
+		Assert.assertEquals(false, result);
+	}
+
+	
+	@Test
+	public void testToJson() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toJson();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		UserData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetUniqueIdKey() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueIdKey();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		UserData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		UserData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		UserData testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserFunctionalMenuDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserFunctionalMenuDataTest.java
new file mode 100644
index 0000000000..fd493fa54e
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserFunctionalMenuDataTest.java
@@ -0,0 +1,103 @@
+package org.openecomp.sdc.be.resources.data;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class UserFunctionalMenuDataTest {
+
+	private UserFunctionalMenuData createTestSubject() {
+		return new UserFunctionalMenuData("", "");
+	}
+
+	
+	@Test
+	public void testGetFunctionalMenu() throws Exception {
+		UserFunctionalMenuData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getFunctionalMenu();
+	}
+
+	
+	@Test
+	public void testSetFunctionalMenu() throws Exception {
+		UserFunctionalMenuData testSubject;
+		String functionalMenu = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setFunctionalMenu(functionalMenu);
+	}
+
+	
+	@Test
+	public void testSetUniqueId() throws Exception {
+		UserFunctionalMenuData testSubject;
+		String uniqueId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUniqueId(uniqueId);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		UserFunctionalMenuData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testToJson() throws Exception {
+		UserFunctionalMenuData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toJson();
+	}
+
+	
+	@Test
+	public void testToGraphMap() throws Exception {
+		UserFunctionalMenuData testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toGraphMap();
+	}
+
+	
+	@Test
+	public void testGetUniqueIdKey() throws Exception {
+		UserFunctionalMenuData testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueIdKey();
+	}
+
+	
+	@Test
+	public void testGetUniqueId() throws Exception {
+		UserFunctionalMenuData testSubject;
+		Object result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUniqueId();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEventTest.java
new file mode 100644
index 0000000000..c6de8d16c5
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEventTest.java
@@ -0,0 +1,133 @@
+package org.openecomp.sdc.be.resources.data.auditing;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class AuditingGenericEventTest {
+
+	private AuditingGenericEvent createTestSubject() {
+		return new AuditingGenericEvent();
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		AuditingGenericEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		AuditingGenericEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		AuditingGenericEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		AuditingGenericEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		AuditingGenericEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		AuditingGenericEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		AuditingGenericEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		AuditingGenericEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		AuditingGenericEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		AuditingGenericEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		AuditingGenericEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEventTest.java
new file mode 100644
index 0000000000..7940ae182a
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEventTest.java
@@ -0,0 +1,213 @@
+package org.openecomp.sdc.be.resources.data.auditing;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class AuditingGetUebClusterEventTest {
+
+	private AuditingGetUebClusterEvent createTestSubject() {
+		return new AuditingGetUebClusterEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetConsumerId() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerId();
+	}
+
+	
+	@Test
+	public void testSetConsumerId() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String consumerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConsumerId(consumerId);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		AuditingGetUebClusterEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuthEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuthEventTest.java
new file mode 100644
index 0000000000..42de349d5b
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuthEventTest.java
@@ -0,0 +1,246 @@
+package org.openecomp.sdc.be.resources.data.auditing;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class AuthEventTest {
+
+	private AuthEvent createTestSubject() {
+		return new AuthEvent();
+	}
+
+	
+	@Test
+	public void testGetUrl() throws Exception {
+		AuthEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUrl();
+	}
+
+	
+	@Test
+	public void testSetUrl() throws Exception {
+		AuthEvent testSubject;
+		String url = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUrl(url);
+	}
+
+	
+	@Test
+	public void testGetUser() throws Exception {
+		AuthEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUser();
+	}
+
+	
+	@Test
+	public void testSetUser() throws Exception {
+		AuthEvent testSubject;
+		String user = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUser(user);
+	}
+
+	
+	@Test
+	public void testGetAuthStatus() throws Exception {
+		AuthEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAuthStatus();
+	}
+
+	
+	@Test
+	public void testSetAuthStatus() throws Exception {
+		AuthEvent testSubject;
+		String authStatus = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAuthStatus(authStatus);
+	}
+
+	
+	@Test
+	public void testGetRealm() throws Exception {
+		AuthEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRealm();
+	}
+
+	
+	@Test
+	public void testSetRealm() throws Exception {
+		AuthEvent testSubject;
+		String realm = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRealm(realm);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		AuthEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		AuthEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		AuthEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		AuthEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		AuthEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		AuthEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		AuthEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		AuthEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		AuthEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		AuthEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		AuthEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		AuthEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		AuthEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEventTest.java
new file mode 100644
index 0000000000..448df507d7
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEventTest.java
@@ -0,0 +1,290 @@
+package org.openecomp.sdc.be.resources.data.auditing;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class CategoryEventTest {
+
+	private CategoryEvent createTestSubject() {
+		return new CategoryEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		CategoryEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		CategoryEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		CategoryEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		CategoryEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		CategoryEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		CategoryEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetCategoryName() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCategoryName();
+	}
+
+	
+	@Test
+	public void testSetCategoryName() throws Exception {
+		CategoryEvent testSubject;
+		String categoryName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCategoryName(categoryName);
+	}
+
+	
+	@Test
+	public void testGetSubCategoryName() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getSubCategoryName();
+	}
+
+	
+	@Test
+	public void testSetSubCategoryName() throws Exception {
+		CategoryEvent testSubject;
+		String subCategoryName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setSubCategoryName(subCategoryName);
+	}
+
+	
+	@Test
+	public void testGetGroupingName() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getGroupingName();
+	}
+
+	
+	@Test
+	public void testSetGroupingName() throws Exception {
+		CategoryEvent testSubject;
+		String groupingName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setGroupingName(groupingName);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		CategoryEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		CategoryEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		CategoryEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		CategoryEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetResourceType() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceType();
+	}
+
+	
+	@Test
+	public void testSetResourceType() throws Exception {
+		CategoryEvent testSubject;
+		String resourceType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceType(resourceType);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		CategoryEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		CategoryEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ConsumerEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ConsumerEventTest.java
new file mode 100644
index 0000000000..2b2bb4d5e9
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ConsumerEventTest.java
@@ -0,0 +1,213 @@
+package org.openecomp.sdc.be.resources.data.auditing;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ConsumerEventTest {
+
+	private ConsumerEvent createTestSubject() {
+		return new ConsumerEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		ConsumerEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		ConsumerEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		ConsumerEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetEcompUser() throws Exception {
+		ConsumerEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getEcompUser();
+	}
+
+	
+	@Test
+	public void testSetEcompUser() throws Exception {
+		ConsumerEvent testSubject;
+		String ecompUser = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setEcompUser(ecompUser);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		ConsumerEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		ConsumerEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		ConsumerEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		ConsumerEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		ConsumerEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		ConsumerEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		ConsumerEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		ConsumerEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		ConsumerEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		ConsumerEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		ConsumerEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		ConsumerEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ConsumerEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDeployEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDeployEventTest.java
new file mode 100644
index 0000000000..2ea9bf9cf1
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDeployEventTest.java
@@ -0,0 +1,301 @@
+package org.openecomp.sdc.be.resources.data.auditing;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class DistributionDeployEventTest {
+
+	private DistributionDeployEvent createTestSubject() {
+		return new DistributionDeployEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		DistributionDeployEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetResourceName() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceName();
+	}
+
+	
+	@Test
+	public void testSetResourceName() throws Exception {
+		DistributionDeployEvent testSubject;
+		String resourceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceName(resourceName);
+	}
+
+	
+	@Test
+	public void testGetResourceType() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceType();
+	}
+
+	
+	@Test
+	public void testSetResourceType() throws Exception {
+		DistributionDeployEvent testSubject;
+		String resourceType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceType(resourceType);
+	}
+
+	
+	@Test
+	public void testGetCurrVersion() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrVersion();
+	}
+
+	
+	@Test
+	public void testSetCurrVersion() throws Exception {
+		DistributionDeployEvent testSubject;
+		String currVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrVersion(currVersion);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		DistributionDeployEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		DistributionDeployEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		DistributionDeployEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		DistributionDeployEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		DistributionDeployEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		DistributionDeployEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		DistributionDeployEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		DistributionDeployEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		DistributionDeployEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		DistributionDeployEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetDid() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDid();
+	}
+
+	
+	@Test
+	public void testSetDid() throws Exception {
+		DistributionDeployEvent testSubject;
+		String did = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDid(did);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		DistributionDeployEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDownloadEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDownloadEventTest.java
new file mode 100644
index 0000000000..7ab3d8ca1f
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDownloadEventTest.java
@@ -0,0 +1,235 @@
+package org.openecomp.sdc.be.resources.data.auditing;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class DistributionDownloadEventTest {
+
+	private DistributionDownloadEvent createTestSubject() {
+		return new DistributionDownloadEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		DistributionDownloadEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetConsumerId() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerId();
+	}
+
+	
+	@Test
+	public void testSetConsumerId() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String consumerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConsumerId(consumerId);
+	}
+
+	
+	@Test
+	public void testGetResourceUrl() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceUrl();
+	}
+
+	
+	@Test
+	public void testSetResourceUrl() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String resourceUrl = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceUrl(resourceUrl);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		DistributionDownloadEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		DistributionDownloadEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		DistributionDownloadEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		DistributionDownloadEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		DistributionDownloadEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionEngineEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionEngineEventTest.java
new file mode 100644
index 0000000000..e4450111c1
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionEngineEventTest.java
@@ -0,0 +1,323 @@
+package org.openecomp.sdc.be.resources.data.auditing;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class DistributionEngineEventTest {
+
+	private DistributionEngineEvent createTestSubject() {
+		return new DistributionEngineEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		DistributionEngineEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetDstatusTopic() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDstatusTopic();
+	}
+
+	
+	@Test
+	public void testSetDstatusTopic() throws Exception {
+		DistributionEngineEvent testSubject;
+		String dstatusTopic = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDstatusTopic(dstatusTopic);
+	}
+
+	
+	@Test
+	public void testGetDnotifTopic() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDnotifTopic();
+	}
+
+	
+	@Test
+	public void testSetDnotifTopic() throws Exception {
+		DistributionEngineEvent testSubject;
+		String dnotifTopic = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDnotifTopic(dnotifTopic);
+	}
+
+	
+	@Test
+	public void testGetEnvironmentName() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getEnvironmentName();
+	}
+
+	
+	@Test
+	public void testSetEnvironmentName() throws Exception {
+		DistributionEngineEvent testSubject;
+		String environmentName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setEnvironmentName(environmentName);
+	}
+
+	
+	@Test
+	public void testGetRole() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRole();
+	}
+
+	
+	@Test
+	public void testSetRole() throws Exception {
+		DistributionEngineEvent testSubject;
+		String role = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRole(role);
+	}
+
+	
+	@Test
+	public void testGetApiKey() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getApiKey();
+	}
+
+	
+	@Test
+	public void testSetApiKey() throws Exception {
+		DistributionEngineEvent testSubject;
+		String apiKey = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setApiKey(apiKey);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		DistributionEngineEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		DistributionEngineEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		DistributionEngineEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		DistributionEngineEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		DistributionEngineEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		DistributionEngineEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		DistributionEngineEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		DistributionEngineEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		DistributionEngineEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetConsumerId() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerId();
+	}
+
+	
+	@Test
+	public void testSetConsumerId() throws Exception {
+		DistributionEngineEvent testSubject;
+		String consumerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConsumerId(consumerId);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		DistributionEngineEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionNotificationEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionNotificationEventTest.java
new file mode 100644
index 0000000000..40a46c080b
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionNotificationEventTest.java
@@ -0,0 +1,344 @@
+package org.openecomp.sdc.be.resources.data.auditing;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+public class DistributionNotificationEventTest {
+
+	private DistributionNotificationEvent createTestSubject() {
+		return new DistributionNotificationEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		DistributionNotificationEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetResourceName() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceName();
+	}
+
+	
+	@Test
+	public void testSetResourceName() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String resourceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceName(resourceName);
+	}
+
+	
+	@Test
+	public void testGetResourceType() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceType();
+	}
+
+	
+	@Test
+	public void testSetResourceType() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String resourceType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceType(resourceType);
+	}
+
+	
+	@Test
+	public void testGetCurrVersion() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrVersion();
+	}
+
+	
+	@Test
+	public void testSetCurrVersion() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String currVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrVersion(currVersion);
+	}
+
+	
+	@Test
+	public void testGetCurrState() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrState();
+	}
+
+	
+	@Test
+	public void testSetCurrState() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String currState = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrState(currState);
+	}
+
+	
+	@Test
+	public void testGetTopicName() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTopicName();
+	}
+
+	
+	@Test
+	public void testSetTopicName() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String topicName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTopicName(topicName);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		DistributionNotificationEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		DistributionNotificationEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		DistributionNotificationEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		DistributionNotificationEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetDid() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDid();
+	}
+
+	
+	@Test
+	public void testSetDid() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String did = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDid(did);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		DistributionNotificationEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEventTest.java
new file mode 100644
index 0000000000..b776085746
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEventTest.java
@@ -0,0 +1,301 @@
+package org.openecomp.sdc.be.resources.data.auditing;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class DistributionStatusEventTest {
+
+	private DistributionStatusEvent createTestSubject() {
+		return new DistributionStatusEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		DistributionStatusEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetDid() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDid();
+	}
+
+	
+	@Test
+	public void testSetDid() throws Exception {
+		DistributionStatusEvent testSubject;
+		String did = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDid(did);
+	}
+
+	
+	@Test
+	public void testGetConsumerId() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerId();
+	}
+
+	
+	@Test
+	public void testSetConsumerId() throws Exception {
+		DistributionStatusEvent testSubject;
+		String consumerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConsumerId(consumerId);
+	}
+
+	
+	@Test
+	public void testGetTopicName() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTopicName();
+	}
+
+	
+	@Test
+	public void testSetTopicName() throws Exception {
+		DistributionStatusEvent testSubject;
+		String topicName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTopicName(topicName);
+	}
+
+	
+	@Test
+	public void testGetResoureURL() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResoureURL();
+	}
+
+	
+	@Test
+	public void testSetResoureURL() throws Exception {
+		DistributionStatusEvent testSubject;
+		String resoureURL = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResoureURL(resoureURL);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		DistributionStatusEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		DistributionStatusEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		DistributionStatusEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		DistributionStatusEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		DistributionStatusEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		DistributionStatusEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		DistributionStatusEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		DistributionStatusEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		DistributionStatusEvent testSubject;
+		Date timestamp = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp);
+	}
+
+	
+	@Test
+	public void testGetStatusTime() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatusTime();
+	}
+
+	
+	@Test
+	public void testSetStatusTime() throws Exception {
+		DistributionStatusEvent testSubject;
+		String statusTime = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatusTime(statusTime);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		DistributionStatusEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ExternalApiEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ExternalApiEventTest.java
new file mode 100644
index 0000000000..d4988dae3c
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ExternalApiEventTest.java
@@ -0,0 +1,455 @@
+package org.openecomp.sdc.be.resources.data.auditing;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ExternalApiEventTest {
+
+	private ExternalApiEvent createTestSubject() {
+		return new ExternalApiEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		ExternalApiEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		ExternalApiEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		ExternalApiEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		ExternalApiEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		ExternalApiEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		ExternalApiEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		ExternalApiEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		ExternalApiEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetConsumerId() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConsumerId();
+	}
+
+	
+	@Test
+	public void testSetConsumerId() throws Exception {
+		ExternalApiEvent testSubject;
+		String consumerId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConsumerId(consumerId);
+	}
+
+	
+	@Test
+	public void testGetResourceURL() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceURL();
+	}
+
+	
+	@Test
+	public void testSetResourceURL() throws Exception {
+		ExternalApiEvent testSubject;
+		String resourceURL = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceURL(resourceURL);
+	}
+
+	
+	@Test
+	public void testGetResourceName() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceName();
+	}
+
+	
+	@Test
+	public void testSetResourceName() throws Exception {
+		ExternalApiEvent testSubject;
+		String resourceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceName(resourceName);
+	}
+
+	
+	@Test
+	public void testGetResourceType() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceType();
+	}
+
+	
+	@Test
+	public void testSetResourceType() throws Exception {
+		ExternalApiEvent testSubject;
+		String resourceType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceType(resourceType);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		ExternalApiEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetInvariantUuid() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInvariantUuid();
+	}
+
+	
+	@Test
+	public void testSetInvariantUuid() throws Exception {
+		ExternalApiEvent testSubject;
+		String invariantUuid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInvariantUuid(invariantUuid);
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		ExternalApiEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetPrevArtifactUuid() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPrevArtifactUuid();
+	}
+
+	
+	@Test
+	public void testSetPrevArtifactUuid() throws Exception {
+		ExternalApiEvent testSubject;
+		String prevArtifactUuid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPrevArtifactUuid(prevArtifactUuid);
+	}
+
+	
+	@Test
+	public void testGetCurrArtifactUuid() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrArtifactUuid();
+	}
+
+	
+	@Test
+	public void testSetCurrArtifactUuid() throws Exception {
+		ExternalApiEvent testSubject;
+		String currArtifactUuid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrArtifactUuid(currArtifactUuid);
+	}
+
+	
+	@Test
+	public void testGetArtifactData() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactData();
+	}
+
+	
+	@Test
+	public void testSetArtifactData() throws Exception {
+		ExternalApiEvent testSubject;
+		String artifactData = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactData(artifactData);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+
+	
+	@Test
+	public void testGetPrevVersion() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPrevVersion();
+	}
+
+	
+	@Test
+	public void testSetPrevVersion() throws Exception {
+		ExternalApiEvent testSubject;
+		String prevVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPrevVersion(prevVersion);
+	}
+
+	
+	@Test
+	public void testGetCurrVersion() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrVersion();
+	}
+
+	
+	@Test
+	public void testSetCurrVersion() throws Exception {
+		ExternalApiEvent testSubject;
+		String currVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrVersion(currVersion);
+	}
+
+	
+	@Test
+	public void testGetPrevState() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPrevState();
+	}
+
+	
+	@Test
+	public void testSetPrevState() throws Exception {
+		ExternalApiEvent testSubject;
+		String prevState = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPrevState(prevState);
+	}
+
+	
+	@Test
+	public void testGetCurrState() throws Exception {
+		ExternalApiEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrState();
+	}
+
+	
+	@Test
+	public void testSetCurrState() throws Exception {
+		ExternalApiEvent testSubject;
+		String currState = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrState(currState);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetCategoryHierarchyEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetCategoryHierarchyEventTest.java
new file mode 100644
index 0000000000..e60747d7c9
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetCategoryHierarchyEventTest.java
@@ -0,0 +1,213 @@
+package org.openecomp.sdc.be.resources.data.auditing;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class GetCategoryHierarchyEventTest {
+
+	private GetCategoryHierarchyEvent createTestSubject() {
+		return new GetCategoryHierarchyEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetDetails() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDetails();
+	}
+
+	
+	@Test
+	public void testSetDetails() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String details = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDetails(details);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GetCategoryHierarchyEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetUsersListEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetUsersListEventTest.java
new file mode 100644
index 0000000000..bd51b61d92
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetUsersListEventTest.java
@@ -0,0 +1,213 @@
+package org.openecomp.sdc.be.resources.data.auditing;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class GetUsersListEventTest {
+
+	private GetUsersListEvent createTestSubject() {
+		return new GetUsersListEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		GetUsersListEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		GetUsersListEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		GetUsersListEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		GetUsersListEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		GetUsersListEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		GetUsersListEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		GetUsersListEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		GetUsersListEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		GetUsersListEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		GetUsersListEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		GetUsersListEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		GetUsersListEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		GetUsersListEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		GetUsersListEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		GetUsersListEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetDetails() throws Exception {
+		GetUsersListEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDetails();
+	}
+
+	
+	@Test
+	public void testSetDetails() throws Exception {
+		GetUsersListEvent testSubject;
+		String details = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDetails(details);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		GetUsersListEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ResourceAdminEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ResourceAdminEventTest.java
new file mode 100644
index 0000000000..a840319367
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ResourceAdminEventTest.java
@@ -0,0 +1,543 @@
+package org.openecomp.sdc.be.resources.data.auditing;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class ResourceAdminEventTest {
+
+	private ResourceAdminEvent createTestSubject() {
+		return new ResourceAdminEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		ResourceAdminEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetResourceName() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceName();
+	}
+
+	
+	@Test
+	public void testSetResourceName() throws Exception {
+		ResourceAdminEvent testSubject;
+		String resourceName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceName(resourceName);
+	}
+
+	
+	@Test
+	public void testGetResourceType() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getResourceType();
+	}
+
+	
+	@Test
+	public void testSetResourceType() throws Exception {
+		ResourceAdminEvent testSubject;
+		String resourceType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setResourceType(resourceType);
+	}
+
+	
+	@Test
+	public void testGetPrevVersion() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPrevVersion();
+	}
+
+	
+	@Test
+	public void testSetPrevVersion() throws Exception {
+		ResourceAdminEvent testSubject;
+		String prevVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPrevVersion(prevVersion);
+	}
+
+	
+	@Test
+	public void testGetCurrVersion() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrVersion();
+	}
+
+	
+	@Test
+	public void testSetCurrVersion() throws Exception {
+		ResourceAdminEvent testSubject;
+		String currVersion = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrVersion(currVersion);
+	}
+
+	
+	@Test
+	public void testGetPrevState() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPrevState();
+	}
+
+	
+	@Test
+	public void testSetPrevState() throws Exception {
+		ResourceAdminEvent testSubject;
+		String prevState = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPrevState(prevState);
+	}
+
+	
+	@Test
+	public void testGetCurrState() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrState();
+	}
+
+	
+	@Test
+	public void testSetCurrState() throws Exception {
+		ResourceAdminEvent testSubject;
+		String currState = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrState(currState);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		ResourceAdminEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		ResourceAdminEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		ResourceAdminEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		ResourceAdminEvent testSubject;
+		Date timestamp1 = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp1);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		ResourceAdminEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		ResourceAdminEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		ResourceAdminEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		ResourceAdminEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		ResourceAdminEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		ResourceAdminEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetPrevArtifactUUID() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getPrevArtifactUUID();
+	}
+
+	
+	@Test
+	public void testSetPrevArtifactUUID() throws Exception {
+		ResourceAdminEvent testSubject;
+		String prevArtifactUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setPrevArtifactUUID(prevArtifactUUID);
+	}
+
+	
+	@Test
+	public void testGetCurrArtifactUUID() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getCurrArtifactUUID();
+	}
+
+	
+	@Test
+	public void testSetCurrArtifactUUID() throws Exception {
+		ResourceAdminEvent testSubject;
+		String currArtifactUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setCurrArtifactUUID(currArtifactUUID);
+	}
+
+	
+	@Test
+	public void testGetArtifactData() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getArtifactData();
+	}
+
+	
+	@Test
+	public void testSetArtifactData() throws Exception {
+		ResourceAdminEvent testSubject;
+		String artifactData = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setArtifactData(artifactData);
+	}
+
+	
+	@Test
+	public void testGetDid() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDid();
+	}
+
+	
+	@Test
+	public void testSetDid() throws Exception {
+		ResourceAdminEvent testSubject;
+		String did = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDid(did);
+	}
+
+	
+	@Test
+	public void testGetDprevStatus() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDprevStatus();
+	}
+
+	
+	@Test
+	public void testSetDprevStatus() throws Exception {
+		ResourceAdminEvent testSubject;
+		String dprevStatus = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDprevStatus(dprevStatus);
+	}
+
+	
+	@Test
+	public void testGetDcurrStatus() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDcurrStatus();
+	}
+
+	
+	@Test
+	public void testSetDcurrStatus() throws Exception {
+		ResourceAdminEvent testSubject;
+		String dcurrStatus = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDcurrStatus(dcurrStatus);
+	}
+
+	
+	@Test
+	public void testGetToscaNodeType() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getToscaNodeType();
+	}
+
+	
+	@Test
+	public void testSetToscaNodeType() throws Exception {
+		ResourceAdminEvent testSubject;
+		String toscaNodeType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setToscaNodeType(toscaNodeType);
+	}
+
+	
+	@Test
+	public void testGetComment() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getComment();
+	}
+
+	
+	@Test
+	public void testSetComment() throws Exception {
+		ResourceAdminEvent testSubject;
+		String comment = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setComment(comment);
+	}
+
+	
+	@Test
+	public void testGetInvariantUUID() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getInvariantUUID();
+	}
+
+	
+	@Test
+	public void testSetInvariantUUID() throws Exception {
+		ResourceAdminEvent testSubject;
+		String invariantUUID = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setInvariantUUID(invariantUUID);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		ResourceAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEventTest.java
new file mode 100644
index 0000000000..efdaeb06ab
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEventTest.java
@@ -0,0 +1,191 @@
+package org.openecomp.sdc.be.resources.data.auditing;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class UserAccessEventTest {
+
+	private UserAccessEvent createTestSubject() {
+		return new UserAccessEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		UserAccessEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetUserUid() throws Exception {
+		UserAccessEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUserUid();
+	}
+
+	
+	@Test
+	public void testSetUserUid() throws Exception {
+		UserAccessEvent testSubject;
+		String userUid = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUserUid(userUid);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		UserAccessEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		UserAccessEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		UserAccessEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		UserAccessEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		UserAccessEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		UserAccessEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		UserAccessEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		UserAccessEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		UserAccessEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		UserAccessEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		UserAccessEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		UserAccessEvent testSubject;
+		Date timestamp = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		UserAccessEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAdminEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAdminEventTest.java
new file mode 100644
index 0000000000..4b66893821
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAdminEventTest.java
@@ -0,0 +1,257 @@
+package org.openecomp.sdc.be.resources.data.auditing;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class UserAdminEventTest {
+
+	private UserAdminEvent createTestSubject() {
+		return new UserAdminEvent();
+	}
+
+	
+	@Test
+	public void testFillFields() throws Exception {
+		UserAdminEvent testSubject;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.fillFields();
+	}
+
+	
+	@Test
+	public void testGetModifier() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getModifier();
+	}
+
+	
+	@Test
+	public void testSetModifier() throws Exception {
+		UserAdminEvent testSubject;
+		String modifier = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setModifier(modifier);
+	}
+
+	
+	@Test
+	public void testGetUserBefore() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUserBefore();
+	}
+
+	
+	@Test
+	public void testSetUserBefore() throws Exception {
+		UserAdminEvent testSubject;
+		String userBeforeName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUserBefore(userBeforeName);
+	}
+
+	
+	@Test
+	public void testGetUserAfter() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getUserAfter();
+	}
+
+	
+	@Test
+	public void testSetUserAfter() throws Exception {
+		UserAdminEvent testSubject;
+		String userAfterName = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setUserAfter(userAfterName);
+	}
+
+	
+	@Test
+	public void testGetRequestId() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRequestId();
+	}
+
+	
+	@Test
+	public void testSetRequestId() throws Exception {
+		UserAdminEvent testSubject;
+		String requestId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRequestId(requestId);
+	}
+
+	
+	@Test
+	public void testGetServiceInstanceId() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getServiceInstanceId();
+	}
+
+	
+	@Test
+	public void testSetServiceInstanceId() throws Exception {
+		UserAdminEvent testSubject;
+		String serviceInstanceId = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setServiceInstanceId(serviceInstanceId);
+	}
+
+	
+	@Test
+	public void testGetAction() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getAction();
+	}
+
+	
+	@Test
+	public void testSetAction() throws Exception {
+		UserAdminEvent testSubject;
+		String action = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setAction(action);
+	}
+
+	
+	@Test
+	public void testGetStatus() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getStatus();
+	}
+
+	
+	@Test
+	public void testSetStatus() throws Exception {
+		UserAdminEvent testSubject;
+		String status = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setStatus(status);
+	}
+
+	
+	@Test
+	public void testGetDesc() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getDesc();
+	}
+
+	
+	@Test
+	public void testSetDesc() throws Exception {
+		UserAdminEvent testSubject;
+		String desc = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setDesc(desc);
+	}
+
+	
+	@Test
+	public void testGetTimebaseduuid() throws Exception {
+		UserAdminEvent testSubject;
+		UUID result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimebaseduuid();
+	}
+
+	
+	@Test
+	public void testSetTimebaseduuid() throws Exception {
+		UserAdminEvent testSubject;
+		UUID timebaseduuid = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimebaseduuid(timebaseduuid);
+	}
+
+	
+	@Test
+	public void testGetTimestamp1() throws Exception {
+		UserAdminEvent testSubject;
+		Date result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTimestamp1();
+	}
+
+	
+	@Test
+	public void testSetTimestamp1() throws Exception {
+		UserAdminEvent testSubject;
+		Date timestamp = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setTimestamp1(timestamp);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		UserAdminEvent testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file