add more unit tests to BE components

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

30 files changed, 1924 insertions, 87 deletions

diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ArtifactTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ArtifactTableDescriptionTest.java
new file mode 100644
index 0000000000..e0e1adac6c
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ArtifactTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class ArtifactTableDescriptionTest {
+
+	private ArtifactTableDescription createTestSubject() {
+		return new ArtifactTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		ArtifactTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		ArtifactTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		ArtifactTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		ArtifactTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		ArtifactTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/AuthEventTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/AuthEventTableDescriptionTest.java
new file mode 100644
index 0000000000..95000492c0
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/AuthEventTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class AuthEventTableDescriptionTest {
+
+	private AuthEventTableDescription createTestSubject() {
+		return new AuthEventTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		AuthEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		AuthEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		AuthEventTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		AuthEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		AuthEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/CategoryEventTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/CategoryEventTableDescriptionTest.java
new file mode 100644
index 0000000000..c83595d591
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/CategoryEventTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class CategoryEventTableDescriptionTest {
+
+	private CategoryEventTableDescription createTestSubject() {
+		return new CategoryEventTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		CategoryEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		CategoryEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		CategoryEventTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		CategoryEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		CategoryEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ComponentCacheTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ComponentCacheTableDescriptionTest.java
new file mode 100644
index 0000000000..72117731d0
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ComponentCacheTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class ComponentCacheTableDescriptionTest {
+
+	private ComponentCacheTableDescription createTestSubject() {
+		return new ComponentCacheTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		ComponentCacheTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		ComponentCacheTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		ComponentCacheTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		ComponentCacheTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		ComponentCacheTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ConsumerEventTableDefinitionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ConsumerEventTableDefinitionTest.java
new file mode 100644
index 0000000000..61c1c17565
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ConsumerEventTableDefinitionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class ConsumerEventTableDefinitionTest {
+
+	private ConsumerEventTableDefinition createTestSubject() {
+		return new ConsumerEventTableDefinition();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		ConsumerEventTableDefinition testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		ConsumerEventTableDefinition testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		ConsumerEventTableDefinition testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		ConsumerEventTableDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		ConsumerEventTableDefinition testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribDeployEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribDeployEventTableDescTest.java
new file mode 100644
index 0000000000..430d408a72
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribDeployEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class DistribDeployEventTableDescTest {
+
+	private DistribDeployEventTableDesc createTestSubject() {
+		return new DistribDeployEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		DistribDeployEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		DistribDeployEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		DistribDeployEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		DistribDeployEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		DistribDeployEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribDownloadEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribDownloadEventTableDescTest.java
new file mode 100644
index 0000000000..28fed8c6aa
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribDownloadEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class DistribDownloadEventTableDescTest {
+
+	private DistribDownloadEventTableDesc createTestSubject() {
+		return new DistribDownloadEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		DistribDownloadEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		DistribDownloadEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		DistribDownloadEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		DistribDownloadEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		DistribDownloadEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribEngineEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribEngineEventTableDescTest.java
new file mode 100644
index 0000000000..6904aea64c
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribEngineEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class DistribEngineEventTableDescTest {
+
+	private DistribEngineEventTableDesc createTestSubject() {
+		return new DistribEngineEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		DistribEngineEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		DistribEngineEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		DistribEngineEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		DistribEngineEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		DistribEngineEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribNotifEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribNotifEventTableDescTest.java
new file mode 100644
index 0000000000..97f587976e
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribNotifEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class DistribNotifEventTableDescTest {
+
+	private DistribNotifEventTableDesc createTestSubject() {
+		return new DistribNotifEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		DistribNotifEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		DistribNotifEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		DistribNotifEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		DistribNotifEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		DistribNotifEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribStatusEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribStatusEventTableDescTest.java
new file mode 100644
index 0000000000..23b7301a68
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribStatusEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class DistribStatusEventTableDescTest {
+
+	private DistribStatusEventTableDesc createTestSubject() {
+		return new DistribStatusEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		DistribStatusEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		DistribStatusEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		DistribStatusEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		DistribStatusEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		DistribStatusEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ExternalApiEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ExternalApiEventTableDescTest.java
new file mode 100644
index 0000000000..eb23b88363
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ExternalApiEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class ExternalApiEventTableDescTest {
+
+	private ExternalApiEventTableDesc createTestSubject() {
+		return new ExternalApiEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		ExternalApiEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		ExternalApiEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		ExternalApiEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		ExternalApiEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		ExternalApiEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetCatHierEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetCatHierEventTableDescTest.java
new file mode 100644
index 0000000000..ce858ee33f
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetCatHierEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class GetCatHierEventTableDescTest {
+
+	private GetCatHierEventTableDesc createTestSubject() {
+		return new GetCatHierEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		GetCatHierEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		GetCatHierEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		GetCatHierEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		GetCatHierEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		GetCatHierEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetUebClusterEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetUebClusterEventTableDescTest.java
new file mode 100644
index 0000000000..559c8c9280
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetUebClusterEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class GetUebClusterEventTableDescTest {
+
+	private GetUebClusterEventTableDesc createTestSubject() {
+		return new GetUebClusterEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		GetUebClusterEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		GetUebClusterEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		GetUebClusterEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		GetUebClusterEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		GetUebClusterEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetUsersListEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetUsersListEventTableDescTest.java
new file mode 100644
index 0000000000..26a8788e5c
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetUsersListEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class GetUsersListEventTableDescTest {
+
+	private GetUsersListEventTableDesc createTestSubject() {
+		return new GetUsersListEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		GetUsersListEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		GetUsersListEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		GetUsersListEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		GetUsersListEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		GetUsersListEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/MigrationTasksTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/MigrationTasksTableDescriptionTest.java
new file mode 100644
index 0000000000..ad2b5c8a0d
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/MigrationTasksTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class MigrationTasksTableDescriptionTest {
+
+	private MigrationTasksTableDescription createTestSubject() {
+		return new MigrationTasksTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		MigrationTasksTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		MigrationTasksTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		MigrationTasksTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		MigrationTasksTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		MigrationTasksTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OldExternalApiEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OldExternalApiEventTableDescTest.java
new file mode 100644
index 0000000000..31ae8b5549
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OldExternalApiEventTableDescTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class OldExternalApiEventTableDescTest {
+
+	private OldExternalApiEventTableDesc createTestSubject() {
+		return new OldExternalApiEventTableDesc();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		OldExternalApiEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		OldExternalApiEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		OldExternalApiEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		OldExternalApiEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		OldExternalApiEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ResAdminEventTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ResAdminEventTableDescriptionTest.java
new file mode 100644
index 0000000000..68b06e1b66
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ResAdminEventTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class ResAdminEventTableDescriptionTest {
+
+	private ResAdminEventTableDescription createTestSubject() {
+		return new ResAdminEventTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		ResAdminEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		ResAdminEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		ResAdminEventTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		ResAdminEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		ResAdminEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/SdcSchemaFilesTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/SdcSchemaFilesTableDescriptionTest.java
new file mode 100644
index 0000000000..b323c0fabe
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/SdcSchemaFilesTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class SdcSchemaFilesTableDescriptionTest {
+
+	private SdcSchemaFilesTableDescription createTestSubject() {
+		return new SdcSchemaFilesTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		SdcSchemaFilesTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		SdcSchemaFilesTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		SdcSchemaFilesTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		SdcSchemaFilesTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		SdcSchemaFilesTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/UserAccessEventTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/UserAccessEventTableDescriptionTest.java
new file mode 100644
index 0000000000..da90309e34
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/UserAccessEventTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class UserAccessEventTableDescriptionTest {
+
+	private UserAccessEventTableDescription createTestSubject() {
+		return new UserAccessEventTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		UserAccessEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		UserAccessEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		UserAccessEventTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		UserAccessEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		UserAccessEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/UserAdminEventTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/UserAdminEventTableDescriptionTest.java
new file mode 100644
index 0000000000..1efb68c1a9
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/UserAdminEventTableDescriptionTest.java
@@ -0,0 +1,74 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+
+public class UserAdminEventTableDescriptionTest {
+
+	private UserAdminEventTableDescription createTestSubject() {
+		return new UserAdminEventTableDescription();
+	}
+
+	
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		UserAdminEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	
+	@Test
+	public void testClusteringKeys() throws Exception {
+		UserAdminEventTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		UserAdminEventTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	
+	@Test
+	public void testGetKeyspace() throws Exception {
+		UserAdminEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	
+	@Test
+	public void testGetTableName() throws Exception {
+		UserAdminEventTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getTableName();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/MatchFilterTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/MatchFilterTest.java
new file mode 100644
index 0000000000..529f642fb2
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/MatchFilterTest.java
@@ -0,0 +1,50 @@
+package org.openecomp.sdc.be.dao.neo4j.filters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class MatchFilterTest {
+
+	private MatchFilter createTestSubject() {
+		return new MatchFilter();
+	}
+
+	
+	@Test
+	public void testGetProperties() throws Exception {
+		MatchFilter testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperties();
+	}
+
+	
+	@Test
+	public void testSetProperties() throws Exception {
+		MatchFilter testSubject;
+		Map<String, Object> properties = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setProperties(properties);
+	}
+
+	
+	@Test
+	public void testAddToMatch() throws Exception {
+		MatchFilter testSubject;
+		String propName = "";
+		Object value = null;
+		MatchFilter result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.addToMatch(propName, value);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/RecursiveByRelationFilterTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/RecursiveByRelationFilterTest.java
new file mode 100644
index 0000000000..76b36d2a97
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/RecursiveByRelationFilterTest.java
@@ -0,0 +1,93 @@
+package org.openecomp.sdc.be.dao.neo4j.filters;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.dao.graph.datatype.GraphNode;
+
+
+public class RecursiveByRelationFilterTest {
+
+	private RecursiveByRelationFilter createTestSubject() {
+		return new RecursiveByRelationFilter();
+	}
+
+	
+	@Test
+	public void testAddNode() throws Exception {
+		RecursiveByRelationFilter testSubject;
+		GraphNode node = null;
+		RecursiveByRelationFilter result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.addNode(node);
+	}
+
+	
+	@Test
+	public void testAddRelation() throws Exception {
+		RecursiveByRelationFilter testSubject;
+		String relationType = "";
+		RecursiveByRelationFilter result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.addRelation(relationType);
+	}
+
+	
+	@Test
+	public void testGetNode() throws Exception {
+		RecursiveByRelationFilter testSubject;
+		GraphNode result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNode();
+	}
+
+	
+	@Test
+	public void testSetNode() throws Exception {
+		RecursiveByRelationFilter testSubject;
+		GraphNode node = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNode(node);
+	}
+
+	
+	@Test
+	public void testGetRelationType() throws Exception {
+		RecursiveByRelationFilter testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getRelationType();
+	}
+
+	
+	@Test
+	public void testSetRelationType() throws Exception {
+		RecursiveByRelationFilter testSubject;
+		String relationType = "";
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setRelationType(relationType);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RecursiveByRelationFilter testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/RecursiveFilterTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/RecursiveFilterTest.java
new file mode 100644
index 0000000000..990a2b4972
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/RecursiveFilterTest.java
@@ -0,0 +1,83 @@
+package org.openecomp.sdc.be.dao.neo4j.filters;
+
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
+
+
+public class RecursiveFilterTest {
+
+	private RecursiveFilter createTestSubject() {
+		return new RecursiveFilter();
+	}
+
+	
+	@Test
+	public void testAddChildRelationType() throws Exception {
+		RecursiveFilter testSubject;
+		String type = "";
+		RecursiveFilter result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.addChildRelationType(type);
+	}
+
+	
+	@Test
+	public void testGetChildRelationTypes() throws Exception {
+		RecursiveFilter testSubject;
+		List<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getChildRelationTypes();
+	}
+
+	
+	@Test
+	public void testSetChildRelationTypes() throws Exception {
+		RecursiveFilter testSubject;
+		List<String> childRelationTypes = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setChildRelationTypes(childRelationTypes);
+	}
+
+	
+	@Test
+	public void testGetNodeType() throws Exception {
+		RecursiveFilter testSubject;
+		NodeTypeEnum result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getNodeType();
+	}
+
+	
+	@Test
+	public void testSetNodeType() throws Exception {
+		RecursiveFilter testSubject;
+		NodeTypeEnum nodeType = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setNodeType(nodeType);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RecursiveFilter testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/UpdateFilterTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/UpdateFilterTest.java
new file mode 100644
index 0000000000..55a9255d31
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/filters/UpdateFilterTest.java
@@ -0,0 +1,40 @@
+package org.openecomp.sdc.be.dao.neo4j.filters;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class UpdateFilterTest {
+
+	private UpdateFilter createTestSubject() {
+		return new UpdateFilter(null);
+	}
+
+	
+	@Test
+	public void testGetToUpdate() throws Exception {
+		UpdateFilter testSubject;
+		Map<String, Object> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getToUpdate();
+	}
+
+	
+	@Test
+	public void testSetToUpdate() throws Exception {
+		UpdateFilter testSubject;
+		Map<String, Object> toUpdate = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setToUpdate(toUpdate);
+	}
+
+	
+
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/rest/RestConfigurationInfoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/rest/RestConfigurationInfoTest.java
new file mode 100644
index 0000000000..5ce78c2c95
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/rest/RestConfigurationInfoTest.java
@@ -0,0 +1,134 @@
+package org.openecomp.sdc.be.dao.rest;
+
+import javax.annotation.Generated;
+
+import org.junit.Test;
+
+
+public class RestConfigurationInfoTest {
+
+	private RestConfigurationInfo createTestSubject() {
+		return new RestConfigurationInfo();
+	}
+
+	
+	@Test
+	public void testGetReadTimeoutInSec() throws Exception {
+		RestConfigurationInfo testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getReadTimeoutInSec();
+	}
+
+	
+	@Test
+	public void testSetReadTimeoutInSec() throws Exception {
+		RestConfigurationInfo testSubject;
+		Integer readTimeoutInSec = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setReadTimeoutInSec(readTimeoutInSec);
+	}
+
+	
+	@Test
+	public void testGetIgnoreCertificate() throws Exception {
+		RestConfigurationInfo testSubject;
+		Boolean result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getIgnoreCertificate();
+	}
+
+	
+	@Test
+	public void testSetIgnoreCertificate() throws Exception {
+		RestConfigurationInfo testSubject;
+		Boolean ignoreCertificate = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setIgnoreCertificate(ignoreCertificate);
+	}
+
+	
+	@Test
+	public void testGetConnectionPoolSize() throws Exception {
+		RestConfigurationInfo testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConnectionPoolSize();
+	}
+
+	
+	@Test
+	public void testSetConnectionPoolSize() throws Exception {
+		RestConfigurationInfo testSubject;
+		Integer connectionPoolSize = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConnectionPoolSize(connectionPoolSize);
+	}
+
+	
+	@Test
+	public void testGetConnectTimeoutInSec() throws Exception {
+		RestConfigurationInfo testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getConnectTimeoutInSec();
+	}
+
+	
+	@Test
+	public void testSetConnectTimeoutInSec() throws Exception {
+		RestConfigurationInfo testSubject;
+		Integer connectTimeoutInSec = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setConnectTimeoutInSec(connectTimeoutInSec);
+	}
+
+	
+	@Test
+	public void testGetSocketTimeoutInSec() throws Exception {
+		RestConfigurationInfo testSubject;
+		Integer result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getSocketTimeoutInSec();
+	}
+
+	
+	@Test
+	public void testSetSocketTimeoutInSec() throws Exception {
+		RestConfigurationInfo testSubject;
+		Integer socketTimeoutInSec = 0;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setSocketTimeoutInSec(socketTimeoutInSec);
+	}
+
+	
+	@Test
+	public void testToString() throws Exception {
+		RestConfigurationInfo testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.toString();
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/MapEntryTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/MapEntryTest.java
new file mode 100644
index 0000000000..bb6afc4153
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/MapEntryTest.java
@@ -0,0 +1,44 @@
+package org.openecomp.sdc.be.dao.utils;
+
+import javax.annotation.Generated;
+
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.elasticsearch.common.recycler.Recycler.V;
+import org.junit.Test;
+
+
+public class MapEntryTest {
+
+	private MapEntry createTestSubject() {
+		return new MapEntry();
+	}
+
+	
+
+
+
+	
+	@Test
+	public void testSetKey() throws Exception {
+		MapEntry testSubject;
+		T key = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setKey(key);
+	}
+
+	
+
+
+	
+	@Test
+	public void testSetValue() throws Exception {
+		MapEntry testSubject;
+		V value = null;
+
+		// default test
+		testSubject = createTestSubject();
+		testSubject.setValue(value);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEventTest.java
index c6de8d16c5..5172fc31dc 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEventTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEventTest.java
@@ -1,17 +1,13 @@
 package org.openecomp.sdc.be.resources.data.auditing;
 
-import javax.annotation.Generated;
-
 import org.junit.Test;
 
-
 public class AuditingGenericEventTest {
 
 	private AuditingGenericEvent createTestSubject() {
 		return new AuditingGenericEvent();
 	}
 
-	
 	@Test
 	public void testGetRequestId() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -22,7 +18,6 @@ public class AuditingGenericEventTest {
 		result = testSubject.getRequestId();
 	}
 
-	
 	@Test
 	public void testSetRequestId() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -33,7 +28,6 @@ public class AuditingGenericEventTest {
 		testSubject.setRequestId(requestId);
 	}
 
-	
 	@Test
 	public void testGetServiceInstanceId() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -44,7 +38,6 @@ public class AuditingGenericEventTest {
 		result = testSubject.getServiceInstanceId();
 	}
 
-	
 	@Test
 	public void testSetServiceInstanceId() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -55,7 +48,6 @@ public class AuditingGenericEventTest {
 		testSubject.setServiceInstanceId(serviceInstanceId);
 	}
 
-	
 	@Test
 	public void testGetAction() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -66,7 +58,6 @@ public class AuditingGenericEventTest {
 		result = testSubject.getAction();
 	}
 
-	
 	@Test
 	public void testSetAction() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -77,7 +68,6 @@ public class AuditingGenericEventTest {
 		testSubject.setAction(action);
 	}
 
-	
 	@Test
 	public void testGetStatus() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -88,7 +78,6 @@ public class AuditingGenericEventTest {
 		result = testSubject.getStatus();
 	}
 
-	
 	@Test
 	public void testSetStatus() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -99,7 +88,6 @@ public class AuditingGenericEventTest {
 		testSubject.setStatus(status);
 	}
 
-	
 	@Test
 	public void testGetDesc() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -110,7 +98,6 @@ public class AuditingGenericEventTest {
 		result = testSubject.getDesc();
 	}
 
-	
 	@Test
 	public void testSetDesc() throws Exception {
 		AuditingGenericEvent testSubject;
@@ -121,7 +108,6 @@ public class AuditingGenericEventTest {
 		testSubject.setDesc(desc);
 	}
 
-	
 	@Test
 	public void testFillFields() throws Exception {
 		AuditingGenericEvent testSubject;
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEventTest.java
index 7940ae182a..72ccc52b88 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEventTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEventTest.java
@@ -3,18 +3,14 @@ package org.openecomp.sdc.be.resources.data.auditing;
 import java.util.Date;
 import java.util.UUID;
 
-import javax.annotation.Generated;
-
 import org.junit.Test;
 
-
 public class AuditingGetUebClusterEventTest {
 
 	private AuditingGetUebClusterEvent createTestSubject() {
 		return new AuditingGetUebClusterEvent();
 	}
 
-	
 	@Test
 	public void testFillFields() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -24,7 +20,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.fillFields();
 	}
 
-	
 	@Test
 	public void testGetConsumerId() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -35,7 +30,6 @@ public class AuditingGetUebClusterEventTest {
 		result = testSubject.getConsumerId();
 	}
 
-	
 	@Test
 	public void testSetConsumerId() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -46,7 +40,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.setConsumerId(consumerId);
 	}
 
-	
 	@Test
 	public void testGetTimebaseduuid() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -57,7 +50,6 @@ public class AuditingGetUebClusterEventTest {
 		result = testSubject.getTimebaseduuid();
 	}
 
-	
 	@Test
 	public void testSetTimebaseduuid() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -68,7 +60,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.setTimebaseduuid(timebaseduuid);
 	}
 
-	
 	@Test
 	public void testGetTimestamp1() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -79,7 +70,6 @@ public class AuditingGetUebClusterEventTest {
 		result = testSubject.getTimestamp1();
 	}
 
-	
 	@Test
 	public void testSetTimestamp1() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -90,7 +80,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.setTimestamp1(timestamp1);
 	}
 
-	
 	@Test
 	public void testGetRequestId() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -101,7 +90,6 @@ public class AuditingGetUebClusterEventTest {
 		result = testSubject.getRequestId();
 	}
 
-	
 	@Test
 	public void testSetRequestId() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -112,7 +100,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.setRequestId(requestId);
 	}
 
-	
 	@Test
 	public void testGetServiceInstanceId() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -123,7 +110,6 @@ public class AuditingGetUebClusterEventTest {
 		result = testSubject.getServiceInstanceId();
 	}
 
-	
 	@Test
 	public void testSetServiceInstanceId() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -134,7 +120,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.setServiceInstanceId(serviceInstanceId);
 	}
 
-	
 	@Test
 	public void testGetAction() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -145,7 +130,6 @@ public class AuditingGetUebClusterEventTest {
 		result = testSubject.getAction();
 	}
 
-	
 	@Test
 	public void testSetAction() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -156,7 +140,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.setAction(action);
 	}
 
-	
 	@Test
 	public void testGetStatus() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -167,7 +150,6 @@ public class AuditingGetUebClusterEventTest {
 		result = testSubject.getStatus();
 	}
 
-	
 	@Test
 	public void testSetStatus() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -178,7 +160,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.setStatus(status);
 	}
 
-	
 	@Test
 	public void testGetDesc() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -189,7 +170,6 @@ public class AuditingGetUebClusterEventTest {
 		result = testSubject.getDesc();
 	}
 
-	
 	@Test
 	public void testSetDesc() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
@@ -200,7 +180,6 @@ public class AuditingGetUebClusterEventTest {
 		testSubject.setDesc(desc);
 	}
 
-	
 	@Test
 	public void testToString() throws Exception {
 		AuditingGetUebClusterEvent testSubject;
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuthEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuthEventTest.java
index 42de349d5b..39de467030 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuthEventTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuthEventTest.java
@@ -3,18 +3,14 @@ package org.openecomp.sdc.be.resources.data.auditing;
 import java.util.Date;
 import java.util.UUID;
 
-import javax.annotation.Generated;
-
 import org.junit.Test;
 
-
 public class AuthEventTest {
 
 	private AuthEvent createTestSubject() {
 		return new AuthEvent();
 	}
 
-	
 	@Test
 	public void testGetUrl() throws Exception {
 		AuthEvent testSubject;
@@ -25,7 +21,6 @@ public class AuthEventTest {
 		result = testSubject.getUrl();
 	}
 
-	
 	@Test
 	public void testSetUrl() throws Exception {
 		AuthEvent testSubject;
@@ -36,7 +31,6 @@ public class AuthEventTest {
 		testSubject.setUrl(url);
 	}
 
-	
 	@Test
 	public void testGetUser() throws Exception {
 		AuthEvent testSubject;
@@ -47,7 +41,6 @@ public class AuthEventTest {
 		result = testSubject.getUser();
 	}
 
-	
 	@Test
 	public void testSetUser() throws Exception {
 		AuthEvent testSubject;
@@ -58,7 +51,6 @@ public class AuthEventTest {
 		testSubject.setUser(user);
 	}
 
-	
 	@Test
 	public void testGetAuthStatus() throws Exception {
 		AuthEvent testSubject;
@@ -69,7 +61,6 @@ public class AuthEventTest {
 		result = testSubject.getAuthStatus();
 	}
 
-	
 	@Test
 	public void testSetAuthStatus() throws Exception {
 		AuthEvent testSubject;
@@ -80,7 +71,6 @@ public class AuthEventTest {
 		testSubject.setAuthStatus(authStatus);
 	}
 
-	
 	@Test
 	public void testGetRealm() throws Exception {
 		AuthEvent testSubject;
@@ -91,7 +81,6 @@ public class AuthEventTest {
 		result = testSubject.getRealm();
 	}
 
-	
 	@Test
 	public void testSetRealm() throws Exception {
 		AuthEvent testSubject;
@@ -102,7 +91,6 @@ public class AuthEventTest {
 		testSubject.setRealm(realm);
 	}
 
-	
 	@Test
 	public void testGetTimebaseduuid() throws Exception {
 		AuthEvent testSubject;
@@ -113,7 +101,6 @@ public class AuthEventTest {
 		result = testSubject.getTimebaseduuid();
 	}
 
-	
 	@Test
 	public void testSetTimebaseduuid() throws Exception {
 		AuthEvent testSubject;
@@ -124,7 +111,6 @@ public class AuthEventTest {
 		testSubject.setTimebaseduuid(timebaseduuid);
 	}
 
-	
 	@Test
 	public void testGetTimestamp1() throws Exception {
 		AuthEvent testSubject;
@@ -135,7 +121,6 @@ public class AuthEventTest {
 		result = testSubject.getTimestamp1();
 	}
 
-	
 	@Test
 	public void testSetTimestamp1() throws Exception {
 		AuthEvent testSubject;
@@ -146,7 +131,6 @@ public class AuthEventTest {
 		testSubject.setTimestamp1(timestamp1);
 	}
 
-	
 	@Test
 	public void testGetAction() throws Exception {
 		AuthEvent testSubject;
@@ -157,7 +141,6 @@ public class AuthEventTest {
 		result = testSubject.getAction();
 	}
 
-	
 	@Test
 	public void testSetAction() throws Exception {
 		AuthEvent testSubject;
@@ -168,7 +151,6 @@ public class AuthEventTest {
 		testSubject.setAction(action);
 	}
 
-	
 	@Test
 	public void testGetStatus() throws Exception {
 		AuthEvent testSubject;
@@ -179,7 +161,6 @@ public class AuthEventTest {
 		result = testSubject.getStatus();
 	}
 
-	
 	@Test
 	public void testSetStatus() throws Exception {
 		AuthEvent testSubject;
@@ -190,7 +171,6 @@ public class AuthEventTest {
 		testSubject.setStatus(status);
 	}
 
-	
 	@Test
 	public void testGetDesc() throws Exception {
 		AuthEvent testSubject;
@@ -201,7 +181,6 @@ public class AuthEventTest {
 		result = testSubject.getDesc();
 	}
 
-	
 	@Test
 	public void testSetDesc() throws Exception {
 		AuthEvent testSubject;
@@ -212,7 +191,6 @@ public class AuthEventTest {
 		testSubject.setDesc(desc);
 	}
 
-	
 	@Test
 	public void testGetRequestId() throws Exception {
 		AuthEvent testSubject;
@@ -223,7 +201,6 @@ public class AuthEventTest {
 		result = testSubject.getRequestId();
 	}
 
-	
 	@Test
 	public void testSetRequestId() throws Exception {
 		AuthEvent testSubject;
@@ -234,7 +211,6 @@ public class AuthEventTest {
 		testSubject.setRequestId(requestId);
 	}
 
-	
 	@Test
 	public void testFillFields() throws Exception {
 		AuthEvent testSubject;
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEventTest.java
index 448df507d7..3e508307ed 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEventTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEventTest.java
@@ -3,18 +3,14 @@ package org.openecomp.sdc.be.resources.data.auditing;
 import java.util.Date;
 import java.util.UUID;
 
-import javax.annotation.Generated;
-
 import org.junit.Test;
 
-
 public class CategoryEventTest {
 
 	private CategoryEvent createTestSubject() {
 		return new CategoryEvent();
 	}
 
-	
 	@Test
 	public void testFillFields() throws Exception {
 		CategoryEvent testSubject;
@@ -24,7 +20,6 @@ public class CategoryEventTest {
 		testSubject.fillFields();
 	}
 
-	
 	@Test
 	public void testGetTimebaseduuid() throws Exception {
 		CategoryEvent testSubject;
@@ -35,7 +30,6 @@ public class CategoryEventTest {
 		result = testSubject.getTimebaseduuid();
 	}
 
-	
 	@Test
 	public void testSetTimebaseduuid() throws Exception {
 		CategoryEvent testSubject;
@@ -46,7 +40,6 @@ public class CategoryEventTest {
 		testSubject.setTimebaseduuid(timebaseduuid);
 	}
 
-	
 	@Test
 	public void testGetAction() throws Exception {
 		CategoryEvent testSubject;
@@ -57,7 +50,6 @@ public class CategoryEventTest {
 		result = testSubject.getAction();
 	}
 
-	
 	@Test
 	public void testSetAction() throws Exception {
 		CategoryEvent testSubject;
@@ -68,7 +60,6 @@ public class CategoryEventTest {
 		testSubject.setAction(action);
 	}
 
-	
 	@Test
 	public void testGetStatus() throws Exception {
 		CategoryEvent testSubject;
@@ -79,7 +70,6 @@ public class CategoryEventTest {
 		result = testSubject.getStatus();
 	}
 
-	
 	@Test
 	public void testSetStatus() throws Exception {
 		CategoryEvent testSubject;
@@ -90,7 +80,6 @@ public class CategoryEventTest {
 		testSubject.setStatus(status);
 	}
 
-	
 	@Test
 	public void testGetDesc() throws Exception {
 		CategoryEvent testSubject;
@@ -101,7 +90,6 @@ public class CategoryEventTest {
 		result = testSubject.getDesc();
 	}
 
-	
 	@Test
 	public void testSetDesc() throws Exception {
 		CategoryEvent testSubject;
@@ -112,7 +100,6 @@ public class CategoryEventTest {
 		testSubject.setDesc(desc);
 	}
 
-	
 	@Test
 	public void testGetCategoryName() throws Exception {
 		CategoryEvent testSubject;
@@ -123,7 +110,6 @@ public class CategoryEventTest {
 		result = testSubject.getCategoryName();
 	}
 
-	
 	@Test
 	public void testSetCategoryName() throws Exception {
 		CategoryEvent testSubject;
@@ -134,7 +120,6 @@ public class CategoryEventTest {
 		testSubject.setCategoryName(categoryName);
 	}
 
-	
 	@Test
 	public void testGetSubCategoryName() throws Exception {
 		CategoryEvent testSubject;
@@ -145,7 +130,6 @@ public class CategoryEventTest {
 		result = testSubject.getSubCategoryName();
 	}
 
-	
 	@Test
 	public void testSetSubCategoryName() throws Exception {
 		CategoryEvent testSubject;
@@ -156,7 +140,6 @@ public class CategoryEventTest {
 		testSubject.setSubCategoryName(subCategoryName);
 	}
 
-	
 	@Test
 	public void testGetGroupingName() throws Exception {
 		CategoryEvent testSubject;
@@ -167,7 +150,6 @@ public class CategoryEventTest {
 		result = testSubject.getGroupingName();
 	}
 
-	
 	@Test
 	public void testSetGroupingName() throws Exception {
 		CategoryEvent testSubject;
@@ -178,7 +160,6 @@ public class CategoryEventTest {
 		testSubject.setGroupingName(groupingName);
 	}
 
-	
 	@Test
 	public void testGetTimestamp1() throws Exception {
 		CategoryEvent testSubject;
@@ -189,7 +170,6 @@ public class CategoryEventTest {
 		result = testSubject.getTimestamp1();
 	}
 
-	
 	@Test
 	public void testSetTimestamp1() throws Exception {
 		CategoryEvent testSubject;
@@ -200,7 +180,6 @@ public class CategoryEventTest {
 		testSubject.setTimestamp1(timestamp1);
 	}
 
-	
 	@Test
 	public void testGetModifier() throws Exception {
 		CategoryEvent testSubject;
@@ -211,7 +190,6 @@ public class CategoryEventTest {
 		result = testSubject.getModifier();
 	}
 
-	
 	@Test
 	public void testSetModifier() throws Exception {
 		CategoryEvent testSubject;
@@ -222,7 +200,6 @@ public class CategoryEventTest {
 		testSubject.setModifier(modifier);
 	}
 
-	
 	@Test
 	public void testGetServiceInstanceId() throws Exception {
 		CategoryEvent testSubject;
@@ -233,7 +210,6 @@ public class CategoryEventTest {
 		result = testSubject.getServiceInstanceId();
 	}
 
-	
 	@Test
 	public void testSetServiceInstanceId() throws Exception {
 		CategoryEvent testSubject;
@@ -244,7 +220,6 @@ public class CategoryEventTest {
 		testSubject.setServiceInstanceId(serviceInstanceId);
 	}
 
-	
 	@Test
 	public void testGetResourceType() throws Exception {
 		CategoryEvent testSubject;
@@ -255,7 +230,6 @@ public class CategoryEventTest {
 		result = testSubject.getResourceType();
 	}
 
-	
 	@Test
 	public void testSetResourceType() throws Exception {
 		CategoryEvent testSubject;
@@ -266,7 +240,6 @@ public class CategoryEventTest {
 		testSubject.setResourceType(resourceType);
 	}
 
-	
 	@Test
 	public void testGetRequestId() throws Exception {
 		CategoryEvent testSubject;
@@ -277,7 +250,6 @@ public class CategoryEventTest {
 		result = testSubject.getRequestId();
 	}
 
-	
 	@Test
 	public void testSetRequestId() throws Exception {
 		CategoryEvent testSubject;