Files
ShadowsocksX-NG/ShadowsocksX-NG2/Tests/ProxyRuntime/ProxyRuntimeControllerTests+CatalogConvergence.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

142 lines
7.3 KiB
Swift
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
import XCTest
@testable import ShadowsocksX_NG2
/// 目录提交 → 运行时收敛语义(D3/D5 与 GLOSSARY.md「有效值未变的提交不做
/// 运行时收敛」):与主测试类同构扩展,按既有模式独立成文件。
final class ProxyRuntimeCatalogConvergenceTests: ProxyRuntimeControllerTests {
override func makeDefaultRuleSnapshots() -> BuiltinRuleSnapshots {
BuiltinRuleSnapshots(loader: ProxyRuntimeFixture.controlFlowRuleSnapshot)
}
// MARK: 目录重展开消费(D3/D5)
/// 模拟 wrapper 在跑(pid 指向本测试进程,kill(pid, 0) 判活通过)。
private func simulateRunningWrapper() throws {
try Data("\(ProcessInfo.processInfo.processIdentifier)".utf8).write(to: runtime.pidFile)
}
private func committedCatalog() throws -> ConfigurationCatalog {
try CatalogFileStore(fileURL: catalogFileURL).load().catalog
}
private func replacedFields(
_ fields: ServerFields, address: String? = nil, remark: String? = nil
) -> ServerFields {
ServerFields(
address: address ?? fields.address,
port: fields.port,
encryptionMethod: fields.encryptionMethod,
passwordRef: fields.passwordRef,
remark: remark ?? fields.remark,
pluginProgram: fields.pluginProgram,
pluginOptionsRef: fields.pluginOptionsRef)
}
func testCatalogValueEditOfActiveTargetRewritesAndSignalsRunningWrapper() async throws {
let seeded = try makeSeededCatalog()
let controller = makeController(probe: ProxyRuntimeFixture.FakeProbe.reachable())
try await controller.activate(seeded.server)
await controller.setAgentEnabled(true)
try simulateRunningWrapper()
// 修改激活服务器的连接地址(契约有效值变化),提交目录变更。
var catalog = try CatalogFileStore(fileURL: catalogFileURL).load().catalog
let fields = try ActivationFixture.serverFields(of: seeded.server, in: catalog)
try catalog.updateServer(
seeded.server, with: replacedFields(fields, address: "203.0.113.9"))
try CatalogFileStore(fileURL: catalogFileURL).save(CatalogDocument(catalog: catalog))
// 协调器生产适配入口(issue #40):以刚提交的内存快照重展开。
_ = await controller.catalogDidCommit(snapshot: try committedCatalog())
XCTAssertEqual(controller.state, .running)
let onDisk = try XCTUnwrap(RuntimeFileStore(fileURL: runtime.contract).loadDocument())
XCTAssertEqual(onDisk.servers.first?.server, "203.0.113.9", "运行时文档已原子更新")
let signalsSent = signals.signalsSent.filter { $0.signal != 0 }
XCTAssertEqual(signalsSent.count, 1, "代理运行中:重写后应发一次 SIGUSR1")
XCTAssertEqual(signalsSent.first?.signal, SIGUSR1)
}
func testCatalogRemarkOnlyEditOfActiveTargetKeepsRuntimeUntouched() async throws {
let seeded = try makeSeededCatalog()
let probe = ProxyRuntimeFixture.FakeProbe.reachable()
let controller = makeController(probe: probe)
try await controller.activate(seeded.server)
await controller.setAgentEnabled(true)
try simulateRunningWrapper()
let contractDataBefore = try Data(contentsOf: runtime.contract)
// 修改激活服务器的备注:显示名是目录元数据,不进契约 → 零收敛
// (不写盘、不发信号、不闪 starting、不重走健康门)。
var catalog = try CatalogFileStore(fileURL: catalogFileURL).load().catalog
let fields = try ActivationFixture.serverFields(of: seeded.server, in: catalog)
try catalog.updateServer(
seeded.server, with: replacedFields(fields, remark: "新加坡 01"))
try CatalogFileStore(fileURL: catalogFileURL).save(CatalogDocument(catalog: catalog))
let outcome = await controller.catalogDidCommit(snapshot: try committedCatalog())
XCTAssertEqual(outcome, .converged(skippedServers: []))
XCTAssertEqual(controller.state, .running, "状态面原地不动,不闪回 starting")
XCTAssertEqual(try Data(contentsOf: runtime.contract), contractDataBefore, "契约逐字节未变")
XCTAssertEqual(
signals.signalsSent.filter { $0.signal != 0 }.count, 0, "不向 wrapper 发信号")
XCTAssertEqual(probe.callCount, 2, "不重走健康门(初始部署探测过 SOCKS+HTTP 各一次)")
}
func testCatalogValueEditOutsideActiveSubtreeKeepsRuntimeUntouched() async throws {
var catalog = ConfigurationCatalog()
let activeServer = try ActivationFixture.addPlainServer(
"香港 01", in: &catalog, credentials: credentials)
let idleServer = try ActivationFixture.addPlainServer(
"备用 02", in: &catalog, credentials: credentials)
try CatalogFileStore(fileURL: catalogFileURL).save(CatalogDocument(catalog: catalog))
let probe = ProxyRuntimeFixture.FakeProbe.reachable()
let controller = makeController(probe: probe)
try await controller.activate(activeServer)
await controller.setAgentEnabled(true)
try simulateRunningWrapper()
let contractDataBefore = try Data(contentsOf: runtime.contract)
// 修改目标子树之外服务器的连接地址:派生契约不变 → 零收敛。
var working = try CatalogFileStore(fileURL: catalogFileURL).load().catalog
let fields = try ActivationFixture.serverFields(of: idleServer, in: working)
try working.updateServer(idleServer, with: replacedFields(fields, address: "198.51.100.9"))
try CatalogFileStore(fileURL: catalogFileURL).save(CatalogDocument(catalog: working))
let outcome = await controller.catalogDidCommit(snapshot: try committedCatalog())
XCTAssertEqual(outcome, .converged(skippedServers: []))
XCTAssertEqual(controller.state, .running, "状态面原地不动,不闪回 starting")
XCTAssertEqual(try Data(contentsOf: runtime.contract), contractDataBefore, "契约逐字节未变")
XCTAssertEqual(signals.signalsSent.filter { $0.signal != 0 }.count, 0, "不向 wrapper 发信号")
XCTAssertEqual(probe.callCount, 2, "不重走健康门")
}
func testCatalogGroupMemberValueEditRewritesAndSignalsRunningWrapper() async throws {
var catalog = ConfigurationCatalog()
let group = try catalog.addGroup("分组")
let member = try ActivationFixture.addPlainServer(
"香港 01", to: group, in: &catalog, credentials: credentials)
try CatalogFileStore(fileURL: catalogFileURL).save(CatalogDocument(catalog: catalog))
let controller = makeController(probe: ProxyRuntimeFixture.FakeProbe.reachable())
try await controller.activate(group)
await controller.setAgentEnabled(true)
try simulateRunningWrapper()
// 激活目标是分组:成员连接值变化是活动子树的真实值变化 → 正常收敛。
var working = try CatalogFileStore(fileURL: catalogFileURL).load().catalog
let fields = try ActivationFixture.serverFields(of: member, in: working)
try working.updateServer(member, with: replacedFields(fields, address: "203.0.113.9"))
try CatalogFileStore(fileURL: catalogFileURL).save(CatalogDocument(catalog: working))
_ = await controller.catalogDidCommit(snapshot: try committedCatalog())
XCTAssertEqual(controller.state, .running)
let onDisk = try XCTUnwrap(RuntimeFileStore(fileURL: runtime.contract).loadDocument())
XCTAssertEqual(onDisk.servers.first?.server, "203.0.113.9", "成员值变化进入运行时文档")
XCTAssertEqual(signals.signalsSent.filter { $0.signal != 0 }.count, 1, "转发一次 SIGUSR1")
}
}