nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1140 Corrected ClassificationResourceAssembler and corresponding test

This commit is contained in:
Sofie Hofmann 2020-02-21 20:00:41 +01:00
parent d34a44a32a
commit 1109a01349
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResourceAssembler.java
View File

@ -55,8 +55,8 @@ public class ClassificationResourceAssembler
ClassificationImpl classification = ClassificationImpl classification =
(ClassificationImpl) (ClassificationImpl)
classificationService.newClassification( classificationService.newClassification(
classificationResource.getDomain(),
classificationResource.getKey(), classificationResource.getKey(),
classificationResource.getDomain(),
classificationResource.getType()); classificationResource.getType());
BeanUtils.copyProperties(classificationResource, classification); BeanUtils.copyProperties(classificationResource, classification);

14
rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationAssemblerTest.java
View File

@ -24,7 +24,7 @@ class ClassificationAssemblerTest {
void classificationToResource() { void classificationToResource() {
// given // given
ClassificationImpl classification = ClassificationImpl classification =
(ClassificationImpl) classificationService.newClassification("DOMAIN_A", "1", "A"); (ClassificationImpl) classificationService.newClassification("KEY_A", "DOMAIN_A", "A");
classification.setId("1"); classification.setId("1");
classification.setCategory("ABC"); classification.setCategory("ABC");
classification.setName("Classification 1"); classification.setName("Classification 1");
@ -38,6 +38,7 @@ class ClassificationAssemblerTest {
classification.setCustom7("Custom7"); classification.setCustom7("Custom7");
classification.setCustom8("Custom8"); classification.setCustom8("Custom8");
classification.setParentId("2"); classification.setParentId("2");
classification.setParentKey("parentKey");
classification.setPriority(2); classification.setPriority(2);
classification.setApplicationEntryPoint("12"); classification.setApplicationEntryPoint("12");
classification.setServiceLevel("P1D"); classification.setServiceLevel("P1D");
@ -55,19 +56,16 @@ class ClassificationAssemblerTest {
@Test @Test
void resourceToClassification() { void resourceToClassification() {
ClassificationImpl classification = ClassificationImpl classification =
(ClassificationImpl) classificationService.newClassification("12", "DOMAIN_B", "AB"); (ClassificationImpl) classificationService.newClassification("KEY_B", "DOMAIN_B", "AB");
// given // given
classification.setId("1"); classification.setId("1");
classification.setType("AB");
classification.setDomain("DOMAIN_B");
classification.setApplicationEntryPoint("Test"); classification.setApplicationEntryPoint("Test");
classification.setCategory("ABC"); classification.setCategory("ABC");
classification.setCreated(Instant.parse("2010-01-01T12:00:00Z")); classification.setCreated(Instant.parse("2010-01-01T12:00:00Z"));
classification.setModified(Instant.parse("2011-11-11T11:00:00Z")); classification.setModified(Instant.parse("2011-11-11T11:00:00Z"));
classification.setCustom1("Custom");
classification.setCustom2("Custom2");
classification.setCustom1("Custom1"); classification.setCustom1("Custom1");
classification.setCustom2("Custom2");
classification.setCustom3("Custom3"); classification.setCustom3("Custom3");
classification.setCustom4("Custom4"); classification.setCustom4("Custom4");
classification.setCustom5("Custom5"); classification.setCustom5("Custom5");
@ -75,6 +73,7 @@ class ClassificationAssemblerTest {
classification.setCustom7("Custom7"); classification.setCustom7("Custom7");
classification.setCustom8("Custom8"); classification.setCustom8("Custom8");
classification.setParentId("2"); classification.setParentId("2");
classification.setParentKey("parentKey");
classification.setPriority(2); classification.setPriority(2);
classification.setApplicationEntryPoint("12"); classification.setApplicationEntryPoint("12");
classification.setServiceLevel("P1D"); classification.setServiceLevel("P1D");
@ -117,9 +116,12 @@ class ClassificationAssemblerTest {
assertThat(classification.getCustom7()).isEqualTo(classificationResource.getCustom7()); assertThat(classification.getCustom7()).isEqualTo(classificationResource.getCustom7());
assertThat(classification.getCustom8()).isEqualTo(classificationResource.getCustom8()); assertThat(classification.getCustom8()).isEqualTo(classificationResource.getCustom8());
assertThat(classification.getParentId()).isEqualTo(classificationResource.getParentId()); assertThat(classification.getParentId()).isEqualTo(classificationResource.getParentId());
assertThat(classification.getParentKey()).isEqualTo(classificationResource.getParentKey());
assertThat(classification.getType()).isEqualTo(classificationResource.getType()); assertThat(classification.getType()).isEqualTo(classificationResource.getType());
assertThat(classification.getPriority()).isEqualTo(classificationResource.getPriority()); assertThat(classification.getPriority()).isEqualTo(classificationResource.getPriority());
assertThat(classification.getIsValidInDomain()) assertThat(classification.getIsValidInDomain())
.isEqualTo(classificationResource.getIsValidInDomain()); .isEqualTo(classificationResource.getIsValidInDomain());
assertThat(classification.getCreated()).isEqualTo(classificationResource.getCreated());
assertThat(classification.getModified()).isEqualTo(classificationResource.getModified());
} }
} }