mirror of
https://github.com/shadowsocks/ShadowsocksX-NG.git
synced 2026-11-22 13:34:00 +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。
149 lines
4.8 KiB
Swift
149 lines
4.8 KiB
Swift
@testable import ShadowsocksX_NG2
|
|
|
|
/// 系统代理相关替身(issue #60/#71):从 ProxyRuntimeFixture 主文件分出,
|
|
/// 保持 `ProxyRuntimeFixture.` 限定名不变。
|
|
extension ProxyRuntimeFixture {
|
|
@MainActor
|
|
final class FakeSystemProxy: SystemProxyControlling {
|
|
private(set) var applied: [SystemProxyConfiguration] = []
|
|
private(set) var clearCount = 0
|
|
var services: [SystemProxyServiceState] = [
|
|
SystemProxyServiceState(
|
|
identifier: SystemProxyServiceIdentifier(locationID: "home", serviceID: "wifi"),
|
|
configuration: nil, name: "Wi-Fi")
|
|
]
|
|
var readError: Error?
|
|
var beforeRead: (@MainActor () async -> Void)?
|
|
private(set) var readCount = 0
|
|
private(set) var repairedServices: [SystemProxyServiceIdentifier] = []
|
|
var beforeRepair: (@MainActor () async -> Void)?
|
|
var preserveConfigurationOnApply = false
|
|
var applyError: Error?
|
|
var clearError: Error?
|
|
var onClear: (@MainActor () -> Void)?
|
|
/// 注入返回值:模拟系统值已与期望等价的免授权跳过路径(issue #70)。
|
|
var applyOutcome: SystemProxyWriteOutcome = .written
|
|
/// 可选共享事件日志(次序断言用)。
|
|
weak var eventLog: ProxyRuntimeEventLog?
|
|
|
|
func apply(
|
|
_ configuration: SystemProxyConfiguration
|
|
) async throws -> SystemProxyWriteOutcome {
|
|
eventLog?.record("apply")
|
|
if let applyError { throw applyError }
|
|
applied.append(configuration)
|
|
if !preserveConfigurationOnApply {
|
|
let plan = try SystemProxyPlanner.makeApplyPlan(
|
|
services: services, configuration: configuration)
|
|
for write in plan.writes {
|
|
if let index = services.firstIndex(where: { $0.identifier == write.identifier }) {
|
|
services[index] = SystemProxyServiceState(
|
|
identifier: write.identifier, configuration: write.configuration,
|
|
name: services[index].name)
|
|
}
|
|
}
|
|
}
|
|
return applyOutcome
|
|
}
|
|
|
|
func readServices() async throws -> [SystemProxyServiceState] {
|
|
readCount += 1
|
|
if let readError { throw readError }
|
|
let snapshot = services
|
|
await beforeRead?()
|
|
return snapshot
|
|
}
|
|
|
|
func repair(_ configuration: SystemProxyConfiguration) async throws {
|
|
await beforeRepair?()
|
|
let plan = try SystemProxyPlanner.makeApplyPlan(
|
|
services: services, configuration: configuration)
|
|
repairedServices = plan.writes.map(\.identifier)
|
|
_ = try await apply(configuration)
|
|
}
|
|
|
|
func clear() async throws {
|
|
clearCount += 1
|
|
eventLog?.record("clear")
|
|
onClear?()
|
|
if let clearError { throw clearError }
|
|
services = services.map {
|
|
SystemProxyServiceState(identifier: $0.identifier, configuration: nil, name: $0.name)
|
|
}
|
|
}
|
|
}
|
|
|
|
/// 特权 helper 注册/审批状态可编程替身(issue #71)。
|
|
@MainActor
|
|
final class FakeSystemProxyHelperService: SystemProxyHelperServicing {
|
|
private(set) var currentStatus: SystemProxyHelperStatus
|
|
private(set) var registerCount = 0
|
|
private(set) var unregisterCount = 0
|
|
private(set) var registerError: Error?
|
|
private(set) var unregisterError: Error?
|
|
private(set) var openApprovalPathCount = 0
|
|
/// register() 成功后迁移到的状态(模拟 BTM 批准立即达成)。
|
|
var statusAfterRegister: SystemProxyHelperStatus = .approved
|
|
|
|
init(initialStatus: SystemProxyHelperStatus = .approved) {
|
|
currentStatus = initialStatus
|
|
}
|
|
|
|
var status: SystemProxyHelperStatus { currentStatus }
|
|
|
|
func setStatus(_ status: SystemProxyHelperStatus) {
|
|
currentStatus = status
|
|
}
|
|
|
|
func setRegisterError(_ error: Error?) {
|
|
registerError = error
|
|
}
|
|
|
|
func setUnregisterError(_ error: Error?) {
|
|
unregisterError = error
|
|
}
|
|
|
|
func register() throws {
|
|
registerCount += 1
|
|
if let registerError { throw registerError }
|
|
currentStatus = statusAfterRegister
|
|
}
|
|
|
|
func unregister() throws {
|
|
unregisterCount += 1
|
|
if let unregisterError { throw unregisterError }
|
|
currentStatus = .notRegistered
|
|
}
|
|
|
|
func openApprovalPath() {
|
|
openApprovalPathCount += 1
|
|
}
|
|
}
|
|
|
|
@MainActor
|
|
final class FakeSystemProxyNetworkChangeMonitor: SystemProxyNetworkChangeMonitoring {
|
|
private(set) var startCount = 0
|
|
private(set) var stopCount = 0
|
|
private(set) var isObserving = false
|
|
private var handler: (@MainActor @Sendable (SystemProxyNetworkChange) -> Void)?
|
|
|
|
func start(
|
|
handler: @escaping @MainActor @Sendable (SystemProxyNetworkChange) -> Void
|
|
) {
|
|
startCount += 1
|
|
isObserving = true
|
|
self.handler = handler
|
|
}
|
|
|
|
func stop() {
|
|
stopCount += 1
|
|
isObserving = false
|
|
handler = nil
|
|
}
|
|
|
|
func emit(_ change: SystemProxyNetworkChange) {
|
|
handler?(change)
|
|
}
|
|
}
|
|
}
|