new unit tests for sdc-dao

Change-Id: I2f754832fd4557ba1aa7375ac036aa777d199c3e
Issue-ID: SDC-1333
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

15 files changed, 358 insertions, 83 deletions

diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/ArtifactCassandraDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/ArtifactCassandraDaoTest.java
index 250459f276..661a599ddf 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/ArtifactCassandraDaoTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/ArtifactCassandraDaoTest.java
@@ -1,15 +1,5 @@
 package org.openecomp.sdc.be.dao.cassandra;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.InetAddress;
-import java.nio.ByteBuffer;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.Before;
 import org.junit.Test;
@@ -19,17 +9,10 @@ import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.openecomp.sdc.be.resources.data.ESArtifactData;
 
-import com.datastax.driver.core.ColumnDefinitions;
-import com.datastax.driver.core.LocalDate;
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Row;
 import com.datastax.driver.core.Session;
-import com.datastax.driver.core.Token;
-import com.datastax.driver.core.TupleValue;
-import com.datastax.driver.core.TypeCodec;
-import com.datastax.driver.core.UDTValue;
 import com.datastax.driver.mapping.MappingManager;
-import com.google.common.reflect.TypeToken;
 
 import fj.data.Either;
 
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaBuilderTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaBuilderTest.java
new file mode 100644
index 0000000000..e4d7e84e47
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaBuilderTest.java
@@ -0,0 +1,137 @@
+package org.openecomp.sdc.be.dao.cassandra.schema;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.sdc.be.config.Configuration.CassandrConfig.KeyspaceConfig;
+import org.openecomp.sdc.be.dao.cassandra.schema.SdcSchemaBuilder.ReplicationStrategy;
+import org.openecomp.sdc.be.utils.DAOConfDependentTest;
+
+import com.datastax.driver.core.Session;
+
+import mockit.Deencapsulation;
+
+public class SdcSchemaBuilderTest extends DAOConfDependentTest{
+
+	private SdcSchemaBuilder createTestSubject() {
+		return new SdcSchemaBuilder();
+	}
+
+	@Test
+	public void testHandle1707OSMigration() throws Exception {
+		Map<String, Map<String, List<String>>> cassndraMetadata = new HashMap<>();
+		Map<String, List<ITableDescription>> schemeData = new HashMap<>();
+
+		// default test
+		Deencapsulation.invoke(SdcSchemaBuilder.class, "handle1707OSMigration", cassndraMetadata, schemeData);
+	}
+
+	@Test
+	public void testCreateSchema() throws Exception {
+		boolean result;
+
+		// default test
+		result = SdcSchemaBuilder.createSchema();
+	}
+
+	@Test
+	public void testDeleteSchema() throws Exception {
+		boolean result;
+
+		// default test
+		result = SdcSchemaBuilder.deleteSchema();
+	}
+
+	/*@Test
+	public void testParseKeyspaceMetadata() throws Exception {
+		List<KeyspaceMetadata> keyspacesMetadata = new LinkedList<>();
+		Map<String, Map<String, List<String>>> result;
+
+		// default test
+		result = Deencapsulation.invoke(SdcSchemaBuilder.class, "parseKeyspaceMetadata", keyspacesMetadata);
+	}*/
+
+	/*@Test
+	public void testGetMetadataTablesStructure() throws Exception {
+		List<KeyspaceMetadata> keyspacesMetadata = new LinkedList<>();
+		Map<String, Map<String, List<String>>> result;
+
+		// default test
+		result = Deencapsulation.invoke(SdcSchemaBuilder.class, "getMetadataTablesStructure", keyspacesMetadata);
+	}*/
+
+	@Test
+	public void testCreateIndexName() throws Exception {
+		String table = "";
+		String column = "";
+		String result;
+
+		// default test
+		result = Deencapsulation.invoke(SdcSchemaBuilder.class, "createIndexName", table, column);
+	}
+
+	/*@Test
+	public void testAlterTable() throws Exception {
+		Session session = null;
+		Map<String, List<String>> existingTablesMetadata = null;
+		ITableDescription tableDescription = null;
+		String tableName = "";
+		Map<String, ImmutablePair<DataType, Boolean>> columnDescription = null;
+
+		// default test
+		Deencapsulation.invoke(SdcSchemaBuilder.class, "alterTable",
+				new Object[] { Session.class, Map.class, ITableDescription.class, tableName, Map.class });
+	}*/
+
+	@Test
+	public void testCreateKeyspace() throws Exception {
+		String keyspace = "mock";
+		Map<String, Map<String, List<String>>> cassndraMetadata = new HashMap<>();
+		Session session = Mockito.mock(Session.class);
+		boolean result;
+
+		// default test
+		result = Deencapsulation.invoke(SdcSchemaBuilder.class, "createKeyspace",
+				keyspace, cassndraMetadata, session);
+		
+		cassndraMetadata.put(keyspace, new HashMap<>());
+		result = Deencapsulation.invoke(SdcSchemaBuilder.class, "createKeyspace",
+				keyspace, cassndraMetadata, session);
+	}
+
+	@Test
+	public void testGetSchemeData() throws Exception {
+		Map<String, List<ITableDescription>> result;
+
+		// default test
+		result = Deencapsulation.invoke(SdcSchemaBuilder.class, "getSchemeData");
+	}
+
+	@Test
+	public void testCreateKeyspaceQuereyString() throws Exception {
+		String keyspace = "mock";
+		KeyspaceConfig keyspaceInfo = new KeyspaceConfig();
+		String result;
+
+		// default test
+		result = Deencapsulation.invoke(SdcSchemaBuilder.class, "createKeyspaceQuereyString", keyspace, keyspaceInfo);
+		
+		keyspaceInfo.setReplicationStrategy(ReplicationStrategy.NETWORK_TOPOLOGY_STRATEGY.getName());
+		LinkedList<String> replicationInfo = new LinkedList<>();
+		keyspaceInfo.setReplicationInfo(replicationInfo);
+		//Test1
+		result = Deencapsulation.invoke(SdcSchemaBuilder.class, "createKeyspaceQuereyString", keyspace, keyspaceInfo);
+		replicationInfo.add("mock1");
+		replicationInfo.add("mock2");
+		
+		result = Deencapsulation.invoke(SdcSchemaBuilder.class, "createKeyspaceQuereyString", keyspace, keyspaceInfo);
+		
+		//Test2
+		keyspaceInfo.setReplicationStrategy(ReplicationStrategy.SIMPLE_STRATEGY.getName());
+		result = Deencapsulation.invoke(SdcSchemaBuilder.class, "createKeyspaceQuereyString", keyspace, keyspaceInfo);
+	}
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtilsTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtilsTest.java
index b3cb75fb89..47d310765e 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtilsTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtilsTest.java
@@ -1,17 +1,14 @@
 package org.openecomp.sdc.be.dao.cassandra.schema;
 
-import org.junit.Test;
-
-
-public class SdcSchemaUtilsTest {
-
-	private SdcSchemaUtils createTestSubject() {
-		return new SdcSchemaUtils();
-	}
+import java.util.LinkedList;
+import java.util.List;
 
-	
+import org.junit.Test;
+import org.openecomp.sdc.be.config.ConfigurationManager;
+import org.openecomp.sdc.be.utils.DAOConfDependentTest;
 
 
+public class SdcSchemaUtilsTest extends DAOConfDependentTest{
 	
 	@Test
 	public void testExecuteStatement() throws Exception {
@@ -20,6 +17,13 @@ public class SdcSchemaUtilsTest {
 
 		// default test
 		result = SdcSchemaUtils.executeStatement(statement);
+		
+		List<String> cassandraHosts = new LinkedList<>();
+		ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setCassandraHosts(cassandraHosts);
+		ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setAuthenticate(true);
+		ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setSsl(true);
+		
+		result = SdcSchemaUtils.executeStatement(statement);
 	}
 
 	
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
index d5e5f8fc7d..81030caa50 100644
--- 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
@@ -1,6 +1,7 @@
 package org.openecomp.sdc.be.dao.cassandra.schema.tables;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.Test;
@@ -59,4 +60,17 @@ public class CategoryEventTableDescriptionTest {
 		testSubject = createTestSubject();
 		result = testSubject.getTableName();
 	}
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		CategoryEventTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+		
+		CategoryEventTableDescription.CEFieldsDescription.ACTION.getType();
+		CategoryEventTableDescription.CEFieldsDescription.ACTION.isIndexed();
+	}
 }
\ 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
index 9cb7950c5f..2d49638533 100644
--- 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
@@ -1,12 +1,15 @@
 package org.openecomp.sdc.be.dao.cassandra.schema.tables;
 
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.Test;
+import org.openecomp.sdc.be.dao.cassandra.schema.tables.DistribStatusEventTableDesc.DSEFieldsDescription;
 
 import com.datastax.driver.core.DataType;
 
+import mockit.Deencapsulation;
 
 public class DistribStatusEventTableDescTest {
 
@@ -14,50 +17,32 @@ public class DistribStatusEventTableDescTest {
 		return new DistribStatusEventTableDesc();
 	}
 
-	
 	@Test
-	public void testPrimaryKeys() throws Exception {
+	public void testUpdateColumnDistribDescription() throws Exception {
 		DistribStatusEventTableDesc testSubject;
-		List<ImmutablePair<String, DataType>> result;
+		Map<String, ImmutablePair<DataType, Boolean>> columns = new HashMap<>();
 
 		// default test
 		testSubject = createTestSubject();
-		result = testSubject.primaryKeys();
+		Deencapsulation.invoke(testSubject, "updateColumnDistribDescription", columns);
 	}
 
-	
 	@Test
-	public void testClusteringKeys() throws Exception {
-		DistribStatusEventTableDesc testSubject;
-		List<ImmutablePair<String, DataType>> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.clusteringKeys();
-	}
-
-	
-
-
-	
-	@Test
-	public void testGetKeyspace() throws Exception {
+	public void testGetTableName() throws Exception {
 		DistribStatusEventTableDesc testSubject;
 		String result;
 
 		// default test
 		testSubject = createTestSubject();
-		result = testSubject.getKeyspace();
+		result = testSubject.getTableName();
 	}
-
 	
 	@Test
-	public void testGetTableName() throws Exception {
-		DistribStatusEventTableDesc testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTableName();
+	public void testDSEFieldsDescription() throws Exception {
+		DSEFieldsDescription testSubject = DistribStatusEventTableDesc.DSEFieldsDescription.CONSUMER_ID;
+		
+		testSubject.getName();
+		testSubject.getType();
+		testSubject.isIndexed();
 	}
 }
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/EcompOperationalEnvironmentEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/EcompOperationalEnvironmentEventTableDescTest.java
new file mode 100644
index 0000000000..906ee885a4
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/EcompOperationalEnvironmentEventTableDescTest.java
@@ -0,0 +1,66 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+public class EcompOperationalEnvironmentEventTableDescTest {
+
+	private EcompOperationalEnvironmentEventTableDesc createTestSubject() {
+		return new EcompOperationalEnvironmentEventTableDesc();
+	}
+
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		EcompOperationalEnvironmentEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	@Test
+	public void testClusteringKeys() throws Exception {
+		EcompOperationalEnvironmentEventTableDesc testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	@Test
+	public void testGetKeyspace() throws Exception {
+		EcompOperationalEnvironmentEventTableDesc testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		EcompOperationalEnvironmentEventTableDesc testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	@Test
+	public void testGetTableName() throws Exception {
+		EcompOperationalEnvironmentEventTableDesc 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/OperationalEnvironmentsTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OperationalEnvironmentsTableDescriptionTest.java
new file mode 100644
index 0000000000..ccdb391013
--- /dev/null
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OperationalEnvironmentsTableDescriptionTest.java
@@ -0,0 +1,66 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+public class OperationalEnvironmentsTableDescriptionTest {
+
+	private OperationalEnvironmentsTableDescription createTestSubject() {
+		return new OperationalEnvironmentsTableDescription();
+	}
+
+	@Test
+	public void testPrimaryKeys() throws Exception {
+		OperationalEnvironmentsTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.primaryKeys();
+	}
+
+	@Test
+	public void testClusteringKeys() throws Exception {
+		OperationalEnvironmentsTableDescription testSubject;
+		List<ImmutablePair<String, DataType>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.clusteringKeys();
+	}
+
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		OperationalEnvironmentsTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+	}
+
+	@Test
+	public void testGetKeyspace() throws Exception {
+		OperationalEnvironmentsTableDescription testSubject;
+		String result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getKeyspace();
+	}
+
+	@Test
+	public void testGetTableName() throws Exception {
+		OperationalEnvironmentsTableDescription 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
index 0d9a4c24f3..ed1774e517 100644
--- 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
@@ -1,6 +1,7 @@
 package org.openecomp.sdc.be.dao.cassandra.schema.tables;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.Test;
@@ -60,4 +61,17 @@ public class ResAdminEventTableDescriptionTest {
 		testSubject = createTestSubject();
 		result = testSubject.getTableName();
 	}
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		ResAdminEventTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+		
+		ResAdminEventTableDescription.AEFieldsDescription.ACTION.getType();
+		ResAdminEventTableDescription.AEFieldsDescription.ACTION.isIndexed();
+	}
 }
\ 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
index 2144e002d1..4a8c211497 100644
--- 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
@@ -1,6 +1,7 @@
 package org.openecomp.sdc.be.dao.cassandra.schema.tables;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.Test;
@@ -59,4 +60,17 @@ public class UserAdminEventTableDescriptionTest {
 		testSubject = createTestSubject();
 		result = testSubject.getTableName();
 	}
+	
+	@Test
+	public void testGetColumnDescription() throws Exception {
+		UserAdminEventTableDescription testSubject;
+		Map<String, ImmutablePair<DataType, Boolean>> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getColumnDescription();
+		
+		UserAdminEventTableDescription.UAEFieldsDescription.ACTION.getType();
+		UserAdminEventTableDescription.UAEFieldsDescription.ACTION.isIndexed();
+	}
 }
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/titan/TitanUtilsTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/titan/TitanUtilsTest.java
index d40a64e57a..5ada93027a 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/titan/TitanUtilsTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/titan/TitanUtilsTest.java
@@ -2,15 +2,12 @@ package org.openecomp.sdc.be.dao.titan;
 
 import java.util.Collection;
 import java.util.Map;
-
-import javax.annotation.Generated;
+import java.util.Map.Entry;
 
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.junit.Test;
 
 import com.thinkaurelius.titan.graphdb.query.TitanPredicate;
-
-import java.util.Map.Entry;
 public class TitanUtilsTest {
 
 	@Test
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/JsonParserUtilsTests.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/JsonParserUtilsTests.java
index e02611a5a4..508fb0c2cc 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/JsonParserUtilsTests.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/JsonParserUtilsTests.java
@@ -20,23 +20,24 @@
 
 package org.openecomp.sdc.be.resources;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.google.common.collect.ImmutableList;
-import org.junit.Test;
-import org.openecomp.sdc.be.dao.jsongraph.utils.JsonParserUtils;
-import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition;
-import org.openecomp.sdc.be.datatypes.elements.ListCapabilityDataDefinition;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.openecomp.sdc.be.utils.FixtureHelpers.fixture;
+import static org.openecomp.sdc.be.utils.JsonTester.testJsonMap;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.openecomp.sdc.be.utils.FixtureHelpers.fixture;
-import static org.openecomp.sdc.be.utils.JsonTester.testJsonMap;
+import org.junit.Test;
+import org.openecomp.sdc.be.dao.jsongraph.utils.JsonParserUtils;
+import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ListCapabilityDataDefinition;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.google.common.collect.ImmutableList;
 
 public class JsonParserUtilsTests {
 
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/category/CategoryDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/category/CategoryDataTest.java
index 1072635fcc..f6f8a90a35 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/category/CategoryDataTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/category/CategoryDataTest.java
@@ -2,8 +2,6 @@ package org.openecomp.sdc.be.resources.data.category;
 
 import java.util.Map;
 
-import javax.annotation.Generated;
-
 import org.junit.Test;
 import org.openecomp.sdc.be.datatypes.category.CategoryDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/category/GroupingDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/category/GroupingDataTest.java
index c79db7a582..89e35d0d59 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/category/GroupingDataTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/category/GroupingDataTest.java
@@ -2,8 +2,6 @@ package org.openecomp.sdc.be.resources.data.category;
 
 import java.util.Map;
 
-import javax.annotation.Generated;
-
 import org.junit.Test;
 import org.openecomp.sdc.be.datatypes.category.GroupingDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/category/SubCategoryDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/category/SubCategoryDataTest.java
index de9752f9ff..c02c47926c 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/category/SubCategoryDataTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/category/SubCategoryDataTest.java
@@ -2,8 +2,6 @@ package org.openecomp.sdc.be.resources.data.category;
 
 import java.util.Map;
 
-import javax.annotation.Generated;
-
 import org.junit.Test;
 import org.openecomp.sdc.be.datatypes.category.SubCategoryDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/utils/JsonTester.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/utils/JsonTester.java
index 4f1b2f24bc..53cc8f9add 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/utils/JsonTester.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/utils/JsonTester.java
@@ -1,13 +1,13 @@
 package org.openecomp.sdc.be.utils;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.MapType;
-import com.fasterxml.jackson.databind.type.TypeFactory;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.openecomp.sdc.be.utils.FixtureHelpers.fixture;
 
 import java.util.Map;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.openecomp.sdc.be.utils.FixtureHelpers.fixture;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.MapType;
+import com.fasterxml.jackson.databind.type.TypeFactory;
 
 public class JsonTester {
     private static final ObjectMapper MAPPER = new ObjectMapper();