diff options
Diffstat (limited to 'tests/vb2_ui_action_tests.c')
| -rw-r--r-- | tests/vb2_ui_action_tests.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/tests/vb2_ui_action_tests.c b/tests/vb2_ui_action_tests.c index ddb9ee38..e778f6ee 100644 --- a/tests/vb2_ui_action_tests.c +++ b/tests/vb2_ui_action_tests.c @@ -105,18 +105,13 @@ static vb2_error_t mock_action_flag2(struct vb2_ui_context *ui) /* Mock screens */ struct vb2_screen_info mock_screen_temp; -const struct vb2_menu_item mock_empty_menu[] = {}; const struct vb2_screen_info mock_screen_blank = { .id = VB2_SCREEN_BLANK, .name = "mock_screen_blank", - .num_items = ARRAY_SIZE(mock_empty_menu), - .items = mock_empty_menu, }; const struct vb2_screen_info mock_screen_base = { .id = MOCK_SCREEN_BASE, .name = "mock_screen_base: menuless screen", - .num_items = ARRAY_SIZE(mock_empty_menu), - .items = mock_empty_menu, }; const struct vb2_menu_item mock_screen_menu_items[] = { { @@ -142,33 +137,27 @@ const struct vb2_menu_item mock_screen_menu_items[] = { const struct vb2_screen_info mock_screen_menu = { .id = MOCK_SCREEN_MENU, .name = "mock_screen_menu: screen with 5 items", - .num_items = ARRAY_SIZE(mock_screen_menu_items), - .items = mock_screen_menu_items, + .menu = { + .num_items = ARRAY_SIZE(mock_screen_menu_items), + .items = mock_screen_menu_items, + }, }; const struct vb2_screen_info mock_screen_target0 = { .id = MOCK_SCREEN_TARGET0, .name = "mock_screen_target0", - .num_items = ARRAY_SIZE(mock_empty_menu), - .items = mock_empty_menu, }; const struct vb2_screen_info mock_screen_target1 = { .id = MOCK_SCREEN_TARGET1, .name = "mock_screen_target1", - .num_items = ARRAY_SIZE(mock_empty_menu), - .items = mock_empty_menu, }; const struct vb2_screen_info mock_screen_target2 = { .id = MOCK_SCREEN_TARGET2, .name = "mock_screen_target2", - .num_items = ARRAY_SIZE(mock_empty_menu), - .items = mock_empty_menu, }; const struct vb2_screen_info mock_screen_action = { .id = MOCK_SCREEN_ACTION, .name = "mock_screen_action", .action = mock_action_countdown, - .num_items = ARRAY_SIZE(mock_empty_menu), - .items = mock_empty_menu, }; const struct vb2_menu_item mock_screen_all_action_items[] = { { @@ -180,8 +169,10 @@ const struct vb2_screen_info mock_screen_all_action = { .id = MOCK_SCREEN_ALL_ACTION, .name = "mock_screen_all_action", .action = mock_action_flag0, - .num_items = ARRAY_SIZE(mock_screen_all_action_items), - .items = mock_screen_all_action_items, + .menu = { + .num_items = ARRAY_SIZE(mock_screen_all_action_items), + .items = mock_screen_all_action_items, + }, }; static void screen_state_eq(const struct vb2_screen_state *state, @@ -293,8 +284,6 @@ static void reset_common_data(void) mock_screen_temp = (struct vb2_screen_info){ .id = MOCK_NO_SCREEN, .name = "mock_screen_temp", - .num_items = ARRAY_SIZE(mock_empty_menu), - .items = mock_empty_menu, }; /* Mock ui_context based on mock screens */ |