From 749751828109b48a4e5edb38e1f48b06c0d67e60 Mon Sep 17 00:00:00 2001 From: Holger Hagen <19706592+holgerhagen@users.noreply.github.com> Date: Mon, 29 Jan 2018 15:26:21 +0100 Subject: [PATCH] TSK-170: added tests for sorting by name and key ascending and descending for the WorkbasketQuery. --- .../workbasket/QueryWorkbasketAccTest.java | 58 +++++++++++++++++++ .../QueryWorkbasketByPermissionAccTest.java | 31 +++++++++- 2 files changed, 88 insertions(+), 1 deletion(-) diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java index 1e148c52c..fd0b8f137 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java @@ -6,6 +6,7 @@ import java.util.List; import org.h2.store.fs.FileUtils; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -153,4 +154,61 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public static void cleanUpClass() { FileUtils.deleteRecursive("~/data", true); } + + @Ignore + @Test + public void testQueryWorkbasketByNameStartsWithSortedByNameAscending() + throws SQLException, NotAuthorizedException, InvalidArgumentException { + WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); + List results = workbasketService.createWorkbasketQuery() + .nameLike("%Gruppenpostkorb KSC%") + // .orderByName() + // .ascending() + .list(); + Assert.assertEquals(6L, results.size()); + Assert.assertEquals("GPK_KSC", results.get(0).getKey()); + } + + @Ignore + @Test + public void testQueryWorkbasketByNameStartsWithSortedByNameDescending() + throws SQLException, NotAuthorizedException, InvalidArgumentException { + WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); + List results = workbasketService.createWorkbasketQuery() + .nameLike("%Gruppenpostkorb KSC%") + // .orderByName() + // .descending() + .list(); + Assert.assertEquals(6L, results.size()); + Assert.assertEquals("GPK_B_KSC_2", results.get(0).getKey()); + } + + @Ignore + @Test + public void testQueryWorkbasketByNameStartsWithSortedByKeyAscending() + throws SQLException, NotAuthorizedException, InvalidArgumentException { + WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); + List results = workbasketService.createWorkbasketQuery() + .nameLike("%Gruppenpostkorb KSC%") + // .orderByKey() + // .ascending() + .list(); + Assert.assertEquals(6L, results.size()); + Assert.assertEquals("GPK_B_KSC", results.get(0).getKey()); + } + + @Ignore + @Test + public void testQueryWorkbasketByNameStartsWithSortedByKeyDescending() + throws SQLException, NotAuthorizedException, InvalidArgumentException { + WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); + List results = workbasketService.createWorkbasketQuery() + .nameLike("%Gruppenpostkorb KSC%") + // .orderByKey() + // .descending() + .list(); + Assert.assertEquals(6L, results.size()); + Assert.assertEquals("GPK_KSC_2", results.get(0).getKey()); + } + } diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java index 9b40b6730..dcaed4c56 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java @@ -6,6 +6,7 @@ import java.util.List; import org.h2.store.fs.FileUtils; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -50,9 +51,37 @@ public class QueryWorkbasketByPermissionAccTest extends AbstractAccTest { Assert.assertEquals(9, results.size()); } + @Ignore + @Test + public void testQueryAllTransferTargetsForUserAndGroupSortedByNameAscending() + throws SQLException, NotAuthorizedException, InvalidArgumentException, SystemException { + WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); + List results = workbasketService.createWorkbasketQuery() + .accessIdsHavePersmission(WorkbasketAuthorization.APPEND, "user_1_1", "group_1") + // .orderByName() + // .ascending() + .list(); + Assert.assertEquals(9, results.size()); + Assert.assertEquals("GPK_B_KSC_2", results.get(0).getKey()); + } + + @Ignore + @Test + public void testQueryAllTransferTargetsForUserAndGroupSortedByNameDescending() + throws SQLException, NotAuthorizedException, InvalidArgumentException, SystemException { + WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); + List results = workbasketService.createWorkbasketQuery() + .accessIdsHavePersmission(WorkbasketAuthorization.APPEND, "user_1_1", "group_1") + // .orderByName() + // .descending() + .list(); + Assert.assertEquals(9, results.size()); + Assert.assertEquals("GPK_B_KSC_2", results.get(0).getKey()); + } + @WithAccessId( userName = "user_1_1", - groupNames = { "group_1" }) + groupNames = {"group_1"}) @Test public void testQueryAllTransferTargetsForUserAndGroupFromSubject() throws SQLException, NotAuthorizedException, InvalidArgumentException, SystemException {