Changeset 46bd63c9 in mainline for uspace/lib/ui/test/menubar.c
- Timestamp:
- 2023-09-08T08:47:30Z (9 months ago)
- Branches:
- master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 1af103e
- Parents:
- 0b6fad9
- git-author:
- Jiri Svoboda <jiri@…> (2023-09-07 18:47:09)
- git-committer:
- Jiri Svoboda <jiri@…> (2023-09-08 08:47:30)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/ui/test/menubar.c
r0b6fad9 r46bd63c9 32 32 #include <stdbool.h> 33 33 #include <ui/control.h> 34 #include <ui/menu.h>35 34 #include <ui/menubar.h> 35 #include <ui/menudd.h> 36 36 #include <ui/ui.h> 37 37 #include <ui/window.h> … … 182 182 ui_menu_bar_set_rect(mbar, &rect); 183 183 184 rc = ui_menu_ create(mbar, "Test", &menu);184 rc = ui_menu_dd_create(mbar, "Test", NULL, &menu); 185 185 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 186 186 PCUT_ASSERT_NOT_NULL(menu); … … 206 206 ui_menu_bar_t *mbar = NULL; 207 207 ui_menu_t *menu = NULL; 208 ui_menu_dd_t *mdd = NULL; 208 209 gfx_rect_t rect; 209 210 errno_t rc; … … 229 230 ui_menu_bar_set_rect(mbar, &rect); 230 231 231 rc = ui_menu_create(mbar, "~T~est", &menu); 232 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 232 rc = ui_menu_dd_create(mbar, "~T~est", &mdd, &menu); 233 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 234 PCUT_ASSERT_NOT_NULL(mdd); 233 235 PCUT_ASSERT_NOT_NULL(menu); 234 236 235 PCUT_ASSERT_FALSE(ui_menu_ is_open(menu));237 PCUT_ASSERT_FALSE(ui_menu_dd_is_open(mdd)); 236 238 237 239 ui_menu_bar_press_accel(mbar, 't', 0); 238 240 239 PCUT_ASSERT_TRUE(ui_menu_ is_open(menu));241 PCUT_ASSERT_TRUE(ui_menu_dd_is_open(mdd)); 240 242 241 243 ui_menu_bar_destroy(mbar); … … 252 254 ui_menu_bar_t *mbar = NULL; 253 255 ui_menu_t *menu = NULL; 256 ui_menu_dd_t *mdd = NULL; 254 257 ui_evclaim_t claimed; 255 258 pos_event_t event; … … 277 280 ui_menu_bar_set_rect(mbar, &rect); 278 281 279 rc = ui_menu_ create(mbar, "Test", &menu);282 rc = ui_menu_dd_create(mbar, "Test", &mdd, &menu); 280 283 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 281 284 PCUT_ASSERT_NOT_NULL(menu); … … 288 291 PCUT_ASSERT_EQUALS(ui_claimed, claimed); 289 292 290 /* Clicking the menu bar entry should select menu */291 PCUT_ASSERT_EQUALS(m enu, mbar->selected);293 /* Clicking the menu bar entry should select menu drop-down */ 294 PCUT_ASSERT_EQUALS(mdd, mbar->selected); 292 295 293 296 ui_menu_bar_destroy(mbar); … … 303 306 ui_wnd_params_t params; 304 307 ui_menu_bar_t *mbar = NULL; 305 ui_menu_ t *menu1 = NULL;306 ui_menu_ t *menu2 = NULL;307 errno_t rc; 308 309 rc = ui_create_disp(NULL, &ui); 310 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 311 312 ui_wnd_params_init(¶ms); 313 params.caption = "Hello"; 314 315 rc = ui_window_create(ui, ¶ms, &window); 316 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 317 PCUT_ASSERT_NOT_NULL(window); 318 319 rc = ui_menu_bar_create(ui, window, &mbar); 320 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 321 PCUT_ASSERT_NOT_NULL(mbar); 322 323 rc = ui_menu_ create(mbar, "Test 1", &menu1);324 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 325 PCUT_ASSERT_NOT_NULL(m enu1);326 327 rc = ui_menu_ create(mbar, "Test 2", &menu2);328 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 329 PCUT_ASSERT_NOT_NULL(m enu2);330 331 ui_menu_bar_select(mbar, m enu1, true, 0);332 PCUT_ASSERT_EQUALS(m enu1, mbar->selected);308 ui_menu_dd_t *mdd1 = NULL; 309 ui_menu_dd_t *mdd2 = NULL; 310 errno_t rc; 311 312 rc = ui_create_disp(NULL, &ui); 313 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 314 315 ui_wnd_params_init(¶ms); 316 params.caption = "Hello"; 317 318 rc = ui_window_create(ui, ¶ms, &window); 319 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 320 PCUT_ASSERT_NOT_NULL(window); 321 322 rc = ui_menu_bar_create(ui, window, &mbar); 323 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 324 PCUT_ASSERT_NOT_NULL(mbar); 325 326 rc = ui_menu_dd_create(mbar, "Test 1", &mdd1, NULL); 327 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 328 PCUT_ASSERT_NOT_NULL(mdd1); 329 330 rc = ui_menu_dd_create(mbar, "Test 2", &mdd2, NULL); 331 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 332 PCUT_ASSERT_NOT_NULL(mdd2); 333 334 ui_menu_bar_select(mbar, mdd1, true, 0); 335 PCUT_ASSERT_EQUALS(mdd1, mbar->selected); 333 336 334 337 /* Selecting different menu should select it */ 335 ui_menu_bar_select(mbar, m enu2, true, 0);336 PCUT_ASSERT_EQUALS(m enu2, mbar->selected);338 ui_menu_bar_select(mbar, mdd2, true, 0); 339 PCUT_ASSERT_EQUALS(mdd2, mbar->selected); 337 340 338 341 ui_menu_bar_destroy(mbar); … … 348 351 ui_wnd_params_t params; 349 352 ui_menu_bar_t *mbar = NULL; 350 ui_menu_ t *menu= NULL;351 errno_t rc; 352 353 rc = ui_create_disp(NULL, &ui); 354 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 355 356 ui_wnd_params_init(¶ms); 357 params.caption = "Hello"; 358 359 rc = ui_window_create(ui, ¶ms, &window); 360 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 361 PCUT_ASSERT_NOT_NULL(window); 362 363 rc = ui_menu_bar_create(ui, window, &mbar); 364 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 365 PCUT_ASSERT_NOT_NULL(mbar); 366 367 rc = ui_menu_ create(mbar, "Test", &menu);368 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 369 PCUT_ASSERT_NOT_NULL(m enu);353 ui_menu_dd_t *mdd = NULL; 354 errno_t rc; 355 356 rc = ui_create_disp(NULL, &ui); 357 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 358 359 ui_wnd_params_init(¶ms); 360 params.caption = "Hello"; 361 362 rc = ui_window_create(ui, ¶ms, &window); 363 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 364 PCUT_ASSERT_NOT_NULL(window); 365 366 rc = ui_menu_bar_create(ui, window, &mbar); 367 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 368 PCUT_ASSERT_NOT_NULL(mbar); 369 370 rc = ui_menu_dd_create(mbar, "Test", &mdd, NULL); 371 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 372 PCUT_ASSERT_NOT_NULL(mdd); 370 373 371 374 ui_menu_bar_activate(mbar); 372 PCUT_ASSERT_EQUALS(m enu, mbar->selected);375 PCUT_ASSERT_EQUALS(mdd, mbar->selected); 373 376 374 377 ui_menu_bar_deactivate(mbar);
Note:
See TracChangeset
for help on using the changeset viewer.