From: Tomasz Wrobel Date: Thu, 17 Nov 2022 14:55:02 +0000 (+0100) Subject: Fix calculation of code coverage X-Git-Tag: 1.9.3~7 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=892730e092b799f56b24cedeab371d2881d698b0;p=dcaegen2%2Fservices%2Fsdk.git Fix calculation of code coverage Rename class with unit tests Issue-ID: DCAEGEN2-3165 Signed-off-by: Tomasz Wrobel Change-Id: I0f0424a2fef3f44e2f9709513b26bc88276a8d1b --- diff --git a/Changelog.md b/Changelog.md index 69247c0c..2b5f5eb7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.9.1] - 2022/09/07 +### Added + - [DCAEGEN2-3165] (https://jira.onap.org/browse/DCAEGEN2-3165) - Fix calculation of code coverage + + ## [1.9.0] - 2022/09/07 ### Added - [DCAEGEN2-3098] (https://jira.onap.org/browse/DCAEGEN2-3098) - Remove Consul and CBS property dependencies from CBS-client SDK diff --git a/pom.xml b/pom.xml index 6771ea9c..95b1cabd 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ language governing permissions and limitations under the License. ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml - 1.9.0-SNAPSHOT + 1.9.1-SNAPSHOT diff --git a/rest-services/http-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientIT.java b/rest-services/http-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientTest.java similarity index 99% rename from rest-services/http-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientIT.java rename to rest-services/http-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientTest.java index ff4f0297..c80bda1f 100644 --- a/rest-services/http-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientIT.java +++ b/rest-services/http-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START==================================== * DCAEGEN2-SERVICES-SDK * ========================================================= - * Copyright (C) 2019-2021 Nokia. All rights reserved. + * Copyright (C) 2019-2022 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. @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.onap.dcaegen2.services.sdk.rest.services.adapters.http.test.DummyHttpServer.sendInOrderWithDelay; import static org.onap.dcaegen2.services.sdk.rest.services.adapters.http.test.DummyHttpServer.sendString; -class RxHttpClientIT { +class RxHttpClientTest { private static final Duration TIMEOUT = Duration.ofHours(5); private static final Duration NO_DELAY = Duration.ofSeconds(0); diff --git a/security/ssl/src/test/java/org/onap/dcaegen2/services/sdk/security/ssl/SslFactoryIT.java b/security/ssl/src/test/java/org/onap/dcaegen2/services/sdk/security/ssl/SslFactoryTest.java similarity index 98% rename from security/ssl/src/test/java/org/onap/dcaegen2/services/sdk/security/ssl/SslFactoryIT.java rename to security/ssl/src/test/java/org/onap/dcaegen2/services/sdk/security/ssl/SslFactoryTest.java index 0bd57a40..088c7219 100644 --- a/security/ssl/src/test/java/org/onap/dcaegen2/services/sdk/security/ssl/SslFactoryIT.java +++ b/security/ssl/src/test/java/org/onap/dcaegen2/services/sdk/security/ssl/SslFactoryTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START==================================== * DCAEGEN2-SERVICES-SDK * ========================================================= - * Copyright (C) 2019 Nokia. All rights reserved. + * Copyright (C) 2019-2022 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. @@ -35,7 +35,7 @@ import static org.onap.dcaegen2.services.sdk.security.ssl.Passwords.fromResource * @author Piotr Jaszczyk * @since April 2019 */ -class SslFactoryIT { +class SslFactoryTest { private SslFactory sut = new SslFactory(); diff --git a/standardization/moher-api/server-adapters/spring-webflux/src/test/java/org/onap/dcaegen2/services/sdk/standardization/moher/adapters/springwebflux/HealthControllerIT.java b/standardization/moher-api/server-adapters/spring-webflux/src/test/java/org/onap/dcaegen2/services/sdk/standardization/moher/adapters/springwebflux/HealthControllerTest.java similarity index 97% rename from standardization/moher-api/server-adapters/spring-webflux/src/test/java/org/onap/dcaegen2/services/sdk/standardization/moher/adapters/springwebflux/HealthControllerIT.java rename to standardization/moher-api/server-adapters/spring-webflux/src/test/java/org/onap/dcaegen2/services/sdk/standardization/moher/adapters/springwebflux/HealthControllerTest.java index 236cc16f..860f18cb 100644 --- a/standardization/moher-api/server-adapters/spring-webflux/src/test/java/org/onap/dcaegen2/services/sdk/standardization/moher/adapters/springwebflux/HealthControllerIT.java +++ b/standardization/moher-api/server-adapters/spring-webflux/src/test/java/org/onap/dcaegen2/services/sdk/standardization/moher/adapters/springwebflux/HealthControllerTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START==================================== * DCAEGEN2-SERVICES-SDK * ========================================================= - * Copyright (C) 2019 Nokia. All rights reserved. + * Copyright (C) 2019-2022 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. @@ -37,7 +37,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; import reactor.core.publisher.Mono; -class HealthControllerIT { +class HealthControllerTest { private final AtomicReference currentHealth = new AtomicReference<>(); private final HealthProvider healthProvider = () -> Mono.fromCallable(currentHealth::get); diff --git a/standardization/moher-api/server-adapters/spring-webflux/src/test/java/org/onap/dcaegen2/services/sdk/standardization/moher/adapters/springwebflux/MetricsControllerIT.java b/standardization/moher-api/server-adapters/spring-webflux/src/test/java/org/onap/dcaegen2/services/sdk/standardization/moher/adapters/springwebflux/MetricsControllerTest.java similarity index 96% rename from standardization/moher-api/server-adapters/spring-webflux/src/test/java/org/onap/dcaegen2/services/sdk/standardization/moher/adapters/springwebflux/MetricsControllerIT.java rename to standardization/moher-api/server-adapters/spring-webflux/src/test/java/org/onap/dcaegen2/services/sdk/standardization/moher/adapters/springwebflux/MetricsControllerTest.java index 32d00449..fe59e01e 100644 --- a/standardization/moher-api/server-adapters/spring-webflux/src/test/java/org/onap/dcaegen2/services/sdk/standardization/moher/adapters/springwebflux/MetricsControllerIT.java +++ b/standardization/moher-api/server-adapters/spring-webflux/src/test/java/org/onap/dcaegen2/services/sdk/standardization/moher/adapters/springwebflux/MetricsControllerTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START==================================== * DCAEGEN2-SERVICES-SDK * ========================================================= - * Copyright (C) 2019 Nokia. All rights reserved. + * Copyright (C) 2019-2022 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. @@ -30,7 +30,7 @@ import org.onap.dcaegen2.services.sdk.standardization.moher.metrics.api.MetricsF import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; -class MetricsControllerIT { +class MetricsControllerTest { private final PrometheusMeterRegistry defaultRegistry = MetricsFactory.createDefaultRegistry(); private final Metrics metrics = MetricsFactory.createMetrics(defaultRegistry); diff --git a/version.properties b/version.properties index a1653f6b..e31b2def 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 minor=9 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT