Skip to content

Make DST-sensitive and timing-sensitive tests robust #4325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
360608 wants to merge 1 commit into from
Closed

Make DST-sensitive and timing-sensitive tests robust #4325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions ...ble-cmmn-engine-configurator/src/test/java/org/flowable/cmmn/test/TypeConversionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
import static org.assertj.core.api.Assertions.assertThat;

import java.time.Duration;
import java.time.Instant;
import java.time.LocalDate;
import java.time.Period;
import java.time.ZoneId;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -82,8 +85,10 @@ public void testProcessTaskTypeConversion() {
Date now = new Date();
Object periodToDate = processEngine.getRuntimeService().getVariable(processInstance.getId(), "periodToDate");
assertThat(periodToDate).isInstanceOf(Date.class);
assertThat(Duration.between(now.toInstant(), ((Date) periodToDate).toInstant()))
.isBetween(Duration.ofDays(9).plusHours(23), Duration.ofDays(10).plusMinutes(1));
// A period is added in calendar days, so across a DST change it is not exactly 240 hours
Instant expectedPeriodEnd = now.toInstant().atZone(ZoneId.systemDefault()).plus(Period.ofDays(10)).toInstant();
assertThat(Duration.between(expectedPeriodEnd, ((Date) periodToDate).toInstant()))
.isBetween(Duration.ofMinutes(-1), Duration.ofMinutes(1));

Object durationToLocalDate = processEngine.getRuntimeService().getVariable(processInstance.getId(), "durationToLocalDate");
assertThat(durationToLocalDate).isInstanceOf(LocalDate.class);
Expand Down Expand Up @@ -143,8 +148,10 @@ public void testCaseTaskTypeConversion() {
Date now = new Date();
Object periodToDate = cmmnRuntimeService.getVariable(childCaseInstance.getId(), "periodToDate");
assertThat(periodToDate).isInstanceOf(Date.class);
assertThat(Duration.between(now.toInstant(), ((Date) periodToDate).toInstant()))
.isBetween(Duration.ofDays(9).plusHours(23), Duration.ofDays(10).plusMinutes(1));
// A period is added in calendar days, so across a DST change it is not exactly 240 hours
Instant expectedPeriodEnd = now.toInstant().atZone(ZoneId.systemDefault()).plus(Period.ofDays(10)).toInstant();
assertThat(Duration.between(expectedPeriodEnd, ((Date) periodToDate).toInstant()))
.isBetween(Duration.ofMinutes(-1), Duration.ofMinutes(1));

Object durationToLocalDate = cmmnRuntimeService.getVariable(childCaseInstance.getId(), "durationToLocalDate");
assertThat(durationToLocalDate).isInstanceOf(LocalDate.class);
Expand Down
7 changes: 5 additions & 2 deletions .../test/java/org/flowable/engine/test/bpmn/callactivity/CallActivityTypeConversionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.time.Duration;
import java.time.Instant;
import java.time.LocalDate;
import java.time.Period;
import java.time.ZoneId;
import java.util.Date;
import java.util.HashMap;
Expand Down Expand Up @@ -148,8 +149,10 @@ public void testInParameterTypeConversion() {
Date now = new Date();
Object periodToDate = runtimeService.getVariable(childProcessInstance.getId(), "periodToDate");
assertThat(periodToDate).isInstanceOf(Date.class);
assertThat(Duration.between(now.toInstant(), ((Date) periodToDate).toInstant()))
.isBetween(Duration.ofDays(9).plusHours(23), Duration.ofDays(10).plusMinutes(1));
// A period is added in calendar days, so across a DST change it is not exactly 240 hours
Instant expectedPeriodEnd = now.toInstant().atZone(ZoneId.systemDefault()).plus(Period.ofDays(10)).toInstant();
assertThat(Duration.between(expectedPeriodEnd, ((Date) periodToDate).toInstant()))
.isBetween(Duration.ofMinutes(-1), Duration.ofMinutes(1));

Object durationToDate = runtimeService.getVariable(childProcessInstance.getId(), "durationToDate");
assertThat(durationToDate).isInstanceOf(Date.class);
Expand Down
6 changes: 3 additions & 3 deletions ...ngine/src/test/java/org/flowable/engine/test/bpmn/event/timer/BoundaryTimerEventTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ public void testRescheduleBoundaryTimerOnUserTask() {
Job timerJob = managementService.createTimerJobQuery().processInstanceId(processInstance.getId()).singleResult();
assertThat(timerJob).isNotNull();
long diffInMilliseconds = Math.abs(startTimeInMillis - timerJob.getDuedate().getTime());
assertThat(diffInMilliseconds).isLessThan(100);
assertThat(diffInMilliseconds).isLessThan(5000);

// reschedule timer for two hours from now
calendar = Calendar.getInstance();
Expand Down Expand Up @@ -742,7 +742,7 @@ public void testRescheduleRepeatBoundaryTimer() {
Job timerJob = managementService.createTimerJobQuery().processInstanceId(processInstance.getId()).singleResult();
assertThat(timerJob).isNotNull();
long diffInMilliseconds = Math.abs(startTimeInMillis - timerJob.getDuedate().getTime());
assertThat(diffInMilliseconds).isLessThan(100);
assertThat(diffInMilliseconds).isLessThan(5000);

// reschedule timer for two hours from now
calendar = Calendar.getInstance();
Expand Down Expand Up @@ -806,7 +806,7 @@ public void testRescheduleBoundaryTimerOnSubProcess() {
Job timerJob = managementService.createTimerJobQuery().processInstanceId(processInstance.getId()).singleResult();
assertThat(timerJob).isNotNull();
long diffInMilliseconds = Math.abs(startTimeInMillis - timerJob.getDuedate().getTime());
assertThat(diffInMilliseconds).isLessThan(100);
assertThat(diffInMilliseconds).isLessThan(5000);

// reschedule timer for two hours from now
calendar = Calendar.getInstance();
Expand Down