Skip to content

test: reduce duplication #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ReenigneArcher merged 1 commit into from
Jun 4, 2026
+20 −27
Merged

test: reduce duplication #203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 20 additions & 27 deletions tests/unit/app/client_state_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,23 @@

namespace {

/**
* @brief Navigates from the initial hosts toolbar selection to the display settings options.
*
* @param state Client state to drive through the display settings commands.
*/
void open_display_settings_options(app::ClientState &state) {
app::handle_command(state, input::UiCommand::move_left);
app::handle_command(state, input::UiCommand::move_left);
app::handle_command(state, input::UiCommand::activate);
ASSERT_EQ(state.shell.activeScreen, app::ScreenId::settings);

app::handle_command(state, input::UiCommand::move_down);
app::handle_command(state, input::UiCommand::activate);
ASSERT_EQ(state.settings.selectedCategory, app::SettingsCategory::display);
ASSERT_EQ(state.settings.focusArea, app::SettingsFocusArea::options);
}

TEST(ClientStateTest, StartsOnTheHostsScreenWithTheToolbarSelected) {
const app::ClientState state = app::create_initial_state();

Expand Down Expand Up @@ -1018,15 +1035,7 @@ namespace {
state.settings.preferredVideoMode = state.settings.availableVideoModes.front();
state.settings.preferredVideoModeSet = true;

app::handle_command(state, input::UiCommand::move_left);
app::handle_command(state, input::UiCommand::move_left);
app::handle_command(state, input::UiCommand::activate);
ASSERT_EQ(state.shell.activeScreen, app::ScreenId::settings);

app::handle_command(state, input::UiCommand::move_down);
app::handle_command(state, input::UiCommand::activate);
ASSERT_EQ(state.settings.selectedCategory, app::SettingsCategory::display);
ASSERT_EQ(state.settings.focusArea, app::SettingsFocusArea::options);
ASSERT_NO_FATAL_FAILURE(open_display_settings_options(state));

const app::AppUpdate update = app::handle_command(state, input::UiCommand::activate);
EXPECT_EQ(update.navigation.activatedItemId, "cycle-stream-video-mode");
Expand All @@ -1039,15 +1048,7 @@ namespace {
TEST(ClientStateTest, DisplaySettingsCanCycleStreamFramerateThroughSixtyFps) {
app::ClientState state = app::create_initial_state();

app::handle_command(state, input::UiCommand::move_left);
app::handle_command(state, input::UiCommand::move_left);
app::handle_command(state, input::UiCommand::activate);
ASSERT_EQ(state.shell.activeScreen, app::ScreenId::settings);

app::handle_command(state, input::UiCommand::move_down);
app::handle_command(state, input::UiCommand::activate);
ASSERT_EQ(state.settings.selectedCategory, app::SettingsCategory::display);
ASSERT_EQ(state.settings.focusArea, app::SettingsFocusArea::options);
ASSERT_NO_FATAL_FAILURE(open_display_settings_options(state));

ASSERT_TRUE(state.detailMenu.select_item_by_id("cycle-stream-framerate"));
app::AppUpdate update = app::handle_command(state, input::UiCommand::activate);
Expand Down Expand Up @@ -1075,15 +1076,7 @@ namespace {
ASSERT_TRUE(state.settings.playAudioOnXbox);
ASSERT_FALSE(state.settings.showPerformanceStats);

app::handle_command(state, input::UiCommand::move_left);
app::handle_command(state, input::UiCommand::move_left);
app::handle_command(state, input::UiCommand::activate);
ASSERT_EQ(state.shell.activeScreen, app::ScreenId::settings);

app::handle_command(state, input::UiCommand::move_down);
app::handle_command(state, input::UiCommand::activate);
ASSERT_EQ(state.settings.selectedCategory, app::SettingsCategory::display);
ASSERT_EQ(state.settings.focusArea, app::SettingsFocusArea::options);
ASSERT_NO_FATAL_FAILURE(open_display_settings_options(state));

ASSERT_TRUE(state.detailMenu.select_item_by_id("toggle-play-audio-on-xbox"));
app::AppUpdate update = app::handle_command(state, input::UiCommand::activate);
Expand Down
Loading