refactor: expect 类型模型重构,Raw/Resolved 双层分离与断言基础设施内聚
- 重命名 ContentRules→ContentExpectations, KeyValueExpect→KeyedExpectations - 新增 Raw/Resolved 双层模型:resolve 阶段物化为执行计划,store 持久化 Raw 快照 - HTTP body 按需读取:status/headers 失败或无 body expectation 时不读取 body - 新增 displayValueExpectation() 解包 failure.expected 用户可读展示 - 修复 checkEarlyTimeout 独立 lte/lt 检查,修复 KeyedExpectations JSON Schema - 新增 expect/value.ts(resolve/check/display)、keyed.ts、content.ts、headers.ts、status.ts - 删除旧 normalize.ts/matcher.ts/validate-matcher.ts/key-value.ts - 更新 DEVELOPMENT.md:expect 五层管线表、displayValueExpectation、1.7↔1.10 交叉引用 - 同步 13 个 main specs,归档 refactor-expect-type-model 变更(62/62 tasks)
This commit is contained in:
@@ -1,7 +1,13 @@
|
||||
import { describe, expect, it } from "bun:test";
|
||||
|
||||
import type { ResolvedUdpTarget, UdpExpectConfig } from "../../../../../src/server/checker/runner/udp/types";
|
||||
import type {
|
||||
RawUdpExpectConfig,
|
||||
ResolvedUdpExpectConfig,
|
||||
ResolvedUdpTarget,
|
||||
} from "../../../../../src/server/checker/runner/udp/types";
|
||||
|
||||
import { resolveContentExpectations } from "../../../../../src/server/checker/expect/content";
|
||||
import { resolveValueExpectation } from "../../../../../src/server/checker/expect/value";
|
||||
import { UdpChecker } from "../../../../../src/server/checker/runner/udp/execute";
|
||||
|
||||
async function createEchoServer(): Promise<{ close: () => void; port: number }> {
|
||||
@@ -27,14 +33,26 @@ function makeSignal(timeoutMs: number): { cleanup: () => void; signal: AbortSign
|
||||
return { cleanup: () => clearTimeout(timer), signal: controller.signal };
|
||||
}
|
||||
|
||||
function makeTarget(overrides: Partial<ResolvedUdpTarget["udp"]> = {}, expect?: UdpExpectConfig): ResolvedUdpTarget {
|
||||
function makeTarget(overrides: Partial<ResolvedUdpTarget["udp"]> = {}, raw?: RawUdpExpectConfig): ResolvedUdpTarget {
|
||||
const resolvedExpect: ResolvedUdpExpectConfig | undefined = raw
|
||||
? {
|
||||
durationMs: resolveValueExpectation(raw.durationMs),
|
||||
responded: raw.responded ?? true,
|
||||
response: resolveContentExpectations(raw.response),
|
||||
responseSize: resolveValueExpectation(raw.responseSize),
|
||||
sourceHost: resolveValueExpectation(raw.sourceHost),
|
||||
sourcePort: resolveValueExpectation(raw.sourcePort),
|
||||
}
|
||||
: undefined;
|
||||
|
||||
return {
|
||||
description: null,
|
||||
expect,
|
||||
expect: resolvedExpect,
|
||||
group: "default",
|
||||
id: "test-udp",
|
||||
intervalMs: 30000,
|
||||
name: null,
|
||||
rawExpect: raw,
|
||||
timeoutMs: 10000,
|
||||
type: "udp",
|
||||
udp: {
|
||||
@@ -322,6 +340,8 @@ describe("UdpChecker resolve", () => {
|
||||
expect(target.udp.encoding).toBe("text");
|
||||
expect(target.udp.responseEncoding).toBe("text");
|
||||
expect(target.udp.maxResponseBytes).toBe(4096);
|
||||
expect(target.rawExpect).toBeUndefined();
|
||||
expect(target.expect).toEqual({ responded: true });
|
||||
});
|
||||
|
||||
it("should use defaults.udp for missing fields", () => {
|
||||
|
||||
Reference in New Issue
Block a user