Bläddra i källkod

test(cockpit 外围): 修复全量测试 5 个既有失败

全部为上游 7df9a87「优化报警管理」改实现未同步测试所致,非执行票 12
引入(票 12 对这 5 个失败相关文件零改动,已逐文件核实)。

- WaterSupplyDeviceServiceImplTest(2):实现已把 abnormalReason 从
  alarm.warningType 改为固定文案「设备报警」(7df9a87 删除 warningType
  用法),两处断言仍期望旧值「供水压力超限」→ 更新为当前契约。
- AlarmClearServiceTest(1):remainingCauseSummary 已统一为固定摘要
  「监测报警」,断言仍期望旧的具体 warningType「流量异常」→ 更新。
- AlarmReviewAttachmentServiceTest(2):按维护者裁定删除整个测试类。
  该类断言的「内容嗅探/伪造扩展名拦截」是生产代码从未实现的策略,
  且非空文件会先在测试环境触发 NPE(ZksyConfig.getUploadPath() 未
  配置),测试既不反映现行契约也无法在单测环境表达之。

验证:全量 8 模块 Tests run: 414, Failures: 0, Errors: 0(BUILD SUCCESS)。
Kazerin 1 vecka sedan
förälder
incheckning
4ef21591a4

+ 2 - 2
pipe-network-service/zksy-system/src/test/java/com/zksy/base/alarm/service/AlarmClearServiceTest.java

@@ -127,9 +127,9 @@ class AlarmClearServiceTest {
         assertFalse(result.isCleared());
         assertEquals(1, result.getRemainingCauseCount());
         assertEquals(1, status.getAlarmStatus());
-        assertEquals("流量异常", result.getRemainingCauseSummary());
+        assertEquals("监测报警", result.getRemainingCauseSummary());
 
-        assertEquals("流量异常", result.getRemainingCauseSummary());
+        assertEquals("监测报警", result.getRemainingCauseSummary());
         assertEquals("alarm-2", result.getRemainingCauseAlarmIds());
     }
 

+ 0 - 31
pipe-network-service/zksy-system/src/test/java/com/zksy/base/alarm/service/AlarmReviewAttachmentServiceTest.java

@@ -1,31 +0,0 @@
-package com.zksy.base.alarm.service;
-
-import com.zksy.common.core.redis.RedisCache;
-import com.zksy.common.exception.ServiceException;
-import org.junit.jupiter.api.Test;
-import org.springframework.mock.web.MockMultipartFile;
-import java.util.Arrays;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.*;
-
-class AlarmReviewAttachmentServiceTest {
-    private final RedisCache redis = mock(RedisCache.class);
-    private final AlarmReviewAttachmentService service = new AlarmReviewAttachmentService(redis);
-    @Test void rejectsEmptyAndDisguisedExecutableBeforeSaving() {
-        assertThrows(ServiceException.class, () -> service.upload("a1", new MockMultipartFile("file",new byte[0])));
-        assertThrows(ServiceException.class, () -> service.upload("a1",new MockMultipartFile("file","image.png","image/png","<script>test</script>".getBytes())));
-        assertThrows(ServiceException.class, () -> service.upload("a1",new MockMultipartFile("file","payload.svg","image/svg+xml","<svg/>".getBytes())));
-        verifyNoInteractions(redis);
-    }
-    @Test void rejectsPdfEvenWithAValidPdfHeaderOrRenamedAsImage() {
-        byte[] pdf = "%PDF-1.7 test".getBytes(java.nio.charset.StandardCharsets.US_ASCII);
-        assertThrows(ServiceException.class, () -> service.upload("a1", new MockMultipartFile("file","report.pdf","application/pdf",pdf)));
-        assertThrows(ServiceException.class, () -> service.upload("a1", new MockMultipartFile("file","report.png","image/png",pdf)));
-        verifyNoInteractions(redis);
-    }
-    @Test void rejectsDuplicateOrForgedAttachmentTickets() {
-        assertThrows(ServiceException.class, () -> service.resolve("a1",Arrays.asList("same","same")));
-        assertThrows(ServiceException.class, () -> service.resolve("a1",Arrays.asList("https://attacker.example/test.pdf")));
-        verifyNoInteractions(redis);
-    }
-}

+ 2 - 2
pipe-network-service/zksy-system/src/test/java/com/zksy/base/service/impl/WaterSupplyDeviceServiceImplTest.java

@@ -195,7 +195,7 @@ class WaterSupplyDeviceServiceImplTest {
         DeviceDetailVO detail = service.getDeviceDetail(pressureDevice.getEquipmentId());
 
         assertEquals(1, detail.getAlertLevel());
-        assertEquals("供水压力超限", detail.getAbnormalReason());
+        assertEquals("设备报警", detail.getAbnormalReason());
         assertEquals("WO-DETAIL", detail.getRelatedWorkOrderNo());
         assertEquals(2, detail.getRelatedWorkOrderStatus());
         assertEquals("张三", detail.getRelatedWorkOrderPerson());
@@ -282,7 +282,7 @@ class WaterSupplyDeviceServiceImplTest {
         assertEquals(1, pressureRow.getCurrentStatus());
         assertEquals(1, pressureRow.getOnlineStatus());
         assertEquals(1, pressureRow.getAlertLevel());
-        assertEquals("供水压力超限", pressureRow.getAbnormalReason());
+        assertEquals("设备报警", pressureRow.getAbnormalReason());
         assertEquals("WO-A", pressureRow.getRelatedWorkOrderNo());
         assertEquals(2, pressureRow.getRelatedWorkOrderStatus());
         assertEquals("张三", pressureRow.getRelatedWorkOrderPerson());