d8d8fbe081
90cc9a7d 把旧自研协议层(iec104_asdu/iec104_link/iec104_pts)整体退役
时,连带删掉了 test/host/iec104 与 test/host/iec104_serv 两套单测,却
没给留下来的代码补替代测试,也没同步覆盖率基线。结果 test-coverage
门禁(manual 阶段、远端 CI 强制)一直是红的:
[REGRESS] 总计: 已覆盖行 8848 -> 8052
[REGRESS] App/task/iec104_serv.c 基线里在测,本次未出现在任何单测编译
单元里
[REGRESS] 模块 iec104 / iec104_serv: 基线里有,本次未跑到
两个模块里约 180 行现役代码一行主机单测都没有:104 的 [comm] 段存取
(iec104_comm.c)与现役服务层(iec104_serv.c)。本笔把它们补回来。
新增:
test/host/iec104_comm/ 50 用例,iec104_comm.c 50/50 行
test/host/iec104_serv/ 50 用例,iec104_serv.c 102/102 行
两个套件都 #include 真实生产源(不是测桩),依赖全部走受控 stub。
同时修两个门禁自身的问题:
一、纯 Python 套件被误判为"缺 BUILD"
iec104_dtu/run_unit_test.py 是独立 oracle/解码器测试,只有一个 unittest
模块、不编任何 C 文件,天然没有 TestBuild。覆盖率脚本却把它当 FAIL,
于是基线里被写进一条 ok:false —— 等于把已知失败烤进台账,下次谁跑都
还是红。改成显式标记 COVERAGE_SKIP:有标记即记入 no_coverage_suites、
不计入 modules/modules_total,控制台打 SKIP。没有标记又没有 BUILD 的
运行器仍然 FAIL,严格性不放宽。
刻意不用"目录里没有 .c 就跳过"这类启发式:那会把真丢了 BUILD 的 C 套件
静默洗成绿灯,正是这道门禁要拦的东西。
二、该运行器缺 sys.path 引导
它 from oracle import ... 但没把自己目录加进 sys.path。直接跑能过
(sys.path[0] 是脚本目录),被 importlib 加载就 No module named
'oracle' —— 覆盖率脚本走的正是后者。补上后两种加载方式都过。
基线在全绿状态重建:modules_total = modules_ok = 49,没有任何 ok:false
条目,iec104_dtu 移入 no_coverage_suites;连跑两次全量都 RC=0 且汇总行
逐字一致(8204/9185 行、622/679 函数,suites 49/49)。
测试有牙(源变异实测,每次改完按字节还原并校验 sha 一致):
iec104_comm.c CA 下限 < 改 <= / PORT 上限 > 改 >= / ca_set 不置脏
-> 三条全部 KILLED
iec104_serv.c carry 饱和值减一 / 回绕判定 < 改 <= / carry += 改 =
-> 三条全部 KILLED
最后一条边界判据 `carry > SAT - now` 改 `>=` 经穷举 20 万组输入证明是
等价变异(两个分支返回值相同),没有假装能区分它,只在测试注释里写明。
顺带把 s_monotonic 的用例从 6 条扩到 10 条:补 now == last 不算回绕、
饱和后 carry 恰好等于 SAT、以及 carry + now == SAT-1 不被提前饱和。
只断言返回值不看内部状态时,前一版测试对两个真变异是无感的。
验证:pre-commit 9 Passed / 0 Failed;manual 阶段 test-coverage 与
iec104-tcp(13/13 真实 TCP 回环)均 Passed;新旧文件字节体检 BOM=False
CR=0 U+FFFD=0。
160 lines
5.9 KiB
C
160 lines
5.9 KiB
C
/*
|
|
* IEC104 [comm] segment host unit test.
|
|
* Builds the real App/iec60870/104_port/iec104_comm.c into this translation unit
|
|
* and fakes only the config engine boundary (cfg_file_register/cfg_file_save)
|
|
* against the real App/cfg/cfg_file.h interface.
|
|
*/
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "cfg_file.h"
|
|
|
|
static int s_total = 0, s_passed = 0, s_failed = 0;
|
|
#define CHECK(cond, name) do { \
|
|
s_total++; \
|
|
if (cond) { s_passed++; printf(" [PASS] %s\n", name); } \
|
|
else { s_failed++; printf(" [FAIL] %s (line %d)\n", name, __LINE__); } \
|
|
} while (0)
|
|
|
|
/* Config engine fake, controlled by each test case. */
|
|
static int g_save_result;
|
|
static int g_register_calls;
|
|
static int g_save_calls;
|
|
static cfg_section_reg_t g_last_reg;
|
|
|
|
int cfg_file_save(void)
|
|
{
|
|
g_save_calls++;
|
|
return g_save_result;
|
|
}
|
|
|
|
int cfg_file_register(const cfg_section_reg_t *p_reg)
|
|
{
|
|
g_register_calls++;
|
|
if (p_reg != NULL) {
|
|
g_last_reg = *p_reg;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#include "iec104_comm.c"
|
|
|
|
static void reset_fakes(int save_result)
|
|
{
|
|
g_save_result = save_result;
|
|
g_register_calls = 0;
|
|
g_save_calls = 0;
|
|
memset(&g_last_reg, 0, sizeof(g_last_reg));
|
|
}
|
|
|
|
static void tc_init_defaults(void)
|
|
{
|
|
uint16_t ca, port;
|
|
|
|
reset_fakes(0);
|
|
CHECK(iec104_comm_ca_set(1234) == 0, "set ca before init");
|
|
CHECK(iec104_comm_port_set(4000) == 0, "set port before init");
|
|
CHECK(iec104_comm_init() == 0, "init returns register result");
|
|
CHECK(g_register_calls == 1, "init registers exactly once");
|
|
CHECK(strcmp(g_last_reg.name, IEC104_COMM_SEC) == 0, "registered section name");
|
|
CHECK(g_last_reg.p_data == &s_comm, "registered RAM copy pointer");
|
|
CHECK(g_last_reg.p_defaults == &s_comm_rom, "registered defaults pointer");
|
|
CHECK(g_last_reg.data_size == sizeof(iec104_comm_t), "registered data size");
|
|
CHECK(g_last_reg.p_keys == s_comm_keys, "registered key table");
|
|
CHECK(g_last_reg.key_count == 2u, "registered key count");
|
|
CHECK(g_last_reg.p_cb == NULL, "no config callback");
|
|
CHECK(s_comm_keys[0].type == CFG_VAL_UINT && s_comm_keys[0].len == 2u &&
|
|
s_comm_keys[0].offset == offsetof(iec104_comm_t, ca), "ca key descriptor");
|
|
CHECK(s_comm_keys[1].type == CFG_VAL_UINT && s_comm_keys[1].len == 2u &&
|
|
s_comm_keys[1].offset == offsetof(iec104_comm_t, port), "port key descriptor");
|
|
ca = iec104_comm_ca();
|
|
port = iec104_comm_port();
|
|
CHECK(ca == IEC104_COMM_DEF_CA, "init restores ca default");
|
|
CHECK(port == IEC104_COMM_DEF_PORT, "init restores port default");
|
|
CHECK(iec104_comm_dirty_peek() == 0u, "init clears dirty flag");
|
|
}
|
|
|
|
static void tc_getter_band(void)
|
|
{
|
|
reset_fakes(0);
|
|
(void)iec104_comm_init();
|
|
|
|
s_comm.ca = 0u;
|
|
CHECK(iec104_comm_ca() == IEC104_COMM_DEF_CA, "ca below band falls back");
|
|
s_comm.ca = IEC104_COMM_CA_MAX;
|
|
CHECK(iec104_comm_ca() == IEC104_COMM_CA_MAX, "ca upper bound accepted");
|
|
s_comm.ca = 42u;
|
|
CHECK(iec104_comm_ca() == 42u, "ca in-band returned");
|
|
|
|
s_comm.port = 0u;
|
|
CHECK(iec104_comm_port() == IEC104_COMM_DEF_PORT, "port below band falls back");
|
|
s_comm.port = IEC104_COMM_PORT_MIN - 1u;
|
|
CHECK(iec104_comm_port() == IEC104_COMM_DEF_PORT, "port 1023 falls back");
|
|
s_comm.port = IEC104_COMM_PORT_MAX;
|
|
CHECK(iec104_comm_port() == IEC104_COMM_PORT_MAX, "port upper bound accepted");
|
|
s_comm.port = 2404u;
|
|
CHECK(iec104_comm_port() == 2404u, "port in-band returned");
|
|
}
|
|
|
|
static void tc_setters(void)
|
|
{
|
|
reset_fakes(0);
|
|
(void)iec104_comm_init();
|
|
|
|
CHECK(iec104_comm_ca_set(IEC104_COMM_CA_MIN) == 0, "ca min accepted");
|
|
CHECK(iec104_comm_ca() == IEC104_COMM_CA_MIN, "ca min stored");
|
|
CHECK(iec104_comm_ca_set(IEC104_COMM_CA_MAX) == 0, "ca max accepted");
|
|
CHECK(iec104_comm_ca() == IEC104_COMM_CA_MAX, "ca max stored");
|
|
CHECK(iec104_comm_dirty_peek() == 1u, "legal ca set makes dirty");
|
|
|
|
(void)iec104_comm_init();
|
|
CHECK(iec104_comm_ca_set(0u) == -1, "ca zero rejected");
|
|
CHECK(iec104_comm_ca() == IEC104_COMM_DEF_CA, "rejected ca leaves copy unchanged");
|
|
CHECK(iec104_comm_dirty_peek() == 0u, "rejected ca does not make dirty");
|
|
|
|
CHECK(iec104_comm_port_set(IEC104_COMM_PORT_MIN) == 0, "port min accepted");
|
|
CHECK(iec104_comm_port() == IEC104_COMM_PORT_MIN, "port min stored");
|
|
CHECK(iec104_comm_port_set(IEC104_COMM_PORT_MAX) == 0, "port max accepted");
|
|
CHECK(iec104_comm_port() == IEC104_COMM_PORT_MAX, "port max stored");
|
|
CHECK(iec104_comm_dirty_peek() == 1u, "legal port set makes dirty");
|
|
|
|
(void)iec104_comm_init();
|
|
CHECK(iec104_comm_port_set(IEC104_COMM_PORT_MIN - 1u) == -1, "port 1023 rejected");
|
|
CHECK(iec104_comm_port() == IEC104_COMM_DEF_PORT, "rejected port leaves copy unchanged");
|
|
CHECK(iec104_comm_dirty_peek() == 0u, "rejected port does not make dirty");
|
|
}
|
|
|
|
static void tc_store_save(void)
|
|
{
|
|
reset_fakes(0);
|
|
(void)iec104_comm_init();
|
|
CHECK(iec104_comm_store_save() == 0, "clean store is a no-op success");
|
|
CHECK(g_save_calls == 0, "clean store does not call engine");
|
|
|
|
CHECK(iec104_comm_ca_set(7u) == 0, "dirty setup");
|
|
g_save_result = -1;
|
|
CHECK(iec104_comm_store_save() == -1, "engine failure propagated");
|
|
CHECK(g_save_calls == 1, "engine save attempted once on failure");
|
|
CHECK(iec104_comm_dirty_peek() == 1u, "failed save keeps dirty for retry");
|
|
|
|
g_save_result = 0;
|
|
CHECK(iec104_comm_store_save() == 0, "retry save succeeds");
|
|
CHECK(g_save_calls == 2, "retry calls engine again");
|
|
CHECK(iec104_comm_dirty_peek() == 0u, "successful save clears dirty");
|
|
CHECK(iec104_comm_store_save() == 0, "next clean store again no-op");
|
|
CHECK(g_save_calls == 2, "no extra engine call after clear");
|
|
}
|
|
|
|
int main(void)
|
|
{
|
|
printf("=== IEC104 [comm] Host Unit Tests ===\n");
|
|
tc_init_defaults();
|
|
tc_getter_band();
|
|
tc_setters();
|
|
tc_store_save();
|
|
printf("=== IEC104 Comm Tests: %d/%d PASSED (failed=%d) ===\n",
|
|
s_passed, s_total, s_failed);
|
|
return (s_failed == 0) ? 0 : 1;
|
|
}
|