From 02effb36f3ec26c73082226867c1dfe9c75f62a2 Mon Sep 17 00:00:00 2001 From: Holger Hagen <19706592+holgerhagen@users.noreply.github.com> Date: Thu, 22 Feb 2018 12:50:45 +0100 Subject: [PATCH] TSK-329 (draft): method removed. Tests are not running. --- .../java/pro/taskana/WorkbasketService.java | 7 ----- .../taskana/impl/WorkbasketServiceImpl.java | 21 -------------- .../pro/taskana/mappings/QueryMapper.java | 10 ++++--- .../workbasket/CreateWorkbasketAccTest.java | 29 +++++++++++++++---- ...orkbasketServiceImplIntAutocommitTest.java | 17 ++--------- .../WorkbasketServiceImplIntExplicitTest.java | 21 ++------------ 6 files changed, 33 insertions(+), 72 deletions(-) diff --git a/lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java index 0373969f0..e03387450 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java +++ b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java @@ -44,13 +44,6 @@ public interface WorkbasketService { Workbasket getWorkbasket(String workbasketKey, String domain) throws WorkbasketNotFoundException, NotAuthorizedException; - /** - * Get all available Workbaskets without checking any permission. - * - * @return a list containing all Workbasket Summaries - */ - List getWorkbaskets(); - /** * Create a new Workbasket. * diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java index 72abc83d0..6040646da 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java @@ -124,27 +124,6 @@ public class WorkbasketServiceImpl implements WorkbasketService { } } - @Override - public List getWorkbaskets() { - LOGGER.debug("entry to getWorkbaskets()"); - List workbaskets = new ArrayList<>(); - try { - taskanaEngine.openConnection(); - List workbasketImpls = workbasketMapper.findAll(); - for (WorkbasketSummaryImpl workbasketSummaryImpl : workbasketImpls) { - workbaskets.add(workbasketSummaryImpl); - } - return workbaskets; - } finally { - taskanaEngine.returnConnection(); - if (LOGGER.isDebugEnabled()) { - int numberOfResultObjects = workbaskets.size(); - LOGGER.debug("exit from getWorkbaskets(). Returning {} resulting Objects: {} ", numberOfResultObjects, - LoggerUtils.listToString(workbaskets)); - } - } - } - @Override public Workbasket createWorkbasket(Workbasket newWorkbasket) throws InvalidWorkbasketException { diff --git a/lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java b/lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java index 871d965b0..a4e2064e6 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java @@ -199,7 +199,8 @@ public interface QueryMapper { @Select("") @@ -419,7 +420,8 @@ public interface QueryMapper { @Select("") Long countQueryWorkbaskets(WorkbasketQueryImpl workbasketQuery); diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java index bfc53a5b5..a72eaf36f 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java @@ -1,15 +1,17 @@ package acceptance.workbasket; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import java.sql.SQLException; -import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import acceptance.AbstractAccTest; import pro.taskana.Workbasket; +import pro.taskana.WorkbasketAccessItem; import pro.taskana.WorkbasketService; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.InvalidWorkbasketException; @@ -17,9 +19,10 @@ import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.WorkbasketType; import pro.taskana.security.JAASRunner; +import pro.taskana.security.WithAccessId; /** - * Acceptance test for all "get workbasket" scenarios. + * Acceptance test for all "create workbasket" scenarios. */ @RunWith(JAASRunner.class) public class CreateWorkbasketAccTest extends AbstractAccTest { @@ -28,19 +31,33 @@ public class CreateWorkbasketAccTest extends AbstractAccTest { super(); } + @WithAccessId( + userName = "user_1_2", + groupNames = {"group_1"}) @Test public void testCreateWorkbasket() throws SQLException, NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException, InvalidWorkbasketException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); + int before = workbasketService.createWorkbasketQuery().domainIn("DOMAIN_A").list().size(); - int before = workbasketService.getWorkbaskets().size(); - Workbasket workbasket = workbasketService.newWorkbasket("key", "novatec"); + Workbasket workbasket = workbasketService.newWorkbasket("NT1234", "DOMAIN_A"); workbasket.setName("Megabasket"); workbasket.setType(WorkbasketType.GROUP); workbasket.setOrgLevel1("company"); - workbasketService.createWorkbasket(workbasket); - Assert.assertEquals(before + 1, workbasketService.getWorkbaskets().size()); + workbasket = workbasketService.createWorkbasket(workbasket); + WorkbasketAccessItem wbai = workbasketService.newWorkbasketAccessItem(workbasket.getId(), "user_1_2"); + wbai.setPermRead(true); + workbasketService.createWorkbasketAuthorization(wbai); + + int after = workbasketService.createWorkbasketQuery().domainIn("DOMAIN_A").list().size(); + assertEquals(before + 1, after); + Workbasket createdWorkbasket = workbasketService.getWorkbasket("NT1234", "DOMAIN_A"); + assertNotNull(createdWorkbasket); + assertNotNull(createdWorkbasket.getId()); + Workbasket createdWorkbasket2 = workbasketService.getWorkbasket(createdWorkbasket.getId()); + assertNotNull(createdWorkbasket); + assertEquals(createdWorkbasket, createdWorkbasket2); } @Test diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntAutocommitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntAutocommitTest.java index f61bf24bb..cc68bf9e0 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntAutocommitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntAutocommitTest.java @@ -91,23 +91,10 @@ public class WorkbasketServiceImplIntAutocommitTest { now = Instant.now(); } - @Test - public void testInsertWorkbasket() - throws NotAuthorizedException, InvalidWorkbasketException, WorkbasketNotFoundException { - int before = workBasketService.getWorkbaskets().size(); - WorkbasketImpl workbasket = (WorkbasketImpl) workBasketService.newWorkbasket("key", "novatec"); - String id1 = IdGenerator.generateWithPrefix("TWB"); - workbasket.setId(id1); - workbasket.setName("Megabasket"); - workbasket.setType(WorkbasketType.GROUP); - workBasketService.createWorkbasket(workbasket); - Assert.assertEquals(before + 1, workBasketService.getWorkbaskets().size()); - } - @Test public void testSelectAllWorkbaskets() throws NotAuthorizedException, InvalidWorkbasketException, WorkbasketNotFoundException { - int before = workBasketService.getWorkbaskets().size(); + int before = workBasketService.createWorkbasketQuery().list().size(); WorkbasketImpl workbasket0 = (WorkbasketImpl) workBasketService.newWorkbasket("key0", "novatec"); String id0 = IdGenerator.generateWithPrefix("TWB"); workbasket0.setId(id0); @@ -126,7 +113,7 @@ public class WorkbasketServiceImplIntAutocommitTest { workbasket2.setName("Hyperbasket"); workbasket2.setType(WorkbasketType.GROUP); workBasketService.createWorkbasket(workbasket2); - Assert.assertEquals(before + THREE, workBasketService.getWorkbaskets().size()); + Assert.assertEquals(before + THREE, workBasketService.createWorkbasketQuery().list().size()); } @WithAccessId(userName = "Elena") diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntExplicitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntExplicitTest.java index 2a7865033..d693b8829 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntExplicitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntExplicitTest.java @@ -74,30 +74,13 @@ public class WorkbasketServiceImplIntExplicitTest { cleaner.clearDb(dataSource, false); } - @Test - public void testInsertWorkbasket() - throws NotAuthorizedException, SQLException, InvalidWorkbasketException, WorkbasketNotFoundException { - Connection connection = dataSource.getConnection(); - taskanaEngineImpl.setConnection(connection); - workBasketService = taskanaEngine.getWorkbasketService(); - int before = workBasketService.getWorkbaskets().size(); - WorkbasketImpl workbasket = (WorkbasketImpl) workBasketService.newWorkbasket("key", "novatec"); - String id1 = IdGenerator.generateWithPrefix("TWB"); - workbasket.setId(id1); - workbasket.setName("Megabasket"); - workbasket.setType(WorkbasketType.GROUP); - workBasketService.createWorkbasket(workbasket); - Assert.assertEquals(before + 1, workBasketService.getWorkbaskets().size()); - taskanaEngineImpl.closeConnection(); - } - @Test public void testSelectAllWorkbaskets() throws NotAuthorizedException, SQLException, InvalidWorkbasketException, WorkbasketNotFoundException { Connection connection = dataSource.getConnection(); taskanaEngineImpl.setConnection(connection); workBasketService = taskanaEngine.getWorkbasketService(); - int before = workBasketService.getWorkbaskets().size(); + int before = workBasketService.createWorkbasketQuery().list().size(); WorkbasketImpl workbasket0 = (WorkbasketImpl) workBasketService.newWorkbasket("key0", "novatec"); String id0 = IdGenerator.generateWithPrefix("TWB"); workbasket0.setId(id0); @@ -116,7 +99,7 @@ public class WorkbasketServiceImplIntExplicitTest { workbasket2.setName("Hyperbasket"); workbasket2.setType(WorkbasketType.GROUP); workBasketService.createWorkbasket(workbasket2); - Assert.assertEquals(before + THREE, workBasketService.getWorkbaskets().size()); + Assert.assertEquals(before + THREE, workBasketService.createWorkbasketQuery().list().size()); connection.commit(); taskanaEngineImpl.closeConnection(); }