refactor: 【IoT 物联网】test BaseMockitoUnitTest → BaseMatcherTest，支持 Spring 上下文

puhui999
1 parent 2b3e2d6d
Showing 10 changed files with 109 additions and 33 deletions
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherHelper.java
yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/BaseMatcherTest.java
yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/CurrentTimeConditionMatcherTest.java
yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcherTest.java
yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DeviceStateConditionMatcherTest.java
yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceEventPostTriggerMatcherTest.java
yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DevicePropertyPostTriggerMatcherTest.java
yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceServiceInvokeTriggerMatcherTest.java
yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceStateUpdateTriggerMatcherTest.java
yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/TimerTriggerMatcherTest.java
@@ -91,7 +91,7 @@ public final class IotSceneRuleMatcherHelper {
         Map<String, Object> springExpressionVariables = new HashMap<>();
         // 设置源值
-        springExpressionVariables.put(IotSceneRuleConditionOperatorEnum.SPRING_EXPRESSION_SOURCE, sourceValue);
+        springExpressionVariables.put(IotSceneRuleConditionOperatorEnum.SPRING_EXPRESSION_SOURCE, StrUtil.toString(sourceValue));
         // 处理参数值
         if (StrUtil.isNotBlank(paramValue)) {
+package cn.iocoder.yudao.module.iot.service.rule.scene.matcher;
+
+import cn.hutool.extra.spring.SpringUtil;
+import cn.iocoder.yudao.framework.common.util.spring.SpringExpressionUtils;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+/**
+ * Matcher 测试基类
+ * 提供通用的 Spring 测试配置
+ *
+ * @author HUIHUI
+ */
+@SpringJUnitConfig
+public abstract class BaseMatcherTest {
+
+    /**
+     * 注入一下 SpringUtil，解析 EL 表达式时需要
+     * {@link SpringExpressionUtils#parseExpression}
+     */
+    @Configuration
+    static class TestConfig {
+
+        @Bean
+        public SpringUtil springUtil() {
+            return new SpringUtil();
+        }
+
+    }
+
+}
 package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.condition;
-import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
 import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage;
 import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO;
 import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionOperatorEnum;
 import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionTypeEnum;
+import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.BaseMatcherTest;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -20,11 +20,15 @@ import static org.junit.jupiter.api.Assertions.*;
  *
  * @author HUIHUI
  */
-public class CurrentTimeConditionMatcherTest extends BaseMockitoUnitTest {
+public class CurrentTimeConditionMatcherTest extends BaseMatcherTest {
-    @InjectMocks
     private CurrentTimeConditionMatcher matcher;
+    @BeforeEach
+    public void setUp() {
+        matcher = new CurrentTimeConditionMatcher();
+    }
+
     @Test
     public void testGetSupportedConditionType() {
         // 调用
 package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.condition;
 import cn.hutool.core.map.MapUtil;
-import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
 import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage;
 import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO;
 import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionOperatorEnum;
 import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionTypeEnum;
+import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.BaseMatcherTest;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import java.util.HashMap;
 import java.util.Map;
@@ -21,11 +21,15 @@ import static org.junit.jupiter.api.Assertions.*;
  *
  * @author HUIHUI
  */
-public class DevicePropertyConditionMatcherTest extends BaseMockitoUnitTest {
+public class DevicePropertyConditionMatcherTest extends BaseMatcherTest {
-    @InjectMocks
     private DevicePropertyConditionMatcher matcher;
+    @BeforeEach
+    public void setUp() {
+        matcher = new DevicePropertyConditionMatcher();
+    }
+
     @Test
     public void testGetSupportedConditionType() {
         // 调用
 package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.condition;
-import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
 import cn.iocoder.yudao.module.iot.core.enums.IotDeviceStateEnum;
 import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage;
 import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO;
 import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionOperatorEnum;
 import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionTypeEnum;
+import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.BaseMatcherTest;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;
@@ -18,11 +18,15 @@ import static org.junit.jupiter.api.Assertions.*;
  *
  * @author HUIHUI
  */
-public class DeviceStateConditionMatcherTest extends BaseMockitoUnitTest {
+public class DeviceStateConditionMatcherTest extends BaseMatcherTest {
-    @InjectMocks
     private DeviceStateConditionMatcher matcher;
+    @BeforeEach
+    public void setUp() {
+        matcher = new DeviceStateConditionMatcher();
+    }
+
     @Test
     public void testGetSupportedConditionType() {
         // 调用
 package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.trigger;
 import cn.hutool.core.map.MapUtil;
-import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
 import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum;
 import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage;
 import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO;
 import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum;
+import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.BaseMatcherTest;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import java.util.HashMap;
 import java.util.Map;
@@ -22,11 +22,15 @@ import static org.junit.jupiter.api.Assertions.*;
  *
  * @author HUIHUI
  */
-public class DeviceEventPostTriggerMatcherTest extends BaseMockitoUnitTest {
+public class DeviceEventPostTriggerMatcherTest extends BaseMatcherTest {
-    @InjectMocks
     private DeviceEventPostTriggerMatcher matcher;
+    @BeforeEach
+    public void setUp() {
+        matcher = new DeviceEventPostTriggerMatcher();
+    }
+
     @Test
     public void testGetSupportedTriggerType_success() {
         // 准备参数
 package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.trigger;
 import cn.hutool.core.map.MapUtil;
-import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
 import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum;
 import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage;
 import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO;
 import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionOperatorEnum;
 import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum;
+import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.BaseMatcherTest;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import java.util.HashMap;
 import java.util.Map;
@@ -24,11 +24,15 @@ import static org.junit.jupiter.api.Assertions.*;
  *
  * @author HUIHUI
  */
-public class DevicePropertyPostTriggerMatcherTest extends BaseMockitoUnitTest {
+public class DevicePropertyPostTriggerMatcherTest extends BaseMatcherTest {
-    @InjectMocks
     private DevicePropertyPostTriggerMatcher matcher;
+    @BeforeEach
+    public void setUp() {
+        matcher = new DevicePropertyPostTriggerMatcher();
+    }
+
     @Test
     public void testGetSupportedTriggerType_success() {
         // 准备参数
 package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.trigger;
 import cn.hutool.core.map.MapUtil;
-import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
 import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum;
 import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage;
 import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO;
 import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum;
+import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.BaseMatcherTest;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import java.util.HashMap;
 import java.util.Map;
@@ -22,11 +22,15 @@ import static org.junit.jupiter.api.Assertions.*;
  *
  * @author HUIHUI
  */
-public class DeviceServiceInvokeTriggerMatcherTest extends BaseMockitoUnitTest {
+public class DeviceServiceInvokeTriggerMatcherTest extends BaseMatcherTest {
-    @InjectMocks
     private DeviceServiceInvokeTriggerMatcher matcher;
+    @BeforeEach
+    public void setUp() {
+        matcher = new DeviceServiceInvokeTriggerMatcher();
+    }
+
     @Test
     public void testGetSupportedTriggerType_success() {
         // 准备参数
 package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.trigger;
-import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
+import cn.hutool.extra.spring.SpringUtil;
 import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum;
 import cn.iocoder.yudao.module.iot.core.enums.IotDeviceStateEnum;
 import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage;
 import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO;
 import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionOperatorEnum;
 import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
 import static org.junit.jupiter.api.Assertions.*;
@@ -18,11 +21,24 @@ import static org.junit.jupiter.api.Assertions.*;
  *
  * @author HUIHUI
  */
-public class DeviceStateUpdateTriggerMatcherTest extends BaseMockitoUnitTest {
+@SpringJUnitConfig(DeviceStateUpdateTriggerMatcherTest.TestConfig.class)
+public class DeviceStateUpdateTriggerMatcherTest {
+
+    @Configuration
+    static class TestConfig {
+        @Bean
+        public SpringUtil springUtil() {
+            return new SpringUtil();
+        }
+    }
-    @InjectMocks
     private DeviceStateUpdateTriggerMatcher matcher;
+    @BeforeEach
+    public void setUp() {
+        matcher = new DeviceStateUpdateTriggerMatcher();
+    }
+
     @Test
     public void testGetSupportedTriggerType_success() {
         // 准备参数
 package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.trigger;
-import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
 import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage;
 import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO;
 import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum;
+import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.BaseMatcherTest;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;
@@ -16,11 +16,15 @@ import static org.junit.jupiter.api.Assertions.*;
  *
  * @author HUIHUI
  */
-public class TimerTriggerMatcherTest extends BaseMockitoUnitTest {
+public class TimerTriggerMatcherTest extends BaseMatcherTest {
-    @InjectMocks
     private TimerTriggerMatcher matcher;
+    @BeforeEach
+    public void setUp() {
+        matcher = new TimerTriggerMatcher();
+    }
+
     @Test
     public void testGetSupportedTriggerType_success() {
         // 准备参数