TSK-1824: Refactor createTask tests that involve Attachments; Throw exception in REST if taskId of an Attachment is incorrect #1876
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ryzheboka
changed the title
ryzheboka
force-pushed
the
TSK-1824
branch
2 times, most recently
from
e926b52 to
c0128e0
Compare
ryzheboka
force-pushed
the
TSK-1824
branch
2 times, most recently
from
1398726 to
fcd311f
Compare
mustaphazorgati
changed the title
ryzheboka
force-pushed
the
TSK-1824
branch
2 times, most recently
from
d7af34b to
cdf4ed4
Compare
mustaphazorgati
requested changes
Aug 21, 2022
rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerIntTest.java
Outdated
Show resolved
Hide resolved
rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/TaskController.java
Show resolved
Hide resolved
lib/taskana-core-test/src/test/java/acceptance/task/create/CreateTaskWithAttachmentAccTest.java
Outdated
Show resolved
Hide resolved
lib/taskana-core-test/src/test/java/acceptance/task/create/CreateTaskWithAttachmentAccTest.java
Outdated
Show resolved
Hide resolved
Comment on lines
148
to
149
| assertThatThrownBy(() -> taskService.createTask(task)) | ||
| .isInstanceOf(InvalidArgumentException.class); |
There was a problem hiding this comment.
I know that the original tests did not verify the message of the IllegalArgumentException, but I am undecided whether we should verify the message of those Exceptions. What do you think?
There was a problem hiding this comment.
I will verify the message
lib/taskana-core-test/src/test/java/acceptance/task/create/CreateTaskWithAttachmentAccTest.java
Outdated
Show resolved
Hide resolved
lib/taskana-core-test/src/test/java/acceptance/task/create/CreateTaskWithAttachmentAccTest.java
Show resolved
Hide resolved
Comment on lines
85
to
96
| @WithAccessId(user = "user-1-1") | ||
| @Test | ||
| void should_SetTaskIdOfAttachmentCorrectly_WhenCopyingAttachment() throws Exception { | ||
| Attachment copiedAttachment = | ||
| taskService.getTask(defaultTaskWithAttachment.getId()).getAttachments().get(0).copy(); | ||
| Task taskToCreate = taskService.newTask(defaultWorkbasketSummary.getId()); | ||
| taskToCreate.setClassificationKey(defaultClassificationSummary.getKey()); | ||
| taskToCreate.setPrimaryObjRef(defaultObjectReference); | ||
| taskToCreate.addAttachment(copiedAttachment); | ||
| Task result = taskService.createTask(taskToCreate); | ||
|
|
||
| assertThat(result.getAttachments().get(0).getTaskId()).isEqualTo(result.getId()); | ||
| } |
There was a problem hiding this comment.
This does not test TSK-1824 since the copiedAttachment does not contain a different taskId.
Please don't copy the Attachment. Just reuse the Attachment from the defaultTaskWithAttachment
| @Test | ||
| void should_SetTaskIdOfAttachmentCorrectly_WhenCopyingAttachment() throws Exception { | ||
| Attachment copiedAttachment = | ||
| taskService.getTask(defaultTaskWithAttachment.getId()).getAttachments().get(0).copy(); |
There was a problem hiding this comment.
Suggested change
| taskService.getTask(defaultTaskWithAttachment.getId()).getAttachments().get(0).copy(); | |
| defaultTaskWithAttachment.getAttachments().get(0).copy(); |
Comment on lines
+57
to
+81
| defaultClassificationSummary = | ||
| defaultTestClassification() | ||
| .serviceLevel("P2D") | ||
| .buildAndStoreAsSummary(classificationService); | ||
| defaultWorkbasketSummary = defaultTestWorkbasket().buildAndStoreAsSummary(workbasketService); | ||
|
|
||
| WorkbasketAccessItemBuilder.newWorkbasketAccessItem() | ||
| .workbasketId(defaultWorkbasketSummary.getId()) | ||
| .accessId("user-1-1") | ||
| .permission(WorkbasketPermission.OPEN) | ||
| .permission(WorkbasketPermission.READ) | ||
| .permission(WorkbasketPermission.APPEND) | ||
| .buildAndStore(workbasketService); | ||
| defaultObjectReference = defaultTestObjectReference().build(); | ||
| defaultAttachment = | ||
| TaskAttachmentBuilder.newAttachment() | ||
| .classificationSummary(defaultClassificationSummary) | ||
| .objectReference(defaultObjectReference) | ||
| .build(); | ||
| defaultTaskWithAttachment = | ||
| TaskBuilder.newTask() | ||
| .primaryObjRef(defaultObjectReference) | ||
| .workbasketSummary(defaultWorkbasketSummary) | ||
| .classificationSummary(defaultClassificationSummary) | ||
| .attachments(defaultAttachment) | ||
| .buildAndStore(taskService, "user-1-1"); |
There was a problem hiding this comment.
please be consistent and static import all test-api classes :)
btw: should we make that a guideline?
There was a problem hiding this comment.
I will include this in the guidelines :)
There was a problem hiding this comment.
What do you think about static imports of DefaultTestEntities instead of all test-api classes?
ryzheboka
force-pushed
the
TSK-1824
branch
5 times, most recently
from
93faaef to
f7cd50f
Compare
mustaphazorgati
force-pushed
the
master
branch
3 times, most recently
from
1684202 to
f6a5562
Compare
Merged
14 tasks
|
Closed by #2355 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://sonarcloud.io/summary/new_code?id=ryzheboka_taskana&branch=TSK-1824
For the submitter:
Verified by the reviewer: