From 7962fe55692954548da260f31528dfc434f17755 Mon Sep 17 00:00:00 2001 From: Bartosz Gardziejewski Date: Tue, 20 Aug 2019 15:53:19 +0200 Subject: increasing test coverage in openecomp-be api Issue-ID: SDC-2326 Signed-off-by: Bartosz Gardziejewski Change-Id: I93cc5183190fcbada2349b18f14fbec9c28f1ae5 --- .../healthcheck-rest-services/pom.xml | 7 ++- .../rest/mapping/MapHealthCheckInfoToDtoTest.java | 63 ++++++++++++++++++++++ .../healthcheck-rest-types/pom.xml | 9 +++- .../sdcrests/health/types/HealthInfoDtoTest.java | 40 ++++++++++++++ .../sdcrests/health/types/HealthInfoDtosTest.java | 40 ++++++++++++++ 5 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/src/test/java/org/openecomp/sdcrests/health/rest/mapping/MapHealthCheckInfoToDtoTest.java create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/src/test/java/org/openecomp/sdcrests/health/types/HealthInfoDtoTest.java create mode 100644 openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/src/test/java/org/openecomp/sdcrests/health/types/HealthInfoDtosTest.java (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest') diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml index a3054b1472..2d88272e56 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml @@ -50,8 +50,13 @@ cxf-rt-frontend-jaxrs ${cxf.version} + + junit + junit + test + - \ No newline at end of file + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/src/test/java/org/openecomp/sdcrests/health/rest/mapping/MapHealthCheckInfoToDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/src/test/java/org/openecomp/sdcrests/health/rest/mapping/MapHealthCheckInfoToDtoTest.java new file mode 100644 index 0000000000..7c1ab838e6 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/src/test/java/org/openecomp/sdcrests/health/rest/mapping/MapHealthCheckInfoToDtoTest.java @@ -0,0 +1,63 @@ +/*- + * ============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.sdcrests.health.rest.mapping; + +import org.junit.Before; +import org.junit.Test; +import org.openecomp.sdc.health.data.HealthCheckStatus; +import org.openecomp.sdc.health.data.HealthInfo; +import org.openecomp.sdc.health.data.MonitoredModules; +import org.openecomp.sdcrests.health.types.HealthInfoDto; +import org.openecomp.sdcrests.health.types.HealthInfoDtos; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import static org.junit.Assert.assertEquals; + +public class MapHealthCheckInfoToDtoTest { + + private MapHealthCheckInfoToDto mapHealthCheckInfoToDto; + + @Before + public void setUp() { + mapHealthCheckInfoToDto = new MapHealthCheckInfoToDto(); + } + + @Test + public void validateDoMappingCorrectMapsHealthInfoToHealthInfoDto() { + + final HealthInfo healthInfo = new HealthInfo(MonitoredModules.BE, HealthCheckStatus.UP, "1.0", "test"); + List testSource = Collections.singletonList(healthInfo); + + HealthInfoDtos testTarget = new HealthInfoDtos(); + + mapHealthCheckInfoToDto.doMapping(testSource ,testTarget); + + final HealthInfo sourceElement = testSource.get(0); + final HealthInfoDto responceElement = testTarget.getHealthInfos().get(0); + assertEquals(sourceElement.getDescription(),responceElement.getDescription()); + assertEquals(sourceElement.getHealthCheckStatus().toString(),responceElement.getHealthStatus().toString()); + assertEquals(sourceElement.getVersion(),responceElement.getVersion()); + assertEquals(sourceElement.getHealthCheckComponent().toString(),responceElement.getHealthCheckComponent().toString()); + } +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml index 6b7059eabc..0d23c84022 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml @@ -3,6 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + + junit + junit + test + + org.openecomp.sdc @@ -12,4 +19,4 @@ healthcheck-rest-types - \ No newline at end of file + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/src/test/java/org/openecomp/sdcrests/health/types/HealthInfoDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/src/test/java/org/openecomp/sdcrests/health/types/HealthInfoDtoTest.java new file mode 100644 index 0000000000..1b270aa7fe --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/src/test/java/org/openecomp/sdcrests/health/types/HealthInfoDtoTest.java @@ -0,0 +1,40 @@ +/*- + * ============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.sdcrests.health.types; + +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.allOf; +import static org.hamcrest.MatcherAssert.assertThat; + +public class HealthInfoDtoTest { + + @Test + public void testBean() { + assertThat(HealthInfoDto.class, allOf( + hasValidBeanConstructor(), + hasValidGettersAndSetters() + )); + } + +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/src/test/java/org/openecomp/sdcrests/health/types/HealthInfoDtosTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/src/test/java/org/openecomp/sdcrests/health/types/HealthInfoDtosTest.java new file mode 100644 index 0000000000..259548a22a --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/src/test/java/org/openecomp/sdcrests/health/types/HealthInfoDtosTest.java @@ -0,0 +1,40 @@ +/*- + * ============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.sdcrests.health.types; + +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.allOf; +import static org.hamcrest.MatcherAssert.assertThat; + +public class HealthInfoDtosTest { + + @Test + public void testBean() { + assertThat(HealthInfoDtos.class, allOf( + hasValidBeanConstructor(), + hasValidGettersAndSetters() + )); + } + +} -- cgit 1.2.3-korg