Skip to content

Commit

Permalink
Migrate tests to JUnit5
Browse files Browse the repository at this point in the history
Signed-off-by: Tristan Chuine <tristan.chuine_externe@rte-france.com>
  • Loading branch information
Tristan-WorkGH committed Sep 24, 2024
1 parent 80dbbff commit 11299cf
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 17 deletions.
9 changes: 7 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,19 @@

<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
*/
package com.powsybl.cases.datasource;

import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
Expand All @@ -26,28 +26,26 @@
import java.util.UUID;

import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.BDDMockito.given;

/**
* @author Chamseddine Benhamed <chamseddine.benhamed at rte-france.com>
*/

@RunWith(MockitoJUnitRunner.class)
public class CaseDataSourceClientTest {
@ExtendWith(MockitoExtension.class)
class CaseDataSourceClientTest {

@Mock
private RestTemplate caseServerRest;

private CaseDataSourceClient caseDataSourceClient;

private UUID randomUuid = UUID.randomUUID();

@Before
public void setUp() {
@BeforeEach
void setUp() {
final UUID randomUuid = UUID.randomUUID();
caseDataSourceClient = new CaseDataSourceClient(caseServerRest, randomUuid);

given(caseServerRest.exchange(eq("/v1/cases/{caseUuid}/datasource/baseName"),
Expand All @@ -57,7 +55,7 @@ public void setUp() {
eq(randomUuid)))
.willReturn(ResponseEntity.ok("myCaseName"));

ParameterizedTypeReference< Set<String>> parameterizedTypeReference = new ParameterizedTypeReference<Set<String>>() { };
ParameterizedTypeReference<Set<String>> parameterizedTypeReference = new ParameterizedTypeReference<>() { };

given(caseServerRest.exchange(eq("/v1/cases/" + randomUuid + "/datasource/list?regex=.*"),
eq(HttpMethod.GET),
Expand Down Expand Up @@ -91,7 +89,7 @@ public void setUp() {
}

@Test
public void test() throws IOException {
void test() throws IOException {
assertEquals("myCaseName", caseDataSourceClient.getBaseName());

assertEquals(new HashSet<>(asList("A.xml", "B.xml")), caseDataSourceClient.listNames(".*"));
Expand Down

0 comments on commit 11299cf

Please sign in to comment.