Skip to content

Commit 36967eb

Browse files
adupratbitwiseman
aduprat
authored and
bitwiseman
committed
Switch to Java 8
1 parent e452a90 commit 36967eb

File tree

5 files changed

+58
-21
lines changed

5 files changed

+58
-21
lines changed

‎src/test/java/org/jenkinsci/plugins/ghprb/GhprbIT.java‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import hudson.model.ParameterValue;
77
import hudson.model.Run;
88
import net.sf.json.JSONObject;
9-
import org.joda.time.DateTime;
109
import org.junit.Before;
1110
import org.junit.Rule;
1211
import org.junit.Test;
@@ -20,7 +19,11 @@
2019
import org.mockito.Mockito;
2120
import org.mockito.runners.MockitoJUnitRunner;
2221

22+
import java.time.ZoneOffset;
23+
import java.time.ZonedDateTime;
24+
import java.time.temporal.ChronoUnit;
2325
import java.util.ArrayList;
26+
import java.util.Date;
2427
import java.util.List;
2528
import java.util.Map;
2629

@@ -89,12 +92,17 @@ public void shouldBuildTriggersOnUpdatingNewCommitsPR() throws Exception {
8992
@Test
9093
public void shouldBuildTriggersOnUpdatingRetestMessagePR() throws Exception {
9194
// GIVEN
92-
given(ghPullRequest.getCreatedAt()).willReturn(new DateTime().toDate());
95+
given(ghPullRequest.getCreatedAt()).willReturn(Date.from(
96+
ZonedDateTime.now(ZoneOffset.UTC)
97+
.toInstant()));
9398
GhprbTestUtil.triggerRunAndWait(10, trigger, project);
9499
assertThat(project.getBuilds().toArray().length).isEqualTo(1);
95100

96101
given(comment.getBody()).willReturn("retest this please");
97-
given(comment.getUpdatedAt()).willReturn(new DateTime().plusDays(1).toDate());
102+
given(comment.getUpdatedAt()).willReturn(Date.from(
103+
ZonedDateTime.now(ZoneOffset.UTC)
104+
.plus(1, ChronoUnit.DAYS)
105+
.toInstant()));
98106
given(comment.getUser()).willReturn(ghUser);
99107

100108
given(ghPullRequest.getComments()).willReturn(newArrayList(comment));
@@ -111,7 +119,10 @@ public void shouldNotBuildDisabledBuild() throws Exception {
111119
given(commitPointer.getSha()).willReturn("sha");
112120

113121
given(comment.getBody()).willReturn("retest this please");
114-
given(comment.getUpdatedAt()).willReturn(new DateTime().plusDays(1).toDate());
122+
given(comment.getUpdatedAt()).willReturn(Date.from(
123+
ZonedDateTime.now(ZoneOffset.UTC)
124+
.plus(1, ChronoUnit.DAYS)
125+
.toInstant()));
115126
given(comment.getUser()).willReturn(ghUser);
116127
given(ghPullRequest.getComments()).willReturn(newArrayList(comment));
117128
given(ghPullRequest.getNumber()).willReturn(5);

‎src/test/java/org/jenkinsci/plugins/ghprb/GhprbITBaseTestCase.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import hudson.model.Run;
66
import hudson.model.TaskListener;
77
import hudson.plugins.git.GitSCM;
8-
import org.joda.time.DateTime;
98
import org.kohsuke.github.GHCommitPointer;
109
import org.kohsuke.github.GHIssueState;
1110
import org.kohsuke.github.GHPullRequest;
@@ -16,6 +15,9 @@
1615
import org.mockito.Mock;
1716
import org.mockito.Mockito;
1817

18+
import java.time.ZoneOffset;
19+
import java.time.ZonedDateTime;
20+
import java.time.temporal.ChronoUnit;
1921
import java.util.Map;
2022

2123
import static com.google.common.collect.Lists.newArrayList;
@@ -79,7 +81,11 @@ protected void beforeTest(
7981

8082
given(ghRepository.getName()).willReturn("dropwizard");
8183

82-
GhprbTestUtil.mockPR(ghPullRequest, commitPointer, new DateTime(), new DateTime().plusDays(1));
84+
GhprbTestUtil.mockPR(ghPullRequest,
85+
commitPointer,
86+
ZonedDateTime.now(ZoneOffset.UTC),
87+
ZonedDateTime.now(ZoneOffset.UTC)
88+
.plus(1, ChronoUnit.DAYS));
8389

8490
given(ghRepository.getPullRequests(eq(GHIssueState.OPEN)))
8591
.willReturn(newArrayList(ghPullRequest))

‎src/test/java/org/jenkinsci/plugins/ghprb/GhprbRepositoryTest.java‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.apache.commons.codec.binary.Hex;
1010
import org.fest.util.Collections;
1111
import org.jenkinsci.plugins.ghprb.extensions.status.GhprbSimpleStatus;
12-
import org.joda.time.DateTime;
1312
import org.junit.Assert;
1413
import org.junit.Before;
1514
import org.junit.Rule;
@@ -38,6 +37,9 @@
3837
import java.io.IOException;
3938
import java.net.URL;
4039
import java.net.URLEncoder;
40+
import java.time.ZoneOffset;
41+
import java.time.ZonedDateTime;
42+
import java.time.temporal.ChronoUnit;
4143
import java.util.ArrayList;
4244
import java.util.Arrays;
4345
import java.util.Date;
@@ -519,8 +521,14 @@ public void testCheckMethodWhenPrWasUpdatedWithNonKeyPhrase() throws Exception {
519521
mockCommitList();
520522
GhprbBuilds builds = mockBuilds();
521523

522-
Date later = new DateTime().plusHours(3).toDate();
523-
Date tomorrow = new DateTime().plusDays(1).toDate();
524+
Date later = Date.from(
525+
ZonedDateTime.now(ZoneOffset.UTC)
526+
.plus(3, ChronoUnit.HOURS)
527+
.toInstant());
528+
Date tomorrow = Date.from(
529+
ZonedDateTime.now(ZoneOffset.UTC)
530+
.plus(1, ChronoUnit.DAYS)
531+
.toInstant());
524532

525533

526534
given(ghRepository.getPullRequests(eq(GHIssueState.OPEN))).willReturn(ghPullRequests);
@@ -616,8 +624,13 @@ private List<GHPullRequest> createListWithMockPR() throws IOException {
616624
public void testCheckMethodWhenPrWasUpdatedWithRetestPhrase() throws Exception {
617625
// GIVEN
618626
List<GHPullRequest> ghPullRequests = createListWithMockPR();
619-
Date now = new Date();
620-
Date tomorrow = new DateTime().plusDays(1).toDate();
627+
Date now = Date.from(
628+
ZonedDateTime.now(ZoneOffset.UTC)
629+
.toInstant());
630+
Date tomorrow = Date.from(
631+
ZonedDateTime.now(ZoneOffset.UTC)
632+
.plus(1, ChronoUnit.DAYS)
633+
.toInstant());
621634

622635
mockHeadAndBase();
623636
mockCommitList();

‎src/test/java/org/jenkinsci/plugins/ghprb/GhprbRootActionTest.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.coravy.hudson.plugins.github.GithubProjectProperty;
44
import hudson.model.FreeStyleProject;
55
import hudson.plugins.git.GitSCM;
6-
import org.joda.time.DateTime;
76
import org.junit.Before;
87
import org.junit.Rule;
98
import org.junit.Test;
@@ -28,6 +27,9 @@
2827
import java.io.Reader;
2928
import java.io.StringReader;
3029
import java.net.URLEncoder;
30+
import java.time.ZoneOffset;
31+
import java.time.ZonedDateTime;
32+
import java.time.temporal.ChronoUnit;
3133

3234
import static com.google.common.collect.Lists.newArrayList;
3335
import static org.fest.assertions.Assertions.assertThat;
@@ -79,7 +81,11 @@ public void setup() throws Exception {
7981
given(commitPointer.getRef()).willReturn("ref");
8082
given(ghRepository.getName()).willReturn("dropwizard");
8183

82-
GhprbTestUtil.mockPR(ghPullRequest, commitPointer, new DateTime(), new DateTime().plusDays(1));
84+
GhprbTestUtil.mockPR(ghPullRequest,
85+
commitPointer,
86+
ZonedDateTime.now(ZoneOffset.UTC),
87+
ZonedDateTime.now(ZoneOffset.UTC)
88+
.plus(1, ChronoUnit.DAYS));
8389

8490
given(ghRepository.getPullRequests(eq(OPEN))).willReturn(newArrayList(ghPullRequest)).willReturn(newArrayList(ghPullRequest));
8591

‎src/test/java/org/jenkinsci/plugins/ghprb/GhprbTestUtil.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import hudson.plugins.git.UserRemoteConfig;
2121
import net.sf.json.JSONObject;
2222
import org.apache.commons.lang.StringUtils;
23-
import org.joda.time.DateTime;
2423
import org.kohsuke.github.GHCommitPointer;
2524
import org.kohsuke.github.GHPullRequest;
2625
import org.kohsuke.github.GHRateLimit;
@@ -39,7 +38,9 @@
3938
import java.lang.reflect.Method;
4039
import java.lang.reflect.Modifier;
4140
import java.net.URL;
41+
import java.time.ZonedDateTime;
4242
import java.util.ArrayList;
43+
import java.util.Date;
4344
import java.util.HashMap;
4445
import java.util.List;
4546
import java.util.Map;
@@ -253,7 +254,7 @@ public static void mockCommitList(GHPullRequest ghPullRequest) {
253254
Mockito.when(itr.hasNext()).thenReturn(false);
254255
}
255256

256-
public static void mockPR(GHPullRequest prToMock, GHCommitPointer commitPointer, DateTime... updatedDate) throws Exception {
257+
public static void mockPR(GHPullRequest prToMock, GHCommitPointer commitPointer, ZonedDateTime... updatedDate) throws Exception {
257258

258259
given(prToMock.getHead()).willReturn(commitPointer);
259260
given(prToMock.getBase()).willReturn(commitPointer);
@@ -262,13 +263,13 @@ public static void mockPR(GHPullRequest prToMock, GHCommitPointer commitPointer,
262263

263264
if (updatedDate.length > 1) {
264265
given(prToMock.getUpdatedAt())
265-
.willReturn(updatedDate[0].toDate())
266-
.willReturn(updatedDate[0].toDate())
267-
.willReturn(updatedDate[1].toDate())
268-
.willReturn(updatedDate[1].toDate())
269-
.willReturn(updatedDate[1].toDate());
266+
.willReturn(Date.from(updatedDate[0].toInstant()))
267+
.willReturn(Date.from(updatedDate[0].toInstant()))
268+
.willReturn(Date.from(updatedDate[1].toInstant()))
269+
.willReturn(Date.from(updatedDate[1].toInstant()))
270+
.willReturn(Date.from(updatedDate[1].toInstant()));
270271
} else {
271-
given(prToMock.getUpdatedAt()).willReturn(updatedDate[0].toDate());
272+
given(prToMock.getUpdatedAt()).willReturn(Date.from(updatedDate[0].toInstant()));
272273
}
273274
}
274275

0 commit comments

Comments
 (0)