Skip to content

Commit f0f3594

Browse files
test fixes
1 parent 3fb7444 commit f0f3594

5 files changed

Lines changed: 24 additions & 13 deletions

File tree

modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/runtime/CaseInstanceDueDateAndClaimTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import static org.assertj.core.api.Assertions.assertThat;
1616
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1717

18+
import java.time.Instant;
19+
import java.time.temporal.ChronoUnit;
1820
import java.util.Date;
1921
import java.util.List;
2022

@@ -40,7 +42,7 @@ public void testSetCaseInstanceDueDate() {
4042
.caseDefinitionKey("oneTaskCase")
4143
.start();
4244

43-
Date dueDate = new Date();
45+
Date dueDate = Date.from(Instant.now().truncatedTo(ChronoUnit.SECONDS));
4446
cmmnRuntimeService.setCaseInstanceDueDate(caseInstance.getId(), dueDate);
4547

4648
CaseInstance updatedInstance = cmmnRuntimeService.createCaseInstanceQuery()
@@ -61,7 +63,7 @@ public void testSetCaseInstanceDueDateToNull() {
6163
.caseDefinitionKey("oneTaskCase")
6264
.start();
6365

64-
cmmnRuntimeService.setCaseInstanceDueDate(caseInstance.getId(), new Date());
66+
cmmnRuntimeService.setCaseInstanceDueDate(caseInstance.getId(), Date.from(Instant.now().truncatedTo(ChronoUnit.SECONDS)));
6567

6668
CaseInstance updatedInstance = cmmnRuntimeService.createCaseInstanceQuery()
6769
.caseInstanceId(caseInstance.getId()).singleResult();

modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/runtime/CaseInstanceUpdateBuilderTest.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import static org.assertj.core.api.Assertions.assertThat;
1616
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1717

18+
import java.time.Instant;
19+
import java.time.temporal.ChronoUnit;
1820
import java.util.Date;
1921

2022
import org.flowable.cmmn.api.history.HistoricCaseInstance;
@@ -98,7 +100,7 @@ public void testUpdateDueDate() {
98100
.caseDefinitionKey("oneTaskCase")
99101
.start();
100102

101-
Date dueDate = new Date();
103+
Date dueDate = Date.from(Instant.now().truncatedTo(ChronoUnit.SECONDS));
102104
cmmnRuntimeService.createCaseInstanceUpdateBuilder(caseInstance.getId())
103105
.dueDate(dueDate)
104106
.update();
@@ -122,7 +124,7 @@ public void testUpdateDueDateToNull() {
122124
.start();
123125

124126
cmmnRuntimeService.createCaseInstanceUpdateBuilder(caseInstance.getId())
125-
.dueDate(new Date())
127+
.dueDate(Date.from(Instant.now().truncatedTo(ChronoUnit.SECONDS)))
126128
.update();
127129

128130
CaseInstance updatedInstance = cmmnRuntimeService.createCaseInstanceQuery()
@@ -145,7 +147,7 @@ public void testUpdateMultipleProperties() {
145147
.caseDefinitionKey("oneTaskCase")
146148
.start();
147149

148-
Date dueDate = new Date();
150+
Date dueDate = Date.from(Instant.now().truncatedTo(ChronoUnit.SECONDS));
149151
cmmnRuntimeService.createCaseInstanceUpdateBuilder(caseInstance.getId())
150152
.businessKey("myKey")
151153
.businessStatus("myStatus")
@@ -180,7 +182,7 @@ public void testUpdateOnlyDueDateLeavesOtherFieldsUnchanged() {
180182
.name("Original name")
181183
.start();
182184

183-
Date dueDate = new Date();
185+
Date dueDate = Date.from(Instant.now().truncatedTo(ChronoUnit.SECONDS));
184186
cmmnRuntimeService.createCaseInstanceUpdateBuilder(caseInstance.getId())
185187
.dueDate(dueDate)
186188
.update();

modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Execution.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,10 @@
147147
#{execution.referenceId, jdbcType=NVARCHAR},
148148
#{execution.referenceType, jdbcType=NVARCHAR},
149149
#{execution.propagatedStageInstanceId, jdbcType=NVARCHAR},
150-
#{execution.businessStatus, jdbcType=NVARCHAR}
150+
#{execution.businessStatus, jdbcType=NVARCHAR},
151+
#{execution.dueDate, jdbcType=TIMESTAMP},
152+
#{execution.claimTime, jdbcType=TIMESTAMP},
153+
#{execution.claimedBy, jdbcType=NVARCHAR}
151154
)
152155
</foreach>
153156
SELECT * FROM dual

modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/ProcessInstanceDueDateAndClaimTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import static org.assertj.core.api.Assertions.assertThat;
1616
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1717

18+
import java.time.Instant;
19+
import java.time.temporal.ChronoUnit;
1820
import java.util.Date;
1921
import java.util.List;
2022

@@ -38,7 +40,7 @@ public class ProcessInstanceDueDateAndClaimTest extends PluggableFlowableTestCas
3840
public void testSetProcessInstanceDueDate() {
3941
ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("oneTaskProcess");
4042

41-
Date dueDate = new Date();
43+
Date dueDate = Date.from(Instant.now().truncatedTo(ChronoUnit.SECONDS));
4244
runtimeService.setProcessInstanceDueDate(processInstance.getId(), dueDate);
4345

4446
ProcessInstance updatedInstance = runtimeService.createProcessInstanceQuery()
@@ -57,7 +59,7 @@ public void testSetProcessInstanceDueDate() {
5759
public void testSetProcessInstanceDueDateToNull() {
5860
ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("oneTaskProcess");
5961

60-
runtimeService.setProcessInstanceDueDate(processInstance.getId(), new Date());
62+
runtimeService.setProcessInstanceDueDate(processInstance.getId(), Date.from(Instant.now().truncatedTo(ChronoUnit.SECONDS)));
6163

6264
ProcessInstance updatedInstance = runtimeService.createProcessInstanceQuery()
6365
.processInstanceId(processInstance.getId()).singleResult();

modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/ProcessInstanceUpdateBuilderTest.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import static org.assertj.core.api.Assertions.assertThat;
1616
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1717

18+
import java.time.Instant;
19+
import java.time.temporal.ChronoUnit;
1820
import java.util.Date;
1921

2022
import org.flowable.common.engine.api.FlowableIllegalArgumentException;
@@ -89,7 +91,7 @@ public void testUpdateName() {
8991
public void testUpdateDueDate() {
9092
ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("oneTaskProcess");
9193

92-
Date dueDate = new Date();
94+
Date dueDate = Date.from(Instant.now().truncatedTo(ChronoUnit.SECONDS));
9395
runtimeService.createProcessInstanceUpdateBuilder(processInstance.getId())
9496
.dueDate(dueDate)
9597
.update();
@@ -111,7 +113,7 @@ public void testUpdateDueDateToNull() {
111113
ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("oneTaskProcess");
112114

113115
runtimeService.createProcessInstanceUpdateBuilder(processInstance.getId())
114-
.dueDate(new Date())
116+
.dueDate(Date.from(Instant.now().truncatedTo(ChronoUnit.SECONDS)))
115117
.update();
116118

117119
ProcessInstance updatedInstance = runtimeService.createProcessInstanceQuery()
@@ -132,7 +134,7 @@ public void testUpdateDueDateToNull() {
132134
public void testUpdateMultipleProperties() {
133135
ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("oneTaskProcess");
134136

135-
Date dueDate = new Date();
137+
Date dueDate = Date.from(Instant.now().truncatedTo(ChronoUnit.SECONDS));
136138
runtimeService.createProcessInstanceUpdateBuilder(processInstance.getId())
137139
.businessKey("myKey")
138140
.businessStatus("myStatus")
@@ -167,7 +169,7 @@ public void testUpdateOnlyDueDateLeavesOtherFieldsUnchanged() {
167169
.name("Original name")
168170
.start();
169171

170-
Date dueDate = new Date();
172+
Date dueDate = Date.from(Instant.now().truncatedTo(ChronoUnit.SECONDS));
171173
runtimeService.createProcessInstanceUpdateBuilder(processInstance.getId())
172174
.dueDate(dueDate)
173175
.update();

0 commit comments

Comments
 (0)