mirror of
https://github.com/shadowsocks/ShadowsocksX-NG.git
synced 2026-11-22 05:25:41 +00:00
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。
133 lines
4.7 KiB
Swift
133 lines
4.7 KiB
Swift
import XCTest
|
||
|
||
@testable import ShadowsocksX_NG2
|
||
|
||
/// helper XPC 契约测试(issue #71):typed payload 往返、引擎应答编码与
|
||
/// 串行 last-writer 语义,全部用确定性替身,不触真实 XPC 与 SystemConfiguration。
|
||
final class SystemProxyHelperContractTests: XCTestCase {
|
||
private let configuration = SystemProxyConfiguration(
|
||
socks: .init(host: "127.0.0.1", port: 1086),
|
||
http: .init(host: "127.0.0.1", port: 1087),
|
||
https: .init(host: "127.0.0.1", port: 1087),
|
||
exceptions: ["localhost"])
|
||
|
||
/// 并发闭包与断言之间的线程安全值交接。
|
||
private final class LockedArray<Element>: @unchecked Sendable {
|
||
private let lock = NSLock()
|
||
private var items: [Element] = []
|
||
|
||
func append(_ item: Element) {
|
||
lock.lock()
|
||
items.append(item)
|
||
lock.unlock()
|
||
}
|
||
|
||
var all: [Element] {
|
||
lock.lock()
|
||
defer { lock.unlock() }
|
||
return items
|
||
}
|
||
}
|
||
|
||
func testConfigurationPayloadRoundTripsThroughJSON() throws {
|
||
let payload = try SystemProxyHelperWire.encodeConfiguration(configuration)
|
||
let decoded = try SystemProxyHelperWire.decodeConfiguration(payload)
|
||
XCTAssertEqual(decoded, configuration)
|
||
}
|
||
|
||
func testEngineAnswersApplyWithTypedOutcome() throws {
|
||
let requested = try SystemProxyHelperWire.encodeConfiguration(configuration)
|
||
let observed = LockedArray<SystemProxyHelperEngine.Request>()
|
||
let response = SystemProxyHelperEngine.response(
|
||
request: .success(.apply(configuration)),
|
||
perform: { request in
|
||
observed.append(request)
|
||
return .applied(.written)
|
||
})
|
||
|
||
XCTAssertEqual(observed.all, [.apply(configuration)], "helper 收到 closed typed 配置")
|
||
XCTAssertEqual(response, .applied(.written))
|
||
XCTAssertEqual(
|
||
try SystemProxyHelperWire.decodeConfiguration(requested), configuration,
|
||
"payload 与配置一致")
|
||
}
|
||
|
||
func testEngineAnswersClearWithTypedOutcome() {
|
||
let response = SystemProxyHelperEngine.response(
|
||
request: .success(.clear), perform: { _ in .cleared })
|
||
XCTAssertEqual(response, .cleared)
|
||
}
|
||
|
||
func testEngineEncodesTypedFailuresAndInvalidPayloads() throws {
|
||
let failure = SystemProxyHelperEngine.response(
|
||
request: .failure(SystemProxyError.commitFailed("busy")),
|
||
perform: { _ in .cleared })
|
||
XCTAssertEqual(failure, .failure(.commitFailed("busy")))
|
||
|
||
let genericFailure = SystemProxyHelperEngine.response(
|
||
request: .failure(ProxySettingsStoreError.corrupt(detail: "bad")),
|
||
perform: { _ in .cleared })
|
||
XCTAssertEqual(
|
||
genericFailure, .failure(.helperUnavailable("corrupt(detail: \"bad\")")),
|
||
"非 SystemProxyError 归并为 helperUnavailable")
|
||
|
||
XCTAssertThrowsError(
|
||
try SystemProxyHelperWire.decodeConfiguration(Data("not json".utf8))
|
||
) { error in
|
||
guard case SystemProxyError.invalidRequest = error else {
|
||
return XCTFail("无效 payload 应为 invalidRequest,实际 \(error)")
|
||
}
|
||
}
|
||
}
|
||
|
||
/// 串行 last-writer(issue #71 AC34):注入的假写入器在共享串行队列上按
|
||
/// 接受顺序执行,最后接受的请求决定最终结果。
|
||
func testEngineProcessesRequestsSeriallyWithLastWriterWins() async throws {
|
||
let recorder = LockedArray<String>()
|
||
let queue = DispatchQueue(label: "test.system-proxy-helper.serial")
|
||
let engine = SystemProxyHelperEngine(
|
||
perform: { request in
|
||
switch request {
|
||
case .apply(let applied):
|
||
recorder.append("apply:\(applied.socks.port)")
|
||
case .clear:
|
||
recorder.append("clear")
|
||
}
|
||
return .applied(.written)
|
||
},
|
||
queue: queue)
|
||
|
||
let first = try SystemProxyHelperWire.encodeConfiguration(configuration)
|
||
let second = try SystemProxyHelperWire.encodeConfiguration(
|
||
SystemProxyConfiguration(
|
||
socks: .init(host: "127.0.0.1", port: 2086),
|
||
http: .init(host: "127.0.0.1", port: 2087),
|
||
https: .init(host: "127.0.0.1", port: 2087),
|
||
exceptions: ["localhost"]))
|
||
|
||
let replies = LockedArray<Data>()
|
||
let replyExpectation = expectation(description: "replies")
|
||
replyExpectation.expectedFulfillmentCount = 3
|
||
engine.apply(first) {
|
||
replies.append($0)
|
||
replyExpectation.fulfill()
|
||
}
|
||
engine.clear {
|
||
replies.append($0)
|
||
replyExpectation.fulfill()
|
||
}
|
||
engine.apply(second) {
|
||
replies.append($0)
|
||
replyExpectation.fulfill()
|
||
}
|
||
await fulfillment(of: [replyExpectation], timeout: 5)
|
||
|
||
XCTAssertEqual(recorder.all, ["apply:1086", "clear", "apply:2086"], "逐个串行执行")
|
||
XCTAssertEqual(replies.all.count, 3)
|
||
for reply in replies.all {
|
||
XCTAssertEqual(
|
||
try SystemProxyHelperWire.decode(reply), .applied(.written), "每个请求都有 typed 应答")
|
||
}
|
||
}
|
||
}
|