mirror of
https://github.com/shadowsocks/ShadowsocksX-NG.git
synced 2026-11-16 04:54:42 +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。
161 lines
7.0 KiB
Swift
161 lines
7.0 KiB
Swift
import XCTest
|
||
|
||
@testable import ShadowsocksX_NG2
|
||
|
||
/// 系统代理观察机 interface 驱动测试(ADR-0022 策略机抽取后):不经控制器
|
||
/// 夹具,直接以三条缝的替身驱动 cleanup-until-quiet 循环与操作互斥。
|
||
@MainActor
|
||
final class SystemProxyObserverTests: XCTestCase {
|
||
func testCleanupRescansWhileNetworkKeepsChangingThenGoesQuiet() async throws {
|
||
let proxy = ProxyRuntimeFixture.FakeSystemProxy()
|
||
let monitor = ProxyRuntimeFixture.FakeSystemProxyNetworkChangeMonitor()
|
||
let observer = makeObserver(
|
||
proxy: proxy, monitor: monitor, cleanupSettleNanoseconds: 1_000_000)
|
||
// 第一次 clear 期间到达的网络变化触发整轮重扫;随后安静,循环收敛。
|
||
var emittedChange = false
|
||
proxy.onClear = {
|
||
guard !emittedChange else { return }
|
||
emittedChange = true
|
||
monitor.emit([.networkConfiguration, .proxyConfiguration])
|
||
}
|
||
|
||
let outcome = await observer.clearAndStopSystemProxyObservation()
|
||
|
||
XCTAssertEqual(outcome, .idle)
|
||
XCTAssertEqual(proxy.clearCount, 2, "清理期内的网络变化必须触发整轮重扫")
|
||
XCTAssertTrue(emittedChange)
|
||
XCTAssertEqual(monitor.startCount, 1)
|
||
XCTAssertEqual(monitor.stopCount, 1)
|
||
XCTAssertEqual(observer.systemProxyObservationMode, .stopped)
|
||
XCTAssertEqual(observer.systemProxyState, .idle)
|
||
XCTAssertFalse(observer.systemProxyInspection.isBusy)
|
||
}
|
||
|
||
func testConvergeWaitsForInFlightOperationInsteadOfSkipping() async throws {
|
||
let proxy = ProxyRuntimeFixture.FakeSystemProxy()
|
||
let observer = makeObserver(proxy: proxy, cleanupSettleNanoseconds: 1_000_000)
|
||
// 拉长首次读服务的窗口,制造进行中的操作。
|
||
proxy.beforeRead = { _ = try? await Task.sleep(nanoseconds: 30_000_000) }
|
||
|
||
let first = Task { await observer.convergeSystemProxy(forceApply: true) }
|
||
try await Task.sleep(nanoseconds: 10_000_000)
|
||
await observer.convergeSystemProxy(forceApply: true)
|
||
await first.value
|
||
|
||
XCTAssertEqual(proxy.applied.count, 2, "并发收敛必须等操作收尾后执行而非被跳过")
|
||
}
|
||
|
||
func testEnableIntentAppliesFreshAndStartsObservation() async throws {
|
||
let proxy = ProxyRuntimeFixture.FakeSystemProxy()
|
||
let monitor = ProxyRuntimeFixture.FakeSystemProxyNetworkChangeMonitor()
|
||
let observer = makeObserver(proxy: proxy, monitor: monitor, cleanupSettleNanoseconds: 1_000_000)
|
||
|
||
await observer.enableSystemProxyIntent()
|
||
|
||
XCTAssertEqual(proxy.applied.count, 1, "开启意图必须真实应用一次(清理期可能已清空系统设置)")
|
||
XCTAssertEqual(observer.systemProxyState, .applied)
|
||
XCTAssertEqual(observer.systemProxyObservationMode, .enabled)
|
||
XCTAssertEqual(monitor.startCount, 1)
|
||
}
|
||
|
||
func testDisableIntentClearsStopsObservationAndPublishesOutcome() async throws {
|
||
let proxy = ProxyRuntimeFixture.FakeSystemProxy()
|
||
let monitor = ProxyRuntimeFixture.FakeSystemProxyNetworkChangeMonitor()
|
||
let observer = makeObserver(proxy: proxy, monitor: monitor, cleanupSettleNanoseconds: 1_000_000)
|
||
await observer.enableSystemProxyIntent()
|
||
|
||
await observer.disableSystemProxyIntent()
|
||
|
||
XCTAssertEqual(proxy.clearCount, 1)
|
||
XCTAssertEqual(observer.systemProxyState, .idle)
|
||
XCTAssertEqual(observer.systemProxyObservationMode, .stopped)
|
||
XCTAssertEqual(monitor.stopCount, 1)
|
||
XCTAssertFalse(observer.systemProxyApprovalRequired)
|
||
}
|
||
|
||
func testAgentStopPresentationFollowsProxyIntent() async throws {
|
||
let proxy = ProxyRuntimeFixture.FakeSystemProxy()
|
||
let monitor = ProxyRuntimeFixture.FakeSystemProxyNetworkChangeMonitor()
|
||
var intentEnabled = true
|
||
let observer = makeObserver(
|
||
proxy: proxy, monitor: monitor, cleanupSettleNanoseconds: 1_000_000,
|
||
isIntentEnabled: { intentEnabled })
|
||
|
||
observer.agentDidStop()
|
||
XCTAssertEqual(observer.systemProxyState, .pending, "代理意图仍在开时,agent 停机保持待应用(issue #71)")
|
||
XCTAssertEqual(observer.systemProxyObservationMode, .stopped)
|
||
XCTAssertEqual(monitor.stopCount, 1)
|
||
|
||
intentEnabled = false
|
||
observer.agentDidStop()
|
||
XCTAssertEqual(observer.systemProxyState, .idle, "代理意图已关时,agent 停机呈现空闲")
|
||
}
|
||
|
||
func testModeTransitionAwaitingRuntimeStampsPendingOnlyUnderIntent() async throws {
|
||
var intentEnabled = false
|
||
let observer = makeObserver(
|
||
proxy: ProxyRuntimeFixture.FakeSystemProxy(), cleanupSettleNanoseconds: 1_000_000,
|
||
isIntentEnabled: { intentEnabled })
|
||
|
||
observer.modeTransitionAwaitingRuntime()
|
||
XCTAssertEqual(observer.systemProxyState, .idle, "代理意图关闭时不打待应用图章")
|
||
|
||
intentEnabled = true
|
||
observer.modeTransitionAwaitingRuntime()
|
||
XCTAssertEqual(observer.systemProxyState, .pending)
|
||
}
|
||
|
||
func testSettleLaunchAfterConvergedInspectsWithoutReapplying() async throws {
|
||
let proxy = ProxyRuntimeFixture.FakeSystemProxy()
|
||
let observer = makeObserver(proxy: proxy, cleanupSettleNanoseconds: 1_000_000)
|
||
|
||
await observer.settleLaunchAfterAgentConverged()
|
||
|
||
XCTAssertEqual(proxy.applied.count, 0, "健康的 GUI 启动只巡检,不强推应用")
|
||
XCTAssertGreaterThanOrEqual(proxy.readCount, 1)
|
||
XCTAssertEqual(observer.systemProxyObservationMode, .enabled)
|
||
XCTAssertFalse(observer.systemProxyStartupInProgress)
|
||
// 播种 lastDesired 后,后续收敛(如网络变化回调)不得因相等而重新应用。
|
||
await observer.convergeSystemProxy()
|
||
XCTAssertEqual(proxy.applied.count, 0, "播种 lastDesired 后收敛不得重新应用")
|
||
}
|
||
|
||
func testStartupSuppressionBlocksConvergeUntilSettled() async throws {
|
||
let proxy = ProxyRuntimeFixture.FakeSystemProxy()
|
||
let observer = makeObserver(proxy: proxy, cleanupSettleNanoseconds: 1_000_000)
|
||
observer.beginStartupResync()
|
||
|
||
await observer.convergeSystemProxy(forceApply: true)
|
||
XCTAssertEqual(proxy.applied.count, 0, "launch 重同步抑制期 converge 必须被拒绝")
|
||
|
||
await observer.settleLaunchWithAgentOff()
|
||
XCTAssertFalse(observer.systemProxyStartupInProgress)
|
||
XCTAssertEqual(observer.systemProxyState, .paused, "抑制解除后按意图挂起残留配置")
|
||
XCTAssertEqual(observer.systemProxyObservationMode, .enabled)
|
||
}
|
||
|
||
private func makeObserver(
|
||
proxy: ProxyRuntimeFixture.FakeSystemProxy,
|
||
monitor: SystemProxyNetworkChangeMonitoring =
|
||
ProxyRuntimeFixture.FakeSystemProxyNetworkChangeMonitor(),
|
||
cleanupSettleNanoseconds: UInt64,
|
||
isIntentEnabled: @escaping @MainActor () -> Bool = { true }
|
||
) -> SystemProxyObserver {
|
||
SystemProxyObserver(
|
||
systemProxy: proxy,
|
||
systemProxyHelper: ProxyRuntimeFixture.FakeSystemProxyHelperService(),
|
||
systemProxyNetworkChangeMonitor: monitor,
|
||
appBundle: AppArtifact.bundle,
|
||
helperRefreshDelayNanoseconds: 1_000_000,
|
||
cleanupSettleNanoseconds: cleanupSettleNanoseconds,
|
||
isIntentEnabled: isIntentEnabled,
|
||
isExitAvailable: { true },
|
||
desiredConfiguration: {
|
||
try? ProxyMode.direct.systemProxyConfiguration(
|
||
for: SslocalRuntimeDocument(servers: [], listen: SslocalListenSettings()),
|
||
exceptions: [])
|
||
},
|
||
systemProxyHealthObservationLoop: {})
|
||
}
|
||
}
|