Skip to content

Commit 9f91852

Browse files
Tristan-WorkGHTristan-WorkGH
committed
Migrate to Junit5
1 parent 6fc409b commit 9f91852

File tree

3 files changed

+63
-79
lines changed

3 files changed

+63
-79
lines changed

‎pom.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,6 @@
119119
</dependency>
120120

121121
<!-- Test dependencies -->
122-
<dependency>
123-
<groupId>junit</groupId>
124-
<artifactId>junit</artifactId>
125-
<scope>test</scope>
126-
</dependency>
127-
<dependency>
128-
<groupId>org.junit.vintage</groupId>
129-
<artifactId>junit-vintage-engine</artifactId>
130-
<scope>test</scope>
131-
</dependency>
132122
<dependency>
133123
<groupId>org.springframework.boot</groupId>
134124
<artifactId>spring-boot-starter-test</artifactId>

‎src/test/java/org/gridsuite/gateway/ElementAccessControlTest.java‎

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,42 +17,38 @@
1717
import com.nimbusds.jwt.SignedJWT;
1818
import org.gridsuite.gateway.dto.AccessControlInfos;
1919
import org.gridsuite.gateway.endpoints.ExploreServer;
20-
import org.junit.Before;
21-
import org.junit.Test;
22-
import org.junit.runner.RunWith;
20+
import org.junit.jupiter.api.BeforeEach;
21+
import org.junit.jupiter.api.Test;
2322
import org.springframework.beans.factory.annotation.Autowired;
2423
import org.springframework.beans.factory.annotation.Value;
2524
import org.springframework.boot.test.context.SpringBootTest;
25+
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
2626
import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
2727
import org.springframework.http.HttpStatus;
28-
import org.springframework.test.context.junit4.SpringRunner;
2928
import org.springframework.test.web.reactive.server.WebTestClient;
3029

3130
import java.util.Date;
3231
import java.util.List;
3332
import java.util.UUID;
3433

3534
import static com.github.tomakehurst.wiremock.client.WireMock.*;
36-
import static org.junit.Assert.assertEquals;
37-
import static org.junit.Assert.assertThrows;
35+
import static org.junit.jupiter.api.Assertions.assertEquals;
36+
import static org.junit.jupiter.api.Assertions.assertThrows;
3837

3938
/**
4039
* @author Slimane Amar <slimane.amar at rte-france.com>
4140
*/
42-
@RunWith(SpringRunner.class)
43-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
44-
properties = {
45-
"gridsuite.services.directory-server.base-uri=http://localhost:${wiremock.server.port}",
46-
"gridsuite.services.explore-server.base-uri=http://localhost:${wiremock.server.port}",
47-
"gridsuite.services.study-server.base-uri=http://localhost:${wiremock.server.port}",
48-
"gridsuite.services.actions-server.base-uri=http://localhost:${wiremock.server.port}",
49-
"gridsuite.services.filter-server.base-uri=http://localhost:${wiremock.server.port}",
50-
"gridsuite.services.user-admin-server.base-uri=http://localhost:${wiremock.server.port}",
51-
"gridsuite.services.sensitivity-analysis-server.base-uri=http://localhost:${wiremock.server.port}",
52-
}
53-
)
41+
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
42+
"gridsuite.services.directory-server.base-uri=http://localhost:${wiremock.server.port}",
43+
"gridsuite.services.explore-server.base-uri=http://localhost:${wiremock.server.port}",
44+
"gridsuite.services.study-server.base-uri=http://localhost:${wiremock.server.port}",
45+
"gridsuite.services.actions-server.base-uri=http://localhost:${wiremock.server.port}",
46+
"gridsuite.services.filter-server.base-uri=http://localhost:${wiremock.server.port}",
47+
"gridsuite.services.user-admin-server.base-uri=http://localhost:${wiremock.server.port}",
48+
"gridsuite.services.sensitivity-analysis-server.base-uri=http://localhost:${wiremock.server.port}",
49+
})
5450
@AutoConfigureWireMock(port = 0)
55-
public class ElementAccessControlTest {
51+
class ElementAccessControlTest {
5652

5753
@Value("${wiremock.server.port}")
5854
int port;
@@ -69,7 +65,7 @@ public class ElementAccessControlTest {
6965

7066
private RSAKey rsaKey;
7167

72-
@Before
68+
@BeforeEach
7369
public void prepareToken() throws JOSEException {
7470
// RSA signatures require a public and private RSA key pair, the public key
7571
// must be made known to the JWS recipient in order to verify the signatures
@@ -112,7 +108,7 @@ public void prepareToken() throws JOSEException {
112108
}
113109

114110
@Test
115-
public void testWithNoControl() {
111+
void testWithNoControl() {
116112
initStubForJwk();
117113

118114
// No control for directory server (made inside the endpoint)
@@ -177,7 +173,7 @@ public void testWithNoControl() {
177173
}
178174

179175
@Test
180-
public void testGetElements() {
176+
void testGetElements() {
181177
initStubForJwk();
182178

183179
UUID uuid = UUID.randomUUID();
@@ -271,7 +267,7 @@ public void testGetElements() {
271267
}
272268

273269
@Test
274-
public void testCreateElements() {
270+
void testCreateElements() {
275271
initStubForJwk();
276272

277273
UUID uuid = UUID.randomUUID();
@@ -368,7 +364,7 @@ public void testCreateElements() {
368364
}
369365

370366
@Test
371-
public void testCreateSubElements() {
367+
void testCreateSubElements() {
372368
initStubForJwk();
373369

374370
UUID uuid = UUID.randomUUID();
@@ -394,7 +390,7 @@ public void testCreateSubElements() {
394390
}
395391

396392
@Test
397-
public void testUpdateElements() {
393+
void testUpdateElements() {
398394
initStubForJwk();
399395

400396
UUID uuid = UUID.randomUUID();
@@ -453,7 +449,7 @@ public void testUpdateElements() {
453449
}
454450

455451
@Test
456-
public void testDeleteElements() {
452+
void testDeleteElements() {
457453
initStubForJwk();
458454

459455
UUID uuid = UUID.randomUUID();
@@ -527,7 +523,7 @@ public void testDeleteElements() {
527523
}
528524

529525
@Test
530-
public void testAccessControlInfos() {
526+
void testAccessControlInfos() {
531527
List<UUID> emptyList = List.of();
532528

533529
IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> AccessControlInfos.create(emptyList));

‎src/test/java/org/gridsuite/gateway/TokenValidationTest.java‎

Lines changed: 40 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,28 @@
99
import com.github.tomakehurst.wiremock.client.VerificationException;
1010
import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
1111
import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
12-
import com.nimbusds.jose.*;
12+
import com.nimbusds.jose.JOSEException;
13+
import com.nimbusds.jose.JWSAlgorithm;
14+
import com.nimbusds.jose.JWSHeader;
15+
import com.nimbusds.jose.JWSSigner;
1316
import com.nimbusds.jose.crypto.RSASSASigner;
1417
import com.nimbusds.jose.jwk.RSAKey;
1518
import com.nimbusds.jose.jwk.gen.RSAKeyGenerator;
1619
import com.nimbusds.jwt.JWTClaimsSet;
1720
import com.nimbusds.jwt.SignedJWT;
18-
import lombok.SneakyThrows;
19-
import org.junit.Assert;
20-
import org.junit.Before;
21-
import org.junit.Test;
22-
import org.junit.runner.RunWith;
21+
import org.junit.jupiter.api.Assertions;
22+
import org.junit.jupiter.api.BeforeEach;
23+
import org.junit.jupiter.api.Test;
2324
import org.springframework.beans.factory.annotation.Autowired;
2425
import org.springframework.beans.factory.annotation.Value;
2526
import org.springframework.boot.test.context.SpringBootTest;
27+
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
2628
import org.springframework.boot.test.context.TestConfiguration;
2729
import org.springframework.boot.test.web.server.LocalServerPort;
2830
import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
2931
import org.springframework.cloud.contract.wiremock.WireMockConfigurationCustomizer;
3032
import org.springframework.context.annotation.Bean;
3133
import org.springframework.http.HttpHeaders;
32-
import org.springframework.test.context.junit4.SpringRunner;
3334
import org.springframework.test.web.reactive.server.WebTestClient;
3435
import org.springframework.web.reactive.socket.client.StandardWebSocketClient;
3536
import org.springframework.web.reactive.socket.client.WebSocketClient;
@@ -50,31 +51,29 @@
5051
/**
5152
* @author Chamseddine Benhamed <chamseddine.benhamed at rte-france.com>
5253
*/
53-
@RunWith(SpringRunner.class)
54-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
55-
properties = {"powsybl.services.case-server.base-uri=http://localhost:${wiremock.server.port}",
56-
"gridsuite.services.study-server.base-uri=http://localhost:${wiremock.server.port}",
57-
"gridsuite.services.merge-orchestrator-server.base-uri=http://localhost:${wiremock.server.port}",
58-
"gridsuite.services.merge-notification-server.base-uri=http://localhost:${wiremock.server.port}",
59-
"gridsuite.services.directory-notification-server.base-uri=http://localhost:${wiremock.server.port}",
60-
"gridsuite.services.actions-server.base-uri=http://localhost:${wiremock.server.port}",
61-
"gridsuite.services.study-notification-server.base-uri=http://localhost:${wiremock.server.port}",
62-
"gridsuite.services.config-server.base-uri=http://localhost:${wiremock.server.port}",
63-
"gridsuite.services.config-notification-server.base-uri=http://localhost:${wiremock.server.port}",
64-
"gridsuite.services.directory-server.base-uri=http://localhost:${wiremock.server.port}",
65-
"gridsuite.services.explore-server.base-uri=http://localhost:${wiremock.server.port}",
66-
"gridsuite.services.cgmes-boundary-server.base-uri=http://localhost:${wiremock.server.port}",
67-
"gridsuite.services.dynamic-mapping-server.base-uri=http://localhost:${wiremock.server.port}",
68-
"gridsuite.services.filter-server.base-uri=http://localhost:${wiremock.server.port}",
69-
"gridsuite.services.report-server.base-uri=http://localhost:${wiremock.server.port}",
70-
"gridsuite.services.network-modification-server.base-uri=http://localhost:${wiremock.server.port}",
71-
"gridsuite.services.user-admin-server.base-uri=http://localhost:${wiremock.server.port}",
72-
"gridsuite.services.sensitivity-analysis-server.base-uri=http://localhost:${wiremock.server.port}",
73-
"allowed-issuers=http://localhost:${wiremock.server.port}"
74-
})
75-
54+
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
55+
"powsybl.services.case-server.base-uri=http://localhost:${wiremock.server.port}",
56+
"gridsuite.services.study-server.base-uri=http://localhost:${wiremock.server.port}",
57+
"gridsuite.services.merge-orchestrator-server.base-uri=http://localhost:${wiremock.server.port}",
58+
"gridsuite.services.merge-notification-server.base-uri=http://localhost:${wiremock.server.port}",
59+
"gridsuite.services.directory-notification-server.base-uri=http://localhost:${wiremock.server.port}",
60+
"gridsuite.services.actions-server.base-uri=http://localhost:${wiremock.server.port}",
61+
"gridsuite.services.study-notification-server.base-uri=http://localhost:${wiremock.server.port}",
62+
"gridsuite.services.config-server.base-uri=http://localhost:${wiremock.server.port}",
63+
"gridsuite.services.config-notification-server.base-uri=http://localhost:${wiremock.server.port}",
64+
"gridsuite.services.directory-server.base-uri=http://localhost:${wiremock.server.port}",
65+
"gridsuite.services.explore-server.base-uri=http://localhost:${wiremock.server.port}",
66+
"gridsuite.services.cgmes-boundary-server.base-uri=http://localhost:${wiremock.server.port}",
67+
"gridsuite.services.dynamic-mapping-server.base-uri=http://localhost:${wiremock.server.port}",
68+
"gridsuite.services.filter-server.base-uri=http://localhost:${wiremock.server.port}",
69+
"gridsuite.services.report-server.base-uri=http://localhost:${wiremock.server.port}",
70+
"gridsuite.services.network-modification-server.base-uri=http://localhost:${wiremock.server.port}",
71+
"gridsuite.services.user-admin-server.base-uri=http://localhost:${wiremock.server.port}",
72+
"gridsuite.services.sensitivity-analysis-server.base-uri=http://localhost:${wiremock.server.port}",
73+
"allowed-issuers=http://localhost:${wiremock.server.port}"
74+
})
7675
@AutoConfigureWireMock(port = 0)
77-
public class TokenValidationTest {
76+
class TokenValidationTest {
7877

7978
@Value("${wiremock.server.port}")
8079
int port;
@@ -97,7 +96,7 @@ public class TokenValidationTest {
9796
@Autowired
9897
WebTestClient webClient;
9998

100-
@Before
99+
@BeforeEach
101100
public void prepareToken() throws JOSEException {
102101
// RSA signatures require a public and private RSA key pair, the public key
103102
// must be made known to the JWS recipient in order to verify the signatures
@@ -187,18 +186,18 @@ private void testWebsocket(String name) throws InterruptedException {
187186
}
188187
}
189188
if (!done) {
190-
Assert.fail("Wiremock didn't receive the websocket connection");
189+
Assertions.fail("Wiremock didn't receive the websocket connection");
191190
}
192191
try {
193192
wsconnection.timeout(Duration.ofMillis(100)).block();
194-
Assert.fail("websocket client was closed but should remain open");
193+
Assertions.fail("websocket client was closed but should remain open");
195194
} catch (Exception ignored) {
196195
//should timeout
197196
}
198197
}
199198

200199
@Test
201-
public void gatewayTest() {
200+
void gatewayTest() {
202201
initStubForJwk();
203202

204203
UUID elementUuid = UUID.randomUUID();
@@ -370,8 +369,7 @@ private void testToken(UUID elementUuid, String token) {
370369
}
371370

372371
@Test
373-
@SneakyThrows
374-
public void testWebsockets() {
372+
void testWebsockets() throws InterruptedException {
375373
initStubForJwk();
376374

377375
stubFor(get(urlPathEqualTo("/notify")).withHeader("userId", equalTo("chmits"))
@@ -413,7 +411,7 @@ private void initStubForJwk() {
413411
}
414412

415413
@Test
416-
public void testJwksUpdate() {
414+
void testJwksUpdate() {
417415
stubFor(head(urlEqualTo(String.format("/v1/users/%s", "chmits"))).withPort(port)
418416
.willReturn(aResponse().withStatus(200)));
419417

@@ -481,7 +479,7 @@ public void testJwksUpdate() {
481479
}
482480

483481
@Test
484-
public void invalidToken() {
482+
void invalidToken() {
485483
stubFor(head(urlEqualTo(String.format("/v1/users/%s", "chmits"))).withPort(port)
486484
.willReturn(aResponse().withStatus(200)));
487485

@@ -563,11 +561,11 @@ public void invalidToken() {
563561
WebSocketClient client = new StandardWebSocketClient();
564562
client.execute(URI.create("ws://localhost:" +
565563
this.localServerPort + "/study-notification/notify"),
566-
ws -> ws.receive().then()).doOnSuccess(s -> Assert.fail("Should have thrown"));
564+
ws -> ws.receive().then()).doOnSuccess(s -> Assertions.fail("Should have thrown"));
567565
}
568566

569567
@Test
570-
public void forbiddenUserTest() {
568+
void forbiddenUserTest() {
571569
initStubForJwk();
572570
stubFor(head(urlEqualTo(String.format("/v1/users/%s", "chmits"))).withPort(port)
573571
.willReturn(aResponse().withStatus(204)));
@@ -582,7 +580,7 @@ public void forbiddenUserTest() {
582580
@TestConfiguration
583581
static class MyTestConfiguration {
584582
@Bean
585-
WireMockConfigurationCustomizer optionsCustomizer() {
583+
public WireMockConfigurationCustomizer optionsCustomizer() {
586584
return new WireMockConfigurationCustomizer() {
587585
private static final String SEC_WEBSOCKET_MAGIC = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
588586
@Override

0 commit comments

Comments
 (0)