[PATCH] include: move expect_eq_* test macros to include/wine/test.h

Mikołaj Zalewski mikolajz at tygrys.dom
Sun Feb 7 16:46:03 CST 2010


---
 dlls/kernel32/tests/process.c  |   19 -------------------
 dlls/psapi/tests/psapi_main.c  |    7 -------
 dlls/shell32/tests/shelllink.c |   24 ------------------------
 include/wine/test.h            |   28 ++++++++++++++++++++++++++++
 4 files changed, 28 insertions(+), 50 deletions(-)

diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index 7b5ac75..248c90c 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
@@ -35,25 +35,6 @@
 
 #include "wine/test.h"
 
-#define expect_eq_d(expected, actual) \
-    do { \
-      int value = (actual); \
-      ok((expected) == value, "Expected " #actual " to be %d (" #expected ") is %d\n", \
-          (expected), value); \
-    } while (0)
-#define expect_eq_s(expected, actual) \
-    do { \
-      LPCSTR value = (actual); \
-      ok(lstrcmpA((expected), value) == 0, "Expected " #actual " to be L\"%s\" (" #expected ") is L\"%s\"\n", \
-          expected, value); \
-    } while (0)
-#define expect_eq_ws_i(expected, actual) \
-    do { \
-      LPCWSTR value = (actual); \
-      ok(lstrcmpiW((expected), value) == 0, "Expected " #actual " to be L\"%s\" (" #expected ") is L\"%s\"\n", \
-          wine_dbgstr_w(expected), wine_dbgstr_w(value)); \
-    } while (0)
-
 static HINSTANCE hkernel32;
 static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD);
 static BOOL   (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD);
diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c
index 21a3d1a..2179105 100644
--- a/dlls/psapi/tests/psapi_main.c
+++ b/dlls/psapi/tests/psapi_main.c
@@ -25,13 +25,6 @@
 #include "wine/test.h"
 #include "psapi.h"
 
-#define expect_eq_d(expected, actual) \
-    do { \
-      int value = (actual); \
-      ok((expected) == value, "Expected " #actual " to be %d (" #expected ") is %d\n", \
-          (expected), value); \
-    } while (0)
-
 #define PSAPI_GET_PROC(func) \
     p ## func = (void*)GetProcAddress(hpsapi, #func); \
     if(!p ## func) { \
diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c
index 4e8bf67..b68d801 100644
--- a/dlls/shell32/tests/shelllink.c
+++ b/dlls/shell32/tests/shelllink.c
@@ -33,30 +33,6 @@
 
 #include "shell32_test.h"
 
-#define expect_eq_x(expected, actual) \
-    do { \
-      int value = (actual); \
-      ok((expected) == value, "Expected " #actual " to be 0x%x (" #expected ") is 0x%x\n", \
-          (expected), value); \
-    } while (0)
-#define expect_eq_p(expected, actual) \
-    do { \
-      void *value = (actual); \
-      ok((expected) == value, "Expected " #actual " to be %p (" #expected ") is %p\n", \
-          (expected), value); \
-    } while (0)
-#define expect_eq_ws(expected, actual) \
-    do { \
-      LPCWSTR value = (actual); \
-      ok(lstrcmpW((expected), value) == 0, "Expected " #actual " to be %s (" #expected ") is %s\n", \
-          wine_dbgstr_w(expected), wine_dbgstr_w(value)); \
-    } while (0)
-#define expect_true(actual) \
-    do { \
-      BOOL value = (actual); \
-      ok(value, "Expected " #actual " to be true, but it isn't\n"); \
-    } while (0)
-
 #ifndef SLDF_HAS_LOGO3ID
 #  define SLDF_HAS_LOGO3ID 0x00000800 /* not available in the Vista SDK */
 #endif
diff --git a/include/wine/test.h b/include/wine/test.h
index 42a56c0..53d0c2d 100644
--- a/include/wine/test.h
+++ b/include/wine/test.h
@@ -109,6 +109,34 @@ extern void winetest_trace( const char *msg, ... );
                             winetest_end_todo(platform))
 #define todo_wine      todo("wine")
 
+/* Simple value-checking macros. */
+#define __wine_test_id(x) (x)
+#define __wine_test_std_cmp(a, b) ((a) - (b))
+#define __wine_test_expect(expected, actual, type, format, cmp, conv) \
+    do { \
+      type value = (actual); \
+      ok(cmp((expected), value) == 0, "Expected " #actual " to be " format " (" #expected ") is " format "\n", \
+          conv(expected), conv(value)); \
+    } while (0)
+#define expect_eq_d(expected, actual) \
+    __wine_test_expect(expected, actual, int, "%d", __wine_test_std_cmp, __wine_test_id)
+#define expect_eq_x(expected, actual) \
+    __wine_test_expect(expected, actual, int, "0x%x", __wine_test_std_cmp, __wine_test_id)
+#define expect_eq_p(expected, actual) \
+    __wine_test_expect(expected, actual, void *, "%p", __wine_test_std_cmp, __wine_test_id)
+#define expect_eq_s(expected, actual) \
+    __wine_test_expect(expected, actual, LPCSTR, "\"%s\"", lstrcmpA, __wine_test_id)
+#define expect_eq_ws(expected, actual) \
+    __wine_test_expect(expected, actual, LPCWSTR, "%s", lstrcmpW, wine_dbgstr_w)
+#define expect_eq_ws_i(expected, actual) \
+    __wine_test_expect(expected, actual, LPCWSTR, "%s", lstrcmpiW, wine_dbgstr_w)
+
+#define expect_true(actual) \
+    do { \
+      BOOL value = (actual); \
+      ok(value, "Expected " #actual " to be true, but it isn't\n"); \
+    } while (0)
+
 
 #ifdef NONAMELESSUNION
 # define U(x)  (x).u
-- 
1.6.0.2


--------------030506060406050300040308--



More information about the wine-patches mailing list