Skip to content

Commit 319253e

Browse files
committed
chore: migrating from junit 4 to 5
1 parent 2d75a4a commit 319253e

File tree

17 files changed

+53
-45
lines changed

17 files changed

+53
-45
lines changed

build.gradle

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ plugins {
22
id "se.bjurr.gradle.bundle-jar"
33
}
44

5+
repositories {
6+
mavenCentral()
7+
}
8+
59
dependencies {
610
api 'com.github.jknack:handlebars:4.5.0'
711

@@ -18,11 +22,16 @@ dependencies {
1822
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.0'
1923

2024
testImplementation 'org.slf4j:slf4j-simple:2.0.17'
21-
testImplementation 'junit:junit:4.13.2'
25+
testImplementation "org.junit.jupiter:junit-jupiter:5.13.4"
26+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
2227
testImplementation 'org.assertj:assertj-core:3.27.6'
2328
testImplementation 'com.approvaltests:approvaltests:25.4.3'
2429
testImplementation 'org.mockito:mockito-core:5.20.0'
2530
}
2631

32+
test {
33+
useJUnitPlatform()
34+
}
35+
2736
sourceCompatibility=17
2837
targetCompatibility=17

src/test/java/se/bjurr/gitchangelog/api/BoundaryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import static se.bjurr.gitchangelog.api.GitChangelogApi.gitChangelogApiBuilder;
55
import static se.bjurr.gitchangelog.api.GitChangelogApiConstants.ZERO_COMMIT;
66

7-
import org.junit.Test;
7+
import org.junit.jupiter.api.Test;
88
import se.bjurr.gitchangelog.api.model.Changelog;
99
import se.bjurr.gitchangelog.api.model.Commit;
1010

src/test/java/se/bjurr/gitchangelog/api/GitChangelogApiTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
import java.nio.file.Paths;
1616
import java.util.HashMap;
1717
import java.util.Map;
18-
import org.junit.After;
19-
import org.junit.Before;
20-
import org.junit.Test;
18+
import org.junit.jupiter.api.AfterEach;
19+
import org.junit.jupiter.api.BeforeEach;
20+
import org.junit.jupiter.api.Test;
2121
import se.bjurr.gitchangelog.api.exceptions.GitChangelogRepositoryException;
2222
import se.bjurr.gitchangelog.internal.integrations.github.GitHubMockInterceptor;
2323
import se.bjurr.gitchangelog.internal.integrations.github.GitHubServiceFactory;
@@ -36,7 +36,7 @@ public class GitChangelogApiTest {
3636
private RestClientMock mockedRestClient;
3737
private GitHubMockInterceptor gitHubMockInterceptor;
3838

39-
@Before
39+
@BeforeEach
4040
public void before() throws Exception {
4141
GitChangelogLibAssertions.assertHavingMainRepoAsOrigin();
4242
JiraClientFactory.reset();
@@ -85,7 +85,7 @@ public void before() throws Exception {
8585
.setInterceptor(this.gitHubMockInterceptor);
8686
}
8787

88-
@After
88+
@AfterEach
8989
public void after() {
9090
JiraClientFactory.reset();
9191
RedmineClientFactory.reset();

src/test/java/se/bjurr/gitchangelog/api/TemplatesTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import java.net.URISyntaxException;
1010
import java.nio.file.Files;
1111
import java.nio.file.Paths;
12-
import org.junit.After;
13-
import org.junit.Before;
14-
import org.junit.Test;
12+
import org.junit.jupiter.api.AfterEach;
13+
import org.junit.jupiter.api.BeforeEach;
14+
import org.junit.jupiter.api.Test;
1515
import se.bjurr.gitchangelog.internal.integrations.github.GitHubMockInterceptor;
1616
import se.bjurr.gitchangelog.internal.integrations.github.GitHubServiceFactory;
1717
import se.bjurr.gitchangelog.internal.integrations.jira.JiraClientFactory;
@@ -22,7 +22,7 @@
2222
public class TemplatesTest {
2323
private GitChangelogApi baseBuilder;
2424

25-
@Before
25+
@BeforeEach
2626
public void before() throws Exception {
2727
GitChangelogLibAssertions.assertHavingMainRepoAsOrigin();
2828
JiraClientFactory.reset();
@@ -110,7 +110,7 @@ private RestClientMock mockJiraResponses(
110110
UTF_8));
111111
}
112112

113-
@After
113+
@AfterEach
114114
public void after() {
115115
JiraClientFactory.reset();
116116
GitHubServiceFactory.setInterceptor(null);

src/test/java/se/bjurr/gitchangelog/api/helpers/HandlebarsHelperTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
import static se.bjurr.gitchangelog.api.GitChangelogApi.gitChangelogApiBuilder;
44

5-
import org.junit.Before;
6-
import org.junit.Test;
5+
import org.junit.jupiter.api.BeforeEach;
6+
import org.junit.jupiter.api.Test;
77
import se.bjurr.gitchangelog.api.GitChangelogApi;
88
import se.bjurr.gitchangelog.test.ApprovalsWrapper;
99
import se.bjurr.gitchangelog.test.GitChangelogLibAssertions;
1010

1111
public class HandlebarsHelperTest {
1212
private GitChangelogApi baseBuilder;
1313

14-
@Before
14+
@BeforeEach
1515
public void before() {
1616
GitChangelogLibAssertions.assertHavingMainRepoAsOrigin();
1717
this.baseBuilder =

src/test/java/se/bjurr/gitchangelog/api/model/CommitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static org.assertj.core.api.Assertions.assertThat;
44

55
import java.util.Arrays;
6-
import org.junit.Test;
6+
import org.junit.jupiter.api.Test;
77

88
public class CommitTest {
99

src/test/java/se/bjurr/gitchangelog/internal/git/GitRepoDataTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import java.util.ArrayList;
66
import java.util.List;
7-
import org.junit.Test;
7+
import org.junit.jupiter.api.Test;
88
import se.bjurr.gitchangelog.internal.git.model.GitTag;
99

1010
public class GitRepoDataTest {

src/test/java/se/bjurr/gitchangelog/internal/git/GitRepoTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import static se.bjurr.gitchangelog.api.GitChangelogApiConstants.ZERO_COMMIT;
66

77
import java.io.File;
8-
import java.net.URISyntaxException;
98
import java.util.ArrayList;
109
import java.util.Arrays;
1110
import java.util.Collections;
@@ -14,8 +13,8 @@
1413
import java.util.Optional;
1514
import java.util.TreeMap;
1615
import org.eclipse.jgit.lib.ObjectId;
17-
import org.junit.Before;
18-
import org.junit.Test;
16+
import org.junit.jupiter.api.BeforeEach;
17+
import org.junit.jupiter.api.Test;
1918
import se.bjurr.gitchangelog.api.InclusivenessStrategy;
2019
import se.bjurr.gitchangelog.internal.git.model.GitCommit;
2120
import se.bjurr.gitchangelog.internal.git.model.GitTag;
@@ -26,8 +25,8 @@ public class GitRepoTest {
2625
private static final String TAG_1_0_HASH = "01484ce71bbc76e1af75ebb07a52844145ce99dc";
2726
private File gitRepoFile;
2827

29-
@Before
30-
public void before() throws URISyntaxException {
28+
@BeforeEach
29+
public void before() throws Exception {
3130
this.gitRepoFile = new File(GitRepoTest.class.getResource("/github-issues.json").toURI());
3231
}
3332

src/test/java/se/bjurr/gitchangelog/internal/integrations/gitlab/GitLabClientTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import java.nio.charset.StandardCharsets;
88
import java.nio.file.Files;
99
import java.util.Optional;
10-
import org.junit.Before;
11-
import org.junit.Test;
10+
import org.junit.jupiter.api.BeforeEach;
11+
import org.junit.jupiter.api.Test;
1212
import org.slf4j.Logger;
1313
import org.slf4j.LoggerFactory;
1414
import se.bjurr.gitchangelog.api.exceptions.GitChangelogIntegrationException;
@@ -19,7 +19,7 @@ public class GitLabClientTest {
1919
private GitLabClient sut;
2020
private boolean disabled;
2121

22-
@Before
22+
@BeforeEach
2323
public void before() throws IOException {
2424
final String hostUrl = "https://gitlab.com/";
2525
String apiToken = null;

src/test/java/se/bjurr/gitchangelog/internal/integrations/jira/JiraClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.Arrays;
66
import java.util.Map;
77
import java.util.Optional;
8-
import org.junit.Test;
8+
import org.junit.jupiter.api.Test;
99
import se.bjurr.gitchangelog.api.exceptions.GitChangelogIntegrationException;
1010
import se.bjurr.gitchangelog.test.FileUtils;
1111

0 commit comments

Comments
 (0)