mirror of
https://github.com/shadowsocks/ShadowsocksX-NG.git
synced 2026-11-16 16:24: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。
141 lines
4.9 KiB
Swift
141 lines
4.9 KiB
Swift
import AppKit
|
|
import XCTest
|
|
|
|
@testable import ShadowsocksX_NG2
|
|
|
|
/// Anchored app windows share activation policy; foreign windows are ignored.
|
|
/// Notifications and an injected spy keep these tests independent of presentation.
|
|
@MainActor
|
|
final class WindowActivationPolicyTests: XCTestCase {
|
|
private var spy: SpyApplier!
|
|
private var coordinator: WindowActivationPolicyCoordinator!
|
|
private var window: NSWindow!
|
|
private var foreignWindow: NSWindow!
|
|
|
|
override func setUpWithError() throws {
|
|
try super.setUpWithError()
|
|
spy = SpyApplier()
|
|
coordinator = WindowActivationPolicyCoordinator(applying: spy)
|
|
// 离屏裸窗口仅作通知对象身份:不呈现、不抢 key,创建本身不触碰
|
|
// WindowServer 的窗口呈现。
|
|
window = Self.makeOffscreenWindow()
|
|
foreignWindow = Self.makeOffscreenWindow()
|
|
coordinator.anchorDidAttach(to: window)
|
|
}
|
|
|
|
override func tearDownWithError() throws {
|
|
window = nil
|
|
foreignWindow = nil
|
|
try super.tearDownWithError()
|
|
}
|
|
|
|
/// 策略落点 spy(ADR 0017):只记录目标策略,不触碰真实 NSApp。
|
|
@MainActor
|
|
private final class SpyApplier: WindowActivationPolicyApplying {
|
|
var applied: [NSApplication.ActivationPolicy] = []
|
|
|
|
func apply(_ policy: NSApplication.ActivationPolicy) {
|
|
applied.append(policy)
|
|
}
|
|
}
|
|
|
|
private static func makeOffscreenWindow() -> NSWindow {
|
|
NSWindow(
|
|
contentRect: NSRect(x: 0, y: 0, width: 10, height: 10),
|
|
styleMask: [.titled],
|
|
backing: .buffered,
|
|
defer: false)
|
|
}
|
|
|
|
private func post(_ name: Notification.Name, on target: NSWindow) {
|
|
NotificationCenter.default.post(name: name, object: target)
|
|
}
|
|
|
|
// MARK: 随窗收敛
|
|
|
|
func testAttachToNotYetVisibleWindowAppliesNothing() {
|
|
XCTAssertTrue(
|
|
spy.applied.isEmpty,
|
|
"静默启动预建未呈现的窗口不得触发 regular:启动应停留在 accessory")
|
|
}
|
|
|
|
func testDidBecomeKeyAppliesRegular() {
|
|
post(NSWindow.didBecomeKeyNotification, on: window)
|
|
|
|
XCTAssertEqual(spy.applied, [.regular])
|
|
}
|
|
|
|
func testWillCloseAppliesAccessory() {
|
|
post(NSWindow.willCloseNotification, on: window)
|
|
|
|
XCTAssertEqual(spy.applied, [.accessory])
|
|
}
|
|
|
|
// MARK: 身份过滤
|
|
|
|
func testForeignWindowNotificationsAreIgnored() {
|
|
post(NSWindow.didBecomeKeyNotification, on: foreignWindow)
|
|
post(NSWindow.willCloseNotification, on: foreignWindow)
|
|
|
|
XCTAssertTrue(spy.applied.isEmpty, "非锚定窗口(sheet/辅助窗口)不得驱动策略")
|
|
}
|
|
|
|
func testClosingOneOfTwoWindowsKeepsRegularUntilLastCloses() {
|
|
coordinator.anchorDidAttach(to: foreignWindow)
|
|
post(NSWindow.didBecomeKeyNotification, on: window)
|
|
post(NSWindow.didBecomeKeyNotification, on: foreignWindow)
|
|
spy.applied.removeAll()
|
|
post(NSWindow.willCloseNotification, on: window)
|
|
XCTAssertFalse(spy.applied.contains(.accessory))
|
|
post(NSWindow.willCloseNotification, on: foreignWindow)
|
|
XCTAssertEqual(spy.applied.last, .accessory)
|
|
}
|
|
|
|
func testClosedWindowCanReopenWhileOtherWindowRemainsTracked() {
|
|
coordinator.anchorDidAttach(to: foreignWindow)
|
|
post(NSWindow.didBecomeKeyNotification, on: window)
|
|
post(NSWindow.willCloseNotification, on: window)
|
|
post(NSWindow.didBecomeKeyNotification, on: window)
|
|
post(NSWindow.didBecomeKeyNotification, on: foreignWindow)
|
|
spy.applied.removeAll()
|
|
post(NSWindow.willCloseNotification, on: foreignWindow)
|
|
XCTAssertFalse(spy.applied.contains(.accessory))
|
|
post(NSWindow.willCloseNotification, on: window)
|
|
XCTAssertEqual(spy.applied.last, .accessory)
|
|
}
|
|
|
|
func testWindowShownWithoutBecomingKeyParticipatesInLastClosePolicy() {
|
|
let visible = VisibilityWindow(
|
|
contentRect: .zero, styleMask: [.titled], backing: .buffered, defer: true)
|
|
coordinator.anchorDidAttach(to: visible)
|
|
visible.pretendVisible = true
|
|
post(NSWindow.didChangeOcclusionStateNotification, on: visible)
|
|
XCTAssertEqual(spy.applied.last, .regular)
|
|
post(NSWindow.didBecomeKeyNotification, on: window)
|
|
spy.applied.removeAll()
|
|
post(NSWindow.willCloseNotification, on: window)
|
|
XCTAssertFalse(spy.applied.contains(.accessory))
|
|
post(NSWindow.willCloseNotification, on: visible)
|
|
XCTAssertEqual(spy.applied.last, .accessory)
|
|
}
|
|
|
|
func testCloseIncludesVisibleSiblingWhenPresentationNotificationWasMissed() {
|
|
let visible = VisibilityWindow(
|
|
contentRect: .zero, styleMask: [.titled], backing: .buffered, defer: true)
|
|
coordinator.anchorDidAttach(to: visible)
|
|
visible.pretendVisible = true
|
|
post(NSWindow.didBecomeKeyNotification, on: window)
|
|
spy.applied.removeAll()
|
|
post(NSWindow.willCloseNotification, on: window)
|
|
XCTAssertFalse(spy.applied.contains(.accessory))
|
|
visible.pretendVisible = false
|
|
post(NSWindow.willCloseNotification, on: visible)
|
|
XCTAssertEqual(spy.applied.last, .accessory)
|
|
}
|
|
}
|
|
|
|
private final class VisibilityWindow: NSWindow {
|
|
var pretendVisible = false
|
|
override var isVisible: Bool { pretendVisible }
|
|
}
|