From 8d82a514707fb0853d6a2c6d8f7408a872e727ca Mon Sep 17 00:00:00 2001 From: Dmitry Puzikov Date: Wed, 25 Mar 2020 16:31:43 +0100 Subject: Fix unit tests Added asserts where required, add tests. Replaced getters-setters with Lombok annotations. Fixed incorect SUT in the tests. Removed default constructors used only for tests. Change-Id: I9be29d9c0d891039952178a3c3e1c3a2062d1382 Issue-ID: SDC-2856 Signed-off-by: Dmitry Puzikov --- .../sdc/be/info/ArtifactDefinitionInfoTest.java | 8 -- .../sdc/be/info/ArtifactTemplateInfoTest.java | 1 - .../sdc/be/info/CreateAndAssotiateInfoTest.java | 10 --- .../sdc/be/info/DistributionStatusInfoTest.java | 8 -- .../info/DistributionStatusOfServiceInfoTest.java | 96 ---------------------- .../sdc/be/info/GenericArtifactQueryInfoTest.java | 12 --- .../sdc/be/info/GroupDefinitionInfoTest.java | 42 +++++++--- .../sdc/be/info/GroupTemplateInfoTest.java | 2 +- .../be/info/NodeTypeInfoToUpdateArtifactsTest.java | 6 -- .../sdc/be/info/RelationshipListTest.java | 9 ++ .../openecomp/sdc/be/info/RelationshipTest.java | 16 ++++ .../org/openecomp/sdc/be/info/ServiceInfoTest.java | 6 -- .../sdc/be/info/ServiceVersionInfoTest.java | 6 -- .../openecomp/sdc/be/info/ServicesWrapperTest.java | 2 +- .../sdc/be/info/ServletJsonResponseTest.java | 2 +- .../sdc/be/info/ToscaNodeTypeInfoTest.java | 3 +- 16 files changed, 59 insertions(+), 170 deletions(-) (limited to 'catalog-be/src/test/java/org/openecomp') diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactDefinitionInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactDefinitionInfoTest.java index 725c95c569..9d3cc69006 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactDefinitionInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactDefinitionInfoTest.java @@ -28,7 +28,6 @@ import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.openecomp.sdc.be.model.ArtifactDefinition; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -44,11 +43,6 @@ public class ArtifactDefinitionInfoTest { private static final byte[] PAYLOAD_DATA = "Test".getBytes(); private static final String NAME = "Name"; - @Test - public void shouldHaveValidGettersAndSetters() { - assertThat(ArtifactDefinitionInfo.class, hasValidGettersAndSetters()); - } - @Test public void testCtor() { Mockito.when(artifactDefinition.getPayloadData()).thenReturn(PAYLOAD_DATA); @@ -64,6 +58,4 @@ public class ArtifactDefinitionInfoTest { assertThat(artifactDefinitionInfo.getArtifactUUID(), is(UUID)); } - - } \ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactTemplateInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactTemplateInfoTest.java index 721e929791..4cfb75a859 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactTemplateInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactTemplateInfoTest.java @@ -56,5 +56,4 @@ public class ArtifactTemplateInfoTest { assertThat(artifactTemplateInfo.getEnv(), is(ENV)); assertThat(artifactTemplateInfo.getRelatedArtifactsInfo(), is(artifactsInfo)); } - } \ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/CreateAndAssotiateInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/CreateAndAssotiateInfoTest.java index 4435dc8f4c..81b8171042 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/CreateAndAssotiateInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/CreateAndAssotiateInfoTest.java @@ -26,17 +26,9 @@ import org.junit.Test; import org.openecomp.sdc.be.model.ComponentInstance; import org.openecomp.sdc.be.model.RequirementCapabilityRelDef; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; public class CreateAndAssotiateInfoTest { - - @Test - public void shouldHaveValidGettersAndSetters() { - assertThat(CreateAndAssotiateInfo.class, hasValidGettersAndSetters()); - } - @Test public void shouldTestWhetherTheDefaultConstructorCorrectlySetAllFields() { ComponentInstance componentInstance = new ComponentInstance(); @@ -45,6 +37,4 @@ public class CreateAndAssotiateInfoTest { Assert.assertThat(createAndAssociateInfo.getAssociate(), is(requirementCapabilityRelDef)); Assert.assertThat(createAndAssociateInfo.getNode(), is(componentInstance)); } - - } \ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusInfoTest.java index 46dce6ad61..202a1c1203 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusInfoTest.java @@ -29,9 +29,7 @@ import org.openecomp.sdc.common.datastructure.AuditingFieldsKey; import java.util.HashMap; import java.util.Map; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; public class DistributionStatusInfoTest { @@ -42,11 +40,6 @@ public class DistributionStatusInfoTest { private static final String AUDIT_STATUS = "AUDIT_STATUS"; private static final String AUDIT_DESC = "AUDIT_DESC"; - @Test - public void shouldHaveValidGettersAndSetters() { - assertThat(DistributionStatusInfo.class, hasValidGettersAndSetters()); - } - @Test public void testCtorWithAuditingGenericEvent() { AuditingGenericEvent distributionStatusEvent = createAuditingGenericEvent(); @@ -78,5 +71,4 @@ public class DistributionStatusInfoTest { distributionStatusEvent.setFields(fields); return distributionStatusEvent; } - } \ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusOfServiceInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusOfServiceInfoTest.java index 01040bce2c..f71e41b635 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusOfServiceInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusOfServiceInfoTest.java @@ -39,100 +39,6 @@ public class DistributionStatusOfServiceInfoTest { return new DistributionStatusOfServiceInfo(); } - @Test - public void testCtor() throws Exception { - new DistributionStatusOfServiceInfo("","","",""); - } - - - @Test - public void testGetDistributionID() throws Exception { - DistributionStatusOfServiceInfo testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getDistributionID(); - } - - - @Test - public void testSetDistributionID() throws Exception { - DistributionStatusOfServiceInfo testSubject; - String distributionID = ""; - - // default test - testSubject = createTestSubject(); - testSubject.setDistributionID(distributionID); - } - - - @Test - public void testGetTimestamp() throws Exception { - DistributionStatusOfServiceInfo testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getTimestamp(); - } - - - @Test - public void testSetTimestamp() throws Exception { - DistributionStatusOfServiceInfo testSubject; - String timestamp = ""; - - // default test - testSubject = createTestSubject(); - testSubject.setTimestamp(timestamp); - } - - - @Test - public void testGetUserId() throws Exception { - DistributionStatusOfServiceInfo testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getUserId(); - } - - - @Test - public void testSetUserId() throws Exception { - DistributionStatusOfServiceInfo testSubject; - String userId = ""; - - // default test - testSubject = createTestSubject(); - testSubject.setUserId(userId); - } - - - @Test - public void testGetDeployementStatus() throws Exception { - DistributionStatusOfServiceInfo testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getDeployementStatus(); - } - - - @Test - public void testSetDeployementStatus() throws Exception { - DistributionStatusOfServiceInfo testSubject; - String deployementStatus = ""; - - // default test - testSubject = createTestSubject(); - testSubject.setDeployementStatus(deployementStatus); - } - - @Test public void shouldHaveValidDefaultConstructor() { assertThat(DistributionStatusOfServiceInfo.class, hasValidBeanConstructor()); @@ -152,6 +58,4 @@ public class DistributionStatusOfServiceInfoTest { assertThat(distributionStatusOfServiceInfo.getUserId(), is(USER_ID)); assertThat(distributionStatusOfServiceInfo.getDeployementStatus(), is(STATUS)); } - - } \ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/GenericArtifactQueryInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GenericArtifactQueryInfoTest.java index dce3e16145..befcc8ced6 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/GenericArtifactQueryInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GenericArtifactQueryInfoTest.java @@ -24,8 +24,6 @@ import org.junit.Test; import java.util.Collections; import java.util.Set; -import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -35,16 +33,6 @@ public class GenericArtifactQueryInfoTest { private static final String PARENT_ID = "parentId"; private static final Set FIELDS = Collections.emptySet(); - @Test - public void shouldHaveValidDefaultConstructor() { - assertThat(GenericArtifactQueryInfo.class, hasValidBeanConstructor()); - } - - @Test - public void shouldHaveValidGettersAndSetters() { - assertThat(GenericArtifactQueryInfo.class, hasValidGettersAndSetters()); - } - @Test public void shouldTestConstructorCorrectlySetFields(){ GenericArtifactQueryInfo genericArtifactQueryInfo = new GenericArtifactQueryInfo(FIELDS, PARENT_ID, diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupDefinitionInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupDefinitionInfoTest.java index 3c68e9ec89..a6b9af8b0c 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupDefinitionInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupDefinitionInfoTest.java @@ -21,18 +21,21 @@ */ package org.openecomp.sdc.be.info; -import com.google.code.beanmatchers.BeanMatchers; import org.junit.Test; import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition; import org.openecomp.sdc.be.datatypes.elements.GroupInstanceDataDefinition; +import org.openecomp.sdc.be.model.ArtifactDefinition; import org.openecomp.sdc.be.model.GroupDefinition; import org.openecomp.sdc.be.model.GroupInstance; import java.util.ArrayList; import java.util.List; +import org.openecomp.sdc.be.model.GroupProperty; -import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.matchesPattern; @@ -48,11 +51,6 @@ public class GroupDefinitionInfoTest { private static final String DESC = "DESC"; private static final String NAME = "NAME"; - @Test - public void shouldHaveValidDefaultConstructor() { - assertThat(GroupDefinitionInfo.class, hasValidBeanConstructor()); - } - @Test public void testShouldConstructObjectFromGroupDefinition() { GroupDefinition groupDefinition = createGroupDefinition(); @@ -79,15 +77,36 @@ public class GroupDefinitionInfoTest { } @Test - public void shouldHaveValidGettersAndSetters() { - assertThat(GroupDefinitionInfo.class, BeanMatchers.hasValidGettersAndSettersExcluding("artifacts", "properties")); + public void testValidGetterSetterArtifacts() { + GroupDefinition groupDefinition = new GroupDefinition(); + GroupDefinitionInfo groupDefinitionInfo = new GroupDefinitionInfo(groupDefinition); + groupDefinitionInfo.setArtifacts(null); + assertThat(groupDefinitionInfo.getArtifacts(), nullValue()); + + List artifacts = new ArrayList<>(); + groupDefinitionInfo.setArtifacts(artifacts); + assertThat(groupDefinitionInfo.getArtifacts(), not(sameInstance(artifacts))); + } + + @Test + public void testValidGetterSetterProperties() { + GroupDefinition groupDefinition = new GroupDefinition(); + GroupDefinitionInfo groupDefinitionInfo = new GroupDefinitionInfo(groupDefinition); + groupDefinitionInfo.setProperties(null); + assertThat(groupDefinitionInfo.getProperties(), nullValue()); + + List properties = new ArrayList<>(); + groupDefinitionInfo.setProperties(properties); + assertThat(groupDefinitionInfo.getProperties(), not(sameInstance(properties))); } @Test public void testToString() { - GroupDefinitionInfo groupDefinitionInfo = new GroupDefinitionInfo(); + GroupDefinition groupDefinition = new GroupDefinition(); + ArtifactDefinition artifactDefinition = new ArtifactDefinition(); + GroupDefinitionInfo groupDefinitionInfo = new GroupDefinitionInfo(groupDefinition); List artifacts = new ArrayList<>(); - ArtifactDefinitionInfo artifactDefinitionInfo = new ArtifactDefinitionInfo(); + ArtifactDefinitionInfo artifactDefinitionInfo = new ArtifactDefinitionInfo(artifactDefinition); artifactDefinitionInfo.setArtifactName(ARTIFACT_NAME); artifacts.add(artifactDefinitionInfo); groupDefinitionInfo.setArtifacts(artifacts); @@ -116,5 +135,4 @@ public class GroupDefinitionInfoTest { groupInstanceDataDefinition.setGroupUUID(GROUP_UUID); return groupInstanceDataDefinition; } - } \ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupTemplateInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupTemplateInfoTest.java index dcce6fdb9b..fc9743e4c1 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupTemplateInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupTemplateInfoTest.java @@ -31,7 +31,7 @@ public class GroupTemplateInfoTest { @Test public void shouldHaveValidDefaultConstructor() { - assertThat(DistributionStatusOfServiceListResponce.class, hasValidBeanConstructor()); + assertThat(GroupTemplateInfo.class, hasValidBeanConstructor()); } @Test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/NodeTypeInfoToUpdateArtifactsTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/NodeTypeInfoToUpdateArtifactsTest.java index 987563276d..2980a1e549 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/NodeTypeInfoToUpdateArtifactsTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/NodeTypeInfoToUpdateArtifactsTest.java @@ -30,7 +30,6 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -40,11 +39,6 @@ public class NodeTypeInfoToUpdateArtifactsTest { private static final Map>> NODE_TYPES_ARTIFACTS_TO_HANDLE = Collections .emptyMap(); - @Test - public void shouldHaveValidGettersAndSetters() { - assertThat(NodeTypeInfoToUpdateArtifacts.class, hasValidGettersAndSetters()); - } - @Test public void shouldConstructCorrectObject() { NodeTypeInfoToUpdateArtifacts nodeTypeInfoToUpdateArtifacts = new NodeTypeInfoToUpdateArtifacts(NAME, diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipListTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipListTest.java index 0444e1f689..2af5e83f34 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipListTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipListTest.java @@ -19,10 +19,13 @@ */ package org.openecomp.sdc.be.info; +import java.util.List; import org.junit.Test; import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; public class RelationshipListTest { @@ -37,4 +40,10 @@ public class RelationshipListTest { assertThat(RelationshipList.class, hasValidGettersAndSetters()); } + @Test + public void testNonDefaultGetter() { + RelationshipList relationshipList = new RelationshipList(); + assertThat(relationshipList.getRelationship(), notNullValue()); + assertThat(relationshipList.getRelationship(), instanceOf(List.class)); + } } \ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipTest.java index e2326d49cd..a2b4d72c99 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/RelationshipTest.java @@ -21,10 +21,13 @@ */ package org.openecomp.sdc.be.info; +import java.util.List; import org.junit.Test; import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; public class RelationshipTest { @@ -39,4 +42,17 @@ public class RelationshipTest { assertThat(Relationship.class, hasValidBeanConstructor()); } + @Test + public void testNonDefaultPropertyGetter() { + Relationship relationship = new Relationship(); + assertThat(relationship.getRelatedToProperty(), notNullValue()); + assertThat(relationship.getRelatedToProperty(), instanceOf(List.class)); + } + + @Test + public void testNonDefaultRelationshipDataGetter() { + Relationship relationship = new Relationship(); + assertThat(relationship.getRelationshipData(), notNullValue()); + assertThat(relationship.getRelationshipData(), instanceOf(List.class)); + } } \ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceInfoTest.java index 25021a985c..e7f3f5544a 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceInfoTest.java @@ -26,7 +26,6 @@ import org.junit.Test; import java.util.Collections; import java.util.List; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -35,11 +34,6 @@ public class ServiceInfoTest { private static final String NAME = "NAME"; private static final List SERVICE_VERSION_INFOS = Collections.emptyList(); - @Test - public void shouldHaveValidGettersAndSetters() { - assertThat(ServiceInfo.class, hasValidGettersAndSetters()); - } - @Test public void shouldConstructCorrectObject() { ServiceInfo serviceInfo = new ServiceInfo(NAME, SERVICE_VERSION_INFOS); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceVersionInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceVersionInfoTest.java index d7c9815da9..a800f817e3 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceVersionInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServiceVersionInfoTest.java @@ -23,7 +23,6 @@ package org.openecomp.sdc.be.info; import org.junit.Test; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -34,11 +33,6 @@ public class ServiceVersionInfoTest { private static final String CONTEXT = "http://localhost:1000/"; private static final String URL = "http://localhost:1000/services/NAME/VERSION"; - @Test - public void shouldHaveValidGettersAndSetters() { - assertThat(ServiceVersionInfo.class, hasValidGettersAndSetters()); - } - @Test public void shouldConstructCorrectObject() { ServiceVersionInfo serviceVersionInfo = new ServiceVersionInfo(NAME, VERSION, CONTEXT); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServicesWrapperTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServicesWrapperTest.java index 8e96ead0fd..dcb77b29dd 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServicesWrapperTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServicesWrapperTest.java @@ -36,7 +36,7 @@ public class ServicesWrapperTest { @Test public void shouldHaveValidDefaultConstructor() { - assertThat(ServiceInfo.class, hasValidBeanConstructor()); + assertThat(ServicesWrapper.class, hasValidBeanConstructor()); } } \ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServletJsonResponseTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServletJsonResponseTest.java index c3e76af97d..e603591cb8 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServletJsonResponseTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServletJsonResponseTest.java @@ -36,7 +36,7 @@ public class ServletJsonResponseTest { @Test public void shouldHaveValidDefaultConstructor() { - assertThat(ServiceInfo.class, hasValidBeanConstructor()); + assertThat(ServletJsonResponse.class, hasValidBeanConstructor()); } } \ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ToscaNodeTypeInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ToscaNodeTypeInfoTest.java index e3f68835e5..8c75285fed 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ToscaNodeTypeInfoTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ToscaNodeTypeInfoTest.java @@ -31,7 +31,7 @@ public class ToscaNodeTypeInfoTest { @Test public void shouldHaveValidDefaultConstructor() { - assertThat(ServiceInfo.class, hasValidBeanConstructor()); + assertThat(ToscaNodeTypeInfo.class, hasValidBeanConstructor()); } @Test @@ -43,5 +43,4 @@ public class ToscaNodeTypeInfoTest { public void allPropertiesShouldBeRepresentedInToStringOutput() { assertThat(ToscaNodeTypeInfo.class, BeanMatchers.hasValidBeanToString()); } - } \ No newline at end of file -- cgit