Files
ShadowsocksX-NG/ShadowsocksX-NG2/Tests/Rules/Custom/CustomRuleEditingControllerTests.swift
T
Qiu Yuzhou 20a62117f2 refactor(tests): 按功能领域重组 Tests/ 目录
Tests/ 根层原有 138 个平铺测试文件,无法从目录读出测试覆盖的功能领域。

按功能领域重组为 17 个目录(Catalog/Workflow 与 Rules/Custom 两处嵌套,分别
对应 App/Application/CatalogWorkflow 与 Domain/Rules/Custom):Architecture /
Support / Agent / Activation / Catalog / Subscription / Rules / ProxyRuntime /
ProxyControl / Runtime / Settings / SystemProxy / Plugin / Diagnostics /
Credentials / Workspace / Servers;Smoke/ 保持独立 target 不动。138 个移动中
132 个是 100% 相似度的纯重命名,其余 6 个在重命名之上带路径反推改写(见下)。

本次不是纯搬移:测试代码比生产代码多一层位置耦合,有 7 处用固定层数的
deletingLastPathComponent() 从 #filePath 反推仓库路径(都假定文件就在 Tests/
根层)。这 7 处改走新增的 Tests/Support/TestSourceTree.swift——从调用点沿父
目录上溯找到含 project.yml 的目录,因此不再依赖父目录层数,以后移动测试文件
也不会静默指错。

配套改动:

- 新增 Tests 布局守卫 TestsLayoutTests,断言 Tests/ 根层无平铺 .swift。比
  Domain 那条弱一档——根层的 Info.plist(info.path 生成物)与
  Fixtures/RuleSnapshots 下的 JSON(folder resource)都必须保留,不能用
  「树下只有 .swift」覆盖。
- project.yml:Smoke target 按文件引用的 Tests/AppArtifact.swift 改指
  Tests/Support/;两处注释里写死的 Tests/SkeletonTests.swift 随移动更新。
  excludes 的裸名 "Smoke" / "Fixtures" 仍匹配 Tests/ 直属子目录,无需改动。
- README 的 Tests 条目展开为目录说明,并修掉 Domain 条目里写死的
  Tests/SkeletonTests.swift。
- 顺带删去 DomainLayoutTests 文档注释里「整理前 62 个文件」这类易漂移的数字。

验证:xcodegen generate 后单测 target 为 139 个源文件(全部非 Smoke 文件,0 个
Smoke 文件混入)且仍以 Fixtures/RuleSnapshots 为资源,Smoke target 为 8 个
Smoke 文件加 AppArtifact;依赖路径反推的 6 个测试类全绿(路径指错即失败);
task format 未改写任何被移动文件;task lint 与整理前同为 21 条内容型 warning;
build 0 error;task test 1025 用例全通过(整理前 1024,+1 为新守卫);
TestsLayoutTests 经变异验证(根层投放探针即失败);packaging-gate ALL CHECKS
PASSED。
2026-10-05 20:37:35 +08:00

112 lines
5.3 KiB
Swift

import XCTest
@testable import ShadowsocksX_NG2
/// Verify the editor's public commands against the production commit adapter,
/// using the existing hostless runtime and system-proxy fixtures.
final class CustomRuleEditingControllerTests: ProxyRuntimeControllerTests {
override func makeDefaultRuleSnapshots() -> BuiltinRuleSnapshots {
BuiltinRuleSnapshots(loader: ProxyRuntimeFixture.controlFlowRuleSnapshot)
}
func testEditorSaveWhileOffPersistsWithoutStartingRuntime() async throws {
let (store, _) = try makeCustomRuleStore()
let controller = makeControllerWithCustomRules(
store: store, settings: ProxySettings(listen: ActivationFixture.listen, agentEnabled: false))
let workflow = editingWorkflow(controller)
await workflow.refresh()
var draft = try XCTUnwrap(workflow.makeCustomRuleDraft())
draft.kind = .ipAddress
draft.content = "8.8.8.8"
draft.action = .direct
let result = await workflow.saveCustomRule(draft)
XCTAssertEqual(result, .committed(.saved))
XCTAssertEqual(try store.load().first?.id, draft.id)
XCTAssertEqual(controller.state, .off)
XCTAssertEqual(agent.registerCount, 0)
XCTAssertEqual(workflow.snapshot.commitFeedback?.operation, .add)
}
func testEditorChangesRuntimeACLOnceAndRetainsUUIDAcrossEdits() async throws {
let seeded = try makeSeededCatalog()
let (store, _) = try makeCustomRuleStore()
let controller = makeControllerWithCustomRules(
store: store,
settings: ProxySettings(
listen: ActivationFixture.listen, preferredMode: .rule,
ruleDefaultAction: .proxyWhenUnmatched, agentEnabled: true), proxyMode: .rule)
try await controller.activate(seeded.server)
let workflow = editingWorkflow(controller)
await workflow.refresh()
let registrations = agent.registerCount
var draft = try XCTUnwrap(workflow.makeCustomRuleDraft())
draft.content = "new-rule.example"
draft.action = .direct
let added = await workflow.saveCustomRule(draft)
XCTAssertEqual(added, .committed(.saved))
await controller.ruleApplicationTask?.value
XCTAssertEqual(agent.registerCount, registrations + 1)
let runtimeStore = RuntimeFileStore(fileURL: runtime.contract)
XCTAssertTrue(try activeACLContent(runtimeStore).contains("||new-rule.example"))
var edited = try XCTUnwrap(workflow.makeCustomRuleDraft(editing: draft.id))
edited.content = "edited-rule.example"
let saved = await workflow.saveCustomRule(edited)
XCTAssertEqual(saved, .committed(.saved))
await controller.ruleApplicationTask?.value
XCTAssertEqual(agent.registerCount, registrations + 2)
XCTAssertEqual(try store.load().map(\.id), [draft.id])
XCTAssertFalse(try activeACLContent(runtimeStore).contains("||new-rule.example"))
XCTAssertTrue(try activeACLContent(runtimeStore).contains("||edited-rule.example"))
XCTAssertEqual(workflow.snapshot.commitFeedback?.operation, .edit)
}
func testEditorFailedDeploymentKeepsSavedEditAndRestoresOnlyACL() async throws {
let seeded = try makeSeededCatalog()
let (store, _) = try makeCustomRuleStore()
let existing = CustomRule(action: .direct, match: .domainSuffix("kept.example"))
try store.save([existing])
let controller = makeControllerWithCustomRules(
store: store,
settings: ProxySettings(
listen: ActivationFixture.listen, preferredMode: .rule,
ruleDefaultAction: .proxyWhenUnmatched, agentEnabled: true), proxyMode: .rule)
try await controller.activate(seeded.server)
let workflow = editingWorkflow(controller)
await workflow.refresh()
let version = workflow.snapshot.version
let runtimeStore = RuntimeFileStore(fileURL: runtime.contract)
let originalRuntime = try XCTUnwrap(runtimeStore.loadDocument())
agent.onRegister = {
guard let requested = runtimeStore.loadDocument() else { return }
let content =
(try? Data(contentsOf: runtimeStore.aclFileURL))
.flatMap { String(bytes: $0, encoding: .utf8) } ?? ""
try? runtimeStore.writeRuntimeReceipt(
for: content.contains("new-rule.example") ? originalRuntime : requested, processID: 42)
}
var draft = try XCTUnwrap(workflow.makeCustomRuleDraft(editing: existing.id))
draft.content = "new-rule.example"
let result = await workflow.saveCustomRule(draft)
XCTAssertEqual(result, .committed(.saved))
await controller.ruleApplicationTask?.value
XCTAssertEqual(try store.load().first?.id, existing.id)
XCTAssertEqual(try store.load().first?.match, .domainSuffix("new-rule.example"))
XCTAssertNotEqual(workflow.snapshot.version, version)
XCTAssertEqual(
workflow.snapshot.rows.first { $0.customIDs.contains(existing.id) }?.identity,
RuleIdentity(action: .direct, match: .domainSuffix("new-rule.example")))
XCTAssertEqual(runtimeStore.loadDocument(), originalRuntime)
XCTAssertEqual(controller.state, .running)
let preview = await workflow.previewCustomRule(draft)
XCTAssertEqual(preview.failure, .staleDraft)
XCTAssertNotNil(controller.runtimeFacts.failure)
}
private func editingWorkflow(_ controller: ProxyRuntimeController) -> RulesWorkflow {
RulesWorkflow(
loadDocument: { try controller.ruleDocuments.load() },
commitDocument: { await controller.commitRuleDocument($0) },
builtinSnapshots: controller.ruleSnapshots)
}
}