comctl32: minor updown test cleanup
Leslie Choong
septikus at gmail.com
Fri Feb 16 19:27:26 CST 2007
Hi I recently had a patch accepted:
http://winehq.org/pipermail/wine-cvs/2007-February/030184.html
But in that time I addressed issues brought up by both James Hawkins
and Dan Kegel. Here is a patch that implements the same tests but in a
more readable format. There are also some corrections to error
messages that are printed out. Let me know if there are any issues
-Leslie
-------------- next part --------------
From 538f7ffdac284ff15daafa72c4209a24221768e8 Mon Sep 17 00:00:00 2001
From: U-SEPTIKUS\Leslie <septikus at gmail.com>
Date: Fri, 16 Feb 2007 10:22:03 -0800
Subject: [try2] [PATCH] Added Getter/Setter Tests for Updown Common Control
---
dlls/comctl32/tests/updown.c | 102 ++++++++++++++++++++++---------------------
1 file changed, 52 insertions(+), 50 deletions(-)
diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c
index 76ff59a..f93e840 100644
--- a/dlls/comctl32/tests/updown.c
+++ b/dlls/comctl32/tests/updown.c
@@ -52,6 +52,8 @@
#include "wine/test.h"
+#define expect(expected,got) ok(got == expected, "Expected %d, got %d\n", expected, got)
+
#define NUM_MSG_SEQUENCES 3
#define PARENT_SEQ_INDEX 0
#define EDIT_SEQ_INDEX 1
@@ -509,48 +511,48 @@ static void test_updown_pos(void)
/* No need to check first return as UDM_SETRANGE does not use it */
SendMessage(updown, UDM_SETRANGE, 0 , MAKELONG(100,0) );
r= SendMessage(updown, UDM_GETRANGE, 0,0);
- ok(LOWORD(r) == 100, "Expected 100, got %d\n", LOWORD(r));
- ok(HIWORD(r) == 0, "Expected 0, got %d\n", HIWORD(r));
+ expect(100,LOWORD(r));
+ expect(0,HIWORD(r));
/* Set the position to 5, return is not checked as it was set before func call */
- r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(5,0) );
+ SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(5,0) );
/* Since UDM_SETBUDDYINT was not set at creation HIWORD(r) will always be 1 as a return from UDM_GETPOS */
/* Get the position, which should be 5 */
r = SendMessage(updown, UDM_GETPOS, 0 , 0 );
- ok(LOWORD(r) == 5, "Expected 5, got %d\n", LOWORD(r));
- ok(HIWORD(r) == 1, "Expected 1, got %d\n", HIWORD(r));
+ expect(5,LOWORD(r));
+ expect(1,HIWORD(r));
/* Set the position to 0, return should be 5 */
r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(0,0) );
- ok(r == 5, "Expected 5, got %d\n", r);
+ expect(5,r);
/* Get the position, which should be 0 */
r = SendMessage(updown, UDM_GETPOS, 0 , 0 );
- ok(LOWORD(r) == 0, "Expected 0, got %d\n", LOWORD(r));
- ok(HIWORD(r) == 1, "Expected 1, got %d\n", HIWORD(r));
+ expect(0,LOWORD(r));
+ expect(1,HIWORD(r));
/* Set the position to -1, return should be 0 */
r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(-1,0) );
- ok(r == 0, "Expected 0, got %d\n", r);
+ expect(0,r);
/* Get the position, which should be 0 */
r = SendMessage(updown, UDM_GETPOS, 0 , 0 );
- ok(LOWORD(r) == 0, "Expected 0, got %d\n", LOWORD(r));
- ok(HIWORD(r) == 1, "Expected 1, got %d\n", HIWORD(r));
+ expect(0,LOWORD(r));
+ expect(1,HIWORD(r));
/* Set the position to 100, return should be 0 */
r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(100,0) );
- ok(r == 0, "Expected 0, got %d\n", r);
+ expect(0,r);
/* Get the position, which should be 100 */
r = SendMessage(updown, UDM_GETPOS, 0 , 0 );
- ok(LOWORD(r) == 100, "Expected 100, got %d\n", LOWORD(r));
- ok(HIWORD(r) == 1, "Expected 1, got %d\n", HIWORD(r));
+ expect(100,LOWORD(r));
+ expect(1,HIWORD(r));
/* Set the position to 101, return should be 100 */
r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(101,0) );
- ok(r == 100, "Expected 100, got %d\n", r);
+ expect(100,r);
/* Get the position, which should be 100 */
r = SendMessage(updown, UDM_GETPOS, 0 , 0 );
- ok(LOWORD(r) == 100, "Expected 100, got %d\n", LOWORD(r));
- ok(HIWORD(r) == 1, "Expected 1, got %d\n", HIWORD(r));
+ expect(100,LOWORD(r));
+ expect(1,HIWORD(r));
}
static void test_updown_pos32(void)
@@ -563,45 +565,45 @@ static void test_updown_pos32(void)
SendMessage(updown, UDM_SETRANGE32, 0 , 1000 );
r = SendMessage(updown, UDM_GETRANGE32, (WPARAM) &low , (LPARAM) &high );
- ok(low == 0, "Expected 0, got %d\n", low);
- ok(high == 1000, "Expected 1000, got %d\n", high);
+ expect(0,low);
+ expect(1000,high);
/* Set position to 500, don't check return since it is unset*/
- r = SendMessage(updown, UDM_SETPOS32, 0 , 500 );
+ SendMessage(updown, UDM_SETPOS32, 0 , 500 );
/* Since UDM_SETBUDDYINT was not set at creation bRet will always be true as a return from UDM_GETPOS32 */
r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high );
- ok(r == 500, "Expected 500, got %d\n", r);
+ expect(500,r);
ok(high == 1 , "Expected 0, got %d\n", high);
/* Set position to 0, return should be 500 */
r = SendMessage(updown, UDM_SETPOS32, 0 , 0 );
- ok(r == 500, "Expected 500, got %d\n", r);
+ expect(500,r);
r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high );
- ok(r == 0, "Expected 0, got %d\n", r);
- ok(high == 1 , "Expected 0, got %d\n", high);
+ expect(0,r);
+ expect(1,high);
- /* Set position to -1 which sohuld become 0, return should be 0 */
+ /* Set position to -1 which should become 0, return should be 0 */
r = SendMessage(updown, UDM_SETPOS32, 0 , -1 );
- ok(r == 0, "Expected 0, got %d\n", r);
+ expect(0,r);
r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high );
- ok(r == 0, "Expected 0, got %d\n", r);
- ok(high == 1 , "Expected 0, got %d\n", high);
+ expect(0,r);
+ expect(1,high);
/* Set position to 1000, return should be 0 */
r = SendMessage(updown, UDM_SETPOS32, 0 , 1000 );
- ok(r == 0, "Expected 0, got %d\n", r);
+ expect(0,r);
r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high );
- ok(r == 1000, "Expected 1000, got %d\n", r);
- ok(high == 1 , "Expected 0, got %d\n", high);
+ expect(1000,r);
+ expect(1,high);
- /* Set position to 1001 which sohuld become 1000, return should be 1000 */
+ /* Set position to 1001 which should become 1000, return should be 1000 */
r = SendMessage(updown, UDM_SETPOS32, 0 , 1001 );
- ok(r == 1000, "Expected 1000, got %d\n", r);
+ expect(1000,r);
r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high );
- ok(r == 1000, "Expected 0, got %d\n", r);
- ok(high == 1 , "Expected 0, got %d\n", high);
+ expect(1000,r);
+ expect(1,high);
}
static void test_updown_buddy(void)
@@ -609,7 +611,7 @@ static void test_updown_buddy(void)
HWND buddyReturn;
buddyReturn = (HWND)SendMessage(updown, UDM_GETBUDDY, 0 , 0 );
- ok(buddyReturn == edit, "Expected edit handle\n");
+ expect((int)edit,(int)buddyReturn);
}
static void test_updown_base(void)
@@ -619,31 +621,31 @@ static void test_updown_base(void)
/* return not checked since previous value is not known at start */
SendMessage(updown, UDM_SETBASE, 10 , 0);
r = SendMessage(updown, UDM_GETBASE, 0 , 0);
- ok(r == 10, "Expected 10, got %d\n", r);
+ expect(10,r);
/* Set base to an invalid value, should return 0 and stay at 10 */
r = SendMessage(updown, UDM_SETBASE, 80 , 0);
- ok(r == 0, "Expected 0, got %d\n", r);
+ expect(0,r);
r = SendMessage(updown, UDM_GETBASE, 0 , 0);
- ok(r == 10, "Expected 10, got %d\n", r);
+ expect(10,r);
/* Set base to 16 now, should get 16 as the return */
r = SendMessage(updown, UDM_SETBASE, 16 , 0);
- ok(r == 10, "Expected 10, got %d\n", r);
+ expect(10,r);
r = SendMessage(updown, UDM_GETBASE, 0 , 0);
- ok(r == 16, "Expected 16, got %d\n", r);
+ expect(16,r);
/* Set base to an invalid value, should return 0 and stay at 16 */
r = SendMessage(updown, UDM_SETBASE, 80 , 0);
- ok(r == 0, "Expected 0, got %d\n", r);
+ expect(0,r);
r = SendMessage(updown, UDM_GETBASE, 0 , 0);
- ok(r == 16, "Expected 16, got %d\n", r);
+ expect(16,r);
/* Set base back to 10, return should be 16 */
r = SendMessage(updown, UDM_SETBASE, 10 , 0);
- ok(r == 16, "Expected 16, got %d\n", r);
+ expect(16,r);
r = SendMessage(updown, UDM_GETBASE, 0 , 0);
- ok(r == 10, "Expected 10, got %d\n", r);
+ expect(10,r);
}
static void test_updown_unicode(void)
@@ -653,19 +655,19 @@ static void test_updown_unicode(void)
/* Set it to ANSI, don't check return as we don't know previous state */
SendMessage(updown, UDM_SETUNICODEFORMAT, 0 , 0);
r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0);
- ok(r == 0, "Expected 0, got %d\n", r);
+ expect(0,r);
/* Now set it to Unicode format */
r = SendMessage(updown, UDM_SETUNICODEFORMAT, 1 , 0);
- ok(r == 0, "Expected 0, got %d\n", r);
+ expect(0,r);
r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0);
- ok(r == 1, "Expected 1, got %d\n", r);
+ expect(1,r);
/* And now set it back to ANSI */
r = SendMessage(updown, UDM_SETUNICODEFORMAT, 0 , 0);
- ok(r == 1, "Expected 1, got %d\n", r);
+ expect(1,r);
r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0);
- ok(r == 0, "Expected 0, got %d\n", r);
+ expect(0,r);
}
--
1.4.4.4
More information about the wine-patches
mailing list