implements PLN-0152
This commit is contained in:
@@ -391,9 +391,13 @@ mod tests {
|
||||
}
|
||||
|
||||
fn valid_cartridge(app_mode: AppMode) -> Cartridge {
|
||||
valid_cartridge_with(app_mode, 9, "Valid Cart")
|
||||
}
|
||||
|
||||
fn valid_cartridge_with(app_mode: AppMode, app_id: u32, title: &str) -> Cartridge {
|
||||
Cartridge {
|
||||
app_id: 9,
|
||||
title: "Valid Cart".into(),
|
||||
app_id,
|
||||
title: title.into(),
|
||||
app_version: "1.0.0".into(),
|
||||
app_mode,
|
||||
capabilities: caps::NONE,
|
||||
@@ -404,6 +408,16 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
fn vm_session_tick_index(firmware: &mut Firmware, task_id: TaskId) -> u64 {
|
||||
firmware
|
||||
.os
|
||||
.sessions()
|
||||
.vm_session_for_task(task_id)
|
||||
.expect("VM session should exist")
|
||||
.runtime
|
||||
.tick_index
|
||||
}
|
||||
|
||||
fn load_shell_running_firmware() -> (Firmware, TestPlatform, InputSignals, TaskId) {
|
||||
let mut firmware = Firmware::new(None);
|
||||
let mut platform = TestPlatform::new();
|
||||
@@ -1039,6 +1053,67 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resident_game_and_vm_shell_sessions_tick_independently() {
|
||||
let mut firmware = Firmware::new(None);
|
||||
let mut platform = TestPlatform::new();
|
||||
let signals = InputSignals::default();
|
||||
|
||||
firmware.load_cartridge(valid_cartridge_with(AppMode::Game, 9, "Resident Game"));
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
let game_task = match &firmware.state {
|
||||
FirmwareState::GameRunning(step) => step.task_id,
|
||||
other => panic!("expected GameRunning state, got {:?}", other),
|
||||
};
|
||||
|
||||
firmware.tick(&signals, &mut platform);
|
||||
let game_tick_before_home = vm_session_tick_index(&mut firmware, game_task);
|
||||
|
||||
firmware.request_home_from_host();
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
assert!(matches!(firmware.state, FirmwareState::HubHome(_)));
|
||||
assert_eq!(firmware.os.lifecycle().task_state(game_task), Some(TaskState::Suspended));
|
||||
let game_tick_after_suspend = vm_session_tick_index(&mut firmware, game_task);
|
||||
assert_eq!(game_tick_after_suspend, game_tick_before_home + 1);
|
||||
|
||||
firmware.load_cartridge(valid_cartridge_with(AppMode::Shell, 77, "VM Shell"));
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
let shell_task = match &firmware.state {
|
||||
FirmwareState::ShellRunning(step) => step.task_id,
|
||||
other => panic!("expected ShellRunning state, got {:?}", other),
|
||||
};
|
||||
|
||||
assert_ne!(shell_task, game_task);
|
||||
assert_eq!(firmware.os.lifecycle().resident_game_task(), Some(game_task));
|
||||
assert_eq!(firmware.os.lifecycle().task_state(game_task), Some(TaskState::Suspended));
|
||||
|
||||
let shell_tick_before = vm_session_tick_index(&mut firmware, shell_task);
|
||||
for _ in 0..3 {
|
||||
firmware.tick(&signals, &mut platform);
|
||||
}
|
||||
|
||||
assert_eq!(vm_session_tick_index(&mut firmware, game_task), game_tick_after_suspend);
|
||||
assert_eq!(vm_session_tick_index(&mut firmware, shell_task), shell_tick_before + 3);
|
||||
|
||||
let close_shell = InputSignals { start_signal: true, ..Default::default() };
|
||||
firmware.tick(&close_shell, &mut platform);
|
||||
assert!(matches!(firmware.state, FirmwareState::HubHome(_)));
|
||||
assert_eq!(firmware.os.lifecycle().task_state(shell_task), Some(TaskState::Closed));
|
||||
assert_eq!(firmware.os.lifecycle().resident_game_task(), Some(game_task));
|
||||
|
||||
assert!(firmware.resume_resident_game_from_home());
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
match &firmware.state {
|
||||
FirmwareState::GameRunning(step) => assert_eq!(step.task_id, game_task),
|
||||
other => panic!("expected GameRunning state, got {:?}", other),
|
||||
}
|
||||
assert!(vm_session_tick_index(&mut firmware, game_task) > game_tick_after_suspend);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn direct_game_boot_does_not_depend_on_userland_run_cart_syscall() {
|
||||
assert!(Syscall::from_u32(0x0002).is_none());
|
||||
|
||||
Reference in New Issue
Block a user