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。
210 lines
9.3 KiB
Swift
210 lines
9.3 KiB
Swift
import Combine
|
|
import XCTest
|
|
|
|
@testable import ShadowsocksX_NG2
|
|
|
|
final class ProxyRuntimeModeCommandTests: ProxyRuntimeControllerTests {
|
|
override func makeDefaultRuleSnapshots() -> BuiltinRuleSnapshots {
|
|
BuiltinRuleSnapshots(loader: ProxyRuntimeFixture.controlFlowRuleSnapshot)
|
|
}
|
|
|
|
func testSetProxyModePersistsTheChoiceAndARestoreRestoresIt() async throws {
|
|
let settingsStore = InMemoryProxySettingsStore()
|
|
let controller = makeController(
|
|
probe: ProxyRuntimeFixture.FakeProbe.reachable(), settingsStore: settingsStore)
|
|
|
|
await controller.setProxyMode(.global)
|
|
|
|
XCTAssertEqual(controller.proxyMode, .global)
|
|
XCTAssertEqual(controller.settings.preferredMode, .global)
|
|
XCTAssertEqual(settingsStore.saved?.preferredMode, .global, "模式选择随快照持久化")
|
|
|
|
// GUI 重启路径:恢复出的控制器不注入显式模式,从持久快照读回。
|
|
let restored = makeController(
|
|
probe: ProxyRuntimeFixture.FakeProbe.reachable(),
|
|
settingsRestore: RestoredProxySettings(
|
|
settings: try XCTUnwrap(settingsStore.load()), unreadableError: nil),
|
|
proxyMode: nil)
|
|
XCTAssertEqual(restored.proxyMode, .global)
|
|
}
|
|
|
|
func testSetProxyModePersistenceFailureKeepsPreviousModeAndNamesReason() async throws {
|
|
let settingsStore = InMemoryProxySettingsStore()
|
|
settingsStore.saveError = FakeSettingsSaveError.system
|
|
let controller = makeController(
|
|
probe: ProxyRuntimeFixture.FakeProbe.reachable(), settingsStore: settingsStore)
|
|
|
|
await controller.setProxyMode(.global)
|
|
|
|
XCTAssertEqual(controller.proxyMode, .rule, "持久化失败保留旧模式")
|
|
XCTAssertEqual(controller.settings.preferredMode, .rule)
|
|
guard case .serviceFailed(.persistence) = controller.state else {
|
|
XCTFail("应点名持久化失败,实际 \(controller.state)")
|
|
return
|
|
}
|
|
}
|
|
|
|
func testDirectModeDeploysACLWithoutServerAndProjectsSOCKSProxy() async throws {
|
|
let settingsStore = InMemoryProxySettingsStore()
|
|
let controller = makeController(
|
|
probe: ProxyRuntimeFixture.FakeProbe.reachable(),
|
|
settingsStore: settingsStore,
|
|
settings: ProxySettings(
|
|
listen: ActivationFixture.listen, agentEnabled: true, systemProxyEnabled: true))
|
|
|
|
await controller.resyncOnLaunch()
|
|
XCTAssertEqual(controller.state, .running)
|
|
XCTAssertTrue(systemProxy.applied.isEmpty, "规则模式没有活动目标时不应用系统代理")
|
|
let unregisterCount = agent.unregisterCount
|
|
|
|
await controller.setProxyMode(.direct)
|
|
|
|
XCTAssertEqual(controller.proxyMode, .direct)
|
|
XCTAssertEqual(controller.settings.preferredMode, .direct)
|
|
XCTAssertEqual(settingsStore.saved?.preferredMode, .direct)
|
|
XCTAssertEqual(controller.state, .running)
|
|
XCTAssertEqual(agent.unregisterCount, unregisterCount + 1, "ACL 变化触发完整 agent 重启")
|
|
let runtimeStore = RuntimeFileStore(fileURL: runtime.contract)
|
|
let document = try XCTUnwrap(runtimeStore.loadDocument())
|
|
XCTAssertTrue(document.servers.isEmpty, "直连模式允许空服务器列表")
|
|
XCTAssertEqual(document.aclRuntime?.summary, "direct")
|
|
let expectedACL = ProxyACLDocument.direct(at: runtimeStore.aclFileURL)
|
|
XCTAssertEqual(
|
|
try Data(contentsOf: runtimeStore.aclFileURL),
|
|
Data(expectedACL.content.utf8),
|
|
"链接解析后的内容是 direct 变体")
|
|
XCTAssertEqual(
|
|
systemProxy.applied.last?.socks,
|
|
.init(host: "127.0.0.1", port: ActivationFixture.listen.socksPort))
|
|
XCTAssertEqual(
|
|
systemProxy.applied.last?.http,
|
|
.init(host: "127.0.0.1", port: ActivationFixture.listen.httpPort))
|
|
XCTAssertTrue(
|
|
Set(FixedLocalProxyRanges.systemProxyExceptions).isSubset(
|
|
of: Set(systemProxy.applied.last?.exceptions ?? [])))
|
|
XCTAssertEqual(controller.systemProxyState, .applied)
|
|
|
|
let registersBeforeDisable = agent.unregisterCount
|
|
await controller.setSystemProxyEnabled(false)
|
|
XCTAssertEqual(controller.state, .running, "关闭系统代理不停止本地入口")
|
|
XCTAssertEqual(agent.unregisterCount, registersBeforeDisable)
|
|
XCTAssertEqual(controller.systemProxyState, .idle)
|
|
|
|
let restored = makeController(
|
|
probe: ProxyRuntimeFixture.FakeProbe.reachable(),
|
|
settingsRestore: RestoredProxySettings(
|
|
settings: try XCTUnwrap(settingsStore.load()), unreadableError: nil),
|
|
proxyMode: nil)
|
|
XCTAssertEqual(restored.proxyMode, .direct, "模式选择从持久快照恢复")
|
|
}
|
|
|
|
func testFailedDirectInstanceRestoresOldModeRuntimeAndSystemProxy() async throws {
|
|
let seeded = try makeSeededCatalog()
|
|
let settingsStore = InMemoryProxySettingsStore()
|
|
let controller = makeController(
|
|
probe: ProxyRuntimeFixture.FakeProbe.reachable(),
|
|
settingsStore: settingsStore,
|
|
settings: ProxySettings(
|
|
listen: ActivationFixture.listen, agentEnabled: true, systemProxyEnabled: true),
|
|
launchHealthTimeoutSeconds: 0.05)
|
|
try await controller.activate(seeded.server)
|
|
XCTAssertEqual(controller.systemProxyState, .applied)
|
|
let runtimeStore = RuntimeFileStore(fileURL: runtime.contract)
|
|
let previousDocument = try XCTUnwrap(runtimeStore.loadDocument())
|
|
let previousApplicationCount = systemProxy.applied.count
|
|
var observedStates: [ProxyRuntimeController.AgentRunState] = []
|
|
let cancellable = controller.factChanges.changes.sink { @MainActor _ in
|
|
observedStates.append(controller.state)
|
|
}
|
|
defer { cancellable.cancel() }
|
|
|
|
agent.onRegister = { [runtimeStore, previousDocument] in
|
|
guard let requested = runtimeStore.loadDocument() else { return }
|
|
let accepted = requested.aclRuntime == nil ? requested : previousDocument
|
|
try? runtimeStore.writeRuntimeReceipt(for: accepted, processID: 42)
|
|
}
|
|
|
|
await controller.setProxyMode(.direct)
|
|
|
|
XCTAssertTrue(observedStates.contains(.starting), "重启期间呈现短暂不可用状态")
|
|
XCTAssertEqual(controller.proxyMode, .rule, "新实例未验证时恢复旧模式")
|
|
XCTAssertEqual(controller.settings.preferredMode, .rule)
|
|
XCTAssertEqual(settingsStore.saved?.preferredMode, .rule)
|
|
XCTAssertEqual(runtimeStore.loadDocument(), previousDocument)
|
|
XCTAssertEqual(controller.state, .running, "旧运行时恢复后重新呈现健康")
|
|
XCTAssertEqual(controller.systemProxyState, .applied)
|
|
XCTAssertEqual(systemProxy.applied.count, previousApplicationCount)
|
|
XCTAssertEqual(systemProxy.clearCount, 0, "切换失败期间保持系统代理应用")
|
|
}
|
|
|
|
/// Agent 开关持久化失败(issue #60):保留现状并点名,不静默偏离持久化
|
|
/// 事实(否则重启后意图被覆盖)。
|
|
func testAgentTogglePersistenceFailureKeepsStateAndNamesReason() async throws {
|
|
let settingsStore = InMemoryProxySettingsStore()
|
|
settingsStore.saveError = FakeSettingsSaveError.system
|
|
let controller = makeController(
|
|
probe: ProxyRuntimeFixture.FakeProbe.reachable(),
|
|
settingsStore: settingsStore,
|
|
settings: ProxySettings(listen: ActivationFixture.listen, agentEnabled: false))
|
|
|
|
await controller.setAgentEnabled(true)
|
|
|
|
XCTAssertEqual(controller.state, .serviceFailed(.persistence))
|
|
XCTAssertFalse(controller.agentIntentEnabled, "持久化失败不改变内存意图")
|
|
XCTAssertEqual(agent.registerCount, 0, "意图未落地前不收敛运行时")
|
|
}
|
|
|
|
func testDirectReceiptIsRecheckedAfterReachableStaleListenerProbes() async throws {
|
|
let seeded = try makeSeededCatalog()
|
|
let settingsStore = InMemoryProxySettingsStore()
|
|
let processLiveness = ProcessLivenessRecorder()
|
|
let controller = makeController(
|
|
probe: ProxyRuntimeFixture.FakeProbe.reachable(),
|
|
settingsStore: settingsStore,
|
|
settings: ProxySettings(
|
|
listen: ActivationFixture.listen, agentEnabled: true, systemProxyEnabled: true),
|
|
processIsAlive: { processLiveness.isAlive($0) })
|
|
try await controller.activate(seeded.server)
|
|
XCTAssertEqual(controller.systemProxyState, .applied)
|
|
|
|
let runtimeStore = RuntimeFileStore(fileURL: runtime.contract)
|
|
let previousDocument = try XCTUnwrap(runtimeStore.loadDocument())
|
|
let appliedCount = systemProxy.applied.count
|
|
agent.onRegister = { [runtimeStore] in
|
|
guard let requested = runtimeStore.loadDocument() else { return }
|
|
// 新直连实例用一次性存活的 pid 43;其余(含回滚后的旧实例)恒活 pid 42。
|
|
let processID: Int32 = requested.aclRuntime?.summary == "direct" ? 43 : 42
|
|
try? runtimeStore.writeRuntimeReceipt(for: requested, processID: processID)
|
|
}
|
|
|
|
await controller.setProxyMode(.direct)
|
|
|
|
XCTAssertEqual(controller.proxyMode, .rule, "探测期间新子进程退出时回滚旧模式")
|
|
XCTAssertEqual(controller.state, .running, "旧实例应保持健康")
|
|
XCTAssertEqual(runtimeStore.loadDocument(), previousDocument)
|
|
XCTAssertEqual(controller.systemProxyState, .applied)
|
|
XCTAssertEqual(systemProxy.applied.count, appliedCount, "旧系统代理保持应用")
|
|
XCTAssertEqual(systemProxy.clearCount, 0)
|
|
}
|
|
|
|
private enum FakeSettingsSaveError: Error, CustomStringConvertible {
|
|
case system
|
|
|
|
var description: String { "fake-save-error" }
|
|
}
|
|
}
|
|
|
|
private final class ProcessLivenessRecorder: @unchecked Sendable {
|
|
private let lock = NSLock()
|
|
private var candidateChecks = 0
|
|
|
|
func isAlive(_ pid: Int32) -> Bool {
|
|
if pid == 42 { return true }
|
|
guard pid == 43 else { return false }
|
|
lock.lock()
|
|
defer { lock.unlock() }
|
|
candidateChecks += 1
|
|
return candidateChecks == 1
|
|
}
|
|
}
|