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 | 111 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 89 insertions(+), 22 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 04ec96a..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;
@@ -15,13 +16,13 @@
import java.math.BigDecimal;
import java.util.Collections;
import java.util.LinkedHashMap;
+import java.util.List;
import java.time.Instant;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.dao.DuplicateKeyException;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.system.domain.TTest;
import com.ruoyi.system.domain.TTestBattery;
@@ -224,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();
@@ -354,7 +369,7 @@
}
@Test
- void startReceptionShouldOpenAllSourceIntervalsAtomically()
+ void startReceptionShouldPersistReceptionWithoutLegacyIntervals()
{
TTest current = validTest();
current.setTestId(10L);
@@ -369,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());
}
@@ -395,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);
@@ -419,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
@@ -447,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
@@ -474,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
@@ -488,6 +491,70 @@
verify(testMapper, never()).selectTestByIdForUpdate(anyLong());
}
+ @Test
+ void pauseReceptionShouldStopPollingAndAppendAudit()
+ {
+ TTest current = validTest();
+ current.setTestId(10L);
+ current.setReceptionStatus("RECEIVING");
+ when(testMapper.selectTestByIdForUpdate(10L)).thenReturn(current);
+ when(testMapper.updateReceptionPaused(eq(10L), eq("operator"), any())).thenReturn(1);
+
+ assertEquals(1, testService.pauseReception(10L, 7L, "operator"));
+ verify(testMapper).updateReceptionPaused(eq(10L), eq("operator"), 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 resumeReceptionShouldRestartPollingAndAppendAudit()
+ {
+ TTest current = validTest();
+ current.setTestId(10L);
+ current.setReceptionStatus("PAUSED");
+ List<TTestBattery> configuredBatteries = current.getBatteries();
+ current.setBatteries(null);
+ when(testMapper.selectTestByIdForUpdate(10L)).thenReturn(current);
+ 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).updateReceptionResumed(eq(10L), eq("operator"), any());
+ verify(testMapper).insertTestAudit(eq(10L), eq("RECEPTION_RESUMED"), eq(7L), eq("operator"), isNull(),
+ org.mockito.ArgumentMatchers.argThat(value -> value != null && value.contains("RESUMED")));
+ }
+
+ @Test
+ void stopTestShouldCompleteWithoutLegacyLeaseCleanup()
+ {
+ 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")));
+ }
+
+ @Test
+ void stopTestShouldAuditImmediateStop()
+ {
+ 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()
{
mockEnabledPeopleAndType();
--
Gitblit v1.7.1