Przeglądaj źródła

fix:单测报错

YunaiV 9 miesięcy temu
rodzic
commit
ecda40d300

+ 1 - 1
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/IotOtaTaskRecordController.java

@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.module.iot.controller.admin.ota;
 
-4import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;

+ 2 - 1
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/enums/IotDeviceMessageMethodEnum.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.iot.core.enums;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.iocoder.yudao.framework.common.core.ArrayValuable;
+import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -57,7 +58,7 @@ public enum IotDeviceMessageMethodEnum implements ArrayValuable<String> {
     /**
      * 不进行 reply 回复的方法集合
      */
-    public static final Set<String> REPLY_DISABLED = Set.of(
+    public static final Set<String> REPLY_DISABLED = SetUtils.asSet(
             STATE_UPDATE.getMethod(),
             OTA_PROGRESS.getMethod() // 参考阿里云,OTA 升级进度上报,不进行回复
     );

+ 2 - 2
yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java

@@ -610,7 +610,7 @@ public class PayOrderServiceTest extends BaseDbAndRedisUnitTest {
         orderExtensionMapper.insert(orderExtension);
         // 重要:需要将 order 的 extensionId 更新下
         order.setExtensionId(orderExtension.getId());
-        orderMapper.updateById(order);
+        orderMapper.updateById(new PayOrderDO().setId(order.getId()).setExtensionId(orderExtension.getId()));
         // 准备参数
         PayChannelDO channel = randomPojo(PayChannelDO.class, o -> o.setId(10L));
         PayOrderRespDTO notify = randomPojo(PayOrderRespDTO.class,
@@ -622,7 +622,7 @@ public class PayOrderServiceTest extends BaseDbAndRedisUnitTest {
         // 断言 PayOrderExtensionDO :数据未更新,因为它是 SUCCESS
         assertPojoEquals(orderExtension, orderExtensionMapper.selectOne(null));
         // 断言 PayOrderDO :数据未更新,因为它是 SUCCESS
-        assertPojoEquals(order, orderMapper.selectOne(null));
+        assertPojoEquals(order, orderMapper.selectOne(null), "updateTime", "updater");
         // 断言,调用
         verify(notifyService, never()).createPayNotifyTask(anyInt(), anyLong());
     }