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

+34 -2
View File
@@ -312,7 +312,8 @@ extension StartupTests {
custom.media.cartridges!.physicalSlot=2
try profileStore.save(custom)
for launch in 0..<2 {
let model = MachineModel(diskStore:f.disks,displayDefaults:defaults,inputStore:inputStore,startupStore:f.startup)
let model = MachineModel(diskStore:f.disks,displayDefaults:defaults,inputStore:inputStore,startupStore:f.startup,
inputControllerReadings: { [] })
try await waitForStartup(model)
if launch == 0 {
await model.loadProfile(custom);XCTAssertNil(model.profileError);XCTAssertTrue(model.settings.use6309)
@@ -321,7 +322,7 @@ extension StartupTests {
XCTAssertNil(model.profileError);XCTAssertNil(model.fileError)
XCTAssertEqual(model.settings,MachineSettings());XCTAssertEqual(model.state,.running)
XCTAssertEqual(model.videoOutput,.composite);XCTAssertTrue(model.audioEnabled);XCTAssertEqual(model.volume,0.5)
XCTAssertEqual(model.input.settings,InputSettings());XCTAssertFalse(model.tapeFast)
XCTAssertEqual(model.input.settings,.freshDefaults);XCTAssertFalse(model.tapeFast)
XCTAssertEqual(model.cartridgeAssignments,expected.media.cartridges)
XCTAssertTrue(model.disks[0].mounted);XCTAssertFalse(model.disks[0].writeProtected);XCTAssertFalse(model.diskTemporary[0])
XCTAssertTrue(model.disks.dropFirst().allSatisfy { !$0.mounted });XCTAssertFalse(model.hardDiskConnected)
@@ -333,6 +334,37 @@ extension StartupTests {
await withCheckedContinuation { done in model.shutdown { done.resume() } }
}
}
@MainActor func testBuiltInProfilePreservesInputButPersonalProfileAndExplicitResetApplyTheirChoices() async throws {
let f = try Fixture(); defer { f.remove() }
let suite = "VCCInputProfile-" + UUID().uuidString, defaults = UserDefaults(suiteName: suite)!
defer { defaults.removePersistentDomain(forName: suite) }
let inputStore = InputSettingsStore(url: f.support.appendingPathComponent("Input.json"))
var configured = InputSettings()
configured.right.source = .controller; configured.right.device = "remembered-disconnected"
configured.right.rightStick = true; configured.right.fire1 = 4; configured.right.fire2 = 8
configured.right.deadZone = 0.3; configured.right.interface = .tandy
configured.left.source = .keyboard
try inputStore.save(configured)
let controller = VCCMachineController()
let model = MachineModel(diskStore: f.disks, controller: controller, displayDefaults: defaults, inputStore: inputStore,
startupStore: f.startup, inputControllerReadings: { [] }, restoreMediaOnLaunch: false)
let loaded = await model.loadSystemProfile(.diskBasic)
XCTAssertTrue(loaded); XCTAssertEqual(model.input.settings, configured)
XCTAssertEqual(try inputStore.load(), configured)
let snapshot = await withCheckedContinuation { done in controller.snapshot { done.resume(returning: $0) } }
XCTAssertEqual(Int(snapshot.joystickInputs[0].mode), configured.right.interface.rawValue,
"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.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 reset = await model.restoreAppDefaults()
XCTAssertTrue(reset); XCTAssertEqual(model.input.settings, .freshDefaults)
XCTAssertTrue(try inputStore.loadState().automaticRightController)
await withCheckedContinuation { done in model.shutdown { done.resume() } }
}
@MainActor func testDefaultRestoreRefusesUnsavedDiskAndRecording() async throws {
let f = try Fixture(); defer { f.remove() }
let suite = "VCCDefaultGuards-" + UUID().uuidString, defaults = UserDefaults(suiteName:suite)!