Browse Source

refactor: align dict tests with DTO return types (ADR-0017 tickets 03/04)

master
luoweijian 4 weeks ago
parent
commit
0b4c4d2bbb
  1. 3
      crm-dict/src/test/java/com/crm/dict/config/DictDataInitializerTest.java
  2. 9
      crm-dict/src/test/java/com/crm/dict/service/impl/DictQueryServiceTest.java

3
crm-dict/src/test/java/com/crm/dict/config/DictDataInitializerTest.java

@ -2,6 +2,7 @@ package com.crm.dict.config;
import com.crm.dict.AbstractDictH2Test;
import com.crm.dict.constant.DictConstants;
import com.crm.dict.domain.dto.DictItemDTO;
import com.crm.dict.domain.entity.DictGroup;
import com.crm.dict.domain.entity.DictGroupDefault;
import com.crm.dict.domain.entity.DictItem;
@ -58,7 +59,7 @@ class DictDataInitializerTest extends AbstractDictH2Test {
assertThat(def.getItemId()).isEqualTo(potential.getId());
// 默认项自身在启用列表中
assertThat(dictQueryService.listEnabledItems("customer_status"))
.extracting(DictItem::getCode).contains("potential");
.extracting(DictItemDTO::getCode).contains("potential");
}
@Test

9
crm-dict/src/test/java/com/crm/dict/service/impl/DictQueryServiceTest.java

@ -2,6 +2,7 @@ package com.crm.dict.service.impl;
import com.crm.dict.AbstractDictH2Test;
import com.crm.dict.constant.DictConstants;
import com.crm.dict.domain.dto.DictItemDTO;
import com.crm.dict.domain.entity.DictGroup;
import com.crm.dict.domain.entity.DictItem;
import org.junit.jupiter.api.DisplayName;
@ -56,15 +57,15 @@ class DictQueryServiceTest extends AbstractDictH2Test {
DictItem itemC = newItem(g.getId(), "c", "C");
dictItemService.updateItemStatus(itemB.getId(), DictConstants.STATUS_DISABLED);
DictItem edit = new DictItem();
DictItemDTO edit = new DictItemDTO();
edit.setId(itemC.getId());
edit.setName("项-c");
edit.setSortNo(0);
dictItemService.saveItem(edit);
List<DictItem> items = dictQueryService.listEnabledItems("g");
assertThat(items).extracting(DictItem::getCode).containsExactly("c", "a"); // c 排序0在前,a 无排序号排最后
assertThat(items).extracting(DictItem::getCode).doesNotContain("b");
List<DictItemDTO> items = dictQueryService.listEnabledItems("g");
assertThat(items).extracting(DictItemDTO::getCode).containsExactly("c", "a"); // c 排序0在前,a 无排序号排最后
assertThat(items).extracting(DictItemDTO::getCode).doesNotContain("b");
}
@Test

Loading…
Cancel
Save