Skip to content
Snippets Groups Projects

Turn year 0 into 2023

Merged Turn year 0 into 2023
fix-editionstatuservice-tests into development
All threads resolved!
Merged
Cédric Willekensrequested to merge
fix-editionstatuservice-tests into development
All threads resolved!
Compare
and
2 files
+ 30
− 23
Compare changes
  • Side-by-side
  • Inline

Files

src/test/java/nl/tudelft/queue/service/EditionStatusServiceTest.java
+ 14
− 13
@@ -135,8 +135,8 @@ public class EditionStatusServiceTest {
new RoomDetailsDTO().id(32L).name("R1")
};
private SessionDetailsDTO[] sessions = {
new SessionDetailsDTO().id(34L).start(LocalDateTime.of(0, 1, 1, 0, 0, 0))
.endTime(LocalDateTime.of(0, 1, 1, 0, 0, 2))
new SessionDetailsDTO().id(34L).start(LocalDateTime.of(2023, 1, 1, 0, 0, 0))
.endTime(LocalDateTime.of(2023, 1, 1, 0, 0, 2))
};
@BeforeEach
@@ -181,7 +181,8 @@ public class EditionStatusServiceTest {
.build());
timeSlot = new TimeSlot();
timeSlot.setSlot(new Slot(LocalDateTime.of(0, 1, 1, 0, 0, 6), LocalDateTime.of(0, 1, 1, 0, 2, 10)));
timeSlot.setSlot(new Slot(LocalDateTime.of(2023, 1, 1, 0, 0, 6), LocalDateTime.of(2023, 1,
1, 0, 2, 10)));
timeSlot.setLab(slottedLab);
timeSlot.setCapacity(10);
timeSlot.setRequests(new HashSet<>());
@@ -203,7 +204,7 @@ public class EditionStatusServiceTest {
.room(32L).assignment(32L).studentGroup(32L).requester(32L).comment("Hello")
.session(lab)
.requestType(RequestType.QUESTION)
.createdAt(LocalDateTime.of(0, 1, 1, 0, 0, 1))
.createdAt(LocalDateTime.of(2023, 1, 1, 0, 0, 1))
.build());
request1.getEventInfo().getEvents().addAll(List.of(
new RequestCreatedEvent(request1),
@@ -217,7 +218,7 @@ public class EditionStatusServiceTest {
.room(32L).assignment(32L).studentGroup(32L).requester(32L).comment("Hello")
.requestType(RequestType.QUESTION)
.session(lab)
.createdAt(LocalDateTime.of(0, 1, 1, 0, 0, 1))
.createdAt(LocalDateTime.of(2023, 1, 1, 0, 0, 1))
.build());
request2.getEventInfo().getEvents().addAll(List.of(
new RequestCreatedEvent(request2),
@@ -234,7 +235,7 @@ public class EditionStatusServiceTest {
.room(32L).assignment(32L).studentGroup(33L).requester(32L).comment("Hello")
.requestType(RequestType.QUESTION)
.session(lab)
.createdAt(LocalDateTime.of(0, 1, 1, 0, 0, 8))
.createdAt(LocalDateTime.of(2023, 1, 1, 0, 0, 8))
.build());
request3.getEventInfo().getEvents().addAll(List.of(
new RequestCreatedEvent(request3),
@@ -248,7 +249,7 @@ public class EditionStatusServiceTest {
.requestType(RequestType.QUESTION)
.session(slottedLab)
.timeSlot(timeSlot)
.createdAt(LocalDateTime.of(0, 1, 1, 0, 0, 8))
.createdAt(LocalDateTime.of(2023, 1, 1, 0, 0, 8))
.build());
request4.getEventInfo().getEvents().addAll(List.of(
new RequestCreatedEvent(request4),
@@ -523,7 +524,7 @@ public class EditionStatusServiceTest {
@Test
void averageWaitingTimeTest() {
request1.getEventInfo().setStatus(RequestStatus.APPROVED);
request1.getEventInfo().setLastAssignedAt(LocalDateTime.of(0, 1, 1, 0, 0, 2));
request1.getEventInfo().setLastAssignedAt(LocalDateTime.of(2023, 1, 1, 0, 0, 2));
rr.save(request1);
Long result = ess.averageWaitingTime(List.of(request1));
assertThat(result).isEqualTo(1L);
@@ -533,7 +534,7 @@ public class EditionStatusServiceTest {
@Test
void averageWaitingTimeSlottedLabTest() {
request4.getEventInfo().setStatus(RequestStatus.APPROVED);
request4.getEventInfo().setLastAssignedAt(LocalDateTime.of(0, 1, 1, 0, 0, 7));
request4.getEventInfo().setLastAssignedAt(LocalDateTime.of(2023, 1, 1, 0, 0, 7));
rr.save(request4);
Long result = ess.averageWaitingTime(List.of(request4));
assertThat(result).isEqualTo(1L);
@@ -584,8 +585,8 @@ public class EditionStatusServiceTest {
buckets.add(1L);
buckets.add(2L);
buckets.add(3L);
request1.getEventInfo().setHandledAt(LocalDateTime.of(0, 1, 1, 0, 0, 1));
request2.getEventInfo().setHandledAt(LocalDateTime.of(0, 1, 1, 0, 0, 2));
request1.getEventInfo().setHandledAt(LocalDateTime.of(2023, 1, 1, 0, 0, 1));
request2.getEventInfo().setHandledAt(LocalDateTime.of(2023, 1, 1, 0, 0, 2));
rr.save(request1);
rr.save(request2);
List<Long> result = ess.countHandledRequestsInBuckets(buckets, List.of(request1, request2));
@@ -599,8 +600,8 @@ public class EditionStatusServiceTest {
buckets.add(1L);
buckets.add(2L);
buckets.add(3L);
request1.getEventInfo().setHandledAt(LocalDateTime.of(0, 1, 1, 0, 0, 2));
request2.getEventInfo().setHandledAt(LocalDateTime.of(0, 1, 1, 0, 0, 2));
request1.getEventInfo().setHandledAt(LocalDateTime.of(2023, 1, 1, 0, 0, 2));
request2.getEventInfo().setHandledAt(LocalDateTime.of(2023, 1, 1, 0, 0, 2));
rr.save(request1);
rr.save(request2);
List<Long> result = ess.countOpenRequestsInBuckets(buckets, List.of(request1, request2));