Changeset 1eaead4 in mainline for uspace/lib/ui/test/wdecor.c
- Timestamp:
- 2023-02-07T16:11:53Z (2 years ago)
- Branches:
- master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 0366d09d
- Parents:
- 7c5320c
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/ui/test/wdecor.c
r7c5320c r1eaead4 137 137 PCUT_TEST(set_rect) 138 138 { 139 gfx_context_t *gc = NULL; 140 test_gc_t tgc; 141 ui_resource_t *resource = NULL; 139 142 ui_wdecor_t *wdecor; 140 143 gfx_rect_t rect; 141 144 errno_t rc; 142 145 143 rc = ui_wdecor_create(NULL, "Hello", ui_wds_none, &wdecor); 146 memset(&tgc, 0, sizeof(tgc)); 147 rc = gfx_context_new(&ops, &tgc, &gc); 148 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 149 150 rc = ui_resource_create(gc, false, &resource); 151 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 152 PCUT_ASSERT_NOT_NULL(resource); 153 154 rc = ui_wdecor_create(resource, "Hello", ui_wds_none, &wdecor); 144 155 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 145 156 … … 156 167 157 168 ui_wdecor_destroy(wdecor); 169 ui_resource_destroy(resource); 170 171 rc = gfx_context_delete(gc); 172 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 158 173 } 159 174 … … 445 460 PCUT_TEST(close_btn_clicked) 446 461 { 462 gfx_context_t *gc = NULL; 463 test_gc_t tgc; 464 ui_resource_t *resource = NULL; 447 465 ui_wdecor_t *wdecor; 448 466 gfx_rect_t rect; … … 450 468 errno_t rc; 451 469 452 rc = ui_wdecor_create(NULL, "Hello", ui_wds_none, &wdecor); 470 memset(&tgc, 0, sizeof(tgc)); 471 rc = gfx_context_new(&ops, &tgc, &gc); 472 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 473 474 rc = ui_resource_create(gc, false, &resource); 475 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 476 PCUT_ASSERT_NOT_NULL(resource); 477 478 rc = ui_wdecor_create(resource, "Hello", ui_wds_decorated, &wdecor); 453 479 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 454 480 … … 468 494 469 495 ui_wdecor_destroy(wdecor); 496 ui_resource_destroy(resource); 497 498 rc = gfx_context_delete(gc); 499 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 470 500 } 471 501 … … 788 818 PCUT_TEST(get_rsztype) 789 819 { 820 gfx_context_t *gc = NULL; 821 test_gc_t tgc; 822 ui_resource_t *resource = NULL; 790 823 ui_wdecor_t *wdecor; 791 824 gfx_rect_t rect; … … 794 827 errno_t rc; 795 828 796 rc = ui_wdecor_create(NULL, "Hello", ui_wds_resizable, &wdecor); 829 memset(&tgc, 0, sizeof(tgc)); 830 rc = gfx_context_new(&ops, &tgc, &gc); 831 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 832 833 rc = ui_resource_create(gc, false, &resource); 834 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 835 PCUT_ASSERT_NOT_NULL(resource); 836 837 rc = ui_wdecor_create(resource, "Hello", ui_wds_resizable, &wdecor); 797 838 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 798 839 … … 874 915 /* Non-resizable window */ 875 916 876 rc = ui_wdecor_create( NULL, "Hello", ui_wds_none, &wdecor);917 rc = ui_wdecor_create(resource, "Hello", ui_wds_none, &wdecor); 877 918 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 878 919 … … 890 931 891 932 ui_wdecor_destroy(wdecor); 933 ui_resource_destroy(resource); 934 935 rc = gfx_context_delete(gc); 936 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 892 937 } 893 938 … … 918 963 PCUT_TEST(frame_pos_event) 919 964 { 965 gfx_context_t *gc = NULL; 966 test_gc_t tgc; 967 ui_resource_t *resource = NULL; 920 968 ui_wdecor_t *wdecor; 921 969 gfx_rect_t rect; … … 924 972 errno_t rc; 925 973 926 rc = ui_wdecor_create(NULL, "Hello", ui_wds_resizable, &wdecor); 974 memset(&tgc, 0, sizeof(tgc)); 975 rc = gfx_context_new(&ops, &tgc, &gc); 976 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 977 978 rc = ui_resource_create(gc, false, &resource); 979 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 980 PCUT_ASSERT_NOT_NULL(resource); 981 982 rc = ui_wdecor_create(resource, "Hello", ui_wds_resizable, &wdecor); 927 983 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 928 984 … … 960 1016 961 1017 ui_wdecor_destroy(wdecor); 1018 ui_resource_destroy(resource); 1019 1020 rc = gfx_context_delete(gc); 1021 PCUT_ASSERT_ERRNO_VAL(EOK, rc); 962 1022 } 963 1023
Note:
See TracChangeset
for help on using the changeset viewer.