implements PLN-0108
This commit is contained in:
@@ -174,7 +174,7 @@ mod tests {
|
||||
use crate::firmware::firmware_state::HubHomeStep;
|
||||
use prometeu_bytecode::assembler::assemble;
|
||||
use prometeu_bytecode::model::{BytecodeModule, FunctionMeta, SyscallDecl};
|
||||
use prometeu_drivers::hardware::Hardware;
|
||||
use prometeu_drivers::TestPlatform;
|
||||
use prometeu_hal::app_mode::AppMode;
|
||||
use prometeu_hal::cartridge::AssetsPayloadSource;
|
||||
use prometeu_hal::color::Color;
|
||||
@@ -267,28 +267,28 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
fn load_shell_running_firmware() -> (Firmware, Hardware, InputSignals, TaskId) {
|
||||
fn load_shell_running_firmware() -> (Firmware, TestPlatform, InputSignals, TaskId) {
|
||||
let mut firmware = Firmware::new(None);
|
||||
let mut hardware = Hardware::new();
|
||||
let mut platform = TestPlatform::new();
|
||||
let signals = InputSignals::default();
|
||||
|
||||
firmware.load_cartridge(valid_cartridge(AppMode::Shell));
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
let task_id = match &firmware.state {
|
||||
FirmwareState::ShellRunning(step) => step.task_id,
|
||||
other => panic!("expected ShellRunning state, got {:?}", other),
|
||||
};
|
||||
|
||||
(firmware, hardware, signals, task_id)
|
||||
(firmware, platform, signals, task_id)
|
||||
}
|
||||
|
||||
fn hub_home_firmware() -> (Firmware, Hardware) {
|
||||
fn hub_home_firmware() -> (Firmware, TestPlatform) {
|
||||
let mut firmware = Firmware::new(None);
|
||||
firmware.state = FirmwareState::HubHome(HubHomeStep);
|
||||
firmware.state_initialized = false;
|
||||
|
||||
(firmware, Hardware::new())
|
||||
(firmware, TestPlatform::new())
|
||||
}
|
||||
|
||||
fn focus_window(firmware: &mut Firmware, owner: WindowOwner) {
|
||||
@@ -306,11 +306,11 @@ mod tests {
|
||||
#[test]
|
||||
fn load_cartridge_transitions_to_app_crashes_when_vm_init_fails() {
|
||||
let mut firmware = Firmware::new(None);
|
||||
let mut hardware = Hardware::new();
|
||||
let mut platform = TestPlatform::new();
|
||||
let signals = InputSignals::default();
|
||||
|
||||
firmware.load_cartridge(invalid_game_cartridge());
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
match &firmware.state {
|
||||
FirmwareState::AppCrashes(step) => match &step.report {
|
||||
@@ -326,18 +326,18 @@ mod tests {
|
||||
#[test]
|
||||
fn game_running_transitions_to_app_crashes_when_runtime_surfaces_trap() {
|
||||
let mut firmware = Firmware::new(None);
|
||||
let mut hardware = Hardware::new();
|
||||
let mut platform = TestPlatform::new();
|
||||
let signals = InputSignals::default();
|
||||
|
||||
firmware.load_cartridge(trapping_game_cartridge());
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
let task_id = match &firmware.state {
|
||||
FirmwareState::GameRunning(step) => step.task_id,
|
||||
other => panic!("expected GameRunning state, got {:?}", other),
|
||||
};
|
||||
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
match &firmware.state {
|
||||
FirmwareState::AppCrashes(step) => match &step.report {
|
||||
@@ -359,11 +359,11 @@ mod tests {
|
||||
#[test]
|
||||
fn reset_routes_hub_boot_target_to_splash_screen() {
|
||||
let mut firmware = Firmware::new(None);
|
||||
let mut hardware = Hardware::new();
|
||||
let mut platform = TestPlatform::new();
|
||||
let signals = InputSignals::default();
|
||||
|
||||
firmware.boot_target = BootTarget::Hub;
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
assert!(matches!(firmware.state, FirmwareState::SplashScreen(_)));
|
||||
}
|
||||
@@ -371,12 +371,12 @@ mod tests {
|
||||
#[test]
|
||||
fn reset_routes_cartridge_boot_target_to_launch_hub() {
|
||||
let mut firmware = Firmware::new(None);
|
||||
let mut hardware = Hardware::new();
|
||||
let mut platform = TestPlatform::new();
|
||||
let signals = InputSignals::default();
|
||||
|
||||
firmware.boot_target =
|
||||
BootTarget::Cartridge { path: "missing-cart".into(), debug: false, debug_port: 7777 };
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
assert!(matches!(firmware.state, FirmwareState::LaunchHub(_)));
|
||||
}
|
||||
@@ -384,11 +384,11 @@ mod tests {
|
||||
#[test]
|
||||
fn load_cartridge_routes_system_apps_to_system_running() {
|
||||
let mut firmware = Firmware::new(None);
|
||||
let mut hardware = Hardware::new();
|
||||
let mut platform = TestPlatform::new();
|
||||
let signals = InputSignals::default();
|
||||
|
||||
firmware.load_cartridge(valid_cartridge(AppMode::Shell));
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
assert!(matches!(firmware.state, FirmwareState::ShellRunning(_)));
|
||||
assert!(firmware.os.windows().focused_window().is_some());
|
||||
@@ -398,18 +398,18 @@ mod tests {
|
||||
#[test]
|
||||
fn system_running_ticks_focused_system_app_through_hub_pipeline() {
|
||||
let mut firmware = Firmware::new(None);
|
||||
let mut hardware = Hardware::new();
|
||||
let mut platform = TestPlatform::new();
|
||||
let signals = InputSignals::default();
|
||||
|
||||
firmware.load_cartridge(valid_cartridge(AppMode::Shell));
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
let task_id = match &firmware.state {
|
||||
FirmwareState::ShellRunning(step) => step.task_id,
|
||||
other => panic!("expected ShellRunning state, got {:?}", other),
|
||||
};
|
||||
|
||||
let tick_index_before_system_update = firmware.os.vm().tick_index();
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
assert!(matches!(firmware.state, FirmwareState::ShellRunning(_)));
|
||||
assert!(firmware.os.windows().focused_window_belongs_to_task(task_id));
|
||||
@@ -418,10 +418,10 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn hub_home_does_not_launch_shell_before_home_input_is_armed() {
|
||||
let (mut firmware, mut hardware) = hub_home_firmware();
|
||||
let (mut firmware, mut platform) = hub_home_firmware();
|
||||
let signals = InputSignals { f_signal: true, x_pos: 112, y_pos: 108, ..Default::default() };
|
||||
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
assert!(matches!(firmware.state, FirmwareState::HubHome(_)));
|
||||
assert_eq!(firmware.os.windows().window_count(), 0);
|
||||
@@ -429,11 +429,11 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn hub_home_click_launches_shell_a_as_native_shell_task_window() {
|
||||
let (mut firmware, mut hardware) = hub_home_firmware();
|
||||
firmware.tick(&InputSignals::default(), &mut hardware);
|
||||
let (mut firmware, mut platform) = hub_home_firmware();
|
||||
firmware.tick(&InputSignals::default(), &mut platform);
|
||||
|
||||
let signals = InputSignals { f_signal: true, x_pos: 112, y_pos: 108, ..Default::default() };
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
let task_id = match &firmware.state {
|
||||
FirmwareState::ShellRunning(step) => step.task_id,
|
||||
@@ -452,11 +452,11 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn hub_home_click_launches_shell_b_as_native_shell_task_window() {
|
||||
let (mut firmware, mut hardware) = hub_home_firmware();
|
||||
firmware.tick(&InputSignals::default(), &mut hardware);
|
||||
let (mut firmware, mut platform) = hub_home_firmware();
|
||||
firmware.tick(&InputSignals::default(), &mut platform);
|
||||
|
||||
let signals = InputSignals { f_signal: true, x_pos: 256, y_pos: 108, ..Default::default() };
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
let task_id = match &firmware.state {
|
||||
FirmwareState::ShellRunning(step) => step.task_id,
|
||||
@@ -475,10 +475,10 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn shell_running_start_close_uses_lifecycle_and_returns_hub_home() {
|
||||
let (mut firmware, mut hardware, _signals, task_id) = load_shell_running_firmware();
|
||||
let (mut firmware, mut platform, _signals, task_id) = load_shell_running_firmware();
|
||||
let close_signals = InputSignals { start_signal: true, ..Default::default() };
|
||||
|
||||
firmware.tick(&close_signals, &mut hardware);
|
||||
firmware.tick(&close_signals, &mut platform);
|
||||
|
||||
assert!(matches!(firmware.state, FirmwareState::HubHome(_)));
|
||||
assert_eq!(firmware.os.lifecycle().task_state(task_id), Some(TaskState::Closed));
|
||||
@@ -490,11 +490,11 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn shell_running_close_click_uses_lifecycle_and_returns_hub_home() {
|
||||
let (mut firmware, mut hardware, _signals, task_id) = load_shell_running_firmware();
|
||||
let (mut firmware, mut platform, _signals, task_id) = load_shell_running_firmware();
|
||||
let close_signals =
|
||||
InputSignals { f_signal: true, x_pos: 420, y_pos: 24, ..Default::default() };
|
||||
|
||||
firmware.tick(&close_signals, &mut hardware);
|
||||
firmware.tick(&close_signals, &mut platform);
|
||||
|
||||
assert!(matches!(firmware.state, FirmwareState::HubHome(_)));
|
||||
assert_eq!(firmware.os.lifecycle().task_state(task_id), Some(TaskState::Closed));
|
||||
@@ -506,10 +506,10 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn shell_running_closes_task_and_returns_hub_home_without_focused_window() {
|
||||
let (mut firmware, mut hardware, signals, task_id) = load_shell_running_firmware();
|
||||
let (mut firmware, mut platform, signals, task_id) = load_shell_running_firmware();
|
||||
|
||||
firmware.os.windows().remove_all_windows();
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
assert!(matches!(firmware.state, FirmwareState::HubHome(_)));
|
||||
assert_eq!(firmware.os.lifecycle().task_state(task_id), Some(TaskState::Closed));
|
||||
@@ -521,10 +521,10 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn shell_running_closes_task_and_returns_hub_home_for_focused_hub_window() {
|
||||
let (mut firmware, mut hardware, signals, task_id) = load_shell_running_firmware();
|
||||
let (mut firmware, mut platform, signals, task_id) = load_shell_running_firmware();
|
||||
|
||||
focus_window(&mut firmware, WindowOwner::Hub);
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
assert!(matches!(firmware.state, FirmwareState::HubHome(_)));
|
||||
assert_eq!(firmware.os.lifecycle().task_state(task_id), Some(TaskState::Closed));
|
||||
@@ -536,10 +536,10 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn shell_running_closes_task_and_returns_hub_home_for_focused_overlay_window() {
|
||||
let (mut firmware, mut hardware, signals, task_id) = load_shell_running_firmware();
|
||||
let (mut firmware, mut platform, signals, task_id) = load_shell_running_firmware();
|
||||
|
||||
focus_window(&mut firmware, WindowOwner::Overlay);
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
assert!(matches!(firmware.state, FirmwareState::HubHome(_)));
|
||||
assert_eq!(firmware.os.lifecycle().task_state(task_id), Some(TaskState::Closed));
|
||||
@@ -551,10 +551,10 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn shell_running_closes_task_and_returns_hub_home_for_other_task_window() {
|
||||
let (mut firmware, mut hardware, signals, task_id) = load_shell_running_firmware();
|
||||
let (mut firmware, mut platform, signals, task_id) = load_shell_running_firmware();
|
||||
|
||||
focus_window(&mut firmware, WindowOwner::Task(TaskId(task_id.0 + 1)));
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
assert!(matches!(firmware.state, FirmwareState::HubHome(_)));
|
||||
assert_eq!(firmware.os.lifecycle().task_state(task_id), Some(TaskState::Closed));
|
||||
@@ -567,11 +567,11 @@ mod tests {
|
||||
#[test]
|
||||
fn load_cartridge_routes_game_apps_to_game_running() {
|
||||
let mut firmware = Firmware::new(None);
|
||||
let mut hardware = Hardware::new();
|
||||
let mut platform = TestPlatform::new();
|
||||
let signals = InputSignals::default();
|
||||
|
||||
firmware.load_cartridge(valid_cartridge(AppMode::Game));
|
||||
firmware.tick(&signals, &mut hardware);
|
||||
firmware.tick(&signals, &mut platform);
|
||||
|
||||
assert!(matches!(firmware.state, FirmwareState::GameRunning(_)));
|
||||
assert_eq!(firmware.os.windows().window_count(), 0);
|
||||
|
||||
Reference in New Issue
Block a user