implements PLN-0158
This commit is contained in:
@@ -289,16 +289,29 @@ mod tests {
|
||||
}
|
||||
|
||||
fn add_game(&self, name: &str, with_program: bool) -> PathBuf {
|
||||
self.add_game_with_identity(name, 42, "Stress", "1.0.0", with_program)
|
||||
}
|
||||
|
||||
fn add_game_with_identity(
|
||||
&self,
|
||||
name: &str,
|
||||
app_id: u32,
|
||||
title: &str,
|
||||
app_version: &str,
|
||||
with_program: bool,
|
||||
) -> PathBuf {
|
||||
let cart = self.path.join(name);
|
||||
fs::create_dir_all(&cart).expect("test cartridge should be created");
|
||||
let manifest = r#"{
|
||||
"magic": "PMTU",
|
||||
"cartridge_version": 1,
|
||||
"app_id": 42,
|
||||
"title": "Stress",
|
||||
"app_version": "1.0.0",
|
||||
"app_mode": "Game"
|
||||
}"#;
|
||||
let manifest = format!(
|
||||
r#"{{
|
||||
"magic": "PMTU",
|
||||
"cartridge_version": 1,
|
||||
"app_id": {app_id},
|
||||
"title": "{title}",
|
||||
"app_version": "{app_version}",
|
||||
"app_mode": "Game"
|
||||
}}"#
|
||||
);
|
||||
fs::write(cart.join("manifest.json"), manifest)
|
||||
.expect("test manifest should be written");
|
||||
if with_program {
|
||||
@@ -728,6 +741,72 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn hub_home_clicking_different_game_terminates_previous_resident_session() {
|
||||
let root = TestGameRoot::new();
|
||||
root.add_game("stress", true);
|
||||
root.add_game_with_identity("zzz-dummy", 43, "Zzz Dummy", "1.0.0", true);
|
||||
|
||||
let (mut firmware, mut platform) = hub_home_firmware();
|
||||
firmware.hub.set_game_library(discover_games_root(&root.path));
|
||||
firmware.tick(&InputSignals::default(), &mut platform);
|
||||
|
||||
let stress_click =
|
||||
InputSignals { f_signal: true, x_pos: 72, y_pos: 90, ..Default::default() };
|
||||
firmware.tick(&stress_click, &mut platform);
|
||||
firmware.tick(&InputSignals::default(), &mut platform);
|
||||
|
||||
let first_game_task = match &firmware.state {
|
||||
FirmwareState::GameRunning(step) => step.task_id,
|
||||
other => panic!("expected first GameRunning state, got {:?}", other),
|
||||
};
|
||||
|
||||
firmware.request_home_from_host();
|
||||
firmware.tick(&InputSignals::default(), &mut platform);
|
||||
assert_eq!(firmware.os.lifecycle().resident_game_task(), Some(first_game_task));
|
||||
|
||||
firmware.tick(&InputSignals::default(), &mut platform);
|
||||
let dummy_click =
|
||||
InputSignals { f_signal: true, x_pos: 72, y_pos: 118, ..Default::default() };
|
||||
firmware.tick(&dummy_click, &mut platform);
|
||||
|
||||
assert_eq!(firmware.os.lifecycle().task_state(first_game_task), Some(TaskState::Closed));
|
||||
assert_eq!(
|
||||
firmware.os.lifecycle().process_state_for_task(first_game_task),
|
||||
Ok(ProcessState::Stopped)
|
||||
);
|
||||
assert_eq!(
|
||||
firmware
|
||||
.os
|
||||
.sessions()
|
||||
.vm_session_for_task(first_game_task)
|
||||
.map(|session| session.task_id),
|
||||
None
|
||||
);
|
||||
|
||||
let second_game_task = firmware
|
||||
.os
|
||||
.lifecycle()
|
||||
.resident_game_task()
|
||||
.expect("replacement game should be resident");
|
||||
assert_ne!(second_game_task, first_game_task);
|
||||
assert_eq!(
|
||||
firmware
|
||||
.os
|
||||
.sessions()
|
||||
.vm_session_for_task(second_game_task)
|
||||
.map(|session| session.app_id),
|
||||
Some(43)
|
||||
);
|
||||
|
||||
firmware.tick(&InputSignals::default(), &mut platform);
|
||||
|
||||
match &firmware.state {
|
||||
FirmwareState::GameRunning(step) => assert_eq!(step.task_id, second_game_task),
|
||||
other => panic!("expected replacement GameRunning state, got {:?}", other),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn invalid_games_root_candidate_is_omitted_from_home_launch_boundary() {
|
||||
let root = TestGameRoot::new();
|
||||
|
||||
@@ -69,16 +69,18 @@ impl HubHomeStep {
|
||||
return Some(FirmwareState::ResumeResidentGame);
|
||||
}
|
||||
|
||||
ctx.os.log(
|
||||
LogLevel::Warn,
|
||||
LogSource::Hub,
|
||||
0,
|
||||
format!(
|
||||
"Cannot launch Home game {} while resident game app_id {} is active",
|
||||
cartridge.title, resident_app_id
|
||||
),
|
||||
);
|
||||
return None;
|
||||
if let Err(error) = ctx.os.lifecycle().terminate_resident_game() {
|
||||
ctx.os.log(
|
||||
LogLevel::Error,
|
||||
LogSource::Hub,
|
||||
0,
|
||||
format!(
|
||||
"Failed to terminate resident game app_id {} before launching {}: {:?}",
|
||||
resident_app_id, cartridge.title, error
|
||||
),
|
||||
);
|
||||
return None;
|
||||
}
|
||||
}
|
||||
|
||||
return Some(FirmwareState::LoadCartridge(LoadCartridgeStep::new(
|
||||
|
||||
Reference in New Issue
Block a user