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

TSK-972 - comments from Benjamin

This commit is contained in:
BerndBreier 2019-12-12 11:39:07 +01:00 committed by Holger Hagen
parent 32c27e323c
commit d060a63a23
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
View File

@ -365,9 +365,7 @@ public class TaskServiceImpl implements TaskService {
@Override @Override
public Task newTask() { public Task newTask() {
TaskImpl task = new TaskImpl(); return newTask(null);
task.setCallbackState(CallbackState.NONE);
return task;
} }
@Override @Override

2
lib/taskana-core/src/main/java/pro/taskana/taskrouting/TaskRoutingProducer.java
View File

@ -71,7 +71,7 @@ public final class TaskRoutingProducer {
if (workbasketIds.isEmpty()) { if (workbasketIds.isEmpty()) {
LOGGER.error("No TaskRouter determined a workbasket for task {}.", task); LOGGER.error("No TaskRouter determined a workbasket for task {}.", task);
} else if (workbasketIds.size() > 1) { } else if (workbasketIds.size() > 1) {
LOGGER.error("The TaskRouters determined more than one workbasket for task{}", task); LOGGER.error("The TaskRouters determined more than one workbasket for task {}", task);
} else { } else {
workbasketId = workbasketIds.stream().findFirst().orElse(null); workbasketId = workbasketIds.stream().findFirst().orElse(null);
} }

21
lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java
View File

@ -1,6 +1,6 @@
package acceptance.taskrouting; package acceptance.taskrouting;
import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -25,6 +25,25 @@ import pro.taskana.security.WithAccessId;
@ExtendWith(JAASExtension.class) @ExtendWith(JAASExtension.class)
class TaskRoutingAccTest extends AbstractAccTest { class TaskRoutingAccTest extends AbstractAccTest {
@WithAccessId(userName = "admin", groupNames = {"group_1"})
@Test
void testCreateTaskWithoutWorkbasketAndVoidNewTaskMethod()
throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException,
TaskAlreadyExistException, InvalidArgumentException, TaskNotFoundException {
TaskService taskService = taskanaEngine.getTaskService();
Task newTask = taskService.newTask();
newTask.setClassificationKey("L10303");
newTask.setPrimaryObjRef(createObjectReference("COMPANY_A", "SYSTEM_A", "INSTANCE_A", "VNR", "1234567"));
final Task taskToCreate = newTask;
Assertions.assertThrows(InvalidArgumentException.class, () -> taskService.createTask(taskToCreate));
((TaskImpl) taskToCreate).setDomain("DOMAIN_C");
Assertions.assertThrows(InvalidArgumentException.class, () -> taskService.createTask(taskToCreate));
((TaskImpl) taskToCreate).setDomain("DOMAIN_B");
Task createdTask = taskService.createTask(taskToCreate);
assertEquals("WBI:100000000000000000000000000000000011", createdTask.getWorkbasketSummary().getId());
}
@WithAccessId(userName = "admin", groupNames = {"group_1"}) @WithAccessId(userName = "admin", groupNames = {"group_1"})
@Test @Test
void testCreateTaskWithNullWorkbasket() void testCreateTaskWithNullWorkbasket()