Skip to content

Commit e26f3e4

Browse files
committed
Revert "Blind attempt at test fix that will probably make everything worse. :-D"
This reverts commit a12f306.
1 parent a12f306 commit e26f3e4

File tree

1 file changed

+31
-26
lines changed

1 file changed

+31
-26
lines changed

server/src/test/java/com/objectcomputing/checkins/services/fixture/ReviewPeriodFixture.java

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
public interface ReviewPeriodFixture extends RepositoryFixture {
1111

1212
default ReviewPeriod createADefaultReviewPeriod() {
13-
LocalDateTime launchDate = LocalDateTime.now().plusDays(1).atStartOfDay();
14-
LocalDateTime selfReviewCloseDate = launchDate.plusDays(2);
15-
LocalDateTime closeDate = selfReviewCloseDate.plusDays(2);
16-
LocalDateTime startDate = launchDate.minusDays(31);
17-
LocalDateTime endDate = launchDate.minusDays(1);
13+
LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1)
14+
.truncatedTo(ChronoUnit.MILLIS);
15+
LocalDateTime selfReviewCloseDate = launchDate.plusDays(1);
16+
LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
17+
LocalDateTime startDate = launchDate.minusDays(30);
18+
LocalDateTime endDate = closeDate.minusDays(1);
1819
return getReviewPeriodRepository().save(
1920
new ReviewPeriod("Period of Time", ReviewStatus.OPEN, null, null,
2021
launchDate, selfReviewCloseDate, closeDate,
@@ -26,11 +27,12 @@ default ReviewPeriod createADefaultReviewPeriod(ReviewStatus reviewStatus) {
2627
}
2728

2829
default ReviewPeriod createADefaultReviewPeriod(ReviewStatus reviewStatus, UUID templateId) {
29-
LocalDateTime launchDate = LocalDateTime.now().plusDays(1).atStartOfDay();
30-
LocalDateTime selfReviewCloseDate = launchDate.plusDays(2);
31-
LocalDateTime closeDate = selfReviewCloseDate.plusDays(3);
32-
LocalDateTime startDate = launchDate.minusDays(31);
33-
LocalDateTime endDate = launchDate.minusDays(1);
30+
LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1)
31+
.truncatedTo(ChronoUnit.MILLIS);
32+
LocalDateTime selfReviewCloseDate = launchDate.plusDays(1);
33+
LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
34+
LocalDateTime startDate = launchDate.minusDays(30);
35+
LocalDateTime endDate = closeDate.minusDays(1);
3436
return getReviewPeriodRepository().save(
3537
new ReviewPeriod("Period of Time", reviewStatus, templateId, null,
3638
launchDate, selfReviewCloseDate, closeDate,
@@ -41,12 +43,12 @@ default ReviewPeriod createADefaultReviewPeriod(
4143
LocalDateTime launchDate,
4244
ReviewStatus reviewStatus,
4345
UUID templateId, UUID selfReviewTemplateId) {
44-
launchDate = launchDate.atStartOfDay();
46+
launchDate = launchDate.truncatedTo(ChronoUnit.MILLIS);
4547

46-
LocalDateTime selfReviewCloseDate = launchDate.plusDays(2);
47-
LocalDateTime closeDate = selfReviewCloseDate.plusDays(2);
48-
LocalDateTime startDate = launchDate.minusDays(31);
49-
LocalDateTime endDate = launchDate.minusDays(1);
48+
LocalDateTime selfReviewCloseDate = launchDate.plusDays(4);
49+
LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
50+
LocalDateTime startDate = launchDate.minusDays(30);
51+
LocalDateTime endDate = closeDate.minusDays(1);
5052
return getReviewPeriodRepository().save(
5153
new ReviewPeriod("Specific Launch Date", reviewStatus, templateId,
5254
selfReviewTemplateId,
@@ -55,29 +57,32 @@ default ReviewPeriod createADefaultReviewPeriod(
5557
}
5658

5759
default ReviewPeriod createASecondaryReviewPeriod() {
58-
LocalDateTime launchDate = LocalDateTime.now().plusDays(1).atStartOfDay();
59-
LocalDateTime selfReviewCloseDate = launchDate.plusDays(2);
60-
LocalDateTime closeDate = selfReviewCloseDate.plusDays(2);
61-
LocalDateTime startDate = launchDate.minusDays(31);
62-
LocalDateTime endDate = launchDate.minusDays(1);
60+
LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1)
61+
.truncatedTo(ChronoUnit.MILLIS);
62+
LocalDateTime selfReviewCloseDate = launchDate.plusDays(1);
63+
LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
64+
LocalDateTime startDate = launchDate.minusDays(30);
65+
LocalDateTime endDate = closeDate.minusDays(1);
6366
return getReviewPeriodRepository().save(
6467
new ReviewPeriod("Period of Play", ReviewStatus.OPEN, null, null,
6568
launchDate, selfReviewCloseDate, closeDate,
6669
startDate, endDate));
6770
}
6871

6972
default ReviewPeriod createAClosedReviewPeriod() {
70-
LocalDateTime launchDate = LocalDateTime.now().plusDays(1).atStartOfDay();
71-
LocalDateTime selfReviewCloseDate = launchDate.plusDays(2);
72-
LocalDateTime closeDate = selfReviewCloseDate.plusDays(2);
73-
LocalDateTime startDate = launchDate.minusDays(31);
74-
LocalDateTime endDate = launchDate.minusDays(1);
73+
LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1)
74+
.truncatedTo(ChronoUnit.MILLIS);
75+
LocalDateTime selfReviewCloseDate = launchDate.plusDays(1);
76+
LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
77+
LocalDateTime startDate = launchDate.minusDays(30);
78+
LocalDateTime endDate = closeDate.minusDays(1);
7579
return createAClosedReviewPeriod(startDate, endDate);
7680
}
7781

7882
default ReviewPeriod createAClosedReviewPeriod(
7983
LocalDateTime periodStart, LocalDateTime periodEnd) {
80-
LocalDateTime launchDate = periodEnd.plusDays(1).atStartOfDay();
84+
LocalDateTime launchDate = periodEnd.plusMinutes(1)
85+
.truncatedTo(ChronoUnit.MILLIS).plusDays(1);
8186
LocalDateTime selfReviewCloseDate = launchDate.plusDays(3);
8287
LocalDateTime closeDate = selfReviewCloseDate.plusDays(7);
8388
return getReviewPeriodRepository().save(

0 commit comments

Comments
 (0)