From 78745e4de1d48d777913056649e6fb8fd4f9fb6c Mon Sep 17 00:00:00 2001 From: BVier <26220150+BVier@users.noreply.github.com> Date: Wed, 18 Sep 2019 10:21:35 +0200 Subject: [PATCH] TSK-882: Insert short breaks to avoid getting the same timestamp --- .../acceptance/task/CompleteTaskAccTest.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java index aedcf7f68..70aa99e73 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java @@ -89,6 +89,7 @@ public class CompleteTaskAccTest extends AbstractAccTest { newTaskImpl.setClaimed(Instant.now()); Task createdTask = taskService.createTask(newTaskImpl); + waitAMillisecond(); Task completedTask = taskService.forceCompleteTask(createdTask.getId()); assertEquals(TaskState.COMPLETED, completedTask.getState()); @@ -115,6 +116,7 @@ public class CompleteTaskAccTest extends AbstractAccTest { newTaskImpl.setClaimed(Instant.now()); Task createdTask = taskService.createTask(newTaskImpl); + waitAMillisecond(); Task completedTask = taskService.forceCompleteTask(createdTask.getId()); assertEquals(TaskState.COMPLETED, completedTask.getState()); @@ -174,12 +176,9 @@ public class CompleteTaskAccTest extends AbstractAccTest { assertNull(createdTask.getClaimed()); Instant before = Instant.now(); + waitAMillisecond(); Task claimedTask = taskService.claim(createdTask.getId()); - try { - TimeUnit.MILLISECONDS.sleep(1); - } catch (InterruptedException e) { - e.printStackTrace(); - } + waitAMillisecond(); Instant after = Instant.now(); assertNotNull(claimedTask.getOwner()); @@ -210,6 +209,7 @@ public class CompleteTaskAccTest extends AbstractAccTest { assertNotNull(createdTask); assertEquals(createdTask.getOwner(), "other_user"); + waitAMillisecond(); Instant beforeForceClaim = Instant.now(); Task taskAfterClaim = taskService.forceClaim(createdTask.getId()); @@ -335,4 +335,11 @@ public class CompleteTaskAccTest extends AbstractAccTest { taskService.cancelClaim("TKI:000000000000000000000000000000000100"); } + private void waitAMillisecond() { + try { + TimeUnit.MILLISECONDS.sleep(1); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } }