From 59f4edc21e410e158a79e1bff842f9623126a453 Mon Sep 17 00:00:00 2001 From: vasraz Date: Sat, 27 Mar 2021 00:25:53 +0000 Subject: Improve test coverage Fix test directory structure Change-Id: Iabd6c06424f1a58bd311da4b071853a05e2816f1 Signed-off-by: Vasyl Razinkov Issue-ID: SDC-3428 --- .../types/EnrichedServiceArtifactEntityTest.java | 89 ---------------------- .../types/EnrichedServiceTemplateEntityTest.java | 89 ---------------------- .../model/types/ServiceArtifactEntityTest.java | 89 ---------------------- .../model/types/ServiceTemplateEntityTest.java | 89 ---------------------- 4 files changed, 356 deletions(-) delete mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/EnrichedServiceArtifactEntityTest.java delete mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntityTest.java delete mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/ServiceArtifactEntityTest.java delete 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/api/openecomp-sdc-rest-webapp') 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 deleted file mode 100644 index dfd0b887f5..0000000000 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/EnrichedServiceArtifactEntityTest.java +++ /dev/null @@ -1,89 +0,0 @@ -/*- - * ============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 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.jupiter.api.Test; -import org.openecomp.sdc.common.errors.SdcRuntimeException; -import org.openecomp.sdc.versioning.dao.types.Version; - - -public class EnrichedServiceArtifactEntityTest { - - private static final byte[] BYTE_ARRAY = new byte[]{0xA, 0xB, 0xC, 0xD}; - - 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; - } - - @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 - public void shouldFailOnNullContentBytesSupplied() { - ServiceArtifact serviceArtifactMock = mock(ServiceArtifact.class); - given(serviceArtifactMock.getContent()).willAnswer(invocation -> { - throw new IOException("Test exception"); - }); - assertThrows(SdcRuntimeException.class, () -> { - new EnrichedServiceArtifactEntity(serviceArtifactMock); - }); - } -} 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 deleted file mode 100644 index 6654436e72..0000000000 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntityTest.java +++ /dev/null @@ -1,89 +0,0 @@ -/*- - * ============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 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.jupiter.api.Test; -import org.openecomp.sdc.common.errors.SdcRuntimeException; -import org.openecomp.sdc.versioning.dao.types.Version; - - -public class EnrichedServiceTemplateEntityTest { - - private static final byte[] BYTE_ARRAY = new byte[]{0xA, 0xB, 0xC, 0xD}; - - 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(); - 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 - public void shouldFailOnNullContentBytesSupplied() { - ServiceTemplate serviceTemplateMock = mock(ServiceTemplate.class); - given(serviceTemplateMock.getContent()).willAnswer(invocation -> { - throw new IOException("Test exception"); - }); - assertThrows(SdcRuntimeException.class, () -> { - new EnrichedServiceTemplateEntity(serviceTemplateMock); - }); - } -} 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 deleted file mode 100644 index 109f8d0bee..0000000000 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/ServiceArtifactEntityTest.java +++ /dev/null @@ -1,89 +0,0 @@ -/*- - * ============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 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.jupiter.api.Test; -import org.openecomp.sdc.common.errors.SdcRuntimeException; -import org.openecomp.sdc.versioning.dao.types.Version; - - -public class ServiceArtifactEntityTest { - - private static final byte[] BYTE_ARRAY = new byte[]{0xA, 0xB, 0xC, 0xD}; - - 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; - } - - @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 - public void shouldFailOnNullContentBytesSupplied() { - ServiceArtifact serviceArtifactMock = mock(ServiceArtifact.class); - given(serviceArtifactMock.getContent()).willAnswer(invocation -> { - throw new IOException("Test exception"); - }); - assertThrows(SdcRuntimeException.class, () -> { - new ServiceArtifactEntity(serviceArtifactMock); - }); - } -} 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 deleted file mode 100644 index ad4d6b1fe4..0000000000 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/core/model/types/ServiceTemplateEntityTest.java +++ /dev/null @@ -1,89 +0,0 @@ -/*- - * ============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 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.jupiter.api.Test; -import org.openecomp.sdc.common.errors.SdcRuntimeException; -import org.openecomp.sdc.versioning.dao.types.Version; - - -public class ServiceTemplateEntityTest { - - private static final byte[] BYTE_ARRAY = new byte[]{0xA, 0xB, 0xC, 0xD}; - - 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() { - 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 - public void shouldFailOnNullContentBytesSupplied() { - ServiceTemplate serviceTemplateMock = mock(ServiceTemplate.class); - given(serviceTemplateMock.getContent()).willAnswer(invocation -> { - throw new IOException("Test exception"); - }); - assertThrows(SdcRuntimeException.class, () -> { - new ServiceTemplateEntity(serviceTemplateMock); - }); - } -} -- cgit 1.2.3-korg