marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

riched32/tests: Simplify tests with todo_wine_if. 

Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Jactry Zeng 2016-02-16 16:24:17 +08:00 committed by Alexandre Julliard
parent 25d999d965
commit 3beb006063
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dlls/riched32/tests/editor.c
View File

@ -527,12 +527,9 @@ static void test_EM_LINELENGTH(void)
SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1);
for (i = 0; i < sizeof(offset_test1)/sizeof(offset_test1[0]); i++) {
result = SendMessageA(hwndRichEdit, EM_LINELENGTH, offset_test1[i][0], 0);
if (offset_test1[i][2])
todo_wine ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n",
offset_test1[i][0], result, offset_test1[i][1]);
else
ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n",
offset_test1[i][0], result, offset_test1[i][1]);
todo_wine_if (offset_test1[i][2])
ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n",
offset_test1[i][0], result, offset_test1[i][1]);
}
}
@ -1309,20 +1306,15 @@ static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id
cr.cpMax = setsel->max;
result = SendMessageA(hwnd, EM_EXSETSEL, 0, (LPARAM)&cr);
if (setsel->result_todo)
todo_wine ok(result == setsel->expected_retval, "EM_EXSETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result);
else
todo_wine_if (setsel->result_todo)
ok(result == setsel->expected_retval, "EM_EXSETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result);
SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end);
if (setsel->sel_todo) {
todo_wine {
ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end);
}
} else {
ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end);
}
todo_wine_if (setsel->sel_todo)
ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end,
"EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n",
id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end);
}
static void test_EM_EXSETSEL(void)
@ -1370,20 +1362,15 @@ static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id)
result = SendMessageA(hwnd, EM_SETSEL, setsel->min, setsel->max);
if (setsel->result_todo)
todo_wine ok(result == setsel->expected_retval, "EM_SETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result);
else
todo_wine_if (setsel->result_todo)
ok(result == setsel->expected_retval, "EM_SETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result);
SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end);
if (setsel->sel_todo) {
todo_wine {
ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end);
}
} else {
ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end);
}
todo_wine_if (setsel->sel_todo)
ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end,
"EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n",
id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end);
}
static void test_EM_SETSEL(void)