Francois Gouget : comctl32/tests: Use winetest_push_context() in test_combo_dropdown_size().
Alexandre Julliard
julliard at winehq.org
Wed Apr 27 16:12:13 CDT 2022
Module: wine
Branch: master
Commit: b6b0bc7c9f4b7e8aabad83712de112f1ecc206aa
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6b0bc7c9f4b7e8aabad83712de112f1ecc206aa
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Wed Apr 27 15:20:41 2022 +0200
comctl32/tests: Use winetest_push_context() in test_combo_dropdown_size().
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/comctl32/tests/combo.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c
index 0dd05befa06..3eceeb55bd5 100644
--- a/dlls/comctl32/tests/combo.c
+++ b/dlls/comctl32/tests/combo.c
@@ -1272,6 +1272,7 @@ static void test_combo_dropdown_size(DWORD style)
RECT rect_list_client;
int min_visible_expected;
+ winetest_push_context("Test %d", test);
hCombo = CreateWindowA(WC_COMBOBOXA, "Combo", CBS_DROPDOWN | WS_VISIBLE | WS_CHILD | style, 5, 5, 100,
info_test->height_combo, hMainWnd, (HMENU)COMBO_ID, NULL, 0);
@@ -1297,8 +1298,8 @@ static void test_combo_dropdown_size(DWORD style)
ret = SendMessageA(hCombo, CB_SETMINVISIBLE, min_visible_expected, 0);
ok(ret, "Failed to set visible limit.\n");
min_visible_actual = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0);
- ok(min_visible_expected == min_visible_actual, "test %d: unexpected number of items %d.\n",
- test, min_visible_actual);
+ ok(min_visible_expected == min_visible_actual, "unexpected number of items %d.\n",
+ min_visible_actual);
}
ret = SendMessageA(hCombo, CB_SHOWDROPDOWN, TRUE,0);
@@ -1333,18 +1334,19 @@ static void test_combo_dropdown_size(DWORD style)
if (expected_height_list < 0)
expected_height_list = 0;
- ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n",
- test, expected_height_list, height_list);
+ ok(expected_height_list == height_list, "expected list height to be %d, got %d\n",
+ expected_height_list, height_list);
}
else
{
expected_height_list = min(info_test->num_items, min_visible_expected) * height_item;
- ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n",
- test, expected_height_list, height_list);
+ ok(expected_height_list == height_list, "expected list height to be %d, got %d\n",
+ expected_height_list, height_list);
}
DestroyWindow(hCombo);
+ winetest_pop_context();
}
}
More information about the wine-cvs
mailing list