[1/2] comctl32/listview: Use expect() in tests when possible
Nikolay Sivov
bunglehead at gmail.com
Tue Sep 22 18:03:47 CDT 2009
Changelog:
- Use expect() in tests when possiblew
>From e84c81e292deb078f93a02d5bd91aef467aedaac Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <bunglehead at gmail.com>
Date: Wed, 23 Sep 2009 01:44:10 +0400
Subject: Use expect() in tests when possible
---
dlls/comctl32/tests/listview.c | 41 +++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index d0f2273..7353958 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -742,13 +742,13 @@ static void test_images(void)
ok(r == 0, "should return zero\n");
r = SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)himl);
- ok(r == 0, "should return zero\n");
+ expect(0, r);
r = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELONG(100,50));
/* returns dimensions */
r = SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0);
- ok(r == 0, "should be zero items\n");
+ expect(0, r);
item.mask = LVIF_IMAGE | LVIF_TEXT;
item.iItem = 0;
@@ -756,24 +756,24 @@ static void test_images(void)
item.iImage = 0;
item.pszText = 0;
r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item);
- ok(r == -1, "should fail\n");
+ expect(-1, r);
item.iSubItem = 0;
item.pszText = hello;
r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item);
- ok(r == 0, "should not fail\n");
+ expect(0, r);
memset(&r1, 0, sizeof r1);
r1.left = LVIR_ICON;
r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r1);
r = SendMessage(hwnd, LVM_DELETEALLITEMS, 0, 0);
- ok(r == TRUE, "should not fail\n");
+ expect(TRUE, r);
item.iSubItem = 0;
item.pszText = hello;
r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item);
- ok(r == 0, "should not fail\n");
+ expect(0, r);
memset(&r2, 0, sizeof r2);
r2.left = LVIR_ICON;
@@ -805,7 +805,7 @@ static void test_checkboxes(void)
item.iSubItem = 0;
item.pszText = text;
r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item);
- ok(r == 0, "ret %d\n", r);
+ expect(0, r);
item.iItem = 0;
item.mask = LVIF_STATE;
@@ -821,16 +821,16 @@ static void test_checkboxes(void)
item.iSubItem = 0;
item.pszText = text;
r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item);
- ok(r == 1, "ret %d\n", r);
+ expect(1, r);
item.iItem = 1;
item.mask = LVIF_STATE;
item.stateMask = 0xffff;
r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item);
- ok(item.state == 0, "state %x\n", item.state);
+ expect(0, item.state);
r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, LVS_EX_CHECKBOXES);
- ok(r == 0, "should return zero\n");
+ expect(0, r);
/* Having turned on checkboxes, check that all existing items are set to 0x1000 (unchecked) */
item.iItem = 0;
@@ -845,7 +845,7 @@ static void test_checkboxes(void)
item.state = 0;
item.pszText = text2;
r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item);
- ok(r == 2, "ret %d\n", r);
+ expect(2, r);
item.iItem = 2;
item.mask = LVIF_STATE;
@@ -860,7 +860,7 @@ static void test_checkboxes(void)
item.state = 0x2aaa;
item.pszText = text3;
r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item);
- ok(r == 3, "ret %d\n", r);
+ expect(3, r);
item.iItem = 3;
item.mask = LVIF_STATE;
@@ -913,7 +913,7 @@ static void test_checkboxes(void)
/* Now setting the style again will change an item's state */
r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, LVS_EX_CHECKBOXES);
- ok(r == 0, "ret %x\n", r);
+ expect(0, r);
item.iItem = 3;
item.mask = LVIF_STATE;
@@ -1021,7 +1021,7 @@ static void test_items(void)
item.iItem = 0;
item.iSubItem = 0;
r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item);
- ok(r == 0, "ret %d\n", r);
+ expect(0, r);
/* get */
memset (&item, 0xcc, sizeof (item));
item.mask = LVIF_STATE;
@@ -1043,7 +1043,7 @@ static void test_items(void)
item.iItem = 0;
item.iSubItem = 0;
r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item);
- ok(r == 0, "ret %d\n", r);
+ expect(0, r);
/* get */
memset (&item, 0xcc, sizeof (item));
item.mask = LVIF_STATE;
@@ -1065,7 +1065,7 @@ static void test_items(void)
item.iItem = 0;
item.iSubItem = 0;
r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item);
- ok(r == 0, "ret %d\n", r);
+ expect(0, r);
/* get */
memset (&item, 0xcc, sizeof (item));
item.mask = LVIF_STATE;
@@ -1085,7 +1085,7 @@ static void test_items(void)
item.iSubItem = 0;
item.lParam = lparamTest;
r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item);
- ok(r == 0, "ret %d\n", r);
+ expect(0, r);
/* Test getting of the param */
memset (&item, 0xcc, sizeof (item));
@@ -1121,7 +1121,7 @@ static void test_items(void)
item.iSubItem = 1;
item.lParam = lparamTest+1;
r = SendMessage(hwnd, LVM_SETITEMA, 0, (LPARAM) &item);
- ok(r == 0, "ret %d\n", r);
+ expect(0, r);
/* Query param from subitem again: should still return main item param */
memset (&item, 0xcc, sizeof (item));
@@ -1181,7 +1181,7 @@ static void test_items(void)
item.pszText = LPSTR_TEXTCALLBACK;
item.iItem = 0;
r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item);
- ok(r == 0, "ret %d\n", r);
+ expect(0, r);
memset (&item, 0, sizeof (item));
flush_sequences(sequences, NUM_MSG_SEQUENCES);
@@ -1315,7 +1315,7 @@ static void test_create(void)
col.mask = LVCF_WIDTH;
col.cx = 100;
r = SendMessage(hList, LVM_INSERTCOLUMN, 0, (LPARAM)&col);
- ok(r == 0, "Expected 0 column's inserted\n");
+ expect(0, r);
hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0);
ok(IsWindow(hHeader), "Header should be created\n");
ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n");
@@ -3348,7 +3348,6 @@ static void test_getitemrect(void)
expect(2 + 16, rect.left);
expect(34, rect.right);
-
DestroyWindow(hwnd);
}
--
1.5.6.5
More information about the wine-patches
mailing list