Sync source edition with VCC Plus 3.7.0 build 63

This commit is contained in:
Brian Holman committed 2026-11-14 01:43:46 -07:00
1 parent c652a5276d
commit b2ecec4d87
86 files changed
+10519 -472

No files matched your search

+149 -1
View File
@@ -1,7 +1,155 @@
// SPDX-License-Identifier: GPL-3.0-or-later
import XCTest
import AppKit
final class InputTests: XCTestCase {
private func inputStore() throws -> InputSettingsStore {
let directory = FileManager.default.temporaryDirectory.appendingPathComponent("InputSelection-" + UUID().uuidString)
try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
addTeardownBlock { try? FileManager.default.removeItem(at: directory) }
return InputSettingsStore(url: directory.appendingPathComponent("input.json"))
}
func testSoleControllerPolicyPreservesOtherSourcesAndRememberedAssignments() {
for source in JoystickSource.allCases {
var settings = InputSettings(); settings.right.source = source
settings.right.interface = .tandy; settings.right.rightStick = true
settings.right.fire1 = 4; settings.right.fire2 = 8; settings.right.deadZone = 0.3
settings.left.source = .controller; settings.left.device = "disconnected-remembered"
XCTAssertEqual(settings.assigningSoleController([]), settings)
XCTAssertEqual(settings.assigningSoleController(["first", "second"]), settings)
let selected = settings.assigningSoleController(["sole"])
var expected = settings
if source == .controller { expected.right.device = "sole" }
XCTAssertEqual(selected, expected)
var remembered = settings; remembered.right.device = "previous-controller"
XCTAssertEqual(remembered.assigningSoleController(["sole"]), remembered)
}
}
@MainActor func testSelectingControllerWithSoleCachedDevicePersistsOnceAndReopens() throws {
_ = NSApplication.shared
let store = try inputStore()
var settings = InputSettings(); settings.right.source = .keyboard
settings.right.interface = .tandy; settings.right.rightStick = true
settings.right.fire1 = 4; settings.right.fire2 = 1; settings.right.deadZone = 0.25
try store.save(settings)
let device = ControllerReading(id: "gc:authored:0", name: "Authored controller", rx: 1, ry: -1, buttons: 8)
let hub = InputHub(controller: VCCMachineController(), store: store, controllerReadings: { [device] }, automaticallyPoll: false)
hub.poll()
XCTAssertEqual(hub.epoch, 0)
hub.settings.right.source = .controller
settings.right.source = .controller; settings.right.device = device.id
XCTAssertEqual(hub.settings, settings)
XCTAssertEqual(hub.epoch, 1, "One effective settings edit must release and persist once")
XCTAssertEqual(try store.load(), settings)
XCTAssertFalse(try store.loadState().automaticRightController)
hub.poll()
XCTAssertEqual(hub.preview[0], JoystickSample(x: 16383, y: 0, buttons: 1))
let stamp = Date(timeIntervalSince1970: 1234)
try FileManager.default.setAttributes([.modificationDate: stamp], ofItemAtPath: store.url.path)
for _ in 0..<8 { hub.poll() }
XCTAssertEqual(try FileManager.default.attributesOfItem(atPath: store.url.path)[.modificationDate] as? Date, stamp)
let reopened = InputHub(controller: VCCMachineController(), store: store, controllerReadings: { [device] }, automaticallyPoll: false)
reopened.poll()
XCTAssertEqual(reopened.settings, settings); XCTAssertEqual(reopened.epoch, 0)
XCTAssertEqual(try FileManager.default.attributesOfItem(atPath: store.url.path)[.modificationDate] as? Date, stamp)
}
@MainActor func testUnassignedControllerAdoptsLateDeviceButNeverStealsDisconnectedAssignment() throws {
_ = NSApplication.shared
let store = try inputStore()
var settings = InputSettings(); settings.right.source = .controller
try store.save(settings)
var observed: [ControllerReading] = []
let hub = InputHub(controller: VCCMachineController(), store: store, controllerReadings: { observed }, automaticallyPoll: false)
hub.poll(); XCTAssertEqual(hub.settings, settings); XCTAssertEqual(hub.epoch, 0)
observed = [ControllerReading(id: "hid:authored:one", name: "First"), ControllerReading(id: "gc:authored:two", name: "Second")]
hub.poll(); XCTAssertEqual(hub.settings.right.device, ""); XCTAssertEqual(hub.epoch, 0)
observed.removeLast(); hub.poll()
XCTAssertEqual(hub.settings.right.device, "hid:authored:one"); XCTAssertEqual(hub.epoch, 1)
observed = [ControllerReading(id: "gc:authored:two", name: "Other", x: 1, buttons: 3)]
hub.poll()
XCTAssertEqual(hub.settings.right.device, "hid:authored:one")
XCTAssertEqual(hub.preview[0], JoystickSample()); XCTAssertEqual(hub.epoch, 1)
XCTAssertEqual(try store.load(), hub.settings)
}
@MainActor func testFreshMouseFallbackSurvivesStoreRecreationThenAdoptsSoleController() throws {
_ = NSApplication.shared
let immediateStore = try inputStore()
let immediate = InputHub(controller: VCCMachineController(), store: immediateStore,
controllerReadings: { [ControllerReading(id: "connected-at-launch", name: "Sole")] }, automaticallyPoll: false)
immediate.poll()
XCTAssertEqual(immediate.settings.right.source, .controller)
XCTAssertEqual(immediate.settings.right.device, "connected-at-launch")
XCTAssertEqual(immediate.settings.left.source, .none)
XCTAssertEqual(try immediateStore.load(), immediate.settings)
let store = try inputStore()
var observed: [ControllerReading] = []
let hub = InputHub(controller: VCCMachineController(), store: store, controllerReadings: { observed }, automaticallyPoll: false)
XCTAssertEqual(hub.settings, .freshDefaults)
hub.poll(); XCTAssertEqual(hub.settings.right.source, .mouse); XCTAssertEqual(hub.settings.left.source, .none)
observed = [ControllerReading(id: "one", name: "First"), ControllerReading(id: "two", name: "Second")]
hub.poll(); XCTAssertEqual(hub.settings.right.source, .mouse)
hub.settings.keyboard = .compact
XCTAssertTrue(try store.loadState().automaticRightController)
let reopened = InputHub(controller: VCCMachineController(), store: store, controllerReadings: { observed }, automaticallyPoll: false)
observed.removeLast(); reopened.poll()
XCTAssertEqual(reopened.settings.right.source, .controller); XCTAssertEqual(reopened.settings.right.device, "one")
XCTAssertEqual(reopened.settings.keyboard, .compact); XCTAssertEqual(reopened.settings.left.source, .none)
XCTAssertFalse(try store.loadState().automaticRightController)
}
@MainActor func testLegacyExplicitSourcesAndPersonalProfileOverrideFreshAutomaticDefault() throws {
_ = NSApplication.shared
let sole = ControllerReading(id: "one", name: "Sole")
for source in [JoystickSource.none, .keyboard, .mouse] {
let store = try inputStore()
var settings = InputSettings(); settings.right.source = source
// Exact previous-format document has no automatic-default marker.
try JSONEncoder().encode(settings).write(to: store.url)
let hub = InputHub(controller: VCCMachineController(), store: store, controllerReadings: { [sole] }, automaticallyPoll: false)
hub.poll(); XCTAssertEqual(hub.settings, settings); XCTAssertEqual(hub.epoch, 0)
}
let store = try inputStore()
var observed: [ControllerReading] = []
let hub = InputHub(controller: VCCMachineController(), store: store, controllerReadings: { observed }, automaticallyPoll: false)
hub.applyProfileSettings(.freshDefaults)
XCTAssertFalse(try store.loadState().automaticRightController, "An explicit profile's Mouse source is authoritative even when it matches the fresh fallback")
observed = [sole]; hub.poll(); XCTAssertEqual(hub.settings.right.source, .mouse)
hub.restoreDefaultSettings(); hub.poll()
XCTAssertEqual(hub.settings.right.source, .controller); XCTAssertEqual(hub.settings.right.device, sole.id)
XCTAssertEqual(hub.settings.left.source, .none)
hub.settings.right = PortSettings(source: .mouse)
hub.poll()
XCTAssertEqual(hub.settings.right.source, .mouse)
XCTAssertFalse(try store.loadState().automaticRightController, "An explicit right-port edit must end fresh automatic discovery")
}
@MainActor func testLibraryHintsPreserveUnchangedFreshRightPolicyAcrossReload() throws {
_ = NSApplication.shared
let store = try inputStore()
let hub = InputHub(controller: VCCMachineController(), store: store, controllerReadings: { [] }, automaticallyPoll: false)
var librarySettings = hub.settings
librarySettings.left.source = .keyboard
hub.applyLibrarySettings(librarySettings)
XCTAssertEqual(try store.load(), librarySettings)
XCTAssertTrue(try store.loadState().automaticRightController)
let reopened = InputHub(controller: VCCMachineController(), store: store,
controllerReadings: { [ControllerReading(id: "late", name: "Sole")] }, automaticallyPoll: false)
reopened.poll()
XCTAssertEqual(reopened.settings.right.source, .controller)
XCTAssertEqual(reopened.settings.right.device, "late")
XCTAssertEqual(reopened.settings.left, librarySettings.left)
XCTAssertFalse(try store.loadState().automaticRightController)
// A library action must not re-enable discovery after an explicit
// personal profile selected Mouse, even if all its values match.
reopened.applyProfileSettings(.freshDefaults)
reopened.applyLibrarySettings(.freshDefaults)
reopened.poll()
XCTAssertEqual(reopened.settings.right.source, .mouse)
XCTAssertFalse(try store.loadState().automaticRightController)
}
func testKeyboardModesAndReservedNavigation() {
var keyboard = CocoKeyboard()
keyboard.mode = .coco
@@ -194,7 +342,7 @@ final class InputTests: XCTestCase {
let directory = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
defer { try? FileManager.default.removeItem(at: directory) }
let store = InputSettingsStore(url: directory.appendingPathComponent("input.json"))
XCTAssertEqual(try store.load(), InputSettings())
XCTAssertEqual(try store.load(), .freshDefaults)
var settings = InputSettings(); settings.keyboard = .compact
settings.right.source = .controller; settings.right.device = "authored controller"
settings.right.interface = .tandy; settings.left.source = .keyboard; settings.left.keys = .wasd