From d07459fe2677e4948c3f91c7a027a9b172cfdda5 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Thu, 4 Jun 2020 21:00:53 +0200 Subject: [PATCH] TASK-1278: Extended Test Coverage of Assembler Classes --- .../task/internal/models/TaskImpl.java | 26 +- .../task/internal/models/TaskSummaryImpl.java | 3 - qa/intellij/taskana_formatter_intellij.xml | 325 +----------------- ...onSummaryRepresentationModelAssembler.java | 8 +- .../ClassificationRepresentationModel.java | 1 - .../rest/models/TaskanaPagedModelKeys.java | 2 +- ...ttachmentRepresentationModelAssembler.java | 2 +- ...ntSummaryRepresentationModelAssembler.java | 5 +- ...skSummaryRepresentationModelAssembler.java | 4 +- .../rest/models/TaskRepresentationModel.java | 2 - .../rest/WorkbasketDefinitionController.java | 17 +- ...ccessItemRepresentationModelAssembler.java | 32 +- ...efinitionRepresentationModelAssembler.java | 68 +--- ...etSummaryRepresentationModelAssembler.java | 7 +- ...rkbasketAccessItemRepresentationModel.java | 5 +- ...rkbasketDefinitionRepresentationModel.java | 19 +- ...basketRepresentationModelWithoutLinks.java | 13 - .../ClassificationAssemblerTest.java | 148 -------- ...ationRepresentationModelAssemblerTest.java | 147 ++++++++ .../ClassificationSummaryAssemblerTest.java | 109 ------ ...mmaryRepresentationModelAssemblerTest.java | 147 ++++++++ ...WorkbasketControllerRestDocumentation.java | 2 +- .../task/rest/TaskControllerIntTest.java | 2 +- ...hmentRepresentationModelAssemblerTest.java | 119 +++++++ ...mmaryRepresentationModelAssemblerTest.java | 126 +++++++ ...mmentRepresentationModelAssemblerTest.java | 78 +++-- .../TaskRepresentationModelAssemberTest.java | 265 +++++++------- .../assembler/TaskSummaryAssemblerTest.java | 159 --------- ...mmaryRepresentationModelAssemblerTest.java | 294 ++++++++++++++++ ...sItemRepresentationModelAssemblerTest.java | 165 +++++---- ...itionRepresentationModelAssemblerTest.java | 82 +++++ ...asketRepresentationModelAssemblerTest.java | 102 +++--- .../WorkbasketSummaryAssemblerTest.java | 77 ----- ...mmaryRepresentationModelAssemblerTest.java | 130 +++++++ 34 files changed, 1471 insertions(+), 1220 deletions(-) delete mode 100644 rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/models/WorkbasketRepresentationModelWithoutLinks.java delete mode 100644 rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/assembler/ClassificationAssemblerTest.java create mode 100644 rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/assembler/ClassificationRepresentationModelAssemblerTest.java delete mode 100644 rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/assembler/ClassificationSummaryAssemblerTest.java create mode 100644 rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/assembler/ClassificationSummaryRepresentationModelAssemblerTest.java create mode 100644 rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/AttachmentRepresentationModelAssemblerTest.java create mode 100644 rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/AttachmentSummaryRepresentationModelAssemblerTest.java delete mode 100644 rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskSummaryAssemblerTest.java create mode 100644 rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskSummaryRepresentationModelAssemblerTest.java create mode 100644 rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketDefinitionRepresentationModelAssemblerTest.java delete mode 100644 rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketSummaryAssemblerTest.java create mode 100644 rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketSummaryRepresentationModelAssemblerTest.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskImpl.java index b4eee2428..2caad89ab 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskImpl.java @@ -38,12 +38,13 @@ public class TaskImpl extends TaskSummaryImpl implements Task { attachments = copyFrom.attachments.stream().map(Attachment::copy).collect(Collectors.toList()); } - public CallbackState getCallbackState() { - return callbackState; + public String getClassificationId() { + return classificationSummary == null ? null : classificationSummary.getId(); } - public void setCallbackState(CallbackState callbackState) { - this.callbackState = callbackState; + @Override + public TaskImpl copy() { + return new TaskImpl(this); } public String getClassificationKey() { @@ -81,6 +82,14 @@ public class TaskImpl extends TaskSummaryImpl implements Task { this.customAttributes = customAttributes; } + public CallbackState getCallbackState() { + return callbackState; + } + + public void setCallbackState(CallbackState callbackState) { + this.callbackState = callbackState; + } + @Override public Map getCallbackInfo() { if (callbackInfo == null) { @@ -263,11 +272,6 @@ public class TaskImpl extends TaskSummaryImpl implements Task { ((ClassificationSummaryImpl) this.classificationSummary).setCategory(classificationCategory); } - @Override - public TaskImpl copy() { - return new TaskImpl(this); - } - protected boolean canEqual(Object other) { return (other instanceof TaskImpl); } @@ -388,8 +392,4 @@ public class TaskImpl extends TaskSummaryImpl implements Task { + custom16 + "]"; } - - public String getClassificationId() { - return classificationSummary == null ? null : classificationSummary.getId(); - } } diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskSummaryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskSummaryImpl.java index 4a0360af6..e23e6c403 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskSummaryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskSummaryImpl.java @@ -314,9 +314,6 @@ public class TaskSummaryImpl implements TaskSummary { @Override public List getAttachmentSummaries() { - if (attachmentSummaries == null) { - attachmentSummaries = new ArrayList<>(); - } return attachmentSummaries; } diff --git a/qa/intellij/taskana_formatter_intellij.xml b/qa/intellij/taskana_formatter_intellij.xml index 8910c6e58..0d0f1bc8f 100644 --- a/qa/intellij/taskana_formatter_intellij.xml +++ b/qa/intellij/taskana_formatter_intellij.xml @@ -175,16 +175,6 @@ - - - GETTERS_AND_SETTERS - KEEP - - - OVERRIDDEN_METHODS - KEEP - -
@@ -430,320 +420,7 @@