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。
99 lines
4.1 KiB
Swift
99 lines
4.1 KiB
Swift
import Combine
|
||
import XCTest
|
||
|
||
@testable import ShadowsocksX_NG2
|
||
|
||
final class ProxyRuntimeResyncAndSettingsTests: ProxyRuntimeControllerTests {
|
||
override func makeDefaultRuleSnapshots() -> BuiltinRuleSnapshots {
|
||
BuiltinRuleSnapshots(loader: ProxyRuntimeFixture.controlFlowRuleSnapshot)
|
||
}
|
||
|
||
// MARK: GUI 重启重同步(D5)
|
||
|
||
func testResyncWithRegisteredAgentAndMatchingContractSkipsRewrite() async throws {
|
||
let seeded = try makeSeededCatalog()
|
||
let settingsStore = InMemoryProxySettingsStore()
|
||
let enabledSettings = ProxySettings(listen: ActivationFixture.listen, agentEnabled: true)
|
||
let controller = makeController(
|
||
probe: ProxyRuntimeFixture.FakeProbe.reachable(), agentStatus: .notRegistered,
|
||
settingsStore: settingsStore, settings: enabledSettings)
|
||
try await controller.activate(seeded.server)
|
||
await controller.setAgentEnabled(true)
|
||
XCTAssertTrue(agent.registerCount >= 1)
|
||
let contractMtime =
|
||
try FileManager.default.attributesOfItem(
|
||
atPath: runtime.contract.path
|
||
)[.modificationDate] as? Date
|
||
|
||
// 模拟 GUI 重启:全新控制器,agent 已注册、wrapper pid 存活(本测试进程)。
|
||
try Data("\(ProcessInfo.processInfo.processIdentifier)".utf8).write(to: runtime.pidFile)
|
||
let restarted = makeController(
|
||
probe: ProxyRuntimeFixture.FakeProbe.reachable(), agentStatus: .registered,
|
||
settingsStore: settingsStore, settings: enabledSettings)
|
||
|
||
await restarted.resyncOnLaunch()
|
||
|
||
XCTAssertEqual(restarted.state, .running)
|
||
XCTAssertEqual(agent.registerCount, 1, "已注册不再重复注册")
|
||
let afterResyncMtime =
|
||
try FileManager.default.attributesOfItem(
|
||
atPath: runtime.contract.path
|
||
)[.modificationDate] as? Date
|
||
XCTAssertEqual(contractMtime, afterResyncMtime, "相同契约内容跳过写入(幂等)")
|
||
XCTAssertTrue(
|
||
signals.signalsSent.filter { $0.signal != 0 }.isEmpty,
|
||
"内容一致不需要 reload 信号")
|
||
}
|
||
|
||
func testLegacyImportBoundaryStopsRuntimeWithoutRestoringSystemProxy() async throws {
|
||
let seeded = try makeSeededCatalog()
|
||
let settingsStore = InMemoryProxySettingsStore()
|
||
var importedSettings = ProxySettings()
|
||
importedSettings.preferredMode = .global
|
||
settingsStore.saved = importedSettings
|
||
let controller = makeController(
|
||
probe: ProxyRuntimeFixture.FakeProbe.reachable(),
|
||
settingsStore: settingsStore,
|
||
systemProxy: systemProxy)
|
||
|
||
try await controller.activate(seeded.server)
|
||
await controller.setAgentEnabled(true)
|
||
XCTAssertEqual(controller.state, .running)
|
||
|
||
await controller.legacyImportDidCommit()
|
||
|
||
XCTAssertEqual(controller.state, .off)
|
||
XCTAssertEqual(controller.settings, importedSettings)
|
||
XCTAssertEqual(controller.activeTargetID, seeded.server)
|
||
XCTAssertEqual(systemProxy.clearCount, 0, "Legacy 导入不能写入或清理系统代理")
|
||
XCTAssertTrue(systemProxy.applied.isEmpty, "导入边界不应重新应用系统代理")
|
||
}
|
||
|
||
func testUpdatingSettingsPersistsAndReactivatesTheRuntimeContract() 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))
|
||
|
||
try await controller.activate(seeded.server)
|
||
await controller.setAgentEnabled(true)
|
||
|
||
var next = controller.settings
|
||
next.listen.httpPort = 2088
|
||
next.proxyExceptions = "localhost, 127.0.0.1"
|
||
try await controller.updateSettings(next)
|
||
|
||
let document = try XCTUnwrap(RuntimeFileStore(fileURL: runtime.contract).loadDocument())
|
||
XCTAssertEqual(controller.settings, next)
|
||
XCTAssertEqual(settingsStore.saved, next)
|
||
XCTAssertEqual(document.httpPort, 2088)
|
||
XCTAssertEqual(
|
||
systemProxy.applied.last?.exceptions,
|
||
FixedLocalProxyRanges.systemProxyExceptions(including: ["localhost", "127.0.0.1"]),
|
||
"系统代理意图开启时随设置更新重新应用")
|
||
}
|
||
}
|