From 292fc63873a9cb26b1b1f0181ab093d1d8270c93 Mon Sep 17 00:00:00 2001 From: devplant Date: Mon, 27 Feb 2023 17:12:59 +0200 Subject: [PATCH 1/2] RED-4988 Check jacoco version in poms and update to a current compatible version - update platform-dependency, platform-commons-dependency --- search-service-v1/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/search-service-v1/pom.xml b/search-service-v1/pom.xml index dd274e3..88552c8 100644 --- a/search-service-v1/pom.xml +++ b/search-service-v1/pom.xml @@ -5,7 +5,7 @@ platform-dependency com.iqser.red - 1.13.0 + 1.17.0 4.0.0 @@ -28,7 +28,7 @@ com.iqser.red platform-commons-dependency - 1.20.0 + 1.21.0 import pom From b36248fff440cd1e6fcc5245d0afa686620bb78a Mon Sep 17 00:00:00 2001 From: devplant Date: Tue, 28 Feb 2023 11:54:35 +0200 Subject: [PATCH 2/2] RED-4988 Check jacoco version in poms and update to a current compatible version - uodate junit tests from 4 to 5 --- .../AbstractElasticsearchIntegrationTest.java | 6 +++--- .../service/search/v1/server/service/IndexTest.java | 12 ++++++------ .../v1/server/service/MetricsIntegrationTest.java | 2 +- .../service/search/v1/server/service/SearchTest.java | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java index 4f24c4a..cff9156 100644 --- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java +++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java @@ -1,6 +1,6 @@ package com.iqser.red.service.search.v1.server.service; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration; @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.testcontainers.elasticsearch.ElasticsearchContainer; import org.testcontainers.utility.DockerImageName; @@ -26,7 +26,7 @@ import com.iqser.red.storage.commons.StorageAutoConfiguration; import com.iqser.red.storage.commons.service.StorageService; @ComponentScan -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {AbstractElasticsearchIntegrationTest.WAIT_FOR_WRITE_REQUESTS}) @ContextConfiguration(initializers = {AbstractElasticsearchIntegrationTest.Initializer.class}) @EnableFeignClients(basePackageClasses = AbstractElasticsearchIntegrationTest.TestConfiguration.class) diff --git a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/IndexTest.java b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/IndexTest.java index c7e0334..9e6a97b 100644 --- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/IndexTest.java +++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/IndexTest.java @@ -2,8 +2,8 @@ package com.iqser.red.service.search.v1.server.service; import static org.mockito.Mockito.when; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; @@ -37,7 +37,7 @@ public class IndexTest extends AbstractElasticsearchIntegrationTest { // Assert System.out.println(hash); - Assert.assertNotNull(hash); + Assertions.assertNotNull(hash); } @@ -50,7 +50,7 @@ public class IndexTest extends AbstractElasticsearchIntegrationTest { when(indexInformationClient.getIndexInformation()).thenReturn(indexInformation); // Act and Assert - Assert.assertTrue(indexInformationService.hasIndexChanged()); + Assertions.assertTrue(indexInformationService.hasIndexChanged()); } @@ -63,7 +63,7 @@ public class IndexTest extends AbstractElasticsearchIntegrationTest { when(indexInformationClient.getIndexInformation()).thenReturn(indexInformation); // Act and Assert - Assert.assertFalse(indexInformationService.hasIndexChanged()); + Assertions.assertFalse(indexInformationService.hasIndexChanged()); } @@ -74,7 +74,7 @@ public class IndexTest extends AbstractElasticsearchIntegrationTest { when(indexInformationClient.getIndexInformation()).thenReturn(null); // Act and Assert - Assert.assertTrue(indexInformationService.hasIndexChanged()); + Assertions.assertTrue(indexInformationService.hasIndexChanged()); } } diff --git a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/MetricsIntegrationTest.java b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/MetricsIntegrationTest.java index 62b5c4e..1882b03 100644 --- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/MetricsIntegrationTest.java +++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/MetricsIntegrationTest.java @@ -2,7 +2,7 @@ package com.iqser.red.service.search.v1.server.service; import static org.mockito.Mockito.when; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; diff --git a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/SearchTest.java b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/SearchTest.java index 9e3462e..98a91da 100644 --- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/SearchTest.java +++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/SearchTest.java @@ -6,7 +6,7 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean;