mirror of
https://github.com/shadowsocks/ShadowsocksX-NG.git
synced 2026-11-16 21:44: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。
146 lines
6.2 KiB
Swift
146 lines
6.2 KiB
Swift
import Foundation
|
|
import Testing
|
|
|
|
@testable import ShadowsocksX_NG2
|
|
|
|
/// 通过模式命令验证配置派生失败和无 ACL 变化路径,不调用恢复实现。
|
|
@MainActor
|
|
struct RuntimeConvergenceTests {
|
|
@Test(arguments: [false, true])
|
|
func modeDerivationFailureRestoresRuntimeAndReportsPersistenceFailure(
|
|
restorePersistenceFails: Bool
|
|
) async throws {
|
|
let fixture = try Fixture(
|
|
systemProxyEnabled: true,
|
|
snapshots: BuiltinRuleSnapshots(loader: { _ in throw RuleSnapshotError.missing }))
|
|
defer { fixture.cleanUp() }
|
|
try await fixture.controller.activate(fixture.server)
|
|
let previous = try #require(fixture.runtimeStore.loadDocument())
|
|
let appliedCount = fixture.proxy.applied.count
|
|
fixture.settings.rejectGlobalMode = restorePersistenceFails
|
|
|
|
await fixture.controller.setProxyMode(.rule)
|
|
|
|
#expect(fixture.controller.proxyMode == .global)
|
|
#expect(fixture.controller.settings.preferredMode == .global)
|
|
#expect(fixture.runtimeStore.loadDocument() == previous)
|
|
#expect(
|
|
fixture.controller.state
|
|
== (restorePersistenceFails ? .serviceFailed(.persistence) : .running))
|
|
#expect(fixture.settings.saved?.preferredMode == (restorePersistenceFails ? .rule : .global))
|
|
#expect(fixture.controller.systemProxyState == .applied)
|
|
#expect(fixture.proxy.applied.count == appliedCount)
|
|
#expect(fixture.proxy.clearCount == 0)
|
|
}
|
|
|
|
@Test(arguments: [false, true])
|
|
func unchangedModeACLOnlyChecksHealthWhenSystemProxyIsEnabled(
|
|
systemProxyEnabled: Bool
|
|
) async throws {
|
|
let fixture = try Fixture(systemProxyEnabled: systemProxyEnabled)
|
|
defer { fixture.cleanUp() }
|
|
try await fixture.controller.activate(fixture.server)
|
|
let bytes = try Data(contentsOf: fixture.runtimeStore.fileURL)
|
|
let registers = fixture.agent.registerCount
|
|
let unregisters = fixture.agent.unregisterCount
|
|
let probes = fixture.probe.ports.count
|
|
let signals = fixture.signals.signalsSent.filter { $0.signal != 0 }.count
|
|
|
|
// 全局模式仍保存规则默认动作,但它不改变全局 ACL。
|
|
await fixture.controller.setRuleDefaultAction(.directWhenUnmatched)
|
|
|
|
#expect(fixture.settings.saved?.ruleDefaultAction == .directWhenUnmatched)
|
|
#expect(fixture.controller.proxyMode == .global)
|
|
#expect(fixture.controller.state == .running)
|
|
#expect(try Data(contentsOf: fixture.runtimeStore.fileURL) == bytes)
|
|
#expect(fixture.agent.registerCount == registers)
|
|
#expect(fixture.agent.unregisterCount == unregisters)
|
|
#expect(fixture.signals.signalsSent.filter { $0.signal != 0 }.count == signals)
|
|
#expect(fixture.probe.ports.count == probes + (systemProxyEnabled ? 2 : 0))
|
|
}
|
|
|
|
@MainActor
|
|
private struct Fixture {
|
|
let runtime = ProxyRuntimeFixture.makeTemporaryRuntime()
|
|
let agent = ProxyRuntimeFixture.FakeLaunchAgent()
|
|
let probe = ProxyRuntimeFixture.FakeProbe.reachable()
|
|
let proxy = ProxyRuntimeFixture.FakeSystemProxy()
|
|
let settings = ModeRestoreSettingsStore()
|
|
let signals = ProxyRuntimeControllerTests.SignalRecorder()
|
|
let runtimeStore: RuntimeFileStore
|
|
let controller: ProxyRuntimeController
|
|
let server: NodeID
|
|
|
|
init(
|
|
systemProxyEnabled: Bool,
|
|
snapshots: BuiltinRuleSnapshots = BuiltinRuleSnapshots(
|
|
loader: ProxyRuntimeFixture.controlFlowRuleSnapshot)
|
|
) throws {
|
|
let credentials = InMemoryCredentialStore()
|
|
var catalog = ConfigurationCatalog()
|
|
server = try ActivationFixture.addPlainServer("收敛测试", in: &catalog, credentials: credentials)
|
|
let catalogURL = runtime.directory.appendingPathComponent("catalog.json")
|
|
try CatalogFileStore(fileURL: catalogURL).save(CatalogDocument(catalog: catalog))
|
|
runtimeStore = RuntimeFileStore(fileURL: runtime.contract)
|
|
let store = runtimeStore
|
|
let recorder = signals
|
|
agent.onUnregister = { recorder.terminateWrapper() }
|
|
agent.onRegister = {
|
|
recorder.relaunchWrapper()
|
|
if let document = store.loadDocument() {
|
|
try? store.writeRuntimeReceipt(for: document, processID: 42)
|
|
}
|
|
}
|
|
recorder.reloadReceipt = {
|
|
if let document = store.loadDocument() {
|
|
try? store.writeRuntimeReceipt(for: document, processID: 42)
|
|
}
|
|
}
|
|
controller = ProxyRuntimeController(
|
|
catalogSnapshotReader: ProxyRuntimeFixture.catalogSnapshotReader(at: catalogURL),
|
|
activationFileStore: ActivationStateFileStore(
|
|
fileURL: runtime.directory.appendingPathComponent("activation.json")),
|
|
runtimeFileStore: runtimeStore, credentials: credentials,
|
|
plugins: ActivationFixture.plugins, settingsStore: settings,
|
|
customRuleStore: CustomRuleStore(
|
|
fileURL: runtime.directory.appendingPathComponent("rules.json")),
|
|
appBundle: AppArtifact.bundle, ruleSnapshots: snapshots,
|
|
settingsRestore: RestoredProxySettings(
|
|
settings: ProxySettings(
|
|
listen: ActivationFixture.listen, preferredMode: .global,
|
|
agentEnabled: true, systemProxyEnabled: systemProxyEnabled),
|
|
unreadableError: nil),
|
|
agent: agent, probe: probe, systemProxy: proxy,
|
|
systemProxyHelper: ProxyRuntimeFixture.FakeSystemProxyHelperService(),
|
|
proxyMode: .global, firewallChecker: ProxyRuntimeFixture.FakeFirewallChecker(),
|
|
launchHealthTimeoutSeconds: 0.05,
|
|
launchHealthRetryDelay: { await Task.yield() },
|
|
systemProxyHealthPollIntervalNanoseconds: 60_000_000_000,
|
|
helperRefreshDelayNanoseconds: 0,
|
|
sendSignal: { recorder.send($0, $1) },
|
|
processIsAlive: { recorder.send($0, 0) == 0 })
|
|
}
|
|
|
|
func cleanUp() {
|
|
controller.systemProxyObserver.systemProxyHealthTask?.cancel()
|
|
controller.cancelFirewallObservation()
|
|
try? FileManager.default.removeItem(at: runtime.directory)
|
|
}
|
|
}
|
|
}
|
|
|
|
private final class ModeRestoreSettingsStore: ProxySettingsStoring {
|
|
private let store = InMemoryProxySettingsStore()
|
|
var rejectGlobalMode = false
|
|
var saved: ProxySettings? { store.saved }
|
|
|
|
func load() throws -> ProxySettings { try store.load() }
|
|
|
|
func save(_ settings: ProxySettings) throws {
|
|
if rejectGlobalMode && settings.preferredMode == .global {
|
|
throw ProxySettingsStoreError.ioFailure(detail: "restore fixture failure")
|
|
}
|
|
try store.save(settings)
|
|
}
|
|
}
|