Skip to content

fix: make keyboard pipeline tests hermetic and assert NFC at scalar level #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonaskahn merged 1 commit into from
Oct 16, 2026
Merged

fix: make keyboard pipeline tests hermetic and assert NFC at scalar level #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions EasyKeyTests/KeyboardInputPipelineProcessTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,7 @@ final class KeyboardInputPipelineProcessTests: XCTestCase {
var posted: [CGEvent] = []
let pipeline = KeyboardInputPipeline(
settings: settings,
spotlightVisibilityProvider: { false },
eventPoster: { event, _ in posted.append(event) }
)

Expand Down Expand Up @@ -540,6 +541,7 @@ final class KeyboardInputPipelineProcessTests: XCTestCase {
var posted: [CGEvent] = []
let pipeline = KeyboardInputPipeline(
settings: settings,
spotlightVisibilityProvider: { false },
eventPoster: { event, _ in posted.append(event) }
)
pipeline.setActiveApplication("com.google.Chrome")
Expand Down Expand Up @@ -573,6 +575,7 @@ final class KeyboardInputPipelineProcessTests: XCTestCase {
var posted: [CGEvent] = []
let pipeline = KeyboardInputPipeline(
settings: settings,
spotlightVisibilityProvider: { false },
eventPoster: { event, _ in posted.append(event) }
)
pipeline.setActiveApplication("com.google.Chrome")
Expand Down Expand Up @@ -626,6 +629,7 @@ final class KeyboardInputPipelineProcessTests: XCTestCase {
var posted: [CGEvent] = []
let pipeline = KeyboardInputPipeline(
settings: settings,
spotlightVisibilityProvider: { false },
chromiumAddressBarDetector: chromiumAddressBarDetector,
eventPoster: { event, _ in posted.append(event) }
)
Expand Down Expand Up @@ -717,8 +721,8 @@ final class KeyboardInputPipelineProcessTests: XCTestCase {
for event in posted where event.type == .keyDown {
let text = unicodeText(of: event)
XCTAssertEqual(
text,
text.precomposedStringWithCanonicalMapping,
text.unicodeScalars.map(\.value),
text.precomposedStringWithCanonicalMapping.unicodeScalars.map(\.value),
"wire text must be precomposed NFC, got \(text.unicodeScalars.map { String(format: "U+%04X", $0.value) })"
)
}
Expand Down Expand Up @@ -748,6 +752,7 @@ final class KeyboardInputPipelineProcessTests: XCTestCase {
var posted: [CGEvent] = []
let pipeline = KeyboardInputPipeline(
settings: settings,
spotlightVisibilityProvider: { false },
eventPoster: { event, _ in posted.append(event) }
)
pipeline.setActiveApplication("com.google.Chrome")
Expand All @@ -758,7 +763,11 @@ final class KeyboardInputPipelineProcessTests: XCTestCase {
}
for event in posted where event.type == .keyDown {
let text = unicodeText(of: event)
XCTAssertEqual(text, text.precomposedStringWithCanonicalMapping, "explicit combining mode still types NFC")
XCTAssertEqual(
text.unicodeScalars.map(\.value),
text.precomposedStringWithCanonicalMapping.unicodeScalars.map(\.value),
"explicit combining mode still types NFC"
)
}
}

Expand All @@ -771,6 +780,7 @@ final class KeyboardInputPipelineProcessTests: XCTestCase {
var posted: [CGEvent] = []
let pipeline = KeyboardInputPipeline(
settings: settings,
spotlightVisibilityProvider: { false },
eventPoster: { event, _ in posted.append(event) }
)
pipeline.setActiveApplication("com.google.Chrome")
Expand Down
9 changes: 6 additions & 3 deletions EasyKeyTests/VietnameseEngineEdgeCaseTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,10 +637,13 @@ final class VietnameseEngineEdgeCaseTests: XCTestCase {
typeKeys(&engine, "tuyeenf")
let units = engine.renderedUnits
let text = engine.currentBuffer
XCTAssertNotEqual(text, text.precomposedStringWithCanonicalMapping, "sample must actually be decomposed")
XCTAssertTrue(
text.unicodeScalars.contains { (0x0300 ... 0x036F).contains($0.value) },
"sample must actually be decomposed"
)
XCTAssertEqual(
units.map { $0.precomposedStringWithCanonicalMapping }.joined(),
text.precomposedStringWithCanonicalMapping
units.map { $0.precomposedStringWithCanonicalMapping }.joined().unicodeScalars.map(\.value),
text.precomposedStringWithCanonicalMapping.unicodeScalars.map(\.value)
)
}

Expand Down
Loading