diff options
Diffstat (limited to 'catalog-dao/src/test')
127 files changed, 519 insertions, 2439 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 661a599ddf..0bbe2b6e03 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,5 +1,10 @@ package org.openecomp.sdc.be.dao.cassandra; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Row; +import com.datastax.driver.core.Session; +import com.datastax.driver.mapping.MappingManager; +import fj.data.Either; import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.Before; import org.junit.Test; @@ -9,13 +14,6 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.openecomp.sdc.be.resources.data.ESArtifactData; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Row; -import com.datastax.driver.core.Session; -import com.datastax.driver.mapping.MappingManager; - -import fj.data.Either; - public class ArtifactCassandraDaoTest { @InjectMocks diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/AuditCassandraDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/AuditCassandraDaoTest.java index 511f8bd5bb..c5404a2c1f 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/AuditCassandraDaoTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/AuditCassandraDaoTest.java @@ -1,8 +1,9 @@ package org.openecomp.sdc.be.dao.cassandra; -import java.util.LinkedList; -import java.util.List; - +import com.datastax.driver.core.Session; +import com.datastax.driver.mapping.MappingManager; +import com.datastax.driver.mapping.Result; +import fj.data.Either; import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.Before; import org.junit.Test; @@ -11,17 +12,10 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.openecomp.sdc.be.dao.api.ActionStatus; -import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; -import org.openecomp.sdc.be.resources.data.auditing.DistributionDeployEvent; -import org.openecomp.sdc.be.resources.data.auditing.DistributionNotificationEvent; -import org.openecomp.sdc.be.resources.data.auditing.DistributionStatusEvent; -import org.openecomp.sdc.be.resources.data.auditing.ResourceAdminEvent; +import org.openecomp.sdc.be.resources.data.auditing.*; -import com.datastax.driver.core.Session; -import com.datastax.driver.mapping.MappingManager; -import com.datastax.driver.mapping.Result; - -import fj.data.Either; +import java.util.LinkedList; +import java.util.List; public class AuditCassandraDaoTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/CassandraClientTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/CassandraClientTest.java index 2f637f7a14..0392bf0e0a 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/CassandraClientTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/CassandraClientTest.java @@ -1,19 +1,17 @@ package org.openecomp.sdc.be.dao.cassandra; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.tinkerpop.gremlin.structure.T; -import org.junit.Test; -import org.mockito.Mockito; -import org.openecomp.sdc.be.config.ConfigurationManager; -import org.openecomp.sdc.be.utils.DAOConfDependentTest; - import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Cluster.Builder; import com.datastax.driver.core.Session; import com.datastax.driver.mapping.MappingManager; - import fj.data.Either; import mockit.Deencapsulation; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.tinkerpop.gremlin.structure.T; +import org.junit.Test; +import org.mockito.Mockito; +import org.openecomp.sdc.be.config.ConfigurationManager; +import org.openecomp.sdc.be.utils.DAOConfDependentTest; public class CassandraClientTest extends DAOConfDependentTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/ComponentCassandraDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/ComponentCassandraDaoTest.java index 8869c8174b..0a51d27893 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/ComponentCassandraDaoTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/ComponentCassandraDaoTest.java @@ -1,14 +1,9 @@ package org.openecomp.sdc.be.dao.cassandra; -import static org.junit.Assert.assertTrue; - -import java.util.Date; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - +import com.datastax.driver.core.Session; +import com.datastax.driver.mapping.MappingManager; +import com.datastax.driver.mapping.Result; +import fj.data.Either; import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.Before; import org.junit.Test; @@ -19,11 +14,9 @@ import org.mockito.MockitoAnnotations; import org.openecomp.sdc.be.dao.api.ActionStatus; import org.openecomp.sdc.be.resources.data.ComponentCacheData; -import com.datastax.driver.core.Session; -import com.datastax.driver.mapping.MappingManager; -import com.datastax.driver.mapping.Result; +import java.util.*; -import fj.data.Either; +import static org.junit.Assert.assertTrue; public class ComponentCassandraDaoTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/OperationalEnvironmentDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/OperationalEnvironmentDaoTest.java index 12418a44fd..c540d52eea 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/OperationalEnvironmentDaoTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/OperationalEnvironmentDaoTest.java @@ -1,9 +1,9 @@ package org.openecomp.sdc.be.dao.cassandra; -import static org.junit.Assert.assertTrue; - -import java.util.List; - +import com.datastax.driver.core.Session; +import com.datastax.driver.mapping.MappingManager; +import com.datastax.driver.mapping.Result; +import fj.data.Either; import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.Before; import org.junit.Test; @@ -14,11 +14,9 @@ import org.mockito.MockitoAnnotations; import org.openecomp.sdc.be.datatypes.enums.EnvironmentStatusEnum; import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry; -import com.datastax.driver.core.Session; -import com.datastax.driver.mapping.MappingManager; -import com.datastax.driver.mapping.Result; +import java.util.List; -import fj.data.Either; +import static org.junit.Assert.assertTrue; public class OperationalEnvironmentDaoTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/SdcSchemaFilesCassandraDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/SdcSchemaFilesCassandraDaoTest.java index 402cfc56d8..b9b4dd0372 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/SdcSchemaFilesCassandraDaoTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/SdcSchemaFilesCassandraDaoTest.java @@ -1,9 +1,8 @@ package org.openecomp.sdc.be.dao.cassandra; -import static org.junit.Assert.assertTrue; - -import java.util.List; - +import com.datastax.driver.core.Session; +import com.datastax.driver.mapping.MappingManager; +import fj.data.Either; import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.Before; import org.junit.Test; @@ -13,10 +12,9 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.openecomp.sdc.be.resources.data.SdcSchemaFilesData; -import com.datastax.driver.core.Session; -import com.datastax.driver.mapping.MappingManager; +import java.util.List; -import fj.data.Either; +import static org.junit.Assert.assertTrue; public class SdcSchemaFilesCassandraDaoTest { 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 index e4d7e84e47..14eda51a03 100644 --- 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 @@ -1,19 +1,17 @@ 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 com.datastax.driver.core.Session; +import mockit.Deencapsulation; 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; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; public class SdcSchemaBuilderTest extends DAOConfDependentTest{ 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 47d310765e..0744224be8 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,12 +1,12 @@ package org.openecomp.sdc.be.dao.cassandra.schema; -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; +import java.util.LinkedList; +import java.util.List; + public class SdcSchemaUtilsTest extends DAOConfDependentTest{ diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/TableTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/TableTest.java deleted file mode 100644 index b2fdc011f6..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/TableTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.openecomp.sdc.be.dao.cassandra.schema; - -import org.junit.Test; - - -public class TableTest { - - private Table createTestSubject() { - return Table.ARTIFACT; - } - - - @Test - public void testGetTableDescription() throws Exception { - Table testSubject; - ITableDescription result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getTableDescription(); - } -}
\ No newline at end of file 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 deleted file mode 100644 index 8e3e838ba1..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ArtifactTableDescriptionTest.java +++ /dev/null @@ -1,72 +0,0 @@ -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 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 deleted file mode 100644 index fd7752774c..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/AuthEventTableDescriptionTest.java +++ /dev/null @@ -1,72 +0,0 @@ -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 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 index 81030caa50..eb46530b1f 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,12 +1,11 @@ package org.openecomp.sdc.be.dao.cassandra.schema.tables; -import java.util.List; -import java.util.Map; - +import com.datastax.driver.core.DataType; import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.Test; -import com.datastax.driver.core.DataType; +import java.util.List; +import java.util.Map; public class CategoryEventTableDescriptionTest { 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 deleted file mode 100644 index bc97922b53..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ComponentCacheTableDescriptionTest.java +++ /dev/null @@ -1,72 +0,0 @@ -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 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 deleted file mode 100644 index 74ea99e2ec..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ConsumerEventTableDefinitionTest.java +++ /dev/null @@ -1,72 +0,0 @@ -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 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 deleted file mode 100644 index ca1d767065..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribDeployEventTableDescTest.java +++ /dev/null @@ -1,72 +0,0 @@ -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 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 deleted file mode 100644 index a3e11bf1a5..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribDownloadEventTableDescTest.java +++ /dev/null @@ -1,72 +0,0 @@ -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 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 deleted file mode 100644 index 46eb0f590a..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribEngineEventTableDescTest.java +++ /dev/null @@ -1,72 +0,0 @@ -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 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 deleted file mode 100644 index 4046a6101b..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribNotifEventTableDescTest.java +++ /dev/null @@ -1,72 +0,0 @@ -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 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 index 2d49638533..161d20aa6a 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,15 +1,13 @@ package org.openecomp.sdc.be.dao.cassandra.schema.tables; -import java.util.HashMap; -import java.util.Map; - +import com.datastax.driver.core.DataType; +import mockit.Deencapsulation; 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; +import java.util.HashMap; +import java.util.Map; public class DistribStatusEventTableDescTest { 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 index 906ee885a4..082bf74f01 100644 --- 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 @@ -1,12 +1,11 @@ package org.openecomp.sdc.be.dao.cassandra.schema.tables; -import java.util.List; -import java.util.Map; - +import com.datastax.driver.core.DataType; import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.Test; -import com.datastax.driver.core.DataType; +import java.util.List; +import java.util.Map; public class EcompOperationalEnvironmentEventTableDescTest { 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 deleted file mode 100644 index 2626536eed..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ExternalApiEventTableDescTest.java +++ /dev/null @@ -1,72 +0,0 @@ -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 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 deleted file mode 100644 index 9cc7a556a0..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetCatHierEventTableDescTest.java +++ /dev/null @@ -1,72 +0,0 @@ -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 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 deleted file mode 100644 index d31cc59007..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetUebClusterEventTableDescTest.java +++ /dev/null @@ -1,72 +0,0 @@ -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 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 deleted file mode 100644 index b7c217f588..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/GetUsersListEventTableDescTest.java +++ /dev/null @@ -1,72 +0,0 @@ -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 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 deleted file mode 100644 index f79b2759d6..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/MigrationTasksTableDescriptionTest.java +++ /dev/null @@ -1,72 +0,0 @@ -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 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 deleted file mode 100644 index 3cc4094d0f..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OldExternalApiEventTableDescTest.java +++ /dev/null @@ -1,72 +0,0 @@ -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 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/OperationalEnvironmentsTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OperationalEnvironmentsTableDescriptionTest.java index ccdb391013..001d57321d 100644 --- 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 @@ -1,12 +1,11 @@ package org.openecomp.sdc.be.dao.cassandra.schema.tables; -import java.util.List; -import java.util.Map; - +import com.datastax.driver.core.DataType; import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.Test; -import com.datastax.driver.core.DataType; +import java.util.List; +import java.util.Map; public class OperationalEnvironmentsTableDescriptionTest { 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 ed1774e517..4e350f12b3 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,12 +1,11 @@ package org.openecomp.sdc.be.dao.cassandra.schema.tables; -import java.util.List; -import java.util.Map; - +import com.datastax.driver.core.DataType; import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.Test; -import com.datastax.driver.core.DataType; +import java.util.List; +import java.util.Map; public class ResAdminEventTableDescriptionTest { 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 deleted file mode 100644 index e0e02b5d86..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/SdcSchemaFilesTableDescriptionTest.java +++ /dev/null @@ -1,72 +0,0 @@ -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 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 deleted file mode 100644 index 1da6867d01..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/UserAccessEventTableDescriptionTest.java +++ /dev/null @@ -1,72 +0,0 @@ -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 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 index 4a8c211497..83442f466d 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,12 +1,11 @@ package org.openecomp.sdc.be.dao.cassandra.schema.tables; -import java.util.List; -import java.util.Map; - +import com.datastax.driver.core.DataType; import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.Test; -import com.datastax.driver.core.DataType; +import java.util.List; +import java.util.Map; public class UserAdminEventTableDescriptionTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/GraphElementFactoryTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/GraphElementFactoryTest.java index 588eb046a5..47dccd3bea 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/GraphElementFactoryTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/GraphElementFactoryTest.java @@ -1,9 +1,6 @@ package org.openecomp.sdc.be.dao.graph; -import java.util.HashMap; -import java.util.Map; - -import org.apache.tinkerpop.gremlin.structure.T; +import mockit.Deencapsulation; import org.junit.Test; import org.mockito.Mockito; import org.openecomp.sdc.be.dao.graph.datatype.GraphElementTypeEnum; @@ -11,7 +8,8 @@ import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; -import mockit.Deencapsulation; +import java.util.HashMap; +import java.util.Map; public class GraphElementFactoryTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/datatype/GraphEdgeTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/datatype/GraphEdgeTest.java index fba04bb55c..91c7cc0dc2 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/datatype/GraphEdgeTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/datatype/GraphEdgeTest.java @@ -1,12 +1,12 @@ package org.openecomp.sdc.be.dao.graph.datatype; -import java.util.HashMap; -import java.util.Map; - import org.junit.Assert; import org.junit.Test; import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels; +import java.util.HashMap; +import java.util.Map; + public class GraphEdgeTest { private GraphEdge createTestSubject() { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/datatype/GraphRelationTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/datatype/GraphRelationTest.java index 5d47f5d735..38b63c75c9 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/datatype/GraphRelationTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/graph/datatype/GraphRelationTest.java @@ -1,10 +1,10 @@ package org.openecomp.sdc.be.dao.graph.datatype; +import org.junit.Test; + import java.util.HashMap; import java.util.Map; -import org.junit.Test; - public class GraphRelationTest { private GraphRelation createTestSubject() { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/GraphVertexTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/GraphVertexTest.java index e09257d1f9..b336bc65e9 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/GraphVertexTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/GraphVertexTest.java @@ -1,8 +1,6 @@ package org.openecomp.sdc.be.dao.jsongraph; -import java.util.HashMap; -import java.util.Map; - +import com.thinkaurelius.titan.core.TitanVertex; import org.junit.Test; import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; @@ -10,7 +8,8 @@ import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum; import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields; import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition; -import com.thinkaurelius.titan.core.TitanVertex; +import java.util.HashMap; +import java.util.Map; public class GraphVertexTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/TitanDaoMockTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/TitanDaoMockTest.java index f31e08e2fb..5703e53c9c 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/TitanDaoMockTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/TitanDaoMockTest.java @@ -1,10 +1,9 @@ package org.openecomp.sdc.be.dao.jsongraph; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - +import com.thinkaurelius.titan.core.TitanGraph; +import com.thinkaurelius.titan.core.TitanVertex; +import fj.data.Either; +import mockit.Deencapsulation; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Edge; @@ -24,11 +23,10 @@ import org.openecomp.sdc.be.dao.titan.TitanGraphClient; import org.openecomp.sdc.be.dao.titan.TitanOperationStatus; import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum; -import com.thinkaurelius.titan.core.TitanGraph; -import com.thinkaurelius.titan.core.TitanVertex; - -import fj.data.Either; -import mockit.Deencapsulation; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class TitanDaoMockTest { @@ -223,6 +221,7 @@ public class TitanDaoMockTest { testSubject.parseVertexProperties(graphVertex, JsonParseFlagEnum.NoParse); } + @Test public void testCreateEdge() throws Exception { @@ -294,7 +293,7 @@ public class TitanDaoMockTest { Mockito.when(titanClient.getGraph()).thenReturn(value); // default test - result = testSubject.getCatalogVerticies(); + result = testSubject.getCatalogOrArchiveVerticies(true); } @Test @@ -329,6 +328,7 @@ public class TitanDaoMockTest { result = testSubject.getChildVertex(parentVertex, edgeLabel, parseFlag); } + @Test public void testGetParentVertex_1() throws Exception { @@ -385,6 +385,7 @@ public class TitanDaoMockTest { result = testSubject.getChildrenVertecies(parentVertex, edgeLabel, parseFlag); } + @Test public void testDeleteBelongingEdgeByCriteria() throws Exception { @@ -481,6 +482,7 @@ public class TitanDaoMockTest { result = testSubject.createEdge(from, to, label, edgeToCopy); } + @Test public void testReplaceEdgeLabel() throws Exception { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/TitanDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/TitanDaoTest.java index 4f962ba9b2..2c4b868ff2 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/TitanDaoTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/TitanDaoTest.java @@ -1,9 +1,7 @@ package org.openecomp.sdc.be.dao.jsongraph; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - +import com.thinkaurelius.titan.core.TitanGraph; +import fj.data.Either; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Element; import org.apache.tinkerpop.gremlin.structure.Property; @@ -24,9 +22,9 @@ import org.openecomp.sdc.be.utils.DAOConfDependentTest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.thinkaurelius.titan.core.TitanGraph; - -import fj.data.Either; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class TitanDaoTest extends DAOConfDependentTest{ @@ -225,7 +223,7 @@ public class TitanDaoTest extends DAOConfDependentTest{ // default test - result = dao.getCatalogVerticies(); + result = dao.getCatalogOrArchiveVerticies(true); } @Test diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgeLabelEnumTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgeLabelEnumTest.java deleted file mode 100644 index 0772ebb82d..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgeLabelEnumTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.openecomp.sdc.be.dao.jsongraph.types; - -import org.junit.Test; - - -public class EdgeLabelEnumTest { - - private EdgeLabelEnum createTestSubject() { - return EdgeLabelEnum.ARTIFACTS; - } - - - @Test - public void testGetEdgeLabelEnum() throws Exception { - String name = ""; - EdgeLabelEnum result; - - // default test - result = EdgeLabelEnum.getEdgeLabelEnum(name); - } - - - @Test - public void testIsInstanceArtifactsLabel() throws Exception { - EdgeLabelEnum testSubject; - boolean result; - - // default test - testSubject = createTestSubject(); - result = testSubject.isInstanceArtifactsLabel(); - } -}
\ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgePropertyEnumTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgePropertyEnumTest.java deleted file mode 100644 index 9f556b04f8..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgePropertyEnumTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.openecomp.sdc.be.dao.jsongraph.types; - -import org.junit.Test; - - -public class EdgePropertyEnumTest { - - private EdgePropertyEnum createTestSubject() { - return EdgePropertyEnum.STATE; - } - - - @Test - public void testGetProperty() throws Exception { - EdgePropertyEnum testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getProperty(); - } - - - @Test - public void testGetByProperty() throws Exception { - String property = ""; - EdgePropertyEnum result; - - // default test - result = EdgePropertyEnum.getByProperty(property); - } -}
\ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/types/VertexTypeEnumTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/types/VertexTypeEnumTest.java deleted file mode 100644 index db5ab71bca..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/types/VertexTypeEnumTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.openecomp.sdc.be.dao.jsongraph.types; - -import org.junit.Test; - - -public class VertexTypeEnumTest { - - private VertexTypeEnum createTestSubject() { - return VertexTypeEnum.ADDITIONAL_INFORMATION; - } - - - @Test - public void testGetName() throws Exception { - VertexTypeEnum testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getName(); - } - - - @Test - public void testGetClassOfJson() throws Exception { - VertexTypeEnum testSubject; - Class result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getClassOfJson(); - } - - - @Test - public void testGetByName() throws Exception { - String name = ""; - VertexTypeEnum result; - - // default test - result = VertexTypeEnum.getByName(name); - } -}
\ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FacetedSearchFacetTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FacetedSearchFacetTest.java deleted file mode 100644 index 8a02bc008a..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FacetedSearchFacetTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.openecomp.sdc.be.dao.model; - -import org.junit.Test; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; -import static org.hamcrest.MatcherAssert.assertThat; - -public class FacetedSearchFacetTest { - - @Test - public void shouldHaveValidGettersAndSetters(){ - assertThat(FacetedSearchFacet.class, hasValidGettersAndSetters()); - } -}
\ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/GetMultipleDataResultTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/GetMultipleDataResultTest.java deleted file mode 100644 index 843e39899a..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/GetMultipleDataResultTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.openecomp.sdc.be.dao.model; - -import org.junit.Test; - -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; -import static org.hamcrest.MatcherAssert.assertThat; - -public class GetMultipleDataResultTest { - - @Test - public void testCtor() throws Exception { - new GetMultipleDataResult<>(new String [1], new Object[1]); - new GetMultipleDataResult<>(new String [1], new String [1], 0L, 0L, 1, 1); - } - - @Test - public void shouldHaveValidGettersAndSetters(){ - assertThat(GetMultipleDataResultTest.class, hasValidGettersAndSetters()); - } -}
\ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphEdgeLabelsTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphEdgeLabelsTest.java index 40800f70e2..e658c3cd76 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphEdgeLabelsTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphEdgeLabelsTest.java @@ -1,9 +1,9 @@ package org.openecomp.sdc.be.dao.neo4j; -import java.util.List; - import org.junit.Test; +import java.util.List; + public class GraphEdgeLabelsTest { private GraphEdgeLabels createTestSubject() { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphEdgePropertiesDictionaryTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphEdgePropertiesDictionaryTest.java index 9a1514ec4f..42ade1f80d 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphEdgePropertiesDictionaryTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/neo4j/GraphEdgePropertiesDictionaryTest.java @@ -1,9 +1,9 @@ package org.openecomp.sdc.be.dao.neo4j; -import java.util.List; - import org.junit.Test; +import java.util.List; + public class GraphEdgePropertiesDictionaryTest { private GraphEdgePropertiesDictionary createTestSubject() { 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 5ada93027a..641eec5773 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 @@ -1,13 +1,12 @@ package org.openecomp.sdc.be.dao.titan; -import java.util.Collection; -import java.util.Map; -import java.util.Map.Entry; - +import com.thinkaurelius.titan.graphdb.query.TitanPredicate; import org.apache.tinkerpop.gremlin.structure.T; import org.junit.Test; -import com.thinkaurelius.titan.graphdb.query.TitanPredicate; +import java.util.Collection; +import java.util.Map; +import java.util.Map.Entry; public class TitanUtilsTest { @Test diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/CollectionUtilsTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/CollectionUtilsTest.java index ef84f0e0eb..04dc0591cf 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/CollectionUtilsTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/CollectionUtilsTest.java @@ -1,15 +1,11 @@ package org.openecomp.sdc.be.dao.utils; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.tinkerpop.gremlin.structure.T; import org.junit.Assert; import org.junit.Test; +import java.util.*; + public class CollectionUtilsTest { @Test diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/DaoUtilsTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/DaoUtilsTest.java index 06437adb65..3a915bcc71 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/DaoUtilsTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/DaoUtilsTest.java @@ -1,9 +1,10 @@ package org.openecomp.sdc.be.dao.utils; -import org.apache.tinkerpop.gremlin.structure.T; import org.junit.Assert; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + public class DaoUtilsTest { @Test @@ -15,12 +16,7 @@ public class DaoUtilsTest { result = DaoUtils.convertToJson(object); Assert.assertEquals("{}", result); - try { - result = DaoUtils.convertToJson(null); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + assertThatThrownBy(()->DaoUtils.convertToJson(null)).isInstanceOf(RuntimeException.class); } @Test diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/ImageQualityTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/ImageQualityTest.java deleted file mode 100644 index 2dc8b52707..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/ImageQualityTest.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.openecomp.sdc.be.dao.utils; - -import org.junit.Test; - -public class ImageQualityTest { - - @Test - public void testGetSize() throws Exception { - int result; - - // default test - result = ImageQuality.QUALITY_128.getSize(); - } -}
\ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/ImageResizeUtilTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/ImageResizeUtilTest.java deleted file mode 100644 index cb12203eed..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/ImageResizeUtilTest.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.openecomp.sdc.be.dao.utils; - -import java.awt.image.BufferedImage; - -import org.junit.Test; - -import mockit.Deencapsulation; - -public class ImageResizeUtilTest { - - @Test - public void testResizeImage() throws Exception { - BufferedImage originalImage = new BufferedImage(1, 1, 1); - int width = 1; - int height = 1; - boolean preserveDimensions = false; - BufferedImage result; - - // default test - result = ImageResizeUtil.resizeImage(originalImage, width, height, preserveDimensions); - } - - @Test - public void testResizeImageWithHint() throws Exception { - BufferedImage originalImage = new BufferedImage(1, 1, 1); - int width = 1; - int height = 1; - boolean preserveDimensions = false; - BufferedImage result; - - // default test - result = ImageResizeUtil.resizeImageWithHint(originalImage, width, height, preserveDimensions); - } - - @Test - public void testResizeImage_1() throws Exception { - BufferedImage originalImage = new BufferedImage(1, 1, 1); - int width = 1; - int height = 1; - boolean preserveDimensions = true; - boolean enableHighQuality = false; - BufferedImage result; - - // default test - result = Deencapsulation.invoke(ImageResizeUtil.class, "resizeImage", - originalImage, width, height, preserveDimensions, enableHighQuality); - } - - @Test - public void testComputeDimensions() throws Exception { - int width = 0; - int height = 0; - int originalWidth = 0; - int originalHeight = 0; - int[] result; - - // default test - result = ImageResizeUtil.computeDimensions(width, height, originalWidth, originalHeight); - } -}
\ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/JsonUtilTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/JsonUtilTest.java index 955d55248c..b098cc6a17 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/JsonUtilTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/JsonUtilTest.java @@ -1,19 +1,14 @@ package org.openecomp.sdc.be.dao.utils; -import java.io.BufferedInputStream; -import java.io.InputStream; -import java.util.List; -import java.util.Map; - -import org.apache.cassandra.utils.vint.EncodedDataInputStream; -import org.apache.tinkerpop.gremlin.structure.T; +import com.fasterxml.jackson.databind.ObjectMapper; +import mockit.Deencapsulation; import org.junit.Ignore; import org.junit.Test; import org.mockito.Mockito; -import com.fasterxml.jackson.databind.ObjectMapper; - -import mockit.Deencapsulation; +import java.io.InputStream; +import java.util.List; +import java.util.Map; public class JsonUtilTest { @@ -35,17 +30,6 @@ public class JsonUtilTest { result = JsonUtil.readObject(objectText, objectClass); } - @Ignore - @Test - public void testReadObject_1() throws Exception { - InputStream jsonStream = Mockito.mock(InputStream.class); - Class objectClass = Object.class; - Object result; - - // default test - result = JsonUtil.readObject(jsonStream, objectClass); - } - @Test public void testReadObject_2() throws Exception { String objectText = "{}"; @@ -94,15 +78,4 @@ public class JsonUtilTest { // default test result = JsonUtil.toList(json, clazz); } - - @Test - public void testToList_1() throws Exception { - String json = "[]"; - Class elementClass = List.class;; - Class elementGenericClass = List.class;; - List result; - - // default test - result = JsonUtil.toList(json, elementClass, elementGenericClass); - } }
\ 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 deleted file mode 100644 index 39245bc028..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/MapEntryTest.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.openecomp.sdc.be.dao.utils; - -import org.junit.Test; - -public class MapEntryTest { - - private MapEntry createTestSubject() { - return new MapEntry(); - } - - @Test - public void testCtor() throws Exception { - new MapEntry(new Object(), new Object()); - } - - @Test - public void testGetKey() throws Exception { - MapEntry testSubject; - Object result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getKey(); - } - - @Test - public void testSetKey() throws Exception { - MapEntry testSubject; - Object key = null; - - // default test - testSubject = createTestSubject(); - testSubject.setKey(key); - } - - @Test - public void testGetValue() throws Exception { - MapEntry testSubject; - Object result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getValue(); - } - - @Test - public void testSetValue() throws Exception { - MapEntry testSubject; - Object 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/dao/utils/MapUtilTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/MapUtilTest.java index ed2f3134d2..1f85a290e9 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/MapUtilTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/MapUtilTest.java @@ -1,17 +1,48 @@ package org.openecomp.sdc.be.dao.utils; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import com.google.common.collect.ImmutableMap; +import org.junit.Test; + +import java.util.*; import java.util.function.Function; -import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.openecomp.sdc.be.dao.utils.MapUtil.mergeMaps; public class MapUtilTest { - @Test + @Test + public void mergeMaps_whenBothMapsAreNull_returnEmptyMap() { + assertThat(mergeMaps(null, null)).isEmpty(); + } + + @Test + public void mergeMaps_whenFirstMapIsNull_returnSecondMap() { + ImmutableMap<String, String> second = ImmutableMap.of("a", "b", "c", "d"); + assertThat(mergeMaps(null, second)) + .isNotSameAs(second) + .containsAllEntriesOf(second); + } + + @Test + public void mergeMaps_whenSecondMapsIsNull_returnFirstMap() { + ImmutableMap<String, String> first = ImmutableMap.of("a", "b", "c", "d"); + assertThat(mergeMaps(first, null)) + .isNotSameAs(first) + .containsAllEntriesOf(first); + } + + @Test + public void mergeMaps_avoidDuplications_takeValFromFirstMap() { + ImmutableMap<String, String> first = ImmutableMap.of("key1", "val1", "key2", "val2"); + ImmutableMap<String, String> second = ImmutableMap.of("key1", "val11", "key3", "val3"); + assertThat(mergeMaps(first, second)) + .containsEntry("key1", "val1") + .containsEntry("key2", "val2") + .containsEntry("key3", "val3"); + } + @Test public void testGet() throws Exception { Map<String, ? extends Object> map = null; String path = ""; @@ -67,43 +98,30 @@ public class MapUtilTest { @Test public void testNewHashMap() throws Exception { - String[] keys = new String[] { "mock" }; - String[] values = new String[] { "mock" }; + final String[] keys1 = new String[] { "mock" }; + final String[] values1 = new String[] { "mock" }; Map<String, String> result; // test 1 - result = MapUtil.newHashMap(keys, values); - //Assert.assertEquals(null, result); + result = MapUtil.newHashMap(keys1, values1); // test 2 - keys = new String[] { "mock" }; - values = null; - try { - result = MapUtil.newHashMap(keys, values); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + final String[] keys2 = new String[] { "mock" }; + final String[] values2 = null; + assertThatThrownBy(() -> MapUtil.newHashMap(keys2, values2)) + .isInstanceOf(IllegalArgumentException.class); // test 3 - values = null; - keys = null; - try { - result = MapUtil.newHashMap(keys, values); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - //Assert.assertEquals(null, result); + final String[] keys3 = null; + final String[] values3 = null; + assertThatThrownBy(() -> MapUtil.newHashMap(keys3, values3)) + .isInstanceOf(IllegalArgumentException.class); // test 4 - values = new String[] { "mock" }; - keys = null; - try { - result = MapUtil.newHashMap(keys, values); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + final String[] values4 = new String[] { "mock" }; + final String[] keys4 = null; + assertThatThrownBy(() -> MapUtil.newHashMap(keys4, values4)) + .isInstanceOf(IllegalArgumentException.class); + } }
\ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/TypeMapTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/TypeMapTest.java index 1909a16e60..186b4eb8ea 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/TypeMapTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/TypeMapTest.java @@ -1,11 +1,7 @@ package org.openecomp.sdc.be.dao.utils; -import java.util.Map; - import org.junit.Test; -import mockit.Deencapsulation; - public class TypeMapTest { private TypeMap createTestSubject() { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/UserStatusEnumTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/UserStatusEnumTest.java index 46e35bf228..c5688e414c 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/UserStatusEnumTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/utils/UserStatusEnumTest.java @@ -1,10 +1,9 @@ package org.openecomp.sdc.be.dao.utils; +import fj.data.Either; import org.junit.Test; import org.openecomp.sdc.common.util.MethodActivationStatusEnum; -import fj.data.Either; - public class UserStatusEnumTest { @Test diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/ArtifactDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/ArtifactDaoTest.java index cac21c8b34..fe31e39199 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/ArtifactDaoTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/ArtifactDaoTest.java @@ -20,15 +20,10 @@ package org.openecomp.sdc.be.resources; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import javax.annotation.Resource; - +import fj.data.Either; +import static org.junit.Assert.fail; import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.openecomp.sdc.be.config.ConfigurationManager; @@ -45,7 +40,9 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution import org.springframework.test.context.support.DirtiesContextTestExecutionListener; import org.springframework.test.context.transaction.TransactionalTestExecutionListener; -import fj.data.Either; +import javax.annotation.Resource; + +import static org.junit.Assert.*; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:application-context-test.xml") @@ -73,7 +70,7 @@ public class ArtifactDaoTest extends DAOConfDependentTest { public void testSaveNewArtifact() { // daoUploader = new ArtifactUploader(artifactDAO); if (daoUploader == null) { - assertTrue(false); + fail(); } String strData = "qweqwqweqw34e4wrwer"; @@ -266,7 +263,7 @@ public class ArtifactDaoTest extends DAOConfDependentTest { public void testUpdateArtifact() { // daoUploader = new ArtifactUploader(artifactDAO); if (daoUploader == null) { - assertTrue(false); + fail(); } ResourceUploadStatus status = ResourceUploadStatus.OK; @@ -292,9 +289,8 @@ public class ArtifactDaoTest extends DAOConfDependentTest { private ESArtifactData getArtifactData(String componentName, String componentVersion) { String strData = "qweqwqweqw34e4wrwer"; - ESArtifactData arData = new ESArtifactData("updatedArtifact", strData.getBytes()); - return arData; + return new ESArtifactData("updatedArtifact", strData.getBytes()); } /* diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/AuditingDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/AuditingDaoTest.java index c5249c877b..5639228233 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/AuditingDaoTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/AuditingDaoTest.java @@ -20,18 +20,7 @@ package org.openecomp.sdc.be.resources; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.annotation.Resource; - +import fj.data.Either; import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.index.query.MatchAllQueryBuilder; @@ -46,15 +35,10 @@ import org.openecomp.sdc.be.config.Configuration.ElasticSearchConfig.IndicesTime import org.openecomp.sdc.be.dao.api.ActionStatus; import org.openecomp.sdc.be.dao.es.ElasticSearchClient; import org.openecomp.sdc.be.dao.impl.AuditingDao; -import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; -import org.openecomp.sdc.be.resources.data.auditing.DistributionNotificationEvent; -import org.openecomp.sdc.be.resources.data.auditing.DistributionStatusEvent; -import org.openecomp.sdc.be.resources.data.auditing.ResourceAdminEvent; -import org.openecomp.sdc.be.resources.data.auditing.UserAccessEvent; -import org.openecomp.sdc.be.resources.data.auditing.UserAdminEvent; +import org.openecomp.sdc.be.resources.data.auditing.*; import org.openecomp.sdc.be.utils.DAOConfDependentTest; import org.openecomp.sdc.common.api.Constants; -import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum; +import org.openecomp.sdc.common.datastructure.AuditingFieldsKey; import org.openecomp.sdc.common.datastructure.ESTimeBasedEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,7 +49,14 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution import org.springframework.test.context.support.DirtiesContextTestExecutionListener; import org.springframework.test.context.transaction.TransactionalTestExecutionListener; -import fj.data.Either; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import static org.junit.Assert.*; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:application-context-test.xml") @@ -95,7 +86,7 @@ public class AuditingDaoTest extends DAOConfDependentTest{ .prepareDelete(auditingDao.getIndexPrefix() + "*").execute().actionGet(); if (!deleteResponse.isAcknowledged()) { log.debug("Couldn't delete old auditing indexes!"); - assertTrue(false); + fail(); } } @@ -108,7 +99,7 @@ public class AuditingDaoTest extends DAOConfDependentTest{ String expectedIndexName = auditingDao.getIndexPrefix() + "-2015-06-23-13-34"; assertTrue(!esclient.getClient().admin().indices().prepareExists(expectedIndexName).execute().actionGet() .isExists()); - Map<AuditingFieldsKeysEnum, Object> params = getUserAdminEventParams(timestamp); + Map<AuditingFieldsKey, Object> params = getUserAdminEventParams(timestamp); testCreationPeriodScenario(params, creationPeriod, expectedIndexName, UserAdminEvent.class); params = getUserAccessEventParams(timestamp); testCreationPeriodScenario(params, creationPeriod, expectedIndexName, UserAccessEvent.class); @@ -124,7 +115,7 @@ public class AuditingDaoTest extends DAOConfDependentTest{ String expectedIndexName = auditingDao.getIndexPrefix() + "-2016"; assertTrue(!esclient.getClient().admin().indices().prepareExists(expectedIndexName).execute().actionGet() .isExists()); - Map<AuditingFieldsKeysEnum, Object> params = getUserAdminEventParams(timestamp); + Map<AuditingFieldsKey, Object> params = getUserAdminEventParams(timestamp); testCreationPeriodScenario(params, creationPeriod, expectedIndexName, UserAdminEvent.class); params = getUserAccessEventParams(timestamp); testCreationPeriodScenario(params, creationPeriod, expectedIndexName, UserAccessEvent.class); @@ -140,14 +131,14 @@ public class AuditingDaoTest extends DAOConfDependentTest{ String expectedIndexName1 = auditingDao.getIndexPrefix() + "-2016-06"; assertTrue(!esclient.getClient().admin().indices().prepareExists(expectedIndexName1).execute().actionGet() .isExists()); - Map<AuditingFieldsKeysEnum, Object> params = getDistributionStatusEventParams(timestamp1); + Map<AuditingFieldsKey, Object> params = getDistributionStatusEventParams(timestamp1); testCreationPeriodScenario(params, creationPeriod, expectedIndexName1, DistributionStatusEvent.class); String timestamp2 = "2015-06-23 13:34:53.123"; String expectedIndexName2 = auditingDao.getIndexPrefix() + "-2015-06"; assertTrue(!esclient.getClient().admin().indices().prepareExists(expectedIndexName2).execute().actionGet() .isExists()); - Map<AuditingFieldsKeysEnum, Object> params2 = getDistributionStatusEventParams(timestamp2); + Map<AuditingFieldsKey, Object> params2 = getDistributionStatusEventParams(timestamp2); testCreationPeriodScenario(params2, creationPeriod, expectedIndexName2, DistributionStatusEvent.class); Either<List<ESTimeBasedEvent>, ActionStatus> status = auditingDao.getListOfDistributionStatuses("123-456"); assertEquals(2, status.left().value().size()); @@ -166,9 +157,9 @@ public class AuditingDaoTest extends DAOConfDependentTest{ assertTrue(!esclient.getClient().admin().indices().prepareExists(expectedIndexName2).execute().actionGet() .isExists()); - Map<AuditingFieldsKeysEnum, Object> params1 = getUserAdminEventParams(timestamp1); + Map<AuditingFieldsKey, Object> params1 = getUserAdminEventParams(timestamp1); testCreationPeriodScenario(params1, creationPeriod, expectedIndexName1, UserAdminEvent.class); - Map<AuditingFieldsKeysEnum, Object> params2 = getUserAdminEventParams(timestamp2); + Map<AuditingFieldsKey, Object> params2 = getUserAdminEventParams(timestamp2); testCreationPeriodScenario(params2, creationPeriod, expectedIndexName2, UserAdminEvent.class); long count = auditingDao.count(UserAdminEvent.class, new MatchAllQueryBuilder()); @@ -184,7 +175,7 @@ public class AuditingDaoTest extends DAOConfDependentTest{ String expectedIndexName = auditingDao.getIndexPrefix() + "-2016-06"; assertTrue(!esclient.getClient().admin().indices().prepareExists(expectedIndexName).execute().actionGet() .isExists()); - Map<AuditingFieldsKeysEnum, Object> params = getUserAdminEventParams(timestamp); + Map<AuditingFieldsKey, Object> params = getUserAdminEventParams(timestamp); testCreationPeriodScenario(params, creationPeriod, expectedIndexName, UserAdminEvent.class); params = getUserAccessEventParams(timestamp); testCreationPeriodScenario(params, creationPeriod, expectedIndexName, UserAccessEvent.class); @@ -205,7 +196,7 @@ public class AuditingDaoTest extends DAOConfDependentTest{ String expectedIndexName = auditingDao.getIndexPrefix() + "-2016-06"; assertTrue(!esclient.getClient().admin().indices().prepareExists(expectedIndexName).execute().actionGet() .isExists()); - Map<AuditingFieldsKeysEnum, Object> params = getUserAdminEventParams(timestamp); + Map<AuditingFieldsKey, Object> params = getUserAdminEventParams(timestamp); testCreationPeriodScenario(params, creationPeriod, expectedIndexName, UserAdminEvent.class); params = getUserAccessEventParams(timestamp); testCreationPeriodScenario(params, creationPeriod, expectedIndexName, UserAccessEvent.class); @@ -215,8 +206,8 @@ public class AuditingDaoTest extends DAOConfDependentTest{ @Test public void testGetFilteredResourceAdminAuditingEvents() { - Map<AuditingFieldsKeysEnum, Object> filterMap = new HashMap<>(); - filterMap.put(AuditingFieldsKeysEnum.AUDIT_ACTION, new Object()); + Map<AuditingFieldsKey, Object> filterMap = new HashMap<>(); + filterMap.put(AuditingFieldsKey.AUDIT_ACTION, new Object()); Either<List<ESTimeBasedEvent>, ActionStatus> filteredResourceAdminAuditingEvents = auditingDao .getFilteredResourceAdminAuditingEvents(filterMap); } @@ -229,8 +220,8 @@ public class AuditingDaoTest extends DAOConfDependentTest{ .getListOfDistributionByAction("mock", "mock", null, AuditingGenericEvent.class); } - private SearchResponse testCreationPeriodScenario(Map<AuditingFieldsKeysEnum, Object> params, String creationPeriod, - String expectedIndexName, Class<? extends AuditingGenericEvent> clazz) { + private SearchResponse testCreationPeriodScenario(Map<AuditingFieldsKey, Object> params, String creationPeriod, + String expectedIndexName, Class<? extends AuditingGenericEvent> clazz) { String typeName = clazz.getSimpleName().toLowerCase(); log.debug("Testing auditing type {}", typeName); @@ -252,11 +243,11 @@ public class AuditingDaoTest extends DAOConfDependentTest{ return searchResponse; } - private void validateHitValues(Map<AuditingFieldsKeysEnum, Object> params, SearchHit searchHit) { + private void validateHitValues(Map<AuditingFieldsKey, Object> params, SearchHit searchHit) { Map<String, Object> source = searchHit.getSource(); log.debug("Hit source is {}", searchHit.sourceAsString()); - for (Entry<AuditingFieldsKeysEnum, Object> paramsEntry : params.entrySet()) { - AuditingFieldsKeysEnum key = paramsEntry.getKey(); + for (Entry<AuditingFieldsKey, Object> paramsEntry : params.entrySet()) { + AuditingFieldsKey key = paramsEntry.getKey(); log.debug("Testing auditing field {}", key.name()); Object value = paramsEntry.getValue(); // assertEquals(value, source.get(auditField2esField.get(key))); @@ -273,9 +264,9 @@ public class AuditingDaoTest extends DAOConfDependentTest{ configuration.getElasticSearch().setIndicesTimeFrequency(indicesTimeFrequencyEntries); } - private Map<AuditingFieldsKeysEnum, Object> getUserAdminEventParams(String timestamp) { + private Map<AuditingFieldsKey, Object> getUserAdminEventParams(String timestamp) { - Map<AuditingFieldsKeysEnum, Object> params = new HashMap<AuditingFieldsKeysEnum, Object>(); + Map<AuditingFieldsKey, Object> params = new HashMap<>(); String action = "updateUser"; String modifierName = "moshe moshe"; String modifierUid = "mosheUid"; @@ -289,41 +280,41 @@ public class AuditingDaoTest extends DAOConfDependentTest{ String userStatus = "200"; String userDesc = "OK"; - params.put(AuditingFieldsKeysEnum.AUDIT_ACTION, action); - params.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, modifierName + '(' + modifierUid + ')'); - params.put(AuditingFieldsKeysEnum.AUDIT_USER_UID, userUid); - params.put(AuditingFieldsKeysEnum.AUDIT_USER_BEFORE, + params.put(AuditingFieldsKey.AUDIT_ACTION, action); + params.put(AuditingFieldsKey.AUDIT_MODIFIER_UID, modifierName + '(' + modifierUid + ')'); + params.put(AuditingFieldsKey.AUDIT_USER_UID, userUid); + params.put(AuditingFieldsKey.AUDIT_USER_BEFORE, userUid + ", " + userBeforeName + ", " + userBeforeEmail + ", " + userBeforeRole); - params.put(AuditingFieldsKeysEnum.AUDIT_USER_AFTER, + params.put(AuditingFieldsKey.AUDIT_USER_AFTER, userUid + ", " + userAfterName + ", " + userAfterEmail + ", " + userAfterRole); - params.put(AuditingFieldsKeysEnum.AUDIT_STATUS, userStatus); - params.put(AuditingFieldsKeysEnum.AUDIT_DESC, userDesc); - params.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP, timestamp); + params.put(AuditingFieldsKey.AUDIT_STATUS, userStatus); + params.put(AuditingFieldsKey.AUDIT_DESC, userDesc); + params.put(AuditingFieldsKey.AUDIT_TIMESTAMP, timestamp); return params; } - private Map<AuditingFieldsKeysEnum, Object> getUserAccessEventParams(String timestamp) { + private Map<AuditingFieldsKey, Object> getUserAccessEventParams(String timestamp) { - Map<AuditingFieldsKeysEnum, Object> params = new HashMap<AuditingFieldsKeysEnum, Object>(); + Map<AuditingFieldsKey, Object> params = new HashMap<>(); String action = "userAccess"; String userUid = "mosheUid"; String userName = "moshe moshe"; String userStatus = "200"; String userDesc = "OK"; - params.put(AuditingFieldsKeysEnum.AUDIT_ACTION, action); - params.put(AuditingFieldsKeysEnum.AUDIT_USER_UID, userName + '(' + userUid + ')'); - params.put(AuditingFieldsKeysEnum.AUDIT_STATUS, userStatus); - params.put(AuditingFieldsKeysEnum.AUDIT_DESC, userDesc); - params.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP, timestamp); + params.put(AuditingFieldsKey.AUDIT_ACTION, action); + params.put(AuditingFieldsKey.AUDIT_USER_UID, userName + '(' + userUid + ')'); + params.put(AuditingFieldsKey.AUDIT_STATUS, userStatus); + params.put(AuditingFieldsKey.AUDIT_DESC, userDesc); + params.put(AuditingFieldsKey.AUDIT_TIMESTAMP, timestamp); return params; } - private Map<AuditingFieldsKeysEnum, Object> getResourceAdminEventParams(String timestamp, String action) { + private Map<AuditingFieldsKey, Object> getResourceAdminEventParams(String timestamp, String action) { - Map<AuditingFieldsKeysEnum, Object> params = new HashMap<AuditingFieldsKeysEnum, Object>(); + Map<AuditingFieldsKey, Object> params = new HashMap<>(); String modifierName = "moshe moshe"; String modifierUid = "mosheUid"; @@ -338,27 +329,27 @@ public class AuditingDaoTest extends DAOConfDependentTest{ String distributionId = "123-456"; String serviceId = "SeviceId"; - params.put(AuditingFieldsKeysEnum.AUDIT_ACTION, action); - params.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, modifierName); - params.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, modifierUid); - params.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, resourceName); - params.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE, resourceType); - params.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE, currState); - params.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE, prevState); - params.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, currVersion); - params.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION, prevVersion); - params.put(AuditingFieldsKeysEnum.AUDIT_STATUS, status); - params.put(AuditingFieldsKeysEnum.AUDIT_DESC, desc); - params.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP, timestamp); - params.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID, distributionId); - params.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, serviceId); + params.put(AuditingFieldsKey.AUDIT_ACTION, action); + params.put(AuditingFieldsKey.AUDIT_MODIFIER_NAME, modifierName); + params.put(AuditingFieldsKey.AUDIT_MODIFIER_UID, modifierUid); + params.put(AuditingFieldsKey.AUDIT_RESOURCE_NAME, resourceName); + params.put(AuditingFieldsKey.AUDIT_RESOURCE_TYPE, resourceType); + params.put(AuditingFieldsKey.AUDIT_RESOURCE_CURR_STATE, currState); + params.put(AuditingFieldsKey.AUDIT_RESOURCE_PREV_STATE, prevState); + params.put(AuditingFieldsKey.AUDIT_RESOURCE_CURR_VERSION, currVersion); + params.put(AuditingFieldsKey.AUDIT_RESOURCE_PREV_VERSION, prevVersion); + params.put(AuditingFieldsKey.AUDIT_STATUS, status); + params.put(AuditingFieldsKey.AUDIT_DESC, desc); + params.put(AuditingFieldsKey.AUDIT_TIMESTAMP, timestamp); + params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_ID, distributionId); + params.put(AuditingFieldsKey.AUDIT_SERVICE_INSTANCE_ID, serviceId); return params; } - private Map<AuditingFieldsKeysEnum, Object> getDistributionStatusEventParams(String timestamp) { + private Map<AuditingFieldsKey, Object> getDistributionStatusEventParams(String timestamp) { - Map<AuditingFieldsKeysEnum, Object> params = new HashMap<AuditingFieldsKeysEnum, Object>(); + Map<AuditingFieldsKey, Object> params = new HashMap<>(); String action = "DStatus"; String modifierName = "moshe moshe"; String modifierUid = "mosheUid"; @@ -370,16 +361,16 @@ public class AuditingDaoTest extends DAOConfDependentTest{ String status = "200"; String desc = "OK"; - params.put(AuditingFieldsKeysEnum.AUDIT_DESC, desc); - params.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP, timestamp); - params.put(AuditingFieldsKeysEnum.AUDIT_STATUS, status); - params.put(AuditingFieldsKeysEnum.AUDIT_ACTION, action); - params.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID, distributionId); - params.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, modifierUid); - params.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME, topicName); - params.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL, resourceUrl); - params.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TIME, timestamp); - params.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, serviceId); + params.put(AuditingFieldsKey.AUDIT_DESC, desc); + params.put(AuditingFieldsKey.AUDIT_TIMESTAMP, timestamp); + params.put(AuditingFieldsKey.AUDIT_STATUS, status); + params.put(AuditingFieldsKey.AUDIT_ACTION, action); + params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_ID, distributionId); + params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_CONSUMER_ID, modifierUid); + params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_TOPIC_NAME, topicName); + params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_RESOURCE_URL, resourceUrl); + params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_STATUS_TIME, timestamp); + params.put(AuditingFieldsKey.AUDIT_SERVICE_INSTANCE_ID, serviceId); return params; } @@ -411,11 +402,11 @@ public class AuditingDaoTest extends DAOConfDependentTest{ // // - Map<AuditingFieldsKeysEnum, Object> params = getResourceAdminEventParams(timestamp, "DRequest"); - params.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID, distributionId); + Map<AuditingFieldsKey, Object> params = getResourceAdminEventParams(timestamp, "DRequest"); + params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_ID, distributionId); testCreationPeriodScenario(params, creationPeriod, expectedIndexName, ResourceAdminEvent.class); params = getDistributionNotificationEventParams(timestamp); - params.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID, distributionId); + params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_ID, distributionId); testCreationPeriodScenario(params, creationPeriod, expectedIndexName, DistributionNotificationEvent.class); @@ -431,9 +422,9 @@ public class AuditingDaoTest extends DAOConfDependentTest{ } - private Map<AuditingFieldsKeysEnum, Object> getDistributionNotificationEventParams(String timestamp) { + private Map<AuditingFieldsKey, Object> getDistributionNotificationEventParams(String timestamp) { - Map<AuditingFieldsKeysEnum, Object> params = new HashMap<AuditingFieldsKeysEnum, Object>(); + Map<AuditingFieldsKey, Object> params = new HashMap<>(); String action = "DNotify"; String modifierName = "moshe moshe"; @@ -450,20 +441,20 @@ public class AuditingDaoTest extends DAOConfDependentTest{ String serviceId = "SeviceId"; String requestId = "12364"; - params.put(AuditingFieldsKeysEnum.AUDIT_ACTION, action); - params.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, requestId); - params.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, modifierUid); - params.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, modifierName); - params.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, resourceName); - params.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE, resourceType); - params.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE, currState); - params.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME, topicName); - params.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, currVersion); - params.put(AuditingFieldsKeysEnum.AUDIT_STATUS, status); - params.put(AuditingFieldsKeysEnum.AUDIT_DESC, desc); - params.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP, timestamp); - params.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID, did); - params.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, serviceId); + params.put(AuditingFieldsKey.AUDIT_ACTION, action); + params.put(AuditingFieldsKey.AUDIT_MODIFIER_NAME, requestId); + params.put(AuditingFieldsKey.AUDIT_MODIFIER_UID, modifierUid); + params.put(AuditingFieldsKey.AUDIT_MODIFIER_NAME, modifierName); + params.put(AuditingFieldsKey.AUDIT_RESOURCE_NAME, resourceName); + params.put(AuditingFieldsKey.AUDIT_RESOURCE_TYPE, resourceType); + params.put(AuditingFieldsKey.AUDIT_RESOURCE_CURR_STATE, currState); + params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_TOPIC_NAME, topicName); + params.put(AuditingFieldsKey.AUDIT_RESOURCE_CURR_VERSION, currVersion); + params.put(AuditingFieldsKey.AUDIT_STATUS, status); + params.put(AuditingFieldsKey.AUDIT_DESC, desc); + params.put(AuditingFieldsKey.AUDIT_TIMESTAMP, timestamp); + params.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_ID, did); + params.put(AuditingFieldsKey.AUDIT_SERVICE_INSTANCE_ID, serviceId); return params; } diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/CassandraTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/CassandraTest.java index dbc246eb56..195232aaf5 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/CassandraTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/CassandraTest.java @@ -20,17 +20,15 @@ package org.openecomp.sdc.be.resources; -import org.openecomp.sdc.be.dao.Account; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Session; import com.datastax.driver.mapping.Mapper; import com.datastax.driver.mapping.MappingManager; +import org.openecomp.sdc.be.dao.Account; +import org.openecomp.sdc.common.log.wrappers.Logger; public class CassandraTest { - private static Logger log = LoggerFactory.getLogger(CassandraTest.class.getName()); + private static Logger log = Logger.getLogger(CassandraTest.class.getName()); private Cluster cluster; // #\@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 d92d8dee16..21a728053c 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,26 +20,25 @@ package org.openecomp.sdc.be.resources; -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.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +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 org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition; -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 java.io.IOException; +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; public class JsonParserUtilsTests { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/TitanGenericDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/TitanGenericDaoTest.java index 6dede29977..d420f630e4 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/TitanGenericDaoTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/TitanGenericDaoTest.java @@ -20,16 +20,11 @@ package org.openecomp.sdc.be.resources; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - +import com.google.gson.Gson; +import com.thinkaurelius.titan.core.*; +import com.thinkaurelius.titan.core.attribute.Text; +import com.thinkaurelius.titan.core.schema.TitanManagement; +import fj.data.Either; import org.apache.commons.configuration.BaseConfiguration; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.tinkerpop.gremlin.structure.Direction; @@ -46,12 +41,7 @@ import org.openecomp.sdc.be.dao.titan.TitanOperationStatus; import org.openecomp.sdc.be.dao.utils.UserStatusEnum; import org.openecomp.sdc.be.datatypes.components.ResourceMetadataDataDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; -import org.openecomp.sdc.be.resources.data.AdditionalInfoParameterData; -import org.openecomp.sdc.be.resources.data.ArtifactData; -import org.openecomp.sdc.be.resources.data.ComponentInstanceData; -import org.openecomp.sdc.be.resources.data.GraphNodeLock; -import org.openecomp.sdc.be.resources.data.ResourceMetadataData; -import org.openecomp.sdc.be.resources.data.UserData; +import org.openecomp.sdc.be.resources.data.*; import org.openecomp.sdc.common.api.ConfigurationSource; import org.openecomp.sdc.common.api.UserRoleEnum; import org.openecomp.sdc.common.impl.ExternalConfiguration; @@ -65,16 +55,14 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution import org.springframework.test.context.support.DirtiesContextTestExecutionListener; import org.springframework.test.context.transaction.TransactionalTestExecutionListener; -import com.google.gson.Gson; -import com.thinkaurelius.titan.core.PropertyKey; -import com.thinkaurelius.titan.core.TitanEdge; -import com.thinkaurelius.titan.core.TitanFactory; -import com.thinkaurelius.titan.core.TitanGraph; -import com.thinkaurelius.titan.core.TitanVertex; -import com.thinkaurelius.titan.core.attribute.Text; -import com.thinkaurelius.titan.core.schema.TitanManagement; +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import fj.data.Either; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:application-context-test.xml") @@ -195,7 +183,7 @@ public class TitanGenericDaoTest { log.debug("{}", all.left().value()); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put(keyValueId1.getKey(), keyValueId1.getValue()); @@ -233,27 +221,27 @@ public class TitanGenericDaoTest { Either<List<Edge>, TitanOperationStatus> eitherEdges = titanDao.getEdgesForNode(userData, Direction.OUT); assertTrue(eitherEdges.isLeft()); - assertTrue(eitherEdges.left().value().size() == 1); + assertEquals(1, eitherEdges.left().value().size()); eitherEdges = titanDao.getEdgesForNode(userData, Direction.IN); assertTrue(eitherEdges.isLeft()); - assertTrue(eitherEdges.left().value().size() == 0); + assertEquals(0, eitherEdges.left().value().size()); eitherEdges = titanDao.getEdgesForNode(resourceData, Direction.OUT); assertTrue(eitherEdges.isLeft()); - assertTrue(eitherEdges.left().value().size() == 0); + assertEquals(0, eitherEdges.left().value().size()); eitherEdges = titanDao.getEdgesForNode(resourceData, Direction.IN); assertTrue(eitherEdges.isLeft()); - assertTrue(eitherEdges.left().value().size() == 1); + assertEquals(1, eitherEdges.left().value().size()); eitherEdges = titanDao.getEdgesForNode(resourceData, Direction.BOTH); assertTrue(eitherEdges.isLeft()); - assertTrue(eitherEdges.left().value().size() == 1); + assertEquals(1, eitherEdges.left().value().size()); eitherEdges = titanDao.getEdgesForNode(userData, Direction.BOTH); assertTrue(eitherEdges.isLeft()); - assertTrue(eitherEdges.left().value().size() == 1); + assertEquals(1, eitherEdges.left().value().size()); titanDao.deleteNode(userData, UserData.class); titanDao.deleteNode(resourceData, ResourceMetadataData.class); @@ -394,7 +382,7 @@ public class TitanGenericDaoTest { ResourceMetadataData.class); titanDao.commit(); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put(GraphPropertiesDictionary.STATE.getProperty(), "NOT_CERTIFIED_CHECKOUT"); props.put("name", "resourceForLock"); diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterDataTest.java index 9a1771688f..775022173b 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class AdditionalInfoParameterDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ArtifactDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ArtifactDataTest.java index 944f11b88b..302acc2dfb 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ArtifactDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ArtifactDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class ArtifactDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeDataTest.java index aab4a98b03..e9a8e291c7 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class AttributeDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeValueDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeValueDataTest.java index 0da5a17659..3a7aff2c85 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeValueDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AttributeValueDataTest.java @@ -1,10 +1,10 @@ package org.openecomp.sdc.be.resources.data; +import org.junit.Test; + import java.util.HashMap; import java.util.Map; -import org.junit.Test; - public class AttributeValueDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityDataTest.java index 0a0dee56dd..0688a0bc8e 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; +import org.junit.Test; + import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; - public class CapabilityDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityInstDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityInstDataTest.java index 2ca030cc89..ebb88857be 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityInstDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityInstDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; +import org.junit.Test; + import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; - public class CapabilityInstDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityTypeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityTypeDataTest.java index e3dbdb9000..da0a445e8f 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityTypeDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/CapabilityTypeDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.Map; - import org.apache.commons.collections.map.HashedMap; import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.CapabilityTypeDataDefinition; +import java.util.Map; + public class CapabilityTypeDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentCacheDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentCacheDataTest.java index bda882e465..8c5816d5fd 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentCacheDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentCacheDataTest.java @@ -1,10 +1,10 @@ package org.openecomp.sdc.be.resources.data; +import org.junit.Test; + import java.nio.ByteBuffer; import java.util.Date; -import org.junit.Test; - public class ComponentCacheDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentInstanceDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentInstanceDataTest.java index f3bbae7d87..0a6acd8f7a 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentInstanceDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ComponentInstanceDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.ComponentInstanceDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class ComponentInstanceDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ConsumerDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ConsumerDataTest.java index 1737781eac..f823d022df 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ConsumerDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ConsumerDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class ConsumerDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/DataTypeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/DataTypeDataTest.java index 85fc2620e6..cc9c80256d 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/DataTypeDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/DataTypeDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.DataTypeDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class DataTypeDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ESArtifactDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ESArtifactDataTest.java index 69aa1601d5..acf7227476 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ESArtifactDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ESArtifactDataTest.java @@ -1,9 +1,9 @@ package org.openecomp.sdc.be.resources.data; -import java.nio.ByteBuffer; - import org.junit.Test; +import java.nio.ByteBuffer; + public class ESArtifactDataTest { private ESArtifactData createTestSubject() { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GraphNodeLockTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GraphNodeLockTest.java index 406e96399d..cd3ead97c5 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GraphNodeLockTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GraphNodeLockTest.java @@ -1,10 +1,10 @@ package org.openecomp.sdc.be.resources.data; +import org.junit.Test; + import java.util.HashMap; import java.util.Map; -import org.junit.Test; - public class GraphNodeLockTest { private GraphNodeLock createTestSubject() { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupDataTest.java index 30faa644b5..d49528198a 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class GroupDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupInstanceDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupInstanceDataTest.java index af87f8fa34..e5c9a390f7 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupInstanceDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupInstanceDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.GroupInstanceDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class GroupInstanceDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupTypeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupTypeDataTest.java index 6432672c57..2dd808ac61 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupTypeDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/GroupTypeDataTest.java @@ -1,16 +1,16 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.GroupTypeDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class GroupTypeDataTest { private GroupTypeData createTestSubject() { - return new GroupTypeData(); + return new GroupTypeData(new GroupTypeDataDefinition()); } @Test diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterDataTest.java index ae18dbffac..f009f6776d 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.HeatParameterDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class HeatParameterDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterValueDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterValueDataTest.java index 794940f6a2..d6442decfd 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterValueDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/HeatParameterValueDataTest.java @@ -1,10 +1,10 @@ package org.openecomp.sdc.be.resources.data; +import org.junit.Test; + import java.util.HashMap; import java.util.Map; -import org.junit.Test; - public class HeatParameterValueDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputValueDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputValueDataTest.java index bd0cfc0447..423646b874 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputValueDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputValueDataTest.java @@ -1,10 +1,10 @@ package org.openecomp.sdc.be.resources.data; +import org.junit.Test; + import java.util.HashMap; import java.util.Map; -import org.junit.Test; - public class InputValueDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputsDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputsDataTest.java index 1ba2ba76cd..39833107b2 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputsDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InputsDataTest.java @@ -1,13 +1,13 @@ package org.openecomp.sdc.be.resources.data; +import org.junit.Test; +import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition; + import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.junit.Test; -import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition; - public class InputsDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InterfaceDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InterfaceDataTest.java index d963238f19..a420f28af6 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InterfaceDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/InterfaceDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.InterfaceDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class InterfaceDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/MigrationTaskEntryTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/MigrationTaskEntryTest.java deleted file mode 100644 index 178ac2a6a2..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/MigrationTaskEntryTest.java +++ /dev/null @@ -1,189 +0,0 @@ -package org.openecomp.sdc.be.resources.data; - -import java.util.Date; - -import org.junit.Test; - - -public class MigrationTaskEntryTest { - - private MigrationTaskEntry createTestSubject() { - return new MigrationTaskEntry(); - } - - - @Test - public void testSetMajorVersion() throws Exception { - MigrationTaskEntry testSubject; - Long majorVersion = null; - - // default test - testSubject = createTestSubject(); - testSubject.setMajorVersion(majorVersion); - } - - - @Test - public void testSetMinorVersion() throws Exception { - MigrationTaskEntry testSubject; - Long minorVersion = null; - - // default test - testSubject = createTestSubject(); - testSubject.setMinorVersion(minorVersion); - } - - - @Test - public void testSetTimestamp() throws Exception { - MigrationTaskEntry testSubject; - Date timestamp = null; - - // default test - testSubject = createTestSubject(); - testSubject.setTimestamp(timestamp); - } - - - @Test - public void testSetTaskName() throws Exception { - MigrationTaskEntry testSubject; - String taskName = ""; - - // default test - testSubject = createTestSubject(); - testSubject.setTaskName(taskName); - } - - - @Test - public void testSetTaskStatus() throws Exception { - MigrationTaskEntry testSubject; - String taskStatus = ""; - - // default test - testSubject = createTestSubject(); - testSubject.setTaskStatus(taskStatus); - } - - - @Test - public void testSetMessage() throws Exception { - MigrationTaskEntry testSubject; - String message = ""; - - // default test - testSubject = createTestSubject(); - testSubject.setMessage(message); - } - - - @Test - public void testSetExecutionTime() throws Exception { - MigrationTaskEntry testSubject; - double executionTime = 0.0; - - // default test - testSubject = createTestSubject(); - testSubject.setExecutionTime(executionTime); - } - - - @Test - public void testGetMajorVersion() throws Exception { - MigrationTaskEntry testSubject; - Long result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getMajorVersion(); - } - - - @Test - public void testGetMinorVersion() throws Exception { - MigrationTaskEntry testSubject; - Long result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getMinorVersion(); - } - - - @Test - public void testGetTimestamp() throws Exception { - MigrationTaskEntry testSubject; - Date result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getTimestamp(); - } - - - @Test - public void testGetTaskName() throws Exception { - MigrationTaskEntry testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getTaskName(); - } - - - @Test - public void testGetTaskStatus() throws Exception { - MigrationTaskEntry testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getTaskStatus(); - } - - - @Test - public void testGetMessage() throws Exception { - MigrationTaskEntry testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getMessage(); - } - - - @Test - public void testGetExecutionTime() throws Exception { - MigrationTaskEntry testSubject; - double result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getExecutionTime(); - } - - - @Test - public void testGetDescription() throws Exception { - MigrationTaskEntry testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getDescription(); - } - - - @Test - public void testSetDescription() throws Exception { - MigrationTaskEntry testSubject; - String description = ""; - - // default test - testSubject = createTestSubject(); - testSubject.setDescription(description); - } -}
\ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/OperationDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/OperationDataTest.java index 5745832187..ef71cc4b85 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/OperationDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/OperationDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.OperationDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class OperationDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/OperationalEnvironmentEntryTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/OperationalEnvironmentEntryTest.java index e81da3ada3..684acb29fe 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/OperationalEnvironmentEntryTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/OperationalEnvironmentEntryTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.Date; -import java.util.Set; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.enums.EnvironmentStatusEnum; +import java.util.Date; +import java.util.Set; + public class OperationalEnvironmentEntryTest { private OperationalEnvironmentEntry createTestSubject() { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PolicyTypeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PolicyTypeDataTest.java index 648a9e8e88..e3b7fd141b 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PolicyTypeDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PolicyTypeDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.PolicyTypeDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class PolicyTypeDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ProductMetadataDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ProductMetadataDataTest.java index a87fbba17f..8cfa221f4b 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ProductMetadataDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ProductMetadataDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.ProductMetadataDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class ProductMetadataDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyDataTest.java index ea372d4390..9aff175203 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyDataTest.java @@ -1,13 +1,13 @@ package org.openecomp.sdc.be.resources.data; +import org.junit.Test; +import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition; + import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.junit.Test; -import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition; - public class PropertyDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyValueDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyValueDataTest.java index 138eaa8156..dc85e5a5d0 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyValueDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/PropertyValueDataTest.java @@ -1,12 +1,12 @@ package org.openecomp.sdc.be.resources.data; +import org.junit.Test; +import org.openecomp.sdc.be.datatypes.elements.PropertyRule; + import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; -import org.openecomp.sdc.be.datatypes.elements.PropertyRule; - public class PropertyValueDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipInstDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipInstDataTest.java index b70216d37f..9a2534bf56 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipInstDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipInstDataTest.java @@ -1,10 +1,10 @@ package org.openecomp.sdc.be.resources.data; +import org.junit.Test; + import java.util.HashMap; import java.util.Map; -import org.junit.Test; - public class RelationshipInstDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipTypeDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipTypeDataTest.java index 00fc45bb77..5f875d7999 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipTypeDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RelationshipTypeDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.RelationshipInstDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class RelationshipTypeDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementDataTest.java index f4689dc19d..77685eacba 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementDataTest.java @@ -1,10 +1,10 @@ package org.openecomp.sdc.be.resources.data; +import org.junit.Test; + import java.util.HashMap; import java.util.Map; -import org.junit.Test; - public class RequirementDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementImplDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementImplDataTest.java index d2f391dd6e..d4c44f96f5 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementImplDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/RequirementImplDataTest.java @@ -1,10 +1,10 @@ package org.openecomp.sdc.be.resources.data; +import org.junit.Test; + import java.util.HashMap; import java.util.Map; -import org.junit.Test; - public class RequirementImplDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceCategoryDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceCategoryDataTest.java index 6180172c83..727274b443 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceCategoryDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceCategoryDataTest.java @@ -1,10 +1,10 @@ package org.openecomp.sdc.be.resources.data; +import org.junit.Test; + import java.util.HashMap; import java.util.Map; -import org.junit.Test; - public class ResourceCategoryDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceMetadataDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceMetadataDataTest.java index 172ef5fe01..3de8e632d3 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceMetadataDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ResourceMetadataDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.components.ResourceMetadataDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class ResourceMetadataDataTest { private ResourceMetadataData createTestSubject() { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesDataTest.java index 31a6fb1314..e0642b8743 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/SdcSchemaFilesDataTest.java @@ -1,10 +1,10 @@ package org.openecomp.sdc.be.resources.data; +import org.junit.Test; + import java.nio.ByteBuffer; import java.util.Date; -import org.junit.Test; - public class SdcSchemaFilesDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceArtifactsDataCollectionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceArtifactsDataCollectionTest.java deleted file mode 100644 index 3c498e87f4..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceArtifactsDataCollectionTest.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.openecomp.sdc.be.resources.data; - -import java.util.List; -import java.util.Map; - -import org.junit.Test; - -public class ServiceArtifactsDataCollectionTest { - - private ServiceArtifactsDataCollection createTestSubject() { - return new ServiceArtifactsDataCollection(); - } - - - @Test - public void testGetServiceArtifactDataMap() throws Exception { - ServiceArtifactsDataCollection testSubject; - Map<String, List<ESArtifactData>> result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getServiceArtifactDataMap(); - } - - - @Test - public void testSetServiceArtifactDataMap() throws Exception { - ServiceArtifactsDataCollection testSubject; - Map<String, List<ESArtifactData>> serviceArtifactDataMap = null; - - // default test - testSubject = createTestSubject(); - testSubject.setServiceArtifactDataMap(serviceArtifactDataMap); - } - - - @Test - public void testGetNodeTemplateArtifacts() throws Exception { - ServiceArtifactsDataCollection testSubject; - String nodeTemplateName = ""; - List<ESArtifactData> result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getNodeTemplateArtifacts(nodeTemplateName); - } -}
\ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceCategoryDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceCategoryDataTest.java index 1e0cc7cf68..9c76ac8c39 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceCategoryDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceCategoryDataTest.java @@ -1,10 +1,9 @@ package org.openecomp.sdc.be.resources.data; +import mockit.Deencapsulation; import org.apache.commons.collections.map.HashedMap; import org.junit.Test; -import mockit.Deencapsulation; - public class ServiceCategoryDataTest { private ServiceCategoryData createTestSubject() { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceMetadataDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceMetadataDataTest.java index a60231134b..ae5a1cca7d 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceMetadataDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/ServiceMetadataDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.components.ServiceMetadataDataDefinition; +import java.util.HashMap; +import java.util.Map; + public class ServiceMetadataDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/TagDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/TagDataTest.java index 482ebffa2b..62b8db1357 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/TagDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/TagDataTest.java @@ -1,12 +1,12 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Assert; import org.junit.Test; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.HashMap; +import java.util.Map; + public class TagDataTest { private TagData createTestSubject() { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UniqueIdDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UniqueIdDataTest.java index 0b82c5bb1e..29a7a6eaf3 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UniqueIdDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UniqueIdDataTest.java @@ -1,10 +1,10 @@ package org.openecomp.sdc.be.resources.data; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.Map; + public class UniqueIdDataTest { private UniqueIdData createTestSubject() { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserDataTest.java index 356e4f05e6..f147c8611b 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserDataTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.junit.Assert; import org.junit.Test; +import java.util.HashMap; +import java.util.Map; + public class UserDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserFunctionalMenuDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserFunctionalMenuDataTest.java index 22922e7520..3811a890ae 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserFunctionalMenuDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/UserFunctionalMenuDataTest.java @@ -1,10 +1,10 @@ package org.openecomp.sdc.be.resources.data; +import org.junit.Test; + import java.util.HashMap; import java.util.Map; -import org.junit.Test; - public class UserFunctionalMenuDataTest { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditRecordFactoryTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditRecordFactoryTest.java deleted file mode 100644 index ac3b912d64..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditRecordFactoryTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.openecomp.sdc.be.resources.data.auditing; - -import java.util.HashMap; -import java.util.Map; - -import org.junit.Test; -import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum; - -public class AuditRecordFactoryTest { - - private AuditRecordFactory createTestSubject() { - return new AuditRecordFactory(); - } - - @Test - public void testCreateAuditRecord() throws Exception { - Map<AuditingFieldsKeysEnum, Object> auditingFields = new HashMap<>(); - AuditingGenericEvent result; - - // default test - result = AuditRecordFactory.createAuditRecord(null); - result = AuditRecordFactory.createAuditRecord(auditingFields); - - for (AuditingActionEnum iterable_element : AuditingActionEnum.values()) { - auditingFields = new HashMap<>(); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, iterable_element.getName()); - result = AuditRecordFactory.createAuditRecord(auditingFields); - } - } -}
\ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingActionEnumTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingActionEnumTest.java index 7bd05b71b2..215d7294cc 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingActionEnumTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingActionEnumTest.java @@ -34,6 +34,6 @@ public class AuditingActionEnumTest { AuditingActionEnum result; // default test - result = AuditingActionEnum.getActionByName(name); + result = AuditingActionEnum.fromName(name); } }
\ 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 deleted file mode 100644 index 5172fc31dc..0000000000 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGenericEventTest.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.openecomp.sdc.be.resources.data.auditing; - -import org.junit.Test; - -public class AuditingGenericEventTest { - - private AuditingGenericEvent createTestSubject() { - return new AuditingGenericEvent(); - } - - @Test - public void testGetRequestId() throws Exception { - AuditingGenericEvent testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getRequestId(); - } - - @Test - public void testSetRequestId() throws Exception { - AuditingGenericEvent testSubject; - String requestId = ""; - - // default test - testSubject = createTestSubject(); - testSubject.setRequestId(requestId); - } - - @Test - public void testGetServiceInstanceId() throws Exception { - AuditingGenericEvent testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getServiceInstanceId(); - } - - @Test - public void testSetServiceInstanceId() throws Exception { - AuditingGenericEvent testSubject; - String serviceInstanceId = ""; - - // default test - testSubject = createTestSubject(); - testSubject.setServiceInstanceId(serviceInstanceId); - } - - @Test - public void testGetAction() throws Exception { - AuditingGenericEvent testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getAction(); - } - - @Test - public void testSetAction() throws Exception { - AuditingGenericEvent testSubject; - String action = ""; - - // default test - testSubject = createTestSubject(); - testSubject.setAction(action); - } - - @Test - public void testGetStatus() throws Exception { - AuditingGenericEvent testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getStatus(); - } - - @Test - public void testSetStatus() throws Exception { - AuditingGenericEvent testSubject; - String status = ""; - - // default test - testSubject = createTestSubject(); - testSubject.setStatus(status); - } - - @Test - public void testGetDesc() throws Exception { - AuditingGenericEvent testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getDesc(); - } - - @Test - public void testSetDesc() throws Exception { - AuditingGenericEvent testSubject; - String desc = ""; - - // default test - testSubject = createTestSubject(); - testSubject.setDesc(desc); - } - - @Test - public void testFillFields() throws Exception { - AuditingGenericEvent testSubject; - - // default test - testSubject = createTestSubject(); - testSubject.fillFields(); - } -}
\ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEventTest.java index a277ca8fbd..11a0249a83 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 @@ -1,13 +1,12 @@ package org.openecomp.sdc.be.resources.data.auditing; -import java.util.Date; -import java.util.HashMap; -import java.util.UUID; - import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData.Builder; +import java.util.Date; +import java.util.UUID; + public class AuditingGetUebClusterEventTest { private AuditingGetUebClusterEvent createTestSubject() { @@ -16,7 +15,7 @@ public class AuditingGetUebClusterEventTest { @Test public void testCtor() throws Exception { - new AuditingGetUebClusterEvent(new HashMap<>()); + new AuditingGetUebClusterEvent(); Builder newBuilder = CommonAuditData.newBuilder(); CommonAuditData build = newBuilder.build(); new AuditingGetUebClusterEvent("mock", build, "mock"); 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 1e715cae00..8b3e6634f0 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 @@ -1,13 +1,12 @@ package org.openecomp.sdc.be.resources.data.auditing; -import java.util.Date; -import java.util.HashMap; -import java.util.UUID; - import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData.Builder; +import java.util.Date; +import java.util.UUID; + public class AuthEventTest { private AuthEvent createTestSubject() { @@ -16,7 +15,7 @@ public class AuthEventTest { @Test public void testCtor() throws Exception { - new AuthEvent(new HashMap<>()); + new AuthEvent(); Builder newBuilder = CommonAuditData.newBuilder(); new AuthEvent("mock", newBuilder.build(), "mock", "mock", "mock", "mock"); } 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 bd36f3a789..0f01127385 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 @@ -1,13 +1,12 @@ package org.openecomp.sdc.be.resources.data.auditing; -import java.util.Date; -import java.util.HashMap; -import java.util.UUID; - import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData.Builder; +import java.util.Date; +import java.util.UUID; + public class CategoryEventTest { private CategoryEvent createTestSubject() { @@ -16,7 +15,7 @@ public class CategoryEventTest { @Test public void testCtor() throws Exception { - new CategoryEvent(new HashMap()); + new CategoryEvent(); Builder newBuilder = CommonAuditData.newBuilder(); new CategoryEvent("mock", newBuilder.build(), "mock", "mock", "mock", "mock", "mock"); } diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ConsumerEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ConsumerEventTest.java index fa8abeb093..b67ab50c34 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ConsumerEventTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ConsumerEventTest.java @@ -1,12 +1,11 @@ package org.openecomp.sdc.be.resources.data.auditing; -import java.util.Date; -import java.util.HashMap; -import java.util.UUID; - import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; +import java.util.Date; +import java.util.UUID; + public class ConsumerEventTest { @@ -16,7 +15,7 @@ public class ConsumerEventTest { @Test public void testCtor() throws Exception { - new ConsumerEvent(new HashMap<>()); + new ConsumerEvent(); new ConsumerEvent("mock", CommonAuditData.newBuilder().build(), "mock", "mock"); } diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDeployEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDeployEventTest.java index 8a27de9db4..703efa8082 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDeployEventTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDeployEventTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data.auditing; -import java.util.Date; -import java.util.HashMap; -import java.util.UUID; - import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo; + +import java.util.Date; +import java.util.UUID; public class DistributionDeployEventTest { @@ -16,8 +16,8 @@ public class DistributionDeployEventTest { @Test public void testCtor() throws Exception { - new DistributionDeployEvent(new HashMap<>()); - new DistributionDeployEvent("mock", CommonAuditData.newBuilder().build(), "mock", "mock", "mock", "mock", "mock"); + new DistributionDeployEvent(); + new DistributionDeployEvent("mock", CommonAuditData.newBuilder().build(),new ResourceCommonInfo(), "mock", "mock", "mock"); } @Test diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDownloadEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDownloadEventTest.java index c3e1faf257..7bb8e5ccba 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDownloadEventTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDownloadEventTest.java @@ -1,13 +1,13 @@ -package org.openecomp.sdc.be.resources.data.auditing; -import java.util.Date; -import java.util.HashMap; -import java.util.UUID; +package org.openecomp.sdc.be.resources.data.auditing; import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData; +import java.util.Date; +import java.util.UUID; + public class DistributionDownloadEventTest { @@ -17,7 +17,7 @@ public class DistributionDownloadEventTest { @Test public void testCtor() throws Exception { - new DistributionDownloadEvent(new HashMap<>()); + new DistributionDownloadEvent(); new DistributionDownloadEvent("mock", CommonAuditData.newBuilder().build(), new DistributionData("mock", "mock")); } diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionEngineEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionEngineEventTest.java index 10e61e40d5..33f2dc344e 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionEngineEventTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionEngineEventTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data.auditing; -import java.util.Date; -import java.util.HashMap; -import java.util.UUID; - import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; +import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData; + +import java.util.Date; +import java.util.UUID; public class DistributionEngineEventTest { @@ -16,8 +16,8 @@ public class DistributionEngineEventTest { @Test public void testCtor() throws Exception { - new DistributionEngineEvent(new HashMap<>()); - new DistributionEngineEvent("mock", CommonAuditData.newBuilder().build(), "mock", "mock", "mock", "mock", "mock", "mock"); + new DistributionEngineEvent(); + new DistributionEngineEvent("mock", CommonAuditData.newBuilder().build(), "mock", DistributionTopicData.newBuilder().build(), "mock", "mock", "mock"); } @Test diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionNotificationEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionNotificationEventTest.java index 102c7c4d1c..e8487e1eaf 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionNotificationEventTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionNotificationEventTest.java @@ -1,12 +1,13 @@ package org.openecomp.sdc.be.resources.data.auditing; -import java.util.Date; -import java.util.HashMap; -import java.util.UUID; - import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; import org.openecomp.sdc.be.resources.data.auditing.model.OperationalEnvAuditData; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo; + +import java.util.Date; +import java.util.UUID; public class DistributionNotificationEventTest { @@ -16,8 +17,8 @@ public class DistributionNotificationEventTest { @Test public void testCtor() throws Exception { - new DistributionNotificationEvent(new HashMap<>()); - new DistributionNotificationEvent("mock", CommonAuditData.newBuilder().build(), "mock", "mock", "mock", "mock", "mock", "mock", "mock", new OperationalEnvAuditData("mock", "mock", "mock")); + new DistributionNotificationEvent(); + new DistributionNotificationEvent("mock", CommonAuditData.newBuilder().build(), new ResourceCommonInfo(),ResourceVersionInfo.newBuilder().build() , "mock", "mock", "mock", new OperationalEnvAuditData("mock", "mock", "mock")); } @Test diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEventTest.java index d266135671..441991a7ad 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEventTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEventTest.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.be.resources.data.auditing; -import java.util.Date; -import java.util.HashMap; -import java.util.UUID; - import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; +import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData; + +import java.util.Date; +import java.util.UUID; public class DistributionStatusEventTest { @@ -16,8 +16,8 @@ public class DistributionStatusEventTest { @Test public void testCtor() throws Exception { - new DistributionStatusEvent(new HashMap<>()); - new DistributionStatusEvent("mock", CommonAuditData.newBuilder().build(), "mock", "mock", "mock", "mock", "mock"); + new DistributionStatusEvent(); + new DistributionStatusEvent("mock", CommonAuditData.newBuilder().build(),new DistributionData("",""), "mock", "mock", "mock"); } @Test diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/EcompOperationalEnvironmentEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/EcompOperationalEnvironmentEventTest.java index ed047f85c6..ab5d24eedb 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/EcompOperationalEnvironmentEventTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/EcompOperationalEnvironmentEventTest.java @@ -1,10 +1,9 @@ package org.openecomp.sdc.be.resources.data.auditing; -import java.util.Date; -import java.util.HashMap; - import org.junit.Test; +import java.util.Date; + public class EcompOperationalEnvironmentEventTest { private EcompOperationalEnvironmentEvent createTestSubject() { @@ -13,7 +12,7 @@ public class EcompOperationalEnvironmentEventTest { @Test public void testCtor() throws Exception { - new EcompOperationalEnvironmentEvent(new HashMap<>()); + new EcompOperationalEnvironmentEvent(); new EcompOperationalEnvironmentEvent("mock", "mock", "mock", "mock", "mock", "mock"); } diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ExternalApiEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ExternalApiEventTest.java index 33e86ea6d9..4a71e27de6 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ExternalApiEventTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ExternalApiEventTest.java @@ -1,12 +1,13 @@ package org.openecomp.sdc.be.resources.data.auditing; -import java.util.Date; -import java.util.HashMap; -import java.util.UUID; - import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; +import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo; + +import java.util.Date; +import java.util.UUID; public class ExternalApiEventTest { @@ -17,8 +18,8 @@ public class ExternalApiEventTest { @Test public void testCtor() throws Exception { - new ExternalApiEvent(new HashMap<>()); - new ExternalApiEvent("mock", CommonAuditData.newBuilder().build(), "mock", "mock", "mock", "mock", ResourceAuditData.newBuilder().build(), ResourceAuditData.newBuilder().build(), "mock", "mock", "mock"); + new ExternalApiEvent(); + new ExternalApiEvent("mock", CommonAuditData.newBuilder().build(), new ResourceCommonInfo() ,new DistributionData("","") ,ResourceVersionInfo.newBuilder().build(),ResourceVersionInfo.newBuilder().build(), "mock" , "mock", "mock"); } @Test diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetCategoryHierarchyEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetCategoryHierarchyEventTest.java index fb5ed00927..65dc07d459 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetCategoryHierarchyEventTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetCategoryHierarchyEventTest.java @@ -1,12 +1,11 @@ package org.openecomp.sdc.be.resources.data.auditing; -import java.util.Date; -import java.util.HashMap; -import java.util.UUID; - import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; +import java.util.Date; +import java.util.UUID; + public class GetCategoryHierarchyEventTest { @@ -16,7 +15,7 @@ public class GetCategoryHierarchyEventTest { @Test public void testCtor() throws Exception { - new GetCategoryHierarchyEvent(new HashMap<>()); + new GetCategoryHierarchyEvent(); new GetCategoryHierarchyEvent("mock", CommonAuditData.newBuilder().build(), "mock", "mock"); } diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetUsersListEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetUsersListEventTest.java index 7214a45cbf..a9928ca913 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetUsersListEventTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/GetUsersListEventTest.java @@ -1,12 +1,11 @@ package org.openecomp.sdc.be.resources.data.auditing; -import java.util.Date; -import java.util.HashMap; -import java.util.UUID; - import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; +import java.util.Date; +import java.util.UUID; + public class GetUsersListEventTest { @@ -16,7 +15,7 @@ public class GetUsersListEventTest { @Test public void testCtor() throws Exception { - new GetUsersListEvent(new HashMap<>()); + new GetUsersListEvent(); new GetUsersListEvent("mock", CommonAuditData.newBuilder().build(), "mock", "mock"); } diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ResourceAdminEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ResourceAdminEventTest.java index 43f9b7757f..446b848d2f 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ResourceAdminEventTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/ResourceAdminEventTest.java @@ -1,12 +1,12 @@ package org.openecomp.sdc.be.resources.data.auditing; -import java.util.Date; -import java.util.HashMap; -import java.util.UUID; - import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo; + +import java.util.Date; +import java.util.UUID; public class ResourceAdminEventTest { @@ -16,9 +16,9 @@ public class ResourceAdminEventTest { @Test public void testCtor() throws Exception { - new ResourceAdminEvent(new HashMap<>()); - new ResourceAdminEvent("mock", CommonAuditData.newBuilder().build(), ResourceAuditData.newBuilder().build(), - ResourceAuditData.newBuilder().build(), "mock", "mock", "mock", "mock", "mock", "mock", "mock", "mock"); + new ResourceAdminEvent(); + new ResourceAdminEvent("mock", CommonAuditData.newBuilder().build(),new ResourceCommonInfo(),ResourceVersionInfo.newBuilder().build(),ResourceVersionInfo.newBuilder().build(), + "mock", "mock", "mock", "mock", "mock", "mock"); } @Test diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEventTest.java index 6d0fface25..04f9149a85 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEventTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEventTest.java @@ -1,12 +1,11 @@ package org.openecomp.sdc.be.resources.data.auditing; -import java.util.Date; -import java.util.HashMap; -import java.util.UUID; - import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; +import java.util.Date; +import java.util.UUID; + public class UserAccessEventTest { @@ -16,7 +15,7 @@ public class UserAccessEventTest { @Test public void testCtor() throws Exception { - new UserAccessEvent(new HashMap<>()); + new UserAccessEvent(); new UserAccessEvent("mock", CommonAuditData.newBuilder().build(), "mock"); } diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAdminEventTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAdminEventTest.java index 71a02929c6..2ba1250b1d 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAdminEventTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/UserAdminEventTest.java @@ -1,12 +1,11 @@ package org.openecomp.sdc.be.resources.data.auditing; -import java.util.Date; -import java.util.HashMap; -import java.util.UUID; - import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; +import java.util.Date; +import java.util.UUID; + public class UserAdminEventTest { @@ -16,7 +15,7 @@ public class UserAdminEventTest { @Test public void testCtor() throws Exception { - new UserAdminEvent(new HashMap<>()); + new UserAdminEvent(); new UserAdminEvent("mock", CommonAuditData.newBuilder().build(), "mock", "mock", "mock"); } diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/model/ResourceAuditDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/model/ResourceVersionInfoTest.java index 42ff896caf..bc87286b81 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/model/ResourceAuditDataTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/auditing/model/ResourceVersionInfoTest.java @@ -1,12 +1,13 @@ package org.openecomp.sdc.be.resources.data.auditing.model; import org.junit.Test; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData.Builder; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo.Builder; -public class ResourceAuditDataTest { - private ResourceAuditData createTestSubject() { - Builder newBuilder = ResourceAuditData.newBuilder(); +public class ResourceVersionInfoTest { + + private ResourceVersionInfo createTestSubject() { + Builder newBuilder = ResourceVersionInfo.newBuilder(); return newBuilder.build(); } @@ -16,7 +17,7 @@ public class ResourceAuditDataTest { Builder result; // default test - result = ResourceAuditData.newBuilder(); + result = ResourceVersionInfo.newBuilder(); } @Test @@ -24,7 +25,7 @@ public class ResourceAuditDataTest { Builder result; // default test - result = ResourceAuditData.newBuilder(); + result = ResourceVersionInfo.newBuilder(); result.artifactUuid("mock"); } @@ -33,7 +34,7 @@ public class ResourceAuditDataTest { Builder result; // default test - result = ResourceAuditData.newBuilder(); + result = ResourceVersionInfo.newBuilder(); result.state("mock"); } @@ -42,7 +43,7 @@ public class ResourceAuditDataTest { Builder result; // default test - result = ResourceAuditData.newBuilder(); + result = ResourceVersionInfo.newBuilder(); result.version("mock"); } @@ -51,13 +52,13 @@ public class ResourceAuditDataTest { Builder result; // default test - result = ResourceAuditData.newBuilder(); + result = ResourceVersionInfo.newBuilder(); result.distributionStatus("mock"); } @Test public void testGetArtifactUuid() throws Exception { - ResourceAuditData testSubject; + ResourceVersionInfo testSubject; String result; // default test @@ -68,7 +69,7 @@ public class ResourceAuditDataTest { @Test public void testGetState() throws Exception { - ResourceAuditData testSubject; + ResourceVersionInfo testSubject; String result; // default test @@ -79,7 +80,7 @@ public class ResourceAuditDataTest { @Test public void testGetVersion() throws Exception { - ResourceAuditData testSubject; + ResourceVersionInfo testSubject; String result; // default test @@ -90,7 +91,7 @@ public class ResourceAuditDataTest { @Test public void testGetDistributionStatus() throws Exception { - ResourceAuditData testSubject; + ResourceVersionInfo testSubject; String result; // default test 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 8f18888b6c..2832e7457a 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 @@ -1,12 +1,12 @@ package org.openecomp.sdc.be.resources.data.category; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.category.CategoryDataDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.HashMap; +import java.util.Map; + public class CategoryDataTest { private CategoryData createTestSubject() { 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 0d72d3dd98..22f88c5041 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 @@ -1,12 +1,12 @@ package org.openecomp.sdc.be.resources.data.category; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.category.GroupingDataDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.HashMap; +import java.util.Map; + public class GroupingDataTest { private GroupingData createTestSubject() { 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 407488f375..a42642ba35 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 @@ -1,12 +1,12 @@ package org.openecomp.sdc.be.resources.data.category; -import java.util.HashMap; -import java.util.Map; - import org.junit.Test; import org.openecomp.sdc.be.datatypes.category.SubCategoryDataDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.HashMap; +import java.util.Map; + public class SubCategoryDataTest { private SubCategoryData createTestSubject() { diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/impl/ResourceUploaderTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/impl/ResourceUploaderTest.java index 37c0902a73..df2f0b9678 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/impl/ResourceUploaderTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/impl/ResourceUploaderTest.java @@ -1,5 +1,7 @@ package org.openecomp.sdc.be.resources.impl; +import fj.data.Either; +import mockit.Deencapsulation; import org.junit.Before; import org.junit.Test; import org.mockito.InjectMocks; @@ -12,9 +14,6 @@ import org.openecomp.sdc.be.resources.data.ESArtifactData; import org.openecomp.sdc.be.resources.exception.ResourceDAOException; import org.openecomp.sdc.be.utils.DAOConfDependentTest; -import fj.data.Either; -import mockit.Deencapsulation; - public class ResourceUploaderTest extends DAOConfDependentTest{ @InjectMocks diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/utils/FixtureHelpers.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/utils/FixtureHelpers.java index 1992b8043c..8ac9017aca 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/utils/FixtureHelpers.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/utils/FixtureHelpers.java @@ -1,12 +1,12 @@ package org.openecomp.sdc.be.utils; +import com.google.common.io.Resources; + import java.io.IOException; import java.net.URL; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import com.google.common.io.Resources; - /** * A set of helper method for fixture files. */ 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 53cc8f9add..4f1b2f24bc 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,14 +1,14 @@ package org.openecomp.sdc.be.utils; -import static org.assertj.core.api.Assertions.assertThat; -import static org.openecomp.sdc.be.utils.FixtureHelpers.fixture; - -import java.util.Map; - import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.MapType; import com.fasterxml.jackson.databind.type.TypeFactory; +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.openecomp.sdc.be.utils.FixtureHelpers.fixture; + public class JsonTester { private static final ObjectMapper MAPPER = new ObjectMapper(); |