BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 725940adbceb67e3f1a68cd2e7b08c62ccb308da

Authored by YunaiV
1 parent 2a415b33

feat(mes)：优化 JDK8 的兼容性

Inline Side-by-side
Showing 1 changed file with 3 additions and 4 deletions
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultServiceImplTest.java
  View file @725940a
1 package cn.iocoder.yudao.module.mes.service.qc.indicatorresult; 1 package cn.iocoder.yudao.module.mes.service.qc.indicatorresult;
2 2
3 import cn.hutool.core.collection.ListUtil; 3 import cn.hutool.core.collection.ListUtil;
  4 +import cn.hutool.core.map.MapUtil;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; 6 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
6 import cn.iocoder.yudao.module.mes.controller.admin.qc.indicatorresult.vo.MesQcIndicatorResultPageReqVO; 7 import cn.iocoder.yudao.module.mes.controller.admin.qc.indicatorresult.vo.MesQcIndicatorResultPageReqVO;
@@ -22,8 +23,6 @@ import org.junit.jupiter.api.Test; @@ -22,8 +23,6 @@ import org.junit.jupiter.api.Test;
22 import org.springframework.context.annotation.Import; 23 import org.springframework.context.annotation.Import;
23 import org.springframework.test.context.bean.override.mockito.MockitoBean; 24 import org.springframework.test.context.bean.override.mockito.MockitoBean;
24 25
25 -import java.util.Map;  
26 -  
27 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; 26 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
28 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; 27 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
29 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; 28 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
@@ -117,7 +116,7 @@ public class MesQcIndicatorResultServiceImplTest extends BaseDbUnitTest { @@ -117,7 +116,7 @@ public class MesQcIndicatorResultServiceImplTest extends BaseDbUnitTest {
117 indicator.setName("检测项A"); 116 indicator.setName("检测项A");
118 indicator.setResultType(MesQcResultValueTypeEnum.TEXT.getType()); 117 indicator.setResultType(MesQcResultValueTypeEnum.TEXT.getType());
119 when(indicatorService.validateIndicatorListExists(anySet())) 118 when(indicatorService.validateIndicatorListExists(anySet()))
120 - .thenReturn(Map.of(indicator.getId(), indicator)); 119 + .thenReturn(MapUtil.of(indicator.getId(), indicator));
121 120
122 // 调用 121 // 调用
123 indicatorResultService.updateIndicatorResult(reqVO); 122 indicatorResultService.updateIndicatorResult(reqVO);
@@ -270,7 +269,7 @@ public class MesQcIndicatorResultServiceImplTest extends BaseDbUnitTest { @@ -270,7 +269,7 @@ public class MesQcIndicatorResultServiceImplTest extends BaseDbUnitTest {
270 indicator.setName("检测项A"); 269 indicator.setName("检测项A");
271 indicator.setResultType(resultType); 270 indicator.setResultType(resultType);
272 when(indicatorService.validateIndicatorListExists(anySet())) 271 when(indicatorService.validateIndicatorListExists(anySet()))
273 - .thenReturn(Map.of(indicator.getId(), indicator)); 272 + .thenReturn(MapUtil.of(indicator.getId(), indicator));
274 } 273 }
275 274
276 private MesQcIndicatorResultSaveReqVO buildReqVO(String value, Integer resultType) { 275 private MesQcIndicatorResultSaveReqVO buildReqVO(String value, Integer resultType) {