diff options
Diffstat (limited to 'catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data')
65 files changed, 208 insertions, 600 deletions
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterDataTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterDataTest.java 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() { |