From 92f32acd847ea1700590bc669750f23ef499840e Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 05 九月 2026 13:39:44 +0800
Subject: [PATCH] 清理旧测试结构并贯通最终业务数据链路
---
ruoyi-admin/src/test/java/com/battery/business/service/impl/DeviceAdapterServiceImplTest.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/DeviceAdapterServiceImplTest.java b/ruoyi-admin/src/test/java/com/battery/business/service/impl/DeviceAdapterServiceImplTest.java
similarity index 92%
rename from ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/DeviceAdapterServiceImplTest.java
rename to ruoyi-admin/src/test/java/com/battery/business/service/impl/DeviceAdapterServiceImplTest.java
index 8429318..4fa3e96 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/DeviceAdapterServiceImplTest.java
+++ b/ruoyi-admin/src/test/java/com/battery/business/service/impl/DeviceAdapterServiceImplTest.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.service.impl;
+package com.battery.business.service.impl;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -27,20 +27,20 @@
import com.ruoyi.common.exception.ServiceException;
import com.battery.device.api.DeviceAdapter;
import com.battery.device.api.DeviceAdapterException;
-import com.battery.device.discovery.InMemoryDeviceDiscoveryCandidateStore;
-import com.battery.device.discovery.DeviceDiscoveryCandidateStore;
-import com.battery.device.model.ChannelIdentity;
-import com.battery.device.model.DetectedChannel;
-import com.battery.device.model.DetectedDeviceMetadata;
-import com.battery.device.model.DeviceWorkStatus;
-import com.battery.device.model.RealtimeSnapshot;
-import com.battery.device.registry.DeviceAdapterRegistry;
-import com.ruoyi.system.domain.TDetectionCabinet;
-import com.ruoyi.system.domain.TDetectionChannel;
-import com.ruoyi.system.domain.TDeviceAdapter;
-import com.ruoyi.system.mapper.TDeviceAdapterMapper;
-import com.ruoyi.system.mapper.TDetectionCabinetMapper;
-import com.ruoyi.system.service.DeviceAdapterErrorCodes;
+import com.battery.device.api.discovery.InMemoryDeviceDiscoveryCandidateStore;
+import com.battery.device.api.discovery.DeviceDiscoveryCandidateStore;
+import com.battery.device.api.model.ChannelIdentity;
+import com.battery.device.api.model.DetectedChannel;
+import com.battery.device.api.model.DetectedDeviceMetadata;
+import com.battery.device.api.model.DeviceWorkStatus;
+import com.battery.device.api.model.RealtimeSnapshot;
+import com.battery.device.api.registry.DeviceAdapterRegistry;
+import com.battery.business.domain.TDetectionCabinet;
+import com.battery.business.domain.TDetectionChannel;
+import com.battery.business.domain.TDeviceAdapter;
+import com.battery.business.mapper.TDeviceAdapterMapper;
+import com.battery.business.mapper.TDetectionCabinetMapper;
+import com.battery.business.service.DeviceAdapterErrorCodes;
@ExtendWith(MockitoExtension.class)
class DeviceAdapterServiceImplTest
@@ -242,6 +242,7 @@
void rejectsReservedDevelopmentSimulatorCodeFromDatabaseConfiguration()
{
adapter.setAdapterCode("dev-sim");
+ when(registry.contains("dev-sim")).thenReturn(true);
assertThrows(ServiceException.class, () -> service.insert(adapter));
assertThrows(ServiceException.class, () -> service.ensureManagedAdapter(adapter));
@@ -253,7 +254,7 @@
void developmentSimulatorProvisioningIsIdempotentAndReadOnly()
{
String mapperXml;
- try (InputStream input = getClass().getResourceAsStream("/mapper/system/TDeviceAdapterMapper.xml"))
+ try (InputStream input = getClass().getResourceAsStream("/mapper/battery/TDeviceAdapterMapper.xml"))
{
if (input == null) throw new AssertionError("缺少设备适配器 Mapper");
mapperXml = new String(input.readAllBytes(), StandardCharsets.UTF_8);
--
Gitblit v1.7.1