From d115cc2df4eb722b29258d726d32033ea9ddf0fe Mon Sep 17 00:00:00 2001 From: Kaede Akino Date: Sat, 17 Oct 2026 10:31:50 +0800 Subject: [PATCH] test: remove over-specified assertions and translation lock-ins Drop assertions that could not fail in a meaningful way or that only restated copy already validated by Scripts/check-localization.py. - Screenshot suites asserted arbitrary PNG byte counts, which AGENTS.md forbids; the opt-in Attachment.record exports stay. - AgentSkillTests compared a snapshot revision with itself. - MetricsCPUUsageTests asserted point.cpu, an alias of cpuUsage.utilization already pinned by the sibling assertion in that test. - TerminalTransportTests locked enum declaration order and localized display names; symbol distinctness now compares against allCases.count instead of a magic 4. - AppLanguageTests transcribed catalogs that check-localization.py already enforces for coverage, format arguments, plurals and spacing. Locale routing, migration and fallback tests remain, with the Chinese fallback checks rewritten as relationships rather than literal copy. --- FrameworkTests/MetricsCPUUsageTests.swift | 1 - FrameworkTests/TerminalTransportTests.swift | 5 +- TFITests/MobileSavedNameRenderingTests.swift | 1 - .../MobileSkillSettingsRenderingTests.swift | 1 - TFMTests/AgentSkillTests.swift | 1 - TFMTests/AppLanguageTests.swift | 320 +----------------- TFMTests/ChooserInteractionTests.swift | 1 - .../MemorySettingsRenderingTests.swift | 1 - 8 files changed, 8 insertions(+), 323 deletions(-) diff --git a/FrameworkTests/MetricsCPUUsageTests.swift b/FrameworkTests/MetricsCPUUsageTests.swift index b742aaae..06097ee9 100644 --- a/FrameworkTests/MetricsCPUUsageTests.swift +++ b/FrameworkTests/MetricsCPUUsageTests.swift @@ -15,7 +15,6 @@ nonisolated struct MetricsCPUUsageTests { let expected = MetricsCPUUsage(utilization: 35, user: 20, system: 10, wait: 15, steal: 5, idle: 50) #expect(point.cpuUsage == expected) - #expect(point.cpu == 35) #expect(point.cpuCores == [MetricsCPUPoint(id: 7, usage: expected)]) } diff --git a/FrameworkTests/TerminalTransportTests.swift b/FrameworkTests/TerminalTransportTests.swift index 41c6d287..2e32e375 100644 --- a/FrameworkTests/TerminalTransportTests.swift +++ b/FrameworkTests/TerminalTransportTests.swift @@ -44,10 +44,7 @@ struct TerminalTransportTests { } @Test func transportNamesAndSymbolsAreDistinctAndOrderedBeforeTelnet() { - #expect(HostTerminalProtocol.allCases == [.ssh, .mosh, .eternalTerminal, .telnet]) - #expect(HostTerminalProtocol.mosh.displayName == "Mosh") - #expect(HostTerminalProtocol.eternalTerminal.displayName == "Eternal Terminal") - #expect(Set(HostTerminalProtocol.allCases.map(\.symbol)).count == 4) + #expect(Set(HostTerminalProtocol.allCases.map(\.symbol)).count == HostTerminalProtocol.allCases.count) #expect(ConnectionHistoryEntry.Kind.mosh.symbol == HostTerminalProtocol.mosh.symbol) #expect(ConnectionHistoryEntry.Kind.eternalTerminal.symbol == HostTerminalProtocol.eternalTerminal.symbol) } diff --git a/TFITests/MobileSavedNameRenderingTests.swift b/TFITests/MobileSavedNameRenderingTests.swift index 9bdcfc7b..2d1d0daa 100644 --- a/TFITests/MobileSavedNameRenderingTests.swift +++ b/TFITests/MobileSavedNameRenderingTests.swift @@ -93,7 +93,6 @@ struct MobileSavedNameRenderingTests { } let bytes = try #require(image.pngData()) Attachment.record(bytes, named: "name-hints-\(name)-\(language).png") - #expect(bytes.count > 10_000) } } diff --git a/TFITests/Screenshots/MobileSkillSettingsRenderingTests.swift b/TFITests/Screenshots/MobileSkillSettingsRenderingTests.swift index 8638d9b3..4c4a3713 100644 --- a/TFITests/Screenshots/MobileSkillSettingsRenderingTests.swift +++ b/TFITests/Screenshots/MobileSkillSettingsRenderingTests.swift @@ -37,6 +37,5 @@ struct MobileSkillSettingsRenderingTests { } let bytes = try #require(image.pngData()) Attachment.record(bytes, named: "\(name)-\(language).png") - #expect(bytes.count > 10_000) } } diff --git a/TFMTests/AgentSkillTests.swift b/TFMTests/AgentSkillTests.swift index 78838e57..b198fcef 100644 --- a/TFMTests/AgentSkillTests.swift +++ b/TFMTests/AgentSkillTests.swift @@ -506,7 +506,6 @@ struct SkillLibraryModelTests { let library = SkillLibraryModel(persistence: persistence) #expect(library.skills.isEmpty) #expect(library.catalog.names == ["skill-creator", "skill-installer"]) - #expect(library.snapshot.revision == library.snapshot.revision) for skill in AgentSkillLibrary.builtIns { try skill.validateForInstallation() } #expect(library.snapshot.readOnlyNames == AgentSkillLibrary.reservedNames) } diff --git a/TFMTests/AppLanguageTests.swift b/TFMTests/AppLanguageTests.swift index 5c84d0e2..9c66bfb6 100644 --- a/TFMTests/AppLanguageTests.swift +++ b/TFMTests/AppLanguageTests.swift @@ -21,66 +21,6 @@ struct AppLanguageTests { == String(localized: AppStrings.Pro.accessVerificationFailed)) } - @Test(arguments: [ - ("en", "Upgrade to Pro to unlock this host."), - ("zh-Hans", "升级到Pro以解锁此主机。"), - ("zh-Hant", "升級至Pro以解鎖此主機。"), - ]) - func lockedMetricsSuggestsTheNextActionWithoutASeparateButton(language: String, expected: String) { - #expect( - AppLocalization.resolve(AppStrings.Pro.upgradeToUnlockHost, locale: Locale(identifier: language)) - == expected) - } - - @Test(arguments: [ - ("en", "Rescan"), - ("zh-Hans", "重新扫描"), - ("zh-Hant", "重新掃描"), - ("ja", "再スキャン"), - ("ko", "다시 검색"), - ("de", "Erneut suchen"), - ("fr", "Rechercher à nouveau"), - ]) - func localDiscoveryUsesRescanInEverySupportedLanguage(language: String, expected: String) { - #expect( - AppLocalization.resolve(AppStrings.LocalNetwork.rescan, locale: Locale(identifier: language)) == expected) - } - - @Test(arguments: [ - ("en", "Connection was cancelled. Retry to connect."), - ("zh-Hans", "已取消连接。重试即可连接。"), - ("zh-Hant", "已取消連線。重試即可連線。"), - ("ja", "接続がキャンセルされました。再試行すると接続できます。"), - ("ko", "연결이 취소되었습니다. 연결하려면 다시 시도하세요."), - ("de", "Die Verbindung wurde abgebrochen. Versuchen Sie erneut, eine Verbindung herzustellen."), - ("fr", "La connexion a été annulée. Réessayez pour vous connecter."), - ]) - func connectionCancellationDoesNotClaimAuthenticationWasCancelled(language: String, expected: String) { - #expect( - AppLocalization.resolve( - AppStrings.Connections.connectionCancelled, locale: Locale(identifier: language)) == expected) - } - - @Test - func sessionPersistenceOptionsUseTitleCaseAndHaveTranslations() { - let labels: [(LocalizedStringResource, String)] = [ - (AppStrings.Common.enabled, "Enabled"), - (AppStrings.Common.new, "New"), - (AppStrings.Common.skip, "Skip"), - (AppStrings.SessionPersistence.section, "Session Persistence"), - (AppStrings.SessionPersistence.onConnect, "On Connect"), - (AppStrings.SessionPersistence.ask, "Ask Every Time"), - (AppStrings.SessionPersistence.create, "New Managed Session"), - (AppStrings.SessionPersistence.normalShell, "Use a Normal Shell"), - ] - for (resource, english) in labels { - #expect(AppLocalization.resolve(resource, locale: Locale(identifier: "en")) == english) - for language in ["zh-Hans", "zh-Hant", "ja", "ko", "de", "fr"] { - #expect(AppLocalization.resolve(resource, locale: Locale(identifier: language)) != english) - } - } - } - @Test func languagePickerKeepsSystemFirstThenSortsByLanguageCode() { #expect(AppLanguage.allCases.first == .system) @@ -104,24 +44,6 @@ struct AppLanguageTests { #expect(localized.toolCards.map(\.invocation.call.name) == ["ssh_exec", "ssh_exec"]) } - @Test(arguments: [ - ("en", "SSH authentication failed: key detail; password detail"), - ("zh-Hans", "SSH认证失败：key detail；password detail"), - ("zh-Hant", "SSH認證失敗：key detail；password detail"), - ("ja", "SSH認証に失敗しました：key detail；password detail"), - ("de", "SSH-Authentifizierung fehlgeschlagen: key detail; password detail"), - ("fr", "Échec de l’authentification SSH\u{00A0}: key detail; password detail"), - ("ko", "SSH 인증 실패: key detail; password detail"), - ]) - func authenticationFailuresUseOneLocalizedPrefixAndSemicolon(language: String, expected: String) { - let locale = Locale(identifier: language) - let separator = AppLocalization.resolve(AppStrings.Connections.authenticationFailureSeparator, locale: locale) - let details = ["key detail", "password detail"].joined(separator: separator) - #expect( - AppLocalization.resolve(AppStrings.Connections.sshAuthenticationFailed(details), locale: locale) == expected - ) - } - @Test func missingAndUnknownPreferencesFollowSystem() throws { let defaults = try makeDefaults() @@ -219,132 +141,17 @@ struct AppLanguageTests { @Test(arguments: ["zh-TW", "zh-Hant-TW", "zh-HK", "zh-MO"]) func traditionalChineseSystemLocalesResolveTraditionalCatalog(identifier: String) { - #expect(AppLocalization.string("Settings", locale: Locale(identifier: identifier)) == "設定") + let traditional = AppLocalization.string("Settings", locale: Locale(identifier: "zh-Hant")) + #expect(AppLocalization.string("Settings", locale: Locale(identifier: identifier)) == traditional) } @Test func simplifiedAndTraditionalChineseCatalogsDoNotCrossFallback() { - #expect(AppLocalization.string("Settings", locale: Locale(identifier: "zh-Hans")) == "设置") - #expect(AppLocalization.string("Settings", locale: Locale(identifier: "zh-Hant")) == "設定") - } - - @Test(arguments: [ - ("en", "Built-in Server"), - ("zh-Hans", "内置服务器"), - ("zh-Hant", "內建伺服器"), - ("de", "Integrierter Server"), - ("fr", "Serveur intégré"), - ("ja", "組み込みサーバ"), - ("ko", "내장 서버"), - ]) - func builtInServerTitleIsLocalizedInEverySupportedLanguage(identifier: String, expected: String) { - #expect( - AppLocalization.resolve( - AppStrings.Settings.builtInServer, locale: Locale(identifier: identifier)) == expected) - } - - @Test(arguments: [ - ("en", "Minimum Duration (s)"), - ("zh-Hans", "最短运行时间（秒）"), - ("zh-Hant", "最短執行時間（秒）"), - ("de", "Mindestdauer (s)"), - ("fr", "Durée minimale (s)"), - ("ja", "最短実行時間（秒）"), - ("ko", "최소 실행 시간 (초)"), - ]) - func minimumDurationLocalizesTheWholeLabel(identifier: String, expected: String) { - #expect( - AppLocalization.resolve( - AppStrings.CommandNotifications.minimumDuration, locale: Locale(identifier: identifier)) == expected) - } - - @Test(arguments: [ - (AppLanguage.english, "The new language will be used after Termind relaunches."), - (.japanese, "新しい言語はTermindの再起動後に適用されます。"), - (.german, "Die neue Sprache wird nach dem Neustart von Termind verwendet."), - (.french, "La nouvelle langue sera utilisée après le redémarrage de Termind."), - (.korean, "새 언어는 Termind를 다시 실행한 후 적용됩니다."), - (.simplifiedChinese, "重新启动Termind后将使用新语言。"), - (.traditionalChinese, "重新啟動Termind後將使用新語言。"), - ]) - func languageChangeNoticeUsesTheSelectedLanguage(language: AppLanguage, expected: String) { - #expect( - AppLocalization.resolve( - AppStrings.Settings.theNewLanguageWillBeUsedAfterTermindRelaunches, - locale: language.locale) == expected) - } - - @Test(arguments: ["ja", "ja-JP", "ja_JP"]) - func japaneseLocalesResolveAppCopyAndPreserveInterpolations(identifier: String) { - let locale = Locale(identifier: identifier) - #expect(AppLocalization.string("Settings", locale: locale) == "設定") - #expect(AppLocalization.resolve(AppStrings.Common.cancel, locale: locale) == "キャンセル") - let host = "web-01" - let command = "uptime" - #expect( - AppLocalization.string("Ran “\(command)” on \(host)", locale: locale) - == "web-01で「uptime」を実行しました") - #expect(AppLocalization.string("\(3) files", locale: locale) == "3個のファイル") - } - - @Test(arguments: ["de", "de-DE", "de-AT", "de_CH"]) - func germanLocalesResolveCopyAndReorderedArguments(identifier: String) { - let locale = Locale(identifier: identifier) - #expect(AppLocalization.string("Settings", locale: locale) == "Einstellungen") - #expect(AppLocalization.resolve(AppStrings.Common.cancel, locale: locale) == "Abbrechen") - let duration = "2 s" - #expect( - AppLocalization.string("Command failed with exit code \(7) after \(duration).", locale: locale) - == "Befehl nach 2 s mit Exit-Code 7 fehlgeschlagen." - ) - #expect(AppLocalization.string("Memory", locale: locale) == "Arbeitsspeicher") - #expect(AppLocalization.string("memory", locale: locale) == "Erinnerungen") - } - - @Test(arguments: ["fr", "fr-FR", "fr-CA", "fr_BE"]) - func frenchLocalesResolveCopyAndPreserveCommandAndHost(identifier: String) { - let locale = Locale(identifier: identifier) - #expect(AppLocalization.string("Settings", locale: locale) == "Réglages") - #expect(AppLocalization.resolve(AppStrings.Common.cancel, locale: locale) == "Annuler") - let command = "uptime" - let host = "web-01" - #expect( - AppLocalization.string("Ran “\(command)” on \(host)", locale: locale) - == "«\u{00A0}uptime\u{00A0}» exécuté sur web-01" - ) - let count = "1.2k" - let prefix = "≈" - #expect(AppLocalization.string("\(prefix)\(count) tokens", locale: locale) == "≈1.2k tokens") - #expect(AppLocalization.string("Bearer Token", locale: locale) == "Jeton Bearer") - } - - @Test(arguments: ["ko", "ko-KR", "ko_KR"]) - func koreanLocalesResolveCopyAndReorderCommandArguments(identifier: String) { - let locale = Locale(identifier: identifier) - #expect(AppLocalization.string("Settings", locale: locale) == "설정") - #expect(AppLocalization.resolve(AppStrings.Common.cancel, locale: locale) == "취소") - let command = "uptime" - let host = "web-01" - #expect( - AppLocalization.string("Ran “\(command)” on \(host)", locale: locale) - == "web-01에서 ‘uptime’ 실행됨") - let duration = "2 s" - #expect( - AppLocalization.string("Command failed with exit code \(7) after \(duration).", locale: locale) - == "명령이 2 s 후 종료 코드 7로 실패했습니다.") - } - - @Test(arguments: [ - ("Memory", "메모리"), ("memory", "기억"), - ("Identity", "인증 프로필"), ("Credential", "자격 증명"), - ("Password", "암호"), ("Passphrase", "암호 구문"), - ("Export and Attach", "내보내고 호스트에 연결"), - ("Discouraged", "사용자 확인 요청 안 함"), - ]) - func koreanTermsReflectTheirProductContext(key: String, expected: String) throws { - let path = try #require(Bundle.main.path(forResource: "ko", ofType: "lproj")) - let bundle = try #require(Bundle(path: path)) - #expect(bundle.localizedString(forKey: key, value: nil, table: nil) == expected) + let simplified = AppLocalization.string("Settings", locale: Locale(identifier: "zh-Hans")) + let traditional = AppLocalization.string("Settings", locale: Locale(identifier: "zh-Hant")) + #expect(!simplified.isEmpty) + #expect(!traditional.isEmpty) + #expect(simplified != traditional) } @Test(arguments: ["Google", "OpenAI", "사용자 모델"]) @@ -367,52 +174,6 @@ struct AppLanguageTests { ) == "압축됨 — 2,000 토큰 → 500 토큰") } - @Test(arguments: [ - ("de", "Export and Attach", "Exportieren und zuordnen"), - ("fr", "Export and Attach", "Exporter et associer"), - ("de", "Retry Attachment", "Zuordnung erneut versuchen"), - ("fr", "Retry Attachment", "Réessayer l’association"), - ("de", "Discouraged", "Benutzerverifizierung nicht anfordern"), - ("fr", "Discouraged", "Ne pas demander de vérification"), - ]) - func europeanKeySettingsDistinguishAssociationFromFileAttachments( - language: String, key: String, expected: String - ) throws { - let path = try #require(Bundle.main.path(forResource: language, ofType: "lproj")) - let bundle = try #require(Bundle(path: path)) - #expect(bundle.localizedString(forKey: key, value: nil, table: nil) == expected) - } - - @Test(arguments: [ - ("de", 0, "0 Dateien"), ("de", 1, "1 Datei"), ("de", 2, "2 Dateien"), - ("fr", 0, "0 fichier"), ("fr", 1, "1 fichier"), ("fr", 2, "2 fichiers"), - ("ko", 0, "파일 0개"), ("ko", 1, "파일 1개"), ("ko", 2, "파일 2개"), - ]) - func countedResourcesUseCompiledPluralRules(language: String, count: Int, expected: String) { - #expect(AppLocalization.string("\(count) files", locale: Locale(identifier: language)) == expected) - } - - @Test(arguments: [("de", "Verbinden"), ("fr", "Se connecter"), ("ko", "연결")]) - func additionalBundleMetadataIsLocalized(language: String, expected: String) throws { - let path = try #require(Bundle.main.path(forResource: language, ofType: "lproj")) - let bundle = try #require(Bundle(path: path)) - #expect( - bundle.localizedString(forKey: "QUICK_ACTION_CONNECT_TITLE", value: nil, table: "InfoPlist") == expected - ) - #expect(bundle.localizedString(forKey: "CFBundleDisplayName", value: nil, table: "InfoPlist") == "Termind") - } - - @Test(arguments: [("zh-Hans", "词元"), ("zh-Hant", "符元")]) - func assistantTokenCountsUseModelTerminology(language: String, unit: String) { - let locale = Locale(identifier: language) - let prefix = "≈" - let count = "1.2k" - #expect(AppLocalization.string("\(prefix)\(count) tokens", locale: locale) == "≈1.2k\(unit)") - for key: String.LocalizationValue in ["Token", "Bearer Token", "Clear Token", "Generate Token"] { - #expect(!AppLocalization.string(key, locale: locale).contains(unit)) - } - } - @Test func followSystemRemovesAppleLanguageOverride() throws { let suiteName = "AppLanguageTests.\(UUID().uuidString)" @@ -426,73 +187,6 @@ struct AppLanguageTests { #expect(defaults.persistentDomain(forName: suiteName)?["AppleLanguages"] == nil) } - @Test - func forwardingTemplatesPreserveArgumentsInOrder() throws { - let repository = URL(fileURLWithPath: #filePath) - .deletingLastPathComponent().deletingLastPathComponent() - let url = repository.appending(path: "Frameworks/Resources/Localizable.xcstrings") - let root = try #require( - JSONSerialization.jsonObject(with: Data(contentsOf: url)) as? [String: Any] - ) - let strings = try #require(root["strings"] as? [String: Any]) - let interpolations: [String: [String]] = [ - "SSH %@ → This Mac %@": ["[::1]:8080", "[2001:db8::1]:443"], - "Unable to listen on %@: %@": ["[::1]:8080", "Address already in use"], - ] - - for (key, arguments) in interpolations.sorted(by: { $0.key < $1.key }) { - let entry = try #require(strings[key] as? [String: Any], "Missing forwarding template: \(key)") - let localizations = try #require(entry["localizations"] as? [String: Any]) - for language in ["de", "fr", "ja", "ko", "zh-Hans", "zh-Hant"] { - let localization = try #require(localizations[language] as? [String: Any]) - let unit = try #require(localization["stringUnit"] as? [String: Any]) - let translation = try #require(unit["value"] as? String) - let placeholders = translation.matches(of: /%(?:[1-9][0-9]*\$)?@/) - #expect(placeholders.count == arguments.count, "Placeholder mismatch: \(language) \(key)") - let rendered = String(format: translation, arguments: arguments) - var remaining = rendered[...] - for argument in arguments { - let range = try #require(remaining.range(of: argument), "Lost value: \(language) \(key)") - remaining = remaining[range.upperBound...] - } - } - } - } - - @Test - func countedToolResourcesUseCatalogPluralRules() throws { - let repository = URL(fileURLWithPath: #filePath) - .deletingLastPathComponent().deletingLastPathComponent() - let url = repository.appending(path: "Frameworks/Resources/Localizable.xcstrings") - let root = try #require( - JSONSerialization.jsonObject(with: Data(contentsOf: url)) as? [String: Any] - ) - let strings = try #require(root["strings"] as? [String: Any]) - - for key in [ - // `%lld results` is not here: `web_search`'s card moved to AgentKit - // with the runtime, and so did the plural resource behind it. - "%lld commands", "%lld hosts", "%lld items", "%lld questions", - "%lld files", "%lld directories", "%lld scratch files", "%lld scratch items", - "%lld URLs", "%lld plans", "%lld secrets", "%lld suggestions", - "the task list %lld times", - "%lld tool calls", "%@ — %lld tools", - ] { - let entry = try #require(strings[key] as? [String: Any]) - let localizations = try #require(entry["localizations"] as? [String: Any]) - let english = try #require(localizations["en"] as? [String: Any]) - #expect(pluralForms(in: english).keys.sorted() == ["one", "other"]) - for language in ["de", "fr"] { - let localization = try #require(localizations[language] as? [String: Any]) - #expect(pluralForms(in: localization).keys.sorted() == ["one", "other"]) - } - for language in ["ja", "ko", "zh-Hans", "zh-Hant"] { - let localization = try #require(localizations[language] as? [String: Any]) - #expect(pluralForms(in: localization).keys.sorted() == ["other"]) - } - } - } - @Test func taiwanFlagColorDetectionHandlesColorGrayscaleAndMissingPixels() { #expect(DeviceCensorship.containsColoredPixel([255, 0, 0, 255])) diff --git a/TFMTests/ChooserInteractionTests.swift b/TFMTests/ChooserInteractionTests.swift index 39d3fa10..0b1d3b3c 100644 --- a/TFMTests/ChooserInteractionTests.swift +++ b/TFMTests/ChooserInteractionTests.swift @@ -39,7 +39,6 @@ struct ChooserInteractionTests { let image = try fixture.capture() Attachment.record(image, named: "quick-open-integrated-glass-\(variant).png") - #expect(image.count > 20_000) } @Test(arguments: ["toolbar", "ssh", "serial"]) diff --git a/TFMTests/Screenshots/MemorySettingsRenderingTests.swift b/TFMTests/Screenshots/MemorySettingsRenderingTests.swift index 930e364e..dadaa180 100644 --- a/TFMTests/Screenshots/MemorySettingsRenderingTests.swift +++ b/TFMTests/Screenshots/MemorySettingsRenderingTests.swift @@ -73,6 +73,5 @@ struct MemorySettingsRenderingTests { controller.view.cacheDisplay(in: controller.view.bounds, to: representation) let bytes = try #require(representation.representation(using: .png, properties: [:])) Attachment.record(bytes, named: "\(name)-\(language)-\(dark ? "dark" : "light").png") - #expect(bytes.count > 20_000) } }