From b491e6c3e97f81487d9f70e31b4e1159fe7aa9e8 Mon Sep 17 00:00:00 2001 From: Piotr Darosz Date: Wed, 4 Sep 2019 09:11:35 +0200 Subject: openecomp-be code coverage increase Add tests for classes in openecomp.core.model.types package Change-Id: I1c8044b2c8d422468dba610b2012e1cb34a75835 Issue-ID: SDC-2326 Signed-off-by: Piotr Darosz --- .../types/EnrichedServiceArtifactEntityTest.java | 95 ++++++++++++++++++++++ .../types/EnrichedServiceTemplateEntityTest.java | 95 ++++++++++++++++++++++ .../model/types/ServiceArtifactEntityTest.java | 95 ++++++++++++++++++++++ .../core/model/types/ServiceElementTest.java | 42 ++++++++++ .../model/types/ServiceTemplateEntityTest.java | 95 ++++++++++++++++++++++ 5 files changed, 422 insertions(+) create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/EnrichedServiceArtifactEntityTest.java create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntityTest.java create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/ServiceArtifactEntityTest.java create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/ServiceElementTest.java create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/ServiceTemplateEntityTest.java (limited to 'openecomp-be') diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/EnrichedServiceArtifactEntityTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/EnrichedServiceArtifactEntityTest.java new file mode 100644 index 0000000000..b201e9d24d --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/EnrichedServiceArtifactEntityTest.java @@ -0,0 +1,95 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 Nokia. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.core.model.types; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.junit.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 EnrichedServiceArtifactEntityTest { + + private static final byte[] BYTE_ARRAY = new byte[] {0xA, 0xB, 0xC, 0xD}; + + @Test + public void shouldHaveValidGettersAndSetters() { + assertThat(EnrichedServiceArtifactEntity.class, + hasValidGettersAndSettersExcluding("entityType", "firstClassCitizenId", "serviceArtifact")); + } + + @Test + public void shouldReturnNonEmptyEntityType() { + EnrichedServiceArtifactEntity entity = + new EnrichedServiceArtifactEntity(); + assertTrue(StringUtils.isNoneEmpty(entity.getEntityType())); + } + + @Test + public void shouldHaveFirstClassCitizenIdEqualToVspId() { + EnrichedServiceArtifactEntity entity = + new EnrichedServiceArtifactEntity(createServiceArtifact()); + assertEquals(entity.getId(), entity.getFirstClassCitizenId()); + } + + @Test + public void serviceArtifactGetterShouldReturnCorrectData() throws IOException { + ServiceArtifact serviceArtifact = createServiceArtifact(); + EnrichedServiceArtifactEntity entity = + new EnrichedServiceArtifactEntity(serviceArtifact); + + ServiceArtifact actual = entity.getServiceArtifact(); + + assertEquals(serviceArtifact.getVspId(), actual.getVspId()); + assertEquals(serviceArtifact.getVersion(), actual.getVersion()); + assertEquals(serviceArtifact.getName(), actual.getName()); + assertArrayEquals(IOUtils.toByteArray(serviceArtifact.getContent()), IOUtils.toByteArray(actual.getContent())); + } + + @Test(expected = SdcRuntimeException.class) + public void shouldFailOnNullContentBytesSupplied() { + ServiceArtifact serviceArtifactMock = mock(ServiceArtifact.class); + given(serviceArtifactMock.getContent()).willAnswer(invocation -> { throw new IOException("Test exception"); } ); + EnrichedServiceArtifactEntity entity = + new EnrichedServiceArtifactEntity(serviceArtifactMock); + } + + private static ServiceArtifact createServiceArtifact() { + ServiceArtifact serviceArtifact = new ServiceArtifact(); + serviceArtifact.setVspId("someIdd"); + serviceArtifact.setVersion(new Version("best")); + serviceArtifact.setName("name"); + serviceArtifact.setContentData(BYTE_ARRAY); + return serviceArtifact; + } +} 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 new file mode 100644 index 0000000000..671a0a2d88 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntityTest.java @@ -0,0 +1,95 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 Nokia. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.core.model.types; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.junit.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}; + + @Test + public void shouldHaveValidGettersAndSetters() { + assertThat(EnrichedServiceTemplateEntity.class, + hasValidGettersAndSettersExcluding("entityType", "firstClassCitizenId", "serviceTemplate")); + } + + @Test + public void shouldReturnNonEmptyEntityType() { + EnrichedServiceTemplateEntity entity = + new EnrichedServiceTemplateEntity(); + assertTrue(StringUtils.isNoneEmpty(entity.getEntityType())); + } + + @Test + public void shouldHaveFirstClassCitizenIdEqualToVspId() { + EnrichedServiceTemplateEntity entity = + new EnrichedServiceTemplateEntity(createServiceTemplate()); + assertEquals(entity.getId(), entity.getFirstClassCitizenId()); + } + + @Test + public void serviceTemplateGetterShouldReturnCorrectData() throws IOException { + ServiceTemplate serviceTemplate = createServiceTemplate(); + EnrichedServiceTemplateEntity entity = + new EnrichedServiceTemplateEntity(serviceTemplate); + + ServiceTemplate actual = entity.getServiceTemplate(); + + assertEquals(serviceTemplate.getVspId(), actual.getVspId()); + assertEquals(serviceTemplate.getVersion(), actual.getVersion()); + assertEquals(serviceTemplate.getName(), actual.getName()); + assertArrayEquals(IOUtils.toByteArray(serviceTemplate.getContent()), IOUtils.toByteArray(actual.getContent())); + } + + @Test(expected = SdcRuntimeException.class) + 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; + } +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/ServiceArtifactEntityTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/ServiceArtifactEntityTest.java new file mode 100644 index 0000000000..291abee7f9 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/ServiceArtifactEntityTest.java @@ -0,0 +1,95 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 Nokia. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.core.model.types; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.junit.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 ServiceArtifactEntityTest { + + private static final byte[] BYTE_ARRAY = new byte[] {0xA, 0xB, 0xC, 0xD}; + + @Test + public void shouldHaveValidGettersAndSetters() { + assertThat(ServiceArtifactEntity.class, + hasValidGettersAndSettersExcluding("entityType", "firstClassCitizenId", "serviceArtifact")); + } + + @Test + public void shouldReturnNonEmptyEntityType() { + ServiceArtifactEntity entity = + new ServiceArtifactEntity(); + assertTrue(StringUtils.isNoneEmpty(entity.getEntityType())); + } + + @Test + public void shouldHaveFirstClassCitizenIdEqualToVspId() { + ServiceArtifactEntity entity = + new ServiceArtifactEntity(createServiceArtifact()); + assertEquals(entity.getId(), entity.getFirstClassCitizenId()); + } + + @Test + public void serviceArtifactGetterShouldReturnCorrectData() throws IOException { + ServiceArtifact serviceArtifact = createServiceArtifact(); + ServiceArtifactEntity entity = + new ServiceArtifactEntity(serviceArtifact); + + ServiceArtifact actual = entity.getServiceArtifact(); + + assertEquals(serviceArtifact.getVspId(), actual.getVspId()); + assertEquals(serviceArtifact.getVersion(), actual.getVersion()); + assertEquals(serviceArtifact.getName(), actual.getName()); + assertArrayEquals(IOUtils.toByteArray(serviceArtifact.getContent()), IOUtils.toByteArray(actual.getContent())); + } + + @Test(expected = SdcRuntimeException.class) + public void shouldFailOnNullContentBytesSupplied() { + ServiceArtifact serviceArtifactMock = mock(ServiceArtifact.class); + given(serviceArtifactMock.getContent()).willAnswer(invocation -> { throw new IOException("Test exception"); } ); + ServiceArtifactEntity entity = + new ServiceArtifactEntity(serviceArtifactMock); + } + + private static ServiceArtifact createServiceArtifact() { + ServiceArtifact serviceArtifact = new ServiceArtifact(); + serviceArtifact.setVspId("someIdd"); + serviceArtifact.setVersion(new Version("best")); + serviceArtifact.setName("name"); + serviceArtifact.setContentData(BYTE_ARRAY); + return serviceArtifact; + } +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/ServiceElementTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/ServiceElementTest.java new file mode 100644 index 0000000000..af97cf0ab0 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/ServiceElementTest.java @@ -0,0 +1,42 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 Nokia. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.core.model.types; + +import org.junit.Test; + +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSettersExcluding; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertNull; + +public class ServiceElementTest { + @Test + public void shouldHaveValidGettersAndSetters() { + assertThat(ServiceElement.class, + hasValidGettersAndSettersExcluding("content", "contentData")); + } + + @Test + public void shouldReturnNullWhenNoContentData() { + ServiceElement serviceElement = new ServiceElement(); + serviceElement.setContentData(null); + assertNull(serviceElement.getContent()); + } +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/ServiceTemplateEntityTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/ServiceTemplateEntityTest.java new file mode 100644 index 0000000000..f64c04874e --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/ServiceTemplateEntityTest.java @@ -0,0 +1,95 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2019 Nokia. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.core.model.types; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.junit.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 ServiceTemplateEntityTest { + + private static final byte[] BYTE_ARRAY = new byte[] {0xA, 0xB, 0xC, 0xD}; + + @Test + public void shouldHaveValidGettersAndSetters() { + assertThat(ServiceTemplateEntity.class, + hasValidGettersAndSettersExcluding("entityType", "firstClassCitizenId", "serviceTemplate")); + } + + @Test + public void shouldReturnNonEmptyEntityType() { + ServiceTemplateEntity entity = + new ServiceTemplateEntity(); + assertTrue(StringUtils.isNoneEmpty(entity.getEntityType())); + } + + @Test + public void shouldHaveFirstClassCitizenIdEqualToVspId() { + ServiceTemplateEntity entity = + new ServiceTemplateEntity(createServiceTemplate()); + assertEquals(entity.getId(), entity.getFirstClassCitizenId()); + } + + @Test + public void serviceTemplateGetterShouldReturnCorrectData() throws IOException { + ServiceTemplate serviceTemplate = createServiceTemplate(); + ServiceTemplateEntity entity = + new ServiceTemplateEntity(serviceTemplate); + + ServiceTemplate actual = entity.getServiceTemplate(); + + assertEquals(serviceTemplate.getVspId(), actual.getVspId()); + assertEquals(serviceTemplate.getVersion(), actual.getVersion()); + assertEquals(serviceTemplate.getName(), actual.getName()); + assertArrayEquals(IOUtils.toByteArray(serviceTemplate.getContent()), IOUtils.toByteArray(actual.getContent())); + } + + @Test(expected = SdcRuntimeException.class) + public void shouldFailOnNullContentBytesSupplied() { + ServiceTemplate serviceTemplateMock = mock(ServiceTemplate.class); + given(serviceTemplateMock.getContent()).willAnswer(invocation -> { throw new IOException("Test exception"); } ); + ServiceTemplateEntity entity = + new ServiceTemplateEntity(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; + } +} -- cgit 1.2.3-korg