diff options
Diffstat (limited to 'tests/vb2_ui_action_tests.c')
| -rw-r--r-- | tests/vb2_ui_action_tests.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/vb2_ui_action_tests.c b/tests/vb2_ui_action_tests.c index dd87bc33..03b4eed7 100644 --- a/tests/vb2_ui_action_tests.c +++ b/tests/vb2_ui_action_tests.c @@ -142,7 +142,7 @@ static vb2_error_t global_action_countdown(struct vb2_ui_context *ui) static vb2_error_t global_action_change_screen(struct vb2_ui_context *ui) { - change_screen(ui, MOCK_SCREEN_BASE); + vb2_ui_change_screen(ui, MOCK_SCREEN_BASE); return VB2_REQUEST_UI_CONTINUE; } @@ -500,7 +500,8 @@ static void menu_action_tests(void) reset_common_data(); mock_state->screen = &mock_screen_base; mock_ui_context.key = VB_KEY_ENTER; - TEST_EQ(menu_select_action(&mock_ui_context), VB2_REQUEST_UI_CONTINUE, + TEST_EQ(vb2_ui_menu_select_action(&mock_ui_context), + VB2_REQUEST_UI_CONTINUE, "menu_select_action with no item screen"); screen_state_eq(mock_state, MOCK_SCREEN_BASE, 0, MOCK_IGNORE); @@ -512,7 +513,7 @@ static void menu_action_tests(void) mock_state->screen = &mock_screen_menu; mock_state->selected_item = i; mock_ui_context.key = VB_KEY_ENTER; - TEST_EQ(menu_select_action(&mock_ui_context), + TEST_EQ(vb2_ui_menu_select_action(&mock_ui_context), VB2_REQUEST_UI_CONTINUE, test_name); screen_state_eq(mock_state, target_id, 0, MOCK_IGNORE); } @@ -522,7 +523,8 @@ static void menu_action_tests(void) mock_state->screen = &mock_screen_menu; mock_state->selected_item = 4; mock_ui_context.key = VB_KEY_ENTER; - TEST_EQ(menu_select_action(&mock_ui_context), VB2_REQUEST_UI_CONTINUE, + TEST_EQ(vb2_ui_menu_select_action(&mock_ui_context), + VB2_REQUEST_UI_CONTINUE, "select no target"); screen_state_eq(mock_state, MOCK_SCREEN_MENU, 4, MOCK_IGNORE); @@ -532,7 +534,7 @@ static void menu_action_tests(void) mock_state->screen = &mock_screen_menu; mock_state->selected_item = 1; mock_ui_context.key = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(menu_select_action(&mock_ui_context), + TEST_EQ(vb2_ui_menu_select_action(&mock_ui_context), VB2_REQUEST_UI_CONTINUE, "ignore power button short press when not DETACHABLE"); screen_state_eq(mock_state, MOCK_SCREEN_MENU, 1, MOCK_IGNORE); |