ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32/tests: Simplify tests using todo_wine_if().

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-02-10 13:37:01 +03:00 committed by Alexandre Julliard
parent e17e6e42d1
commit 780ebcc7d9
3 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/comctl32/tests/header.c
View File

@ -1721,11 +1721,7 @@ static void check_orderarray(HWND hwnd, DWORD start, DWORD set, DWORD expected,
for(i = 1; i<=count; i++) for(i = 1; i<=count; i++)
array |= order[i-1]<<(4*(count-i)); array |= order[i-1]<<(4*(count-i));
if (todo) { todo_wine_if(todo)
todo_wine
ok_(__FILE__, line)(array == expected, "Expected %x, got %x\n", expected, array);
}
else
ok_(__FILE__, line)(array == expected, "Expected %x, got %x\n", expected, array); ok_(__FILE__, line)(array == expected, "Expected %x, got %x\n", expected, array);
} }

35
dlls/comctl32/tests/listview.c
View File

@ -790,16 +790,7 @@ static void test_lvm_hittest_(HWND hwnd, INT x, INT y, INT item, UINT flags, UIN
ret = SendMessageA(hwnd, LVM_HITTEST, 0, (LPARAM)&lpht); ret = SendMessageA(hwnd, LVM_HITTEST, 0, (LPARAM)&lpht);
if (todo_item) todo_wine_if(todo_item)
{
todo_wine
{
ok_(__FILE__, line)(ret == item, "Expected %d retval, got %d\n", item, ret);
ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem);
ok_(__FILE__, line)(lpht.iSubItem == 10, "Expected subitem not overwrited\n");
}
}
else
{ {
ok_(__FILE__, line)(ret == item, "Expected %d retval, got %d\n", item, ret); ok_(__FILE__, line)(ret == item, "Expected %d retval, got %d\n", item, ret);
ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem);
@ -832,34 +823,16 @@ static void test_lvm_subitemhittest_(HWND hwnd, INT x, INT y, INT item, INT subi
ret = SendMessageA(hwnd, LVM_SUBITEMHITTEST, 0, (LPARAM)&lpht); ret = SendMessageA(hwnd, LVM_SUBITEMHITTEST, 0, (LPARAM)&lpht);
if (todo_item) todo_wine_if(todo_item)
{
todo_wine
{
ok_(__FILE__, line)(ret == item, "Expected %d retval, got %d\n", item, ret);
ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem);
}
}
else
{ {
ok_(__FILE__, line)(ret == item, "Expected %d retval, got %d\n", item, ret); ok_(__FILE__, line)(ret == item, "Expected %d retval, got %d\n", item, ret);
ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem);
} }
if (todo_subitem) todo_wine_if(todo_subitem)
{
todo_wine
ok_(__FILE__, line)(lpht.iSubItem == subitem, "Expected subitem %d, got %d\n", subitem, lpht.iSubItem);
}
else
ok_(__FILE__, line)(lpht.iSubItem == subitem, "Expected subitem %d, got %d\n", subitem, lpht.iSubItem); ok_(__FILE__, line)(lpht.iSubItem == subitem, "Expected subitem %d, got %d\n", subitem, lpht.iSubItem);
if (todo_flags) todo_wine_if(todo_flags)
{
todo_wine
ok_(__FILE__, line)(lpht.flags == flags, "Expected flags 0x%x, got 0x%x\n", flags, lpht.flags);
}
else
ok_(__FILE__, line)(lpht.flags == flags, "Expected flags 0x%x, got 0x%x\n", flags, lpht.flags); ok_(__FILE__, line)(lpht.flags == flags, "Expected flags 0x%x, got 0x%x\n", flags, lpht.flags);
} }

7
dlls/comctl32/tests/monthcal.c
View File

@ -1182,14 +1182,9 @@ if (0)
if (sizeof(title_hits) / sizeof(title_hits[0]) <= title_index) if (sizeof(title_hits) / sizeof(title_hits[0]) <= title_index)
break; break;
if (title_hits[title_index].todo) { todo_wine_if(title_hits[title_index].todo)
todo_wine
ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n",
title_hits[title_index].ht, res, x); title_hits[title_index].ht, res, x);
} else {
ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n",
title_hits[title_index].ht, res, x);
}
} }
old_res = res; old_res = res;
} }