From 6123639aeaede0cbaed3664bee7544cf64a74699 Mon Sep 17 00:00:00 2001 From: Benjamin Eckstein <13351939+benjamineckstein@users.noreply.github.com> Date: Tue, 10 Dec 2019 08:37:43 +0100 Subject: [PATCH] TSK-967: Cleanup merging and refactoring taskana-data --- .../task/QueryTaskByClassificationNameAccTest.java | 12 ++++++------ .../java/pro/taskana/security/JAASExtension.java | 2 +- .../main/resources/sql/test-data/classification.sql | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java index 23dffbd70..2a863279c 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java @@ -129,13 +129,13 @@ public class QueryTaskByClassificationNameAccTest extends AbstractAccTest { TaskService taskService = taskanaEngine.getTaskService(); // find Task with attachment classification names List tasks = taskService.createTaskQuery() - .attachmentClassificationNameIn("Widerruf", "Beratungsprotokoll", "Dynamikaenderung") + .attachmentClassificationNameIn("Widerruf", "Beratungsprotokoll", "Dynamikänderung") .orderByAttachmentClassificationName(SortDirection.ASCENDING) .list(); assertEquals(4, tasks.size()); // make sure that unordered query returns the same number of objects tasks = taskService.createTaskQuery() - .attachmentClassificationNameIn("Widerruf", "Beratungsprotokoll", "Dynamikaenderung") + .attachmentClassificationNameIn("Widerruf", "Beratungsprotokoll", "Dynamikänderung") .list(); assertEquals(4, tasks.size()); @@ -149,10 +149,10 @@ public class QueryTaskByClassificationNameAccTest extends AbstractAccTest { TaskService taskService = taskanaEngine.getTaskService(); TaskQuery taskQuery = taskService.createTaskQuery(); List tasks = taskQuery - .classificationNameIn("Widerruf", "Beratungsprotokoll", "Dynamikaenderung") + .classificationNameIn("Widerruf", "Beratungsprotokoll", "Dynamikänderung") .list(); long numberOfTasks = taskQuery - .classificationNameIn("Widerruf", "Beratungsprotokoll", "Dynamikaenderung") + .classificationNameIn("Widerruf", "Beratungsprotokoll", "Dynamikänderung") .count(); Assert.assertEquals(numberOfTasks, tasks.size()); @@ -166,13 +166,13 @@ public class QueryTaskByClassificationNameAccTest extends AbstractAccTest { TaskService taskService = taskanaEngine.getTaskService(); TaskQuery taskQuery = taskService.createTaskQuery(); List tasks = taskQuery - .attachmentClassificationNameIn("Widerruf", "Beratungsprotokoll", "Dynamikaenderung") + .attachmentClassificationNameIn("Widerruf", "Beratungsprotokoll", "Dynamikänderung") .list(); // we expect 4 result objects in this case, because task TKI:000000000000000000000000000000000001 has 2 attachments with different Classifications // therefore task TKI:000000000000000000000000000000000001 occurs twice in the result set Assert.assertEquals(4, tasks.size()); long numberOfTasks = taskQuery - .attachmentClassificationNameIn("Widerruf", "Beratungsprotokoll", "Dynamikaenderung") + .attachmentClassificationNameIn("Widerruf", "Beratungsprotokoll", "Dynamikänderung") .count(); Assert.assertEquals(3, numberOfTasks); // the count returns only the number of tasks that have an attachment with the specified classification name. diff --git a/lib/taskana-core/src/test/java/pro/taskana/security/JAASExtension.java b/lib/taskana-core/src/test/java/pro/taskana/security/JAASExtension.java index 942dad753..9734ca89e 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/security/JAASExtension.java +++ b/lib/taskana-core/src/test/java/pro/taskana/security/JAASExtension.java @@ -42,7 +42,7 @@ public class JAASExtension implements InvocationInterceptor { try { invocation.proceed(); - } catch (Exception e) { + } catch (Exception | Error e) { throw e; } catch (Throwable e) { throw new Exception(e); diff --git a/lib/taskana-data/src/main/resources/sql/test-data/classification.sql b/lib/taskana-data/src/main/resources/sql/test-data/classification.sql index 85c8a3d36..02e11ed84 100644 --- a/lib/taskana-data/src/main/resources/sql/test-data/classification.sql +++ b/lib/taskana-data/src/main/resources/sql/test-data/classification.sql @@ -3,7 +3,7 @@ INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000001', 'L10000', '', '', 'EXTERNAL', 'TASK', '', FALSE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'OLD-Leistungsfall', 'OLD-Leistungsfall', 999, 'P1D', '', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', ''); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000002', 'L10303', '', '', 'EXTERNAL', 'TASK', '', FALSE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Beratungsprotokoll', 'Beratungsprotokoll', 1, 'P2D', '', 'VNR,RVNR,KOLVNR, ANR', '', '', '', '', '', '', ''); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000003', 'L1050', '', '', 'EXTERNAL', 'TASK', '', FALSE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Widerruf', 'Widerruf', 1, 'P3D', '', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', ''); -INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000004', 'L11010', '', '', 'EXTERNAL', 'TASK', '', FALSE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Dynamikaenderung', 'Dynamikaenderung', 7, 'P4D', '', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', ''); +INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000004', 'L11010', '', '', 'EXTERNAL', 'TASK', '', FALSE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Dynamikänderung', 'Dynamikänderung', 7, 'P4D', '', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', ''); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000005', 'L110102', 'CLI:000000000000000000000000000000000004', 'L11010', 'EXTERNAL', 'TASK', '', FALSE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Dynamik-Ablehnung', 'Dynamik-Ablehnung', 5, 'P5D', '', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', ''); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000006', 'L110105', 'CLI:000000000000000000000000000000000004', 'L11010', 'EXTERNAL', 'TASK', '', FALSE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Dynamik-Ausschluss', 'Dynamik-Ausschluss', 5, 'P5D', '', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', ''); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000007', 'L110107', 'CLI:000000000000000000000000000000000004', 'L11010', 'EXTERNAL', 'TASK', '', FALSE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Dynamik-Einschluss/Änd.', 'Dynamik-Einschluss/Änd.', 5, 'P6D', '', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', ''); @@ -23,7 +23,7 @@ INSERT INTO CLASSIFICATION VALUES('CLI:300000000000000000000000000000000017', 'L -- DOMAIN_A CLASSIFICATIONS INSERT INTO CLASSIFICATION VALUES('CLI:100000000000000000000000000000000002', 'L10303', '', '', 'EXTERNAL', 'TASK', 'DOMAIN_A', TRUE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Beratungsprotokoll', 'Beratungsprotokoll', 101, 'P1D', '', 'VNR,RVNR,KOLVNR, ANR', '', '', '', '', '', '', ''); INSERT INTO CLASSIFICATION VALUES('CLI:100000000000000000000000000000000003', 'L1050', '', '', 'EXTERNAL', 'TASK', 'DOMAIN_A', TRUE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Widerruf', 'Widerruf', 1, 'P13D', '', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', ''); -INSERT INTO CLASSIFICATION VALUES('CLI:100000000000000000000000000000000004', 'L11010', '', '', 'EXTERNAL', 'TASK', 'DOMAIN_A', TRUE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Dynamikaenderung', 'Dynamikaenderung', 1, 'P14D', '', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', ''); +INSERT INTO CLASSIFICATION VALUES('CLI:100000000000000000000000000000000004', 'L11010', '', '', 'EXTERNAL', 'TASK', 'DOMAIN_A', TRUE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Dynamikänderung', 'Dynamikänderung', 1, 'P14D', '', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', ''); INSERT INTO CLASSIFICATION VALUES('CLI:100000000000000000000000000000000005', 'L110102', 'CLI:100000000000000000000000000000000004', 'L11010', 'EXTERNAL', 'TASK', 'DOMAIN_A', TRUE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Dynamik-Ablehnung', 'Dynamik-Ablehnung', 5, 'P15D', '', 'VNR,RVNR,KOLVNR', 'TEXT_1', '', '', '', '', '', ''); INSERT INTO CLASSIFICATION VALUES('CLI:100000000000000000000000000000000006', 'L110105', 'CLI:100000000000000000000000000000000004', 'L11010', 'EXTERNAL', 'TASK', 'DOMAIN_A', TRUE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Dynamik-Ausschluss', 'Dynamik-Ausschluss', 5, 'P16D', '', 'VNR,RVNR,KOLVNR', 'TEXT_2', '', '', '', '', '', ''); INSERT INTO CLASSIFICATION VALUES('CLI:100000000000000000000000000000000007', 'L110107', 'CLI:100000000000000000000000000000000004', 'L11010', 'EXTERNAL', 'TASK', 'DOMAIN_A', TRUE, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Dynamik-Einschluss/Änd.', 'Dynamik-Einschluss/Änd.', 5, 'P5D', 'point0815', 'VNR,RVNR,KOLVNR', 'TEXT_1', '', '', '', '', '', '');