Skip to content

W
wine-winehq
Commit bf1cdf58 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

riched20/tests: Use todo_wine_if() in tests.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 43a64e38
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 28 deletions
dlls/riched20/tests/editor.c
View file @ bf1cdf58
...@@ -4578,13 +4578,9 @@ static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id ...@@ -4578,13 +4578,9 @@ static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id
SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end);
if (setsel->todo) { todo_wine_if (setsel->todo)
todo_wine { ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n",
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); 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);
}
} }
static void test_EM_EXSETSEL(void) static void test_EM_EXSETSEL(void)
...@@ -4636,13 +4632,9 @@ static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) ...@@ -4636,13 +4632,9 @@ static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id)
SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end);
if (setsel->todo) { todo_wine_if (setsel->todo)
todo_wine { ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n",
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); 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);
}
} }
static void test_EM_SETSEL(void) static void test_EM_SETSEL(void)
...@@ -7826,15 +7818,10 @@ static void test_EM_FINDWORDBREAK_W(void) ...@@ -7826,15 +7818,10 @@ static void test_EM_FINDWORDBREAK_W(void)
wbuf[1] = 0; wbuf[1] = 0;
SendMessageW(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)wbuf); SendMessageW(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)wbuf);
result = SendMessageW(hwndRichEdit, EM_FINDWORDBREAK, WB_ISDELIMITER,0); result = SendMessageW(hwndRichEdit, EM_FINDWORDBREAK, WB_ISDELIMITER,0);
if (wbuf[0] == 0x20 || wbuf[0] == 0xf020) todo_wine_if (wbuf[0] == 0x20 || wbuf[0] == 0xf020)
todo_wine
ok(result == delimiter_tests[i].isdelimiter,
"wanted ISDELIMITER_W(0x%x) %d, got %d\n",
delimiter_tests[i].c, delimiter_tests[i].isdelimiter,result);
else
ok(result == delimiter_tests[i].isdelimiter, ok(result == delimiter_tests[i].isdelimiter,
"wanted ISDELIMITER_W(0x%x) %d, got %d\n", "wanted ISDELIMITER_W(0x%x) %d, got %d\n",
delimiter_tests[i].c, delimiter_tests[i].isdelimiter, result); delimiter_tests[i].c, delimiter_tests[i].isdelimiter, result);
} }
DestroyWindow(hwndRichEdit); DestroyWindow(hwndRichEdit);
} }
...@@ -7864,12 +7851,7 @@ static void test_EM_FINDWORDBREAK_A(void) ...@@ -7864,12 +7851,7 @@ static void test_EM_FINDWORDBREAK_A(void)
buf[1] = 0; buf[1] = 0;
SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)buf); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)buf);
result = SendMessageA(hwndRichEdit, EM_FINDWORDBREAK, WB_ISDELIMITER, 0); result = SendMessageA(hwndRichEdit, EM_FINDWORDBREAK, WB_ISDELIMITER, 0);
if (buf[0] == 0x20) todo_wine_if (buf[0] == 0x20)
todo_wine
ok(result == delimiter_tests[i].isdelimiter,
"wanted ISDELIMITER_A(0x%x) %d, got %d\n",
delimiter_tests[i].c, delimiter_tests[i].isdelimiter,result);
else
ok(result == delimiter_tests[i].isdelimiter, ok(result == delimiter_tests[i].isdelimiter,
"wanted ISDELIMITER_A(0x%x) %d, got %d\n", "wanted ISDELIMITER_A(0x%x) %d, got %d\n",
delimiter_tests[i].c, delimiter_tests[i].isdelimiter, result); delimiter_tests[i].c, delimiter_tests[i].isdelimiter, result);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment