nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-587 Improve Job Support - improve test coverage

This commit is contained in:
BerndBreier 2018-06-22 12:04:08 +02:00 committed by Holger Hagen
parent a64fb47aa0
commit b8138db327
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java
View File

@ -245,6 +245,10 @@ public class UpdateClassificationAccTest extends AbstractAccTest {
"TKI:000000000000000000000000000000000055", "TKI:000000000000000000000000000000000100",
"TKI:000000000000000000000000000000000101", "TKI:000000000000000000000000000000000102",
"TKI:000000000000000000000000000000000103"));
List<String> indirectlyAffectedTasks = new ArrayList<>(Arrays.asList(
"TKI:000000000000000000000000000000000000", "TKI:000000000000000000000000000000000053",
"TKI:000000000000000000000000000000000054", "TKI:000000000000000000000000000000000055"));
TaskService taskService = taskanaEngine.getTaskService();
DaysToWorkingDaysConverter converter = DaysToWorkingDaysConverter
@ -254,15 +258,17 @@ public class UpdateClassificationAccTest extends AbstractAccTest {
Task task = taskService.getTask(taskId);
assertTrue(task.getModified().isAfter(before));
assertTrue(task.getPriority() == 1000);
long calendarDays = converter.convertWorkingDaysToDays(task.getPlanned(), 15);
// the following excluded tasks are affected via attachments. The task or an attachment still has a service
// level below 15 days
// therefore, we cannot compare the due date of these tasks to an SL of 15 days.
if (!taskId.equals("TKI:000000000000000000000000000000000008")
&& !taskId.equals("TKI:000000000000000000000000000000000000")
&& !taskId.equals("TKI:000000000000000000000000000000000053")
&& !taskId.equals("TKI:000000000000000000000000000000000054")
&& !taskId.equals("TKI:000000000000000000000000000000000055")) {
if (taskId.equals("TKI:000000000000000000000000000000000008")) {
long calendarDays = converter.convertWorkingDaysToDays(task.getPlanned(), 8);
assertTrue(task.getDue().equals(task.getPlanned().plus(Duration.ofDays(calendarDays))));
} else if (indirectlyAffectedTasks.contains(taskId)) {
long calendarDays = converter.convertWorkingDaysToDays(task.getPlanned(), 1);
assertTrue(task.getDue().equals(task.getPlanned().plus(Duration.ofDays(calendarDays))));
} else {
long calendarDays = converter.convertWorkingDaysToDays(task.getPlanned(), 15);
assertTrue(task.getDue().equals(task.getPlanned().plus(Duration.ofDays(calendarDays))));
}

5
rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java
View File

@ -279,7 +279,7 @@ public class ClassificationControllerIntTest {
assertEquals(200, con.getResponseCode());
con.disconnect();
// wait taskana.jobscheduler.delay + 5 seconds to give JobScheduler a chance to run
// wait until the next trigger time + 2 seconds to give JobScheduler a chance to run
String cron = env.getProperty("taskana.jobscheduler.cron");
CronTrigger trigger = new CronTrigger(cron);
TriggerContext context = new TriggerContext() {
@ -299,7 +299,8 @@ public class ClassificationControllerIntTest {
return null;
}
};
long delay = trigger.nextExecutionTime(context).getTime() - (new Date()).getTime() + 2000;
Date now = new Date();
long delay = trigger.nextExecutionTime(context).getTime() - now.getTime() + 2000;
LOGGER.info("About to sleep for " + delay / 1000
+ " seconds to give JobScheduler a chance to process the classification change");