Skip to content

Commit f1cead3

Browse files
LEDfanLEDfan
committed
Switch to Junit 5 instead of mix of 4 and 5
1 parent 42c56fe commit f1cead3

10 files changed

Lines changed: 335 additions & 324 deletions

File tree

‎pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,12 @@
102102
<groupId>org.springframework.boot</groupId>
103103
<artifactId>spring-boot-starter-test</artifactId>
104104
<scope>test</scope>
105+
<exclusions>
106+
<exclusion>
107+
<groupId>org.junit.vintage</groupId>
108+
<artifactId>junit-vintage-engine</artifactId>
109+
</exclusion>
110+
</exclusions>
105111
</dependency>
106112
<dependency>
107113
<groupId>org.springframework.boot</groupId>

‎src/test/java/eu/openanalytics/containerproxy/test/auth/LDAPAuthenticationTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@
2020
*/
2121
package eu.openanalytics.containerproxy.test.auth;
2222

23-
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic;
24-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
25-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
26-
27-
import javax.inject.Inject;
28-
2923
import eu.openanalytics.containerproxy.test.proxy.PropertyOverrideContextInitializer;
30-
import org.junit.Test;
31-
import org.junit.runner.RunWith;
24+
import org.junit.jupiter.api.Test;
25+
import org.junit.jupiter.api.extension.ExtendWith;
3226
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
3327
import org.springframework.boot.test.context.SpringBootTest;
3428
import org.springframework.core.env.Environment;
3529
import org.springframework.http.MediaType;
3630
import org.springframework.test.context.ActiveProfiles;
3731
import org.springframework.test.context.ContextConfiguration;
38-
import org.springframework.test.context.junit4.SpringRunner;
32+
import org.springframework.test.context.junit.jupiter.SpringExtension;
3933
import org.springframework.test.web.servlet.MockMvc;
4034

35+
import javax.inject.Inject;
36+
37+
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic;
38+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
39+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
40+
4141
@SpringBootTest
42-
@RunWith(SpringRunner.class)
42+
@ExtendWith(SpringExtension.class)
4343
@AutoConfigureMockMvc
4444
@ActiveProfiles("test-ldap-auth")
4545
@ContextConfiguration(initializers = PropertyOverrideContextInitializer.class)

‎src/test/java/eu/openanalytics/containerproxy/test/auth/NoAuthenticationTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,25 @@
2020
*/
2121
package eu.openanalytics.containerproxy.test.auth;
2222

23-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
24-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
25-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
26-
27-
import javax.inject.Inject;
28-
2923
import eu.openanalytics.containerproxy.test.proxy.PropertyOverrideContextInitializer;
30-
import org.junit.Test;
31-
import org.junit.runner.RunWith;
24+
import org.junit.jupiter.api.Test;
25+
import org.junit.jupiter.api.extension.ExtendWith;
3226
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
3327
import org.springframework.boot.test.context.SpringBootTest;
3428
import org.springframework.http.MediaType;
3529
import org.springframework.test.context.ActiveProfiles;
3630
import org.springframework.test.context.ContextConfiguration;
37-
import org.springframework.test.context.junit4.SpringRunner;
31+
import org.springframework.test.context.junit.jupiter.SpringExtension;
3832
import org.springframework.test.web.servlet.MockMvc;
3933

34+
import javax.inject.Inject;
35+
36+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
37+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
38+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
39+
4040
@SpringBootTest
41-
@RunWith(SpringRunner.class)
41+
@ExtendWith(SpringExtension.class)
4242
@AutoConfigureMockMvc
4343
@ActiveProfiles("test-no-auth")
4444
@ContextConfiguration(initializers = PropertyOverrideContextInitializer.class)

‎src/test/java/eu/openanalytics/containerproxy/test/auth/SimpleAuthenticationTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,20 @@
2727
import javax.inject.Inject;
2828

2929
import eu.openanalytics.containerproxy.test.proxy.PropertyOverrideContextInitializer;
30-
import org.junit.Test;
31-
import org.junit.runner.RunWith;
30+
import org.junit.jupiter.api.Test;
31+
import org.junit.jupiter.api.extension.ExtendWith;
3232
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
3333
import org.springframework.boot.test.context.SpringBootTest;
3434
import org.springframework.core.env.Environment;
3535
import org.springframework.http.MediaType;
3636
import org.springframework.test.context.ActiveProfiles;
3737
import org.springframework.test.context.ContextConfiguration;
38+
import org.springframework.test.context.junit.jupiter.SpringExtension;
3839
import org.springframework.test.context.junit4.SpringRunner;
3940
import org.springframework.test.web.servlet.MockMvc;
4041

4142
@SpringBootTest
42-
@RunWith(SpringRunner.class)
43+
@ExtendWith(SpringExtension.class)
4344
@AutoConfigureMockMvc
4445
@ActiveProfiles("test-simple-auth")
4546
@ContextConfiguration(initializers = PropertyOverrideContextInitializer.class)

‎src/test/java/eu/openanalytics/containerproxy/test/e2e/app_recovery/TestAppRecovery.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.junit.jupiter.params.provider.Arguments;
3131
import org.junit.jupiter.params.provider.MethodSource;
3232

33+
3334
import javax.json.JsonObject;
3435
import java.io.IOException;
3536
import java.util.ArrayList;

‎src/test/java/eu/openanalytics/containerproxy/test/proxy/TestConcurrentUsers.java‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,13 @@
2020
*/
2121
package eu.openanalytics.containerproxy.test.proxy;
2222

23-
import static org.junit.Assert.assertEquals;
24-
25-
import java.util.HashSet;
26-
import java.util.Set;
27-
28-
import javax.inject.Inject;
29-
30-
import org.junit.Before;
31-
import org.junit.Test;
32-
import org.junit.runner.RunWith;
23+
import eu.openanalytics.containerproxy.ContainerProxyApplication;
24+
import eu.openanalytics.containerproxy.model.runtime.Proxy;
25+
import eu.openanalytics.containerproxy.model.runtime.RuntimeSetting;
26+
import org.junit.jupiter.api.Assertions;
27+
import org.junit.jupiter.api.BeforeEach;
28+
import org.junit.jupiter.api.Test;
29+
import org.junit.jupiter.api.extension.ExtendWith;
3330
import org.springframework.boot.test.context.SpringBootTest;
3431
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
3532
import org.springframework.boot.test.web.client.TestRestTemplate;
@@ -42,14 +39,14 @@
4239
import org.springframework.http.ResponseEntity;
4340
import org.springframework.test.context.ActiveProfiles;
4441
import org.springframework.test.context.ContextConfiguration;
45-
import org.springframework.test.context.junit4.SpringRunner;
42+
import org.springframework.test.context.junit.jupiter.SpringExtension;
4643

47-
import eu.openanalytics.containerproxy.ContainerProxyApplication;
48-
import eu.openanalytics.containerproxy.model.runtime.Proxy;
49-
import eu.openanalytics.containerproxy.model.runtime.RuntimeSetting;
44+
import javax.inject.Inject;
45+
import java.util.HashSet;
46+
import java.util.Set;
5047

5148
@SpringBootTest(classes = { ContainerProxyApplication.class }, webEnvironment = WebEnvironment.RANDOM_PORT)
52-
@RunWith(SpringRunner.class)
49+
@ExtendWith(SpringExtension.class)
5350
@ActiveProfiles("test")
5451
@ContextConfiguration(initializers = PropertyOverrideContextInitializer.class)
5552
public class TestConcurrentUsers {
@@ -67,7 +64,7 @@ public class TestConcurrentUsers {
6764
private String[] user2;
6865
private String[] specIds;
6966

70-
@Before
67+
@BeforeEach
7168
public void init() {
7269
user1 = new String[] { environment.getProperty("proxy.users[0].name"),
7370
environment.getProperty("proxy.users[0].password") };
@@ -124,7 +121,7 @@ private String loginAndLaunchProxy(String username, String password, String spec
124121

125122
ResponseEntity<Proxy> createProxyResponse = this.restTemplate.withBasicAuth(username, password).postForEntity(
126123
"http://localhost:" + port + "/api/proxy/{proxySpecId}", createProxyRequest, Proxy.class, specId);
127-
assertEquals(201, createProxyResponse.getStatusCodeValue());
124+
Assertions.assertEquals(201, createProxyResponse.getStatusCodeValue());
128125

129126
Proxy createdProxy = createProxyResponse.getBody();
130127
Thread.sleep(1000);
@@ -141,8 +138,8 @@ private void doDeleteProxy(String proxyId, String username, String password) {
141138
ResponseEntity<String> deleteProxyResponse = this.restTemplate
142139
.withBasicAuth(username, password)
143140
.exchange("http://localhost:" + port + "/api/proxy/{proxyId}", HttpMethod.DELETE, null, String.class, proxyId);
144-
145-
assertEquals(200, deleteProxyResponse.getStatusCodeValue());
141+
142+
Assertions.assertEquals(200, deleteProxyResponse.getStatusCodeValue());
146143
}
147144

148145
private byte[] doGetEndpoint(String endpoint, String username, String password) {
@@ -151,7 +148,7 @@ private byte[] doGetEndpoint(String endpoint, String username, String password)
151148

152149
ResponseEntity<String> getEndpointResponse = this.restTemplate.withBasicAuth(username, password)
153150
.getForEntity("http://localhost:" + port + "/api/route/" + endpoint, String.class);
154-
assertEquals(200, getEndpointResponse.getStatusCodeValue());
151+
Assertions.assertEquals(200, getEndpointResponse.getStatusCodeValue());
155152

156153
return getEndpointResponse.getBody().getBytes();
157154
}

0 commit comments

Comments
 (0)