Marmelator/search-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 33 Wiki Activity

Pull request #70: RED-4988

Browse Source 
Merge in RED/search-service from RED-4988 to master

* commit 'b36248fff440cd1e6fcc5245d0afa686620bb78a':
  RED-4988 Check jacoco version in poms and update to a current compatible version - uodate junit tests from 4 to 5
  RED-4988 Check jacoco version in poms and update to a current compatible version - update platform-dependency, platform-commons-dependency
This commit is contained in:
Corina Olariu 2023-03-02 09:30:08 +01:00
commit b2c013ece4
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
search-service-v1/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>platform-dependency</artifactId>
<groupId>com.iqser.red</groupId>
<version>1.13.0</version>
<version>1.17.0</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -28,7 +28,7 @@
<dependency>
<groupId>com.iqser.red</groupId>
<artifactId>platform-commons-dependency</artifactId>
<version>1.20.0</version>
<version>1.21.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java
View File

@ -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)

12
search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/IndexTest.java
View File

@ -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());
}
}

2
search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/MetricsIntegrationTest.java
View File

@ -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;

2
search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/SearchTest.java
View File

@ -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;