diff options
Diffstat (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntityTest.java')
-rw-r--r-- | openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntityTest.java | 60 |
1 files changed, 27 insertions, 33 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntityTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntityTest.java index 671a0a2d88..6654436e72 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntityTest.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntityTest.java @@ -20,45 +20,45 @@ package org.openecomp.core.model.types; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; + +import java.io.IOException; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openecomp.sdc.common.errors.SdcRuntimeException; import org.openecomp.sdc.versioning.dao.types.Version; -import java.io.IOException; - -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSettersExcluding; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.mock; - public class EnrichedServiceTemplateEntityTest { - private static final byte[] BYTE_ARRAY = new byte[] {0xA, 0xB, 0xC, 0xD}; + private static final byte[] BYTE_ARRAY = new byte[]{0xA, 0xB, 0xC, 0xD}; - @Test - public void shouldHaveValidGettersAndSetters() { - assertThat(EnrichedServiceTemplateEntity.class, - hasValidGettersAndSettersExcluding("entityType", "firstClassCitizenId", "serviceTemplate")); + private static ServiceTemplate createServiceTemplate() { + ServiceTemplate serviceTemplate = new ServiceTemplate(); + serviceTemplate.setVspId("someIdd"); + serviceTemplate.setVersion(new Version("best")); + serviceTemplate.setName("name"); + serviceTemplate.setContentData(BYTE_ARRAY); + return serviceTemplate; } @Test public void shouldReturnNonEmptyEntityType() { EnrichedServiceTemplateEntity entity = - new EnrichedServiceTemplateEntity(); + new EnrichedServiceTemplateEntity(); assertTrue(StringUtils.isNoneEmpty(entity.getEntityType())); } @Test public void shouldHaveFirstClassCitizenIdEqualToVspId() { EnrichedServiceTemplateEntity entity = - new EnrichedServiceTemplateEntity(createServiceTemplate()); + new EnrichedServiceTemplateEntity(createServiceTemplate()); assertEquals(entity.getId(), entity.getFirstClassCitizenId()); } @@ -66,7 +66,7 @@ public class EnrichedServiceTemplateEntityTest { public void serviceTemplateGetterShouldReturnCorrectData() throws IOException { ServiceTemplate serviceTemplate = createServiceTemplate(); EnrichedServiceTemplateEntity entity = - new EnrichedServiceTemplateEntity(serviceTemplate); + new EnrichedServiceTemplateEntity(serviceTemplate); ServiceTemplate actual = entity.getServiceTemplate(); @@ -76,20 +76,14 @@ public class EnrichedServiceTemplateEntityTest { assertArrayEquals(IOUtils.toByteArray(serviceTemplate.getContent()), IOUtils.toByteArray(actual.getContent())); } - @Test(expected = SdcRuntimeException.class) + @Test public void shouldFailOnNullContentBytesSupplied() { ServiceTemplate serviceTemplateMock = mock(ServiceTemplate.class); - given(serviceTemplateMock.getContent()).willAnswer(invocation -> { throw new IOException("Test exception"); } ); - EnrichedServiceTemplateEntity entity = - new EnrichedServiceTemplateEntity(serviceTemplateMock); - } - - private static ServiceTemplate createServiceTemplate() { - ServiceTemplate serviceTemplate = new ServiceTemplate(); - serviceTemplate.setVspId("someIdd"); - serviceTemplate.setVersion(new Version("best")); - serviceTemplate.setName("name"); - serviceTemplate.setContentData(BYTE_ARRAY); - return serviceTemplate; + given(serviceTemplateMock.getContent()).willAnswer(invocation -> { + throw new IOException("Test exception"); + }); + assertThrows(SdcRuntimeException.class, () -> { + new EnrichedServiceTemplateEntity(serviceTemplateMock); + }); } } |