mirror of
https://github.com/shadowsocks/ShadowsocksX-NG.git
synced 2026-11-17 20:44: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。
128 lines
5.5 KiB
Swift
128 lines
5.5 KiB
Swift
import XCTest
|
|
|
|
@testable import ShadowsocksX_NG2
|
|
|
|
/// 表单新建手动服务器的点名校验用例(标签 + 草稿 + 预期 typed error)。
|
|
private struct InvalidCreateDraftCase {
|
|
let label: String
|
|
let draft: ServerEditDraft
|
|
let expected: ServerFormError
|
|
|
|
init(_ label: String, _ draft: ServerEditDraft, _ expected: ServerFormError) {
|
|
self.label = label
|
|
self.draft = draft
|
|
self.expected = expected
|
|
}
|
|
}
|
|
|
|
/// 表单新建手动服务器命令(`createServer`)的 UI-facing interface 测试:
|
|
/// 落点与身份、凭据入存储、点名校验拒绝与插件选择落盘,语义与编辑提交对称。
|
|
@MainActor
|
|
final class CatalogWorkflowCreateServerTests: XCTestCase {
|
|
private var workDir: URL!
|
|
private var fileURL: URL!
|
|
private var credentials: InMemoryCredentialStore!
|
|
private var runtime: FakeCatalogRuntime!
|
|
var workflow: CatalogWorkflow!
|
|
|
|
override func setUp() async throws {
|
|
try await super.setUp()
|
|
// 专用工作目录:写入器会把父目录强制 0700(不得指向临时根)。
|
|
workDir = FileManager.default.temporaryDirectory
|
|
.appendingPathComponent("catalog-create-server-tests-\(UUID().uuidString)", isDirectory: true)
|
|
try FileManager.default.createDirectory(at: workDir, withIntermediateDirectories: true)
|
|
fileURL = workDir.appendingPathComponent("catalog.json")
|
|
credentials = InMemoryCredentialStore()
|
|
runtime = FakeCatalogRuntime()
|
|
runtime.hasActiveTarget = true
|
|
workflow = makeWorkflow()
|
|
}
|
|
|
|
override func tearDown() async throws {
|
|
try? FileManager.default.removeItem(at: workDir)
|
|
try await super.tearDown()
|
|
}
|
|
|
|
private func makeWorkflow() -> CatalogWorkflow {
|
|
let coordinator = CatalogCommitCoordinator(
|
|
fileStore: CatalogFileStore(fileURL: fileURL), runtime: runtime)
|
|
return makeCatalogWorkflow(
|
|
coordinator: coordinator,
|
|
credentials: credentials,
|
|
plugins: NoManagedPluginProvider())
|
|
}
|
|
|
|
func testCreateServerAddsManualLeafWithCredentialAndReturnsIdentity() async throws {
|
|
let groupID = try await workflow.createGroup(named: "手动组", into: nil)
|
|
let id = try await workflow.createServer(
|
|
ServerEditDraft(
|
|
address: "203.0.113.10", port: 8389, encryptionMethod: "aes-256-gcm",
|
|
password: "表单密码", remark: "新来的", plugin: .none, pluginOptions: nil),
|
|
into: groupID)
|
|
let node = try XCTUnwrap(workflow.tree.node(withID: id))
|
|
XCTAssertFalse(node.isGroup)
|
|
XCTAssertTrue(node.isManual)
|
|
XCTAssertEqual(node.parentID, groupID)
|
|
let form = try XCTUnwrap(try workflow.serverEditForm(for: id))
|
|
XCTAssertEqual(form.address, "203.0.113.10")
|
|
XCTAssertEqual(form.port, 8389)
|
|
XCTAssertEqual(form.remark, "新来的")
|
|
XCTAssertEqual(form.encryptionMethod, "aes-256-gcm")
|
|
XCTAssertEqual(form.password, "表单密码", "密码作为凭据写入,目录持引用")
|
|
XCTAssertTrue(node.invalidReasons.isEmpty)
|
|
}
|
|
|
|
func testCreateServerRejectsInvalidDraftsLeavingCatalogAndCredentialsUntouched() async throws {
|
|
let groupID = try await workflow.createGroup(named: "组", into: nil)
|
|
for caseItem in Self.invalidDraftCases {
|
|
await expectThrowsAsync(
|
|
{ _ = try await workflow.createServer(caseItem.draft, into: groupID) },
|
|
onThrow: { error in
|
|
XCTAssertEqual(error as? ServerFormError, caseItem.expected, caseItem.label)
|
|
})
|
|
}
|
|
|
|
XCTAssertEqual(workflow.tree.node(withID: groupID)?.childCount, 0, "校验失败不进目录")
|
|
XCTAssertTrue(credentials.storageSnapshot.isEmpty, "表单校验在建 journal 前失败,不触碰凭据")
|
|
}
|
|
|
|
func testCreateServerPluginSelectionStoresProgramAndOptions() async throws {
|
|
let id = try await workflow.createServer(
|
|
ServerEditDraft(
|
|
address: "203.0.113.10", port: 8388, encryptionMethod: "aes-256-gcm",
|
|
password: "密码", remark: "插件服务器", plugin: .named(program: "v2ray-plugin"),
|
|
pluginOptions: "mode=websocket;host=example.com"),
|
|
into: nil)
|
|
let plugin = try XCTUnwrap(try workflow.serverEditForm(for: id)?.plugin)
|
|
XCTAssertEqual(plugin.selection, .named(program: "v2ray-plugin"))
|
|
XCTAssertTrue(plugin.optionsPresent)
|
|
XCTAssertEqual(plugin.options, "mode=websocket;host=example.com")
|
|
}
|
|
|
|
/// 表单校验用例表:与 `updateServer` 同规则的点名拒绝(含受管集外插件)。
|
|
private static var invalidDraftCases: [InvalidCreateDraftCase] {
|
|
func draft(
|
|
address: String = "203.0.113.10", port: Int = 8388,
|
|
encryptionMethod: String = "aes-256-gcm", password: String = "密码",
|
|
plugin: PluginSelection = .none
|
|
) -> ServerEditDraft {
|
|
ServerEditDraft(
|
|
address: address, port: port, encryptionMethod: encryptionMethod, password: password,
|
|
remark: "", plugin: plugin, pluginOptions: nil)
|
|
}
|
|
return [
|
|
InvalidCreateDraftCase("空地址", draft(address: " "), .invalidAddress),
|
|
InvalidCreateDraftCase("端口下界", draft(port: 0), .invalidPort),
|
|
InvalidCreateDraftCase("端口上界", draft(port: 65_536), .invalidPort),
|
|
InvalidCreateDraftCase("缺加密方式", draft(encryptionMethod: " "), .missingEncryptionMethod),
|
|
InvalidCreateDraftCase(
|
|
"不支持加密方式", draft(encryptionMethod: "future-cipher"),
|
|
.unsupportedEncryptionMethod("future-cipher")),
|
|
InvalidCreateDraftCase("空密码", draft(password: ""), .invalidPassword),
|
|
InvalidCreateDraftCase(
|
|
"受管集外插件", draft(plugin: .named(program: "future-plugin")),
|
|
.pluginUnknown("future-plugin")),
|
|
]
|
|
}
|
|
}
|