File tree Expand file tree Collapse file tree 17 files changed +53
-45
lines changed
src/test/java/se/bjurr/gitchangelog Expand file tree Collapse file tree 17 files changed +53
-45
lines changed Original file line number Diff line number Diff line change @@ -2,6 +2,10 @@ plugins {
22 id " se.bjurr.gradle.bundle-jar"
33}
44
5+ repositories {
6+ mavenCentral()
7+ }
8+
59dependencies {
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+
2736sourceCompatibility= 17
2837targetCompatibility= 17
Original file line number Diff line number Diff line change 44import static se .bjurr .gitchangelog .api .GitChangelogApi .gitChangelogApiBuilder ;
55import static se .bjurr .gitchangelog .api .GitChangelogApiConstants .ZERO_COMMIT ;
66
7- import org .junit .Test ;
7+ import org .junit .jupiter . api . Test ;
88import se .bjurr .gitchangelog .api .model .Changelog ;
99import se .bjurr .gitchangelog .api .model .Commit ;
1010
Original file line number Diff line number Diff line change 1515import java .nio .file .Paths ;
1616import java .util .HashMap ;
1717import 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 ;
2121import se .bjurr .gitchangelog .api .exceptions .GitChangelogRepositoryException ;
2222import se .bjurr .gitchangelog .internal .integrations .github .GitHubMockInterceptor ;
2323import 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 ();
Original file line number Diff line number Diff line change 99import java .net .URISyntaxException ;
1010import java .nio .file .Files ;
1111import 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 ;
1515import se .bjurr .gitchangelog .internal .integrations .github .GitHubMockInterceptor ;
1616import se .bjurr .gitchangelog .internal .integrations .github .GitHubServiceFactory ;
1717import se .bjurr .gitchangelog .internal .integrations .jira .JiraClientFactory ;
2222public 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 );
Original file line number Diff line number Diff line change 22
33import 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 ;
77import se .bjurr .gitchangelog .api .GitChangelogApi ;
88import se .bjurr .gitchangelog .test .ApprovalsWrapper ;
99import se .bjurr .gitchangelog .test .GitChangelogLibAssertions ;
1010
1111public class HandlebarsHelperTest {
1212 private GitChangelogApi baseBuilder ;
1313
14- @ Before
14+ @ BeforeEach
1515 public void before () {
1616 GitChangelogLibAssertions .assertHavingMainRepoAsOrigin ();
1717 this .baseBuilder =
Original file line number Diff line number Diff line change 33import static org .assertj .core .api .Assertions .assertThat ;
44
55import java .util .Arrays ;
6- import org .junit .Test ;
6+ import org .junit .jupiter . api . Test ;
77
88public class CommitTest {
99
Original file line number Diff line number Diff line change 44
55import java .util .ArrayList ;
66import java .util .List ;
7- import org .junit .Test ;
7+ import org .junit .jupiter . api . Test ;
88import se .bjurr .gitchangelog .internal .git .model .GitTag ;
99
1010public class GitRepoDataTest {
Original file line number Diff line number Diff line change 55import static se .bjurr .gitchangelog .api .GitChangelogApiConstants .ZERO_COMMIT ;
66
77import java .io .File ;
8- import java .net .URISyntaxException ;
98import java .util .ArrayList ;
109import java .util .Arrays ;
1110import java .util .Collections ;
1413import java .util .Optional ;
1514import java .util .TreeMap ;
1615import 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 ;
1918import se .bjurr .gitchangelog .api .InclusivenessStrategy ;
2019import se .bjurr .gitchangelog .internal .git .model .GitCommit ;
2120import 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
Original file line number Diff line number Diff line change 77import java .nio .charset .StandardCharsets ;
88import java .nio .file .Files ;
99import 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 ;
1212import org .slf4j .Logger ;
1313import org .slf4j .LoggerFactory ;
1414import 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 ;
Original file line number Diff line number Diff line change 55import java .util .Arrays ;
66import java .util .Map ;
77import java .util .Optional ;
8- import org .junit .Test ;
8+ import org .junit .jupiter . api . Test ;
99import se .bjurr .gitchangelog .api .exceptions .GitChangelogIntegrationException ;
1010import se .bjurr .gitchangelog .test .FileUtils ;
1111
You can’t perform that action at this time.
0 commit comments