Sync joystick resume correction from VCC Plus 1bd2b50e
This commit is contained in:
1 parent
b2ecec4d87
commit
8236ca17c6
4 files changed
+34
-6
No files matched your search
@@ -253,6 +253,11 @@ final class SoftwareLibraryMachineLaunchTests: XCTestCase {
|
||||
@MainActor func testManualDiskLaunchMountsWithoutInjectingCommands() async throws {
|
||||
let fixture = try Fixture(); defer { fixture.cleanup() }
|
||||
try await withMachine(fixture) { model, controller, _ in
|
||||
var configuredInput = model.input.settings
|
||||
configuredInput.right = PortSettings(source: .controller, interface: .tandy, device: "remembered-disconnected")
|
||||
configuredInput.left = PortSettings(source: .mouse, interface: .cocoMax)
|
||||
model.input.applyProfileSettings(configuredInput)
|
||||
let inputEpoch = model.input.epoch
|
||||
let plan = try fixture.plan(cartridge: false)
|
||||
XCTAssertTrue(plan.commands.isEmpty); XCTAssertFalse(plan.automaticallyStarts)
|
||||
let prepared = try await model.prepareLibraryLaunch(plan)
|
||||
@@ -261,6 +266,10 @@ final class SoftwareLibraryMachineLaunchTests: XCTestCase {
|
||||
let running = await step(controller.snapshot)
|
||||
XCTAssertEqual(running.state, .running); XCTAssertTrue(running.disks[0].mounted)
|
||||
XCTAssertEqual(running.pasteRemaining, 0)
|
||||
XCTAssertEqual(Int(running.joystickInputs[0].mode), configuredInput.right.interface.rawValue)
|
||||
XCTAssertEqual(Int(running.joystickInputs[1].mode), configuredInput.left.interface.rawValue)
|
||||
XCTAssertEqual(model.input.settings, configuredInput)
|
||||
XCTAssertEqual(model.input.epoch, inputEpoch)
|
||||
XCTAssertEqual(model.diskAssignments.drives[0]?.url, plan.floppyURLs[0])
|
||||
}
|
||||
}
|
||||
|
||||
@@ -356,10 +356,20 @@ extension StartupTests {
|
||||
"Preserving settings must also restore their interface to the newly loaded guest")
|
||||
var personal = try f.startup.appDefaults()
|
||||
personal.name = "Explicit personal input"; personal.input.right.source = .mouse
|
||||
personal.input.right.interface = .cocoMax
|
||||
personal.input.left.source = .keyboard; personal.sound = false
|
||||
await model.loadProfile(personal)
|
||||
XCTAssertNil(model.profileError); XCTAssertEqual(model.input.settings, personal.input)
|
||||
XCTAssertFalse(try inputStore.loadState().automaticRightController)
|
||||
let inputEpoch = model.input.epoch
|
||||
model.input.poll() // A neutral sample while paused must not suppress resynchronization.
|
||||
model.resume(); try await waitForStartup(model)
|
||||
let resumed = await withCheckedContinuation { done in controller.snapshot { done.resume(returning: $0) } }
|
||||
XCTAssertEqual(Int(resumed.joystickInputs[0].mode), personal.input.right.interface.rawValue,
|
||||
"Ordinary resume must apply a profile's unchanged configured interface after paused submissions were ignored")
|
||||
XCTAssertEqual(resumed.joystickInputs[0].buttons, 0)
|
||||
XCTAssertEqual(model.input.epoch, inputEpoch, "Machine resynchronization is not a settings edit")
|
||||
XCTAssertEqual(try inputStore.load(), personal.input)
|
||||
let reset = await model.restoreAppDefaults()
|
||||
XCTAssertTrue(reset); XCTAssertEqual(model.input.settings, .freshDefaults)
|
||||
XCTAssertTrue(try inputStore.loadState().automaticRightController)
|
||||
|
||||
Reference in new issue
Block a user