Skip to content

Commit fe5ac10

Browse files
HaybuHaybu
authored
Merge pull request spring-cloud#561 from piomin/wip-junit5
upgrade to junit 5
2 parents d73df86 + 646aac4 commit fe5ac10

File tree

12 files changed

+99
-73
lines changed

12 files changed

+99
-73
lines changed

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
<!-- Maven Plugin Versions -->
7070
<maven-compiler-plugin.version>3.5</maven-compiler-plugin.version>
7171
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
72-
<maven-failsafe-plugin.version>2.18.1</maven-failsafe-plugin.version>
73-
<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
72+
<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
73+
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
7474
<fabric8.maven.plugin.version>4.4.0</fabric8.maven.plugin.version>
7575
<groovy.version>2.4.12</groovy.version>
7676
<restassured.version>3.0.2</restassured.version>

‎spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,14 @@
8383
<skip>true</skip>
8484
</configuration>
8585
</plugin>
86+
<plugin>
87+
<artifactId>maven-surefire-plugin</artifactId>
88+
<version>2.22.2</version>
89+
</plugin>
90+
<plugin>
91+
<artifactId>maven-failsafe-plugin</artifactId>
92+
<version>2.22.2</version>
93+
</plugin>
8694
</plugins>
8795
</build>
8896

‎spring-cloud-kubernetes-examples/kubernetes-leader-election-example/src/test/java/org/springframework/cloud/kubernetes/examples/LeaderControllerTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import java.net.InetAddress;
2020
import java.net.UnknownHostException;
2121

22-
import org.junit.Before;
23-
import org.junit.Test;
24-
import org.junit.runner.RunWith;
22+
import org.junit.jupiter.api.BeforeEach;
23+
import org.junit.jupiter.api.Test;
24+
import org.junit.jupiter.api.extension.ExtendWith;
2525
import org.mockito.Mock;
26-
import org.mockito.junit.MockitoJUnitRunner;
26+
import org.mockito.junit.jupiter.MockitoExtension;
2727

2828
import org.springframework.http.HttpStatus;
2929
import org.springframework.http.ResponseEntity;
@@ -36,7 +36,7 @@
3636
import static org.mockito.Mockito.times;
3737
import static org.mockito.Mockito.verify;
3838

39-
@RunWith(MockitoJUnitRunner.class)
39+
@ExtendWith(MockitoExtension.class)
4040
public class LeaderControllerTest {
4141

4242
@Mock
@@ -52,7 +52,7 @@ public class LeaderControllerTest {
5252

5353
private LeaderController leaderController;
5454

55-
@Before
55+
@BeforeEach
5656
public void before() throws UnknownHostException {
5757
this.host = InetAddress.getLocalHost().getHostName();
5858
this.leaderController = new LeaderController();

‎spring-cloud-kubernetes-leader/pom.xml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,21 @@
6161
<groupId>org.springframework.boot</groupId>
6262
<artifactId>spring-boot-starter-test</artifactId>
6363
<scope>test</scope>
64-
</dependency>
65-
<dependency>
66-
<groupId>org.junit.vintage</groupId>
67-
<artifactId>junit-vintage-engine</artifactId>
68-
<scope>test</scope>
64+
<exclusions>
65+
<exclusion>
66+
<groupId>org.junit.vintage</groupId>
67+
<artifactId>junit-vintage-engine</artifactId>
68+
</exclusion>
69+
</exclusions>
6970
</dependency>
7071
</dependencies>
7172
<build>
7273
<plugins>
74+
<plugin>
75+
<groupId>org.apache.maven.plugins</groupId>
76+
<artifactId>maven-surefire-plugin</artifactId>
77+
<version>${maven-surefire-plugin.version}</version>
78+
</plugin>
7379
<plugin>
7480
<groupId>org.apache.maven.plugins</groupId>
7581
<artifactId>maven-failsafe-plugin</artifactId>

‎spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfigurationTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616

1717
package org.springframework.cloud.kubernetes.leader;
1818

19-
import org.junit.Test;
20-
import org.junit.runner.RunWith;
19+
import org.junit.jupiter.api.Test;
20+
import org.junit.jupiter.api.extension.ExtendWith;
21+
import org.mockito.junit.jupiter.MockitoExtension;
2122

2223
import org.springframework.beans.factory.annotation.Autowired;
2324
import org.springframework.beans.factory.annotation.Value;
2425
import org.springframework.boot.SpringBootConfiguration;
2526
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2627
import org.springframework.boot.test.context.SpringBootTest;
2728
import org.springframework.http.MediaType;
28-
import org.springframework.test.context.junit4.SpringRunner;
2929
import org.springframework.test.web.reactive.server.WebTestClient;
3030

3131
import static org.hamcrest.Matchers.containsString;
3232

33-
@RunWith(SpringRunner.class)
33+
@ExtendWith(MockitoExtension.class)
3434
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
3535
// Make sure test passes without Kubernetes cluster
3636
"spring.cloud.kubernetes.leader.autoStartup=false" })

‎spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderContextTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
import java.util.Optional;
2020

21-
import org.junit.Before;
22-
import org.junit.Test;
23-
import org.junit.runner.RunWith;
21+
import org.junit.jupiter.api.BeforeEach;
22+
import org.junit.jupiter.api.Test;
23+
import org.junit.jupiter.api.extension.ExtendWith;
2424
import org.mockito.Mock;
25-
import org.mockito.junit.MockitoJUnitRunner;
25+
import org.mockito.junit.jupiter.MockitoExtension;
2626

2727
import org.springframework.integration.leader.Candidate;
2828

@@ -33,7 +33,7 @@
3333
/**
3434
* @author Gytis Trikleris
3535
*/
36-
@RunWith(MockitoJUnitRunner.class)
36+
@ExtendWith(MockitoExtension.class)
3737
public class LeaderContextTest {
3838

3939
@Mock
@@ -47,7 +47,7 @@ public class LeaderContextTest {
4747

4848
private LeaderContext leaderContext;
4949

50-
@Before
50+
@BeforeEach
5151
public void before() {
5252
this.leaderContext = new LeaderContext(this.mockCandidate,
5353
this.mockLeadershipController);

‎spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderInfoContributorTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
import java.util.Map;
2020
import java.util.Optional;
2121

22-
import org.junit.Before;
23-
import org.junit.Test;
24-
import org.junit.runner.RunWith;
22+
import org.junit.jupiter.api.BeforeEach;
23+
import org.junit.jupiter.api.Test;
24+
import org.junit.jupiter.api.extension.ExtendWith;
2525
import org.mockito.Mock;
26-
import org.mockito.junit.MockitoJUnitRunner;
26+
import org.mockito.junit.jupiter.MockitoExtension;
2727

2828
import org.springframework.boot.actuate.info.Info;
2929
import org.springframework.integration.leader.Candidate;
3030

3131
import static org.assertj.core.api.Assertions.assertThat;
3232
import static org.mockito.BDDMockito.given;
3333

34-
@RunWith(MockitoJUnitRunner.class)
34+
@ExtendWith(MockitoExtension.class)
3535
public class LeaderInfoContributorTest {
3636

3737
@Mock
@@ -45,7 +45,7 @@ public class LeaderInfoContributorTest {
4545

4646
private LeaderInfoContributor leaderInfoContributor;
4747

48-
@Before
48+
@BeforeEach
4949
public void before() {
5050
this.leaderInfoContributor = new LeaderInfoContributor(
5151
this.mockLeadershipController, this.mockCandidate);

‎spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderInitiatorTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
import java.time.Duration;
2020

21-
import org.junit.After;
22-
import org.junit.Before;
23-
import org.junit.Test;
24-
import org.junit.runner.RunWith;
21+
import org.junit.jupiter.api.AfterEach;
22+
import org.junit.jupiter.api.BeforeEach;
23+
import org.junit.jupiter.api.Test;
24+
import org.junit.jupiter.api.extension.ExtendWith;
2525
import org.mockito.Mock;
26-
import org.mockito.junit.MockitoJUnitRunner;
26+
import org.mockito.junit.jupiter.MockitoExtension;
2727

2828
import static org.assertj.core.api.Assertions.assertThat;
2929
import static org.mockito.BDDMockito.given;
@@ -33,7 +33,7 @@
3333
/**
3434
* @author Gytis Trikleris
3535
*/
36-
@RunWith(MockitoJUnitRunner.class)
36+
@ExtendWith(MockitoExtension.class)
3737
public class LeaderInitiatorTest {
3838

3939
@Mock
@@ -53,14 +53,14 @@ public class LeaderInitiatorTest {
5353

5454
private LeaderInitiator leaderInitiator;
5555

56-
@Before
56+
@BeforeEach
5757
public void before() {
5858
this.leaderInitiator = new LeaderInitiator(this.mockLeaderProperties,
5959
this.mockLeadershipController, this.mockLeaderRecordWatcher,
6060
this.mockPodReadinessWatcher);
6161
}
6262

63-
@After
63+
@AfterEach
6464
public void after() {
6565
this.leaderInitiator.stop();
6666
}

‎spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderRecordWatcherTest.java

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
import io.fabric8.kubernetes.client.dsl.MixedOperation;
2727
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
2828
import io.fabric8.kubernetes.client.dsl.Resource;
29-
import org.junit.Before;
30-
import org.junit.Test;
31-
import org.junit.runner.RunWith;
29+
import org.junit.jupiter.api.BeforeEach;
30+
import org.junit.jupiter.api.Test;
31+
import org.junit.jupiter.api.extension.ExtendWith;
3232
import org.mockito.Mock;
33-
import org.mockito.junit.MockitoJUnitRunner;
33+
import org.mockito.junit.jupiter.MockitoExtension;
3434

3535
import static org.mockito.BDDMockito.given;
3636
import static org.mockito.Mockito.times;
@@ -39,7 +39,7 @@
3939
/**
4040
* @author Gytis Trikleris
4141
*/
42-
@RunWith(MockitoJUnitRunner.class)
42+
@ExtendWith(MockitoExtension.class)
4343
public class LeaderRecordWatcherTest {
4444

4545
@Mock
@@ -71,22 +71,15 @@ public class LeaderRecordWatcherTest {
7171

7272
private LeaderRecordWatcher watcher;
7373

74-
@Before
74+
@BeforeEach
7575
public void before() {
7676
this.watcher = new LeaderRecordWatcher(this.mockLeaderProperties,
7777
this.mockLeadershipController, this.mockKubernetesClient);
78-
79-
given(this.mockKubernetesClient.configMaps())
80-
.willReturn(this.mockConfigMapsOperation);
81-
given(this.mockConfigMapsOperation.inNamespace(null))
82-
.willReturn(this.mockInNamespaceOperation);
83-
given(this.mockInNamespaceOperation.withName(null))
84-
.willReturn(this.mockWithNameResource);
85-
given(this.mockWithNameResource.watch(this.watcher)).willReturn(this.mockWatch);
8678
}
8779

8880
@Test
8981
public void shouldStartOnce() {
82+
initStubs();
9083
this.watcher.start();
9184
this.watcher.start();
9285

@@ -95,6 +88,7 @@ public void shouldStartOnce() {
9588

9689
@Test
9790
public void shouldStopOnce() {
91+
initStubs();
9892
this.watcher.start();
9993
this.watcher.stop();
10094
this.watcher.stop();
@@ -120,6 +114,7 @@ public void shouldIgnoreErrorEvent() {
120114

121115
@Test
122116
public void shouldHandleClose() {
117+
initStubs();
123118
this.watcher.onClose(this.mockKubernetesClientException);
124119

125120
verify(this.mockWithNameResource).watch(this.watcher);
@@ -132,4 +127,14 @@ public void shouldIgnoreCloseWithoutCause() {
132127
verify(this.mockWithNameResource, times(0)).watch(this.watcher);
133128
}
134129

130+
private void initStubs() {
131+
given(this.mockKubernetesClient.configMaps())
132+
.willReturn(this.mockConfigMapsOperation);
133+
given(this.mockConfigMapsOperation.inNamespace(null))
134+
.willReturn(this.mockInNamespaceOperation);
135+
given(this.mockInNamespaceOperation.withName(null))
136+
.willReturn(this.mockWithNameResource);
137+
given(this.mockWithNameResource.watch(this.watcher)).willReturn(this.mockWatch);
138+
}
139+
135140
}

‎spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
package org.springframework.cloud.kubernetes.leader;
1818

19-
import org.junit.Before;
20-
import org.junit.Test;
21-
import org.junit.runner.RunWith;
19+
import org.junit.jupiter.api.BeforeEach;
20+
import org.junit.jupiter.api.Test;
21+
import org.junit.jupiter.api.extension.ExtendWith;
2222
import org.mockito.Mock;
23-
import org.mockito.junit.MockitoJUnitRunner;
23+
import org.mockito.junit.jupiter.MockitoExtension;
2424

2525
import org.springframework.integration.leader.Candidate;
2626

@@ -30,7 +30,7 @@
3030
/**
3131
* @author Gytis Trikleris
3232
*/
33-
@RunWith(MockitoJUnitRunner.class)
33+
@ExtendWith(MockitoExtension.class)
3434
public class LeaderTest {
3535

3636
private static final String ROLE = "test-role";
@@ -42,7 +42,7 @@ public class LeaderTest {
4242

4343
private Leader leader;
4444

45-
@Before
45+
@BeforeEach
4646
public void before() {
4747
this.leader = new Leader(ROLE, ID);
4848
}

‎spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeadershipControllerTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
package org.springframework.cloud.kubernetes.leader;
1818

1919
import io.fabric8.kubernetes.client.KubernetesClient;
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;
22+
import org.junit.jupiter.api.extension.ExtendWith;
2323
import org.mockito.Mock;
24-
import org.mockito.junit.MockitoJUnitRunner;
24+
import org.mockito.junit.jupiter.MockitoExtension;
2525

2626
import org.springframework.integration.leader.Candidate;
2727
import org.springframework.integration.leader.event.LeaderEventPublisher;
@@ -31,7 +31,7 @@
3131
/**
3232
* @author Gytis Trikleris
3333
*/
34-
@RunWith(MockitoJUnitRunner.class)
34+
@ExtendWith(MockitoExtension.class)
3535
public class LeadershipControllerTest {
3636

3737
@Mock
@@ -48,7 +48,7 @@ public class LeadershipControllerTest {
4848

4949
private LeadershipController leadershipController;
5050

51-
@Before
51+
@BeforeEach
5252
public void before() {
5353
this.leadershipController = new LeadershipController(this.mockCandidate,
5454
this.mockLeaderProperties, this.mockLeaderEventPublisher,

0 commit comments

Comments
 (0)