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

TSK-521: activated query tasks by workbasket tasks and moved one tests to consolidate all corresponding tests in one class.

This commit is contained in:
Holger Hagen 2018-06-21 09:14:47 +02:00 committed by Martin Rojas Miguel Angel
parent ae23f18852
commit 766cb64621
2 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java
View File

@ -6,7 +6,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@ -19,9 +18,7 @@ import org.junit.runner.RunWith;
import acceptance.AbstractAccTest;
import pro.taskana.Attachment;
import pro.taskana.AttachmentSummary;
import pro.taskana.BaseQuery.SortDirection;
import pro.taskana.KeyDomain;
import pro.taskana.Task;
import pro.taskana.TaskQuery;
import pro.taskana.TaskService;
@ -187,32 +184,7 @@ public class QueryTasksAccTest extends AbstractAccTest {
.list();
assertThat(results.size(), equalTo(1));
assertThat(results.get(0).getAttachmentSummaries().size(), equalTo(3));
AttachmentSummary att = results.get(0).getAttachmentSummaries().get(0);
}
@WithAccessId(
userName = "teamlead_1",
groupNames = {"group_1"})
@Test
public void testQueryForWorkbasketKeyDomain() {
TaskService taskService = taskanaEngine.getTaskService();
List<KeyDomain> workbasketIdentifiers = Arrays.asList(new KeyDomain("GPK_KSC", "DOMAIN_A"),
new KeyDomain("USER_1_2", "DOMAIN_A"));
List<TaskSummary> results = taskService.createTaskQuery()
.workbasketKeyDomainIn(workbasketIdentifiers.toArray(new KeyDomain[0]))
.list();
assertThat(results.size(), equalTo(42));
String[] ids = results.stream()
.map(t -> t.getWorkbasketSummary().getId())
.collect(Collectors.toList())
.toArray(new String[0]);
List<TaskSummary> result2 = taskService.createTaskQuery()
.workbasketIdIn(ids)
.list();
assertThat(result2.size(), equalTo(42));
assertNotNull(results.get(0).getAttachmentSummaries().get(0));
}
@WithAccessId(
@ -625,18 +597,19 @@ public class QueryTasksAccTest extends AbstractAccTest {
TaskService taskService = taskanaEngine.getTaskService();
TaskQuery taskQuery = taskService.createTaskQuery();
long numberOfTasks = taskQuery.count();
Assert.assertEquals(24, numberOfTasks);
assertEquals(24, numberOfTasks);
List<TaskSummary> tasks = taskQuery
.orderByDue(SortDirection.DESCENDING)
.list();
assertEquals(24, tasks.size());
List<TaskSummary> tasksp = taskQuery
.orderByDue(SortDirection.DESCENDING)
.listPage(4, 5);
Assert.assertEquals(5, tasksp.size());
assertEquals(5, tasksp.size());
tasksp = taskQuery
.orderByDue(SortDirection.DESCENDING)
.listPage(5, 5);
Assert.assertEquals(4, tasksp.size());
assertEquals(4, tasksp.size());
}
}

36
lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java
View File

@ -1,12 +1,19 @@
package acceptance.task;
import org.junit.Ignore;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import org.junit.Test;
import org.junit.runner.RunWith;
import acceptance.AbstractAccTest;
import pro.taskana.KeyDomain;
import pro.taskana.TaskService;
import pro.taskana.TaskSummary;
import pro.taskana.exceptions.NotAuthorizedToQueryWorkbasketException;
import pro.taskana.security.JAASRunner;
import pro.taskana.security.WithAccessId;
@ -21,7 +28,31 @@ public class QueryTasksByWorkbasketAccTest extends AbstractAccTest {
super();
}
@Ignore // BB
@WithAccessId(
userName = "teamlead_1",
groupNames = {"group_1"})
@Test
public void testQueryForWorkbasketKeyDomain() {
TaskService taskService = taskanaEngine.getTaskService();
List<KeyDomain> workbasketIdentifiers = Arrays.asList(new KeyDomain("GPK_KSC", "DOMAIN_A"),
new KeyDomain("USER_1_2", "DOMAIN_A"));
List<TaskSummary> results = taskService.createTaskQuery()
.workbasketKeyDomainIn(workbasketIdentifiers.toArray(new KeyDomain[0]))
.list();
assertThat(results.size(), equalTo(42));
String[] ids = results.stream()
.map(t -> t.getWorkbasketSummary().getId())
.collect(Collectors.toList())
.toArray(new String[0]);
List<TaskSummary> result2 = taskService.createTaskQuery()
.workbasketIdIn(ids)
.list();
assertThat(result2.size(), equalTo(42));
}
@WithAccessId(
userName = "user_1_1",
groupNames = {"group_1"})
@ -33,7 +64,6 @@ public class QueryTasksByWorkbasketAccTest extends AbstractAccTest {
.list();
}
@Ignore // BB
@WithAccessId(
userName = "user_1_1",
groupNames = {"group_1"})