From 4eaa4be4d2cbd2aa49d36a313ce71ad3e743db4a Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期三, 02 九月 2026 12:22:53 +0800
Subject: [PATCH] 彻底清理补采完整性遗留依赖
---
ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TTestServiceImplTest.java | 146 ++++++++++++++++++++----------------------------
1 files changed, 60 insertions(+), 86 deletions(-)
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TTestServiceImplTest.java b/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TTestServiceImplTest.java
index c54c680..561b2de 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TTestServiceImplTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TTestServiceImplTest.java
@@ -3,6 +3,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
@@ -22,10 +23,6 @@
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
-import com.ruoyi.device.bts.BtsDevelopmentSimulator;
-import com.ruoyi.device.simulator.DevelopmentCollectorSimulation.CollectorRealtimeSnapshot;
-import com.ruoyi.device.simulator.BtsSimulatorStateStore.CollectorRealtimeMeasurement;
-import org.springframework.dao.DuplicateKeyException;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.system.domain.TTest;
import com.ruoyi.system.domain.TTestBattery;
@@ -35,7 +32,6 @@
import com.ruoyi.system.domain.TTestPlanStep;
import com.ruoyi.system.domain.TTestWarningThreshold;
import com.ruoyi.system.domain.TDetectionChannel;
-import com.ruoyi.system.domain.TTestReceptionInterval;
import com.ruoyi.system.mapper.TTestMapper;
import com.ruoyi.system.service.ISharedFieldSnapshotService;
@@ -48,9 +44,6 @@
@Mock
private ISharedFieldSnapshotService sharedFieldSnapshotService;
-
- @Mock
- private BtsDevelopmentSimulator collectorSimulator;
@InjectMocks
private TTestServiceImpl testService;
@@ -232,6 +225,20 @@
}
@Test
+ void createShouldRejectCaseInsensitiveDuplicateCollectorMeasurement()
+ {
+ TTest test = validTest();
+ test.getBatteries().get(0).getCollectorChannels()
+ .add(collectorChannel("primary_temperature", "主温度重复", "S-04"));
+ mockEnabledOptions();
+
+ ServiceException exception = assertThrows(ServiceException.class, () -> testService.createTest(test));
+
+ assertEquals("同一电池号的采集器测量项不可重复", exception.getMessage());
+ verify(testMapper, never()).insertTest(any(TTest.class));
+ }
+
+ @Test
void createShouldRejectBatteriesFromDifferentGroups()
{
TTest test = validTest();
@@ -362,7 +369,7 @@
}
@Test
- void startReceptionShouldOpenAllSourceIntervalsAtomically()
+ void startReceptionShouldPersistReceptionWithoutLegacyIntervals()
{
TTest current = validTest();
current.setTestId(10L);
@@ -377,12 +384,9 @@
when(testMapper.countCollectorEnabled(8L)).thenReturn(1);
when(testMapper.selectCollectorChannelCount(8L)).thenReturn(4);
when(testMapper.collectorOnline(8L)).thenReturn(true);
- when(testMapper.updateReceptionStarted(eq(10L), any(), eq("operator"))).thenReturn(1);
+ when(testMapper.updateReceptionStarted(eq(10L), any(), anyBoolean(), eq("operator"))).thenReturn(1);
assertEquals(1, testService.startReception(10L, 7L, "operator"));
- verify(testMapper).insertChannelLease(eq(100L), eq(10L), eq(30L), eq(7L), any());
- verify(testMapper, times(3)).insertCollectorChannelLease(eq(8L), any(), eq(10L), eq(30L), eq(7L), any());
- verify(testMapper, times(4)).insertReceptionInterval(any());
verify(testMapper).insertTestAudit(eq(10L), eq("RECEPTION_STARTED"), eq(7L), eq("operator"), isNull(), any());
}
@@ -403,16 +407,16 @@
when(testMapper.countCollectorEnabled(8L)).thenReturn(1);
when(testMapper.selectCollectorChannelCount(8L)).thenReturn(4);
when(testMapper.collectorOnline(8L)).thenReturn(true);
- when(testMapper.updateReceptionStarted(eq(10L), any(), eq("operator"))).thenReturn(1);
+ when(testMapper.updateReceptionStarted(eq(10L), any(), anyBoolean(), eq("operator"))).thenReturn(1);
assertEquals(1, testService.startReception(10L, 7L, "operator"));
verify(testMapper).insertTestAudit(eq(10L), eq("RECEPTION_STARTED"), eq(7L), eq("operator"), isNull(),
org.mockito.ArgumentMatchers.argThat(value -> value != null && value.contains("runtimeAttach")
- && value.contains("运行中接入")));
+ && value.contains("true")));
}
@Test
- void startReceptionShouldRollbackWhenDatabaseLeaseIsTaken()
+ void startReceptionShouldNotDependOnDatabaseLease()
{
TTest current = validTest();
current.setTestId(10L);
@@ -427,16 +431,10 @@
when(testMapper.countCollectorEnabled(8L)).thenReturn(1);
when(testMapper.selectCollectorChannelCount(8L)).thenReturn(4);
when(testMapper.collectorOnline(8L)).thenReturn(true);
- when(testMapper.insertChannelLease(any(), any(), any(), any(), any()))
- .thenThrow(new DuplicateKeyException("lease already exists"));
+ when(testMapper.updateReceptionStarted(eq(10L), any(), anyBoolean(), eq("operator"))).thenReturn(1);
- ServiceException exception = assertThrows(ServiceException.class,
- () -> testService.startReception(10L, 7L, "operator"));
+ assertEquals(1, testService.startReception(10L, 7L, "operator"));
- assertEquals("数据来源已被其他测试占用，请刷新后重试", exception.getMessage());
- verify(testMapper, never()).insertReceptionInterval(any());
- verify(testMapper, never()).updateReceptionStarted(any(), any(), any());
- verify(testMapper, never()).insertTestAudit(anyLong(), any(), anyLong(), any(), any(), any());
}
@Test
@@ -455,9 +453,7 @@
() -> testService.startReception(10L, 7L, "operator"));
assertEquals("检测柜通道 100 当前离线或不可观测", exception.getMessage());
- verify(testMapper, never()).insertChannelLease(any(), any(), any(), any(), any());
- verify(testMapper, never()).insertReceptionInterval(any());
- verify(testMapper, never()).updateReceptionStarted(any(), any(), any());
+ verify(testMapper, never()).updateReceptionStarted(any(), any(), anyBoolean(), any());
}
@Test
@@ -482,8 +478,7 @@
() -> testService.startReception(10L, 7L, "operator"));
assertEquals("每个电池号必须绑定主温度、正电位主通道和负电位主通道", exception.getMessage());
- verify(testMapper, never()).insertChannelLease(any(), any(), any(), any(), any());
- verify(testMapper, never()).updateReceptionStarted(any(), any(), any());
+ verify(testMapper, never()).updateReceptionStarted(any(), any(), anyBoolean(), any());
}
@Test
@@ -497,88 +492,67 @@
}
@Test
- void pauseReceptionShouldCloseAllOpenIntervalsAndAppendAudit()
+ void pauseReceptionShouldStopPollingAndAppendAudit()
{
TTest current = validTest();
current.setTestId(10L);
current.setReceptionStatus("RECEIVING");
when(testMapper.selectTestByIdForUpdate(10L)).thenReturn(current);
- TTestReceptionInterval cabinet = receptionInterval(1L, "CABINET_CHANNEL", 100L, null);
- TTestReceptionInterval collector = receptionInterval(2L, "COLLECTOR_CHANNEL", 8L, "S-01");
- when(testMapper.selectOpenReceptionIntervalsForUpdate(10L)).thenReturn(List.of(cabinet, collector));
- TDetectionChannel channel = new TDetectionChannel();
- channel.setChannelId(100L); channel.setOnlineStatus("ONLINE"); channel.setLastSeenAtUtc(Instant.parse("2026-08-29T12:00:00Z"));
- when(testMapper.selectReceptionChannelForUpdate(100L)).thenReturn(channel);
- when(testMapper.collectorOnline(8L)).thenReturn(true);
- mockCollectorBoundary();
- when(testMapper.closeReceptionInterval(anyLong(), any(), any())).thenReturn(1);
when(testMapper.updateReceptionPaused(eq(10L), eq("operator"), any())).thenReturn(1);
assertEquals(1, testService.pauseReception(10L, 7L, "operator"));
- verify(testMapper, times(2)).closeReceptionInterval(anyLong(), any(), any());
verify(testMapper).updateReceptionPaused(eq(10L), eq("operator"), any());
- verify(testMapper).insertTestAudit(eq(10L), eq("RECEPTION_PAUSED"), eq(7L), eq("operator"), isNull(), any());
+ verify(testMapper).insertTestAudit(eq(10L), eq("RECEPTION_PAUSED"), eq(7L), eq("operator"), isNull(),
+ org.mockito.ArgumentMatchers.argThat(value -> value != null && value.contains("STOPPED")));
}
@Test
- void pauseReceptionShouldFailBeforeWritesWhenBoundaryUnavailable()
+ void resumeReceptionShouldRestartPollingAndAppendAudit()
{
TTest current = validTest();
- current.setTestId(10L); current.setReceptionStatus("RECEIVING");
+ current.setTestId(10L);
+ current.setReceptionStatus("PAUSED");
+ List<TTestBattery> configuredBatteries = current.getBatteries();
+ current.setBatteries(null);
when(testMapper.selectTestByIdForUpdate(10L)).thenReturn(current);
- TTestReceptionInterval interval = receptionInterval(1L, "CABINET_CHANNEL", 100L, null);
- when(testMapper.selectOpenReceptionIntervalsForUpdate(10L)).thenReturn(List.of(interval));
- when(testMapper.selectReceptionChannelForUpdate(100L)).thenReturn(null);
-
- ServiceException exception = assertThrows(ServiceException.class,
- () -> testService.pauseReception(10L, 7L, "operator"));
- assertEquals("检测柜通道 100 当前无法确认暂停接收边界", exception.getMessage());
- verify(testMapper, never()).closeReceptionInterval(anyLong(), any(), any());
- verify(testMapper, never()).updateReceptionPaused(anyLong(), any(), any());
- }
-
- @Test
- void resumeReceptionShouldOpenNewIntervalsAndAppendAudit()
- {
- TTest current = validTest();
- current.setTestId(10L); current.setReceptionStatus("PAUSED");
- current.getBatteries().get(0).getBinding().setBindingId(30L);
- when(testMapper.selectTestByIdForUpdate(10L)).thenReturn(current);
- TDetectionChannel channel = new TDetectionChannel();
- channel.setChannelId(100L); channel.setOnlineStatus("ONLINE"); channel.setLastSeenAtUtc(Instant.parse("2026-08-29T12:00:00Z"));
- when(testMapper.selectReceptionChannelForUpdate(100L)).thenReturn(channel);
- when(testMapper.countCollectorEnabled(8L)).thenReturn(1);
- when(testMapper.collectorOnline(8L)).thenReturn(true);
- when(testMapper.selectCollectorChannelCount(8L)).thenReturn(4);
- mockCollectorBoundary();
+ when(testMapper.selectTestBatteries(10L)).thenReturn(configuredBatteries);
when(testMapper.updateReceptionResumed(eq(10L), eq("operator"), any())).thenReturn(1);
assertEquals(1, testService.resumeReception(10L, 7L, "operator"));
- verify(testMapper, times(4)).insertReceptionInterval(any());
verify(testMapper).updateReceptionResumed(eq(10L), eq("operator"), any());
- verify(testMapper).insertTestAudit(eq(10L), eq("RECEPTION_RESUMED"), eq(7L), eq("operator"), isNull(), any());
+ verify(testMapper).insertTestAudit(eq(10L), eq("RECEPTION_RESUMED"), eq(7L), eq("operator"), isNull(),
+ org.mockito.ArgumentMatchers.argThat(value -> value != null && value.contains("RESUMED")));
}
- private TTestReceptionInterval receptionInterval(Long id, String sourceType, Long sourceId, String channelCode)
+ @Test
+ void stopTestShouldCompleteWithoutLegacyLeaseCleanup()
{
- TTestReceptionInterval interval = new TTestReceptionInterval();
- interval.setIntervalId(id); interval.setTestId(10L); interval.setSourceType(sourceType);
- interval.setSourceId(sourceId); interval.setSourceChannelCode(channelCode); interval.setIntervalStatus("OPEN");
- return interval;
+ TTest current = validTest();
+ current.setTestId(10L);
+ current.setReceptionStatus("PAUSED");
+ when(testMapper.selectTestByIdForUpdate(10L)).thenReturn(current);
+ when(testMapper.updateReceptionStopped(eq(10L), eq("operator"), any())).thenReturn(1);
+
+ assertEquals(1, testService.stopTest(10L, 7L, "operator"));
+ verify(testMapper).updateReceptionStopped(eq(10L), eq("operator"), any());
+ verify(testMapper).insertTestAudit(eq(10L), eq("TEST_STOPPED"), eq(7L), eq("operator"), isNull(),
+ org.mockito.ArgumentMatchers.argThat(value -> value != null && value.contains("COMPLETED")));
}
- private void mockCollectorBoundary()
+ @Test
+ void stopTestShouldAuditImmediateStop()
{
- Instant deviceTime = Instant.parse("2026-08-29T12:00:00Z");
- CollectorRealtimeMeasurement measurement = new CollectorRealtimeMeasurement("dev-sim", "collector-8", "S-01",
- 1L, deviceTime, "2026-08-29 20:00:00", deviceTime, "PRIMARY_TEMPERATURE", new BigDecimal("25"), "℃");
- CollectorRealtimeMeasurement positive = new CollectorRealtimeMeasurement("dev-sim", "collector-8", "S-02",
- 1L, deviceTime, "2026-08-29 20:00:00", deviceTime, "PRIMARY_POSITIVE_POTENTIAL", new BigDecimal("1"), "V");
- CollectorRealtimeMeasurement negative = new CollectorRealtimeMeasurement("dev-sim", "collector-8", "S-03",
- 1L, deviceTime, "2026-08-29 20:00:00", deviceTime, "PRIMARY_NEGATIVE_POTENTIAL", new BigDecimal("1"), "V");
- when(collectorSimulator.collectorRealtime(8)).thenReturn(
- new CollectorRealtimeSnapshot("collector-8", true, 1000,
- List.of(measurement, positive, negative)));
+ TTest current = validTest();
+ current.setTestId(10L);
+ current.setReceptionStatus("RECEIVING");
+ when(testMapper.selectTestByIdForUpdate(10L)).thenReturn(current);
+ when(testMapper.updateReceptionStopped(eq(10L), eq("operator"), any())).thenReturn(1);
+
+ testService.stopTest(10L, 7L, "operator");
+
+ verify(testMapper).insertTestAudit(eq(10L), eq("TEST_STOPPED"), eq(7L), eq("operator"), isNull(),
+ org.mockito.ArgumentMatchers.argThat(value -> value != null
+ && value.contains("IMMEDIATE")));
}
private void mockEnabledOptions()
--
Gitblit v1.7.1