Michael Stefaniuc : riched20/tests: Use EqualRect() instead of open coding it.
Alexandre Julliard
julliard at winehq.org
Thu Jun 2 10:49:59 CDT 2016
Module: wine
Branch: master
Commit: b0104692ac9bffa89452e22ff776fb83056ba59f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0104692ac9bffa89452e22ff776fb83056ba59f
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Thu Jun 2 13:41:21 2016 +0200
riched20/tests: Use EqualRect() instead of open coding it.
Signed-off-by: Michael Stefaniuc <mstefani at redhat.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/riched20/tests/editor.c | 54 ++++++++++++--------------------------------
1 file changed, 14 insertions(+), 40 deletions(-)
diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c
index 2fd9c99..92af700 100644
--- a/dlls/riched20/tests/editor.c
+++ b/dlls/riched20/tests/editor.c
@@ -7050,9 +7050,7 @@ static void test_format_rect(void)
expected.left += 1;
expected.right -= 1;
SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc);
- ok(rc.top == expected.top && rc.left == expected.left &&
- rc.bottom == expected.bottom && rc.right == expected.right,
- "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
+ ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
rc.top, rc.left, rc.bottom, rc.right,
expected.top, expected.left, expected.bottom, expected.right);
@@ -7071,8 +7069,7 @@ static void test_format_rect(void)
expected.bottom = min(clientRect.bottom, rc.bottom);
expected.right = min(clientRect.right, rc.right);
SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc);
- ok(rc.top == expected.top && rc.left == expected.left &&
- rc.bottom == expected.bottom && rc.right == expected.right,
+ ok(EqualRect(&rc, &expected),
"[n=%d] rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
n, rc.top, rc.left, rc.bottom, rc.right,
expected.top, expected.left, expected.bottom, expected.right);
@@ -7082,9 +7079,7 @@ static void test_format_rect(void)
SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc);
expected = clientRect;
SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc);
- ok(rc.top == expected.top && rc.left == expected.left &&
- rc.bottom == expected.bottom && rc.right == expected.right,
- "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
+ ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
rc.top, rc.left, rc.bottom, rc.right,
expected.top, expected.left, expected.bottom, expected.right);
@@ -7094,9 +7089,7 @@ static void test_format_rect(void)
ok(options & ECO_SELECTIONBAR, "EM_SETOPTIONS failed to add selectionbar.\n");
expected.left += 8; /* selection bar width */
SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc);
- ok(rc.top == expected.top && rc.left == expected.left &&
- rc.bottom == expected.bottom && rc.right == expected.right,
- "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
+ ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
rc.top, rc.left, rc.bottom, rc.right,
expected.top, expected.left, expected.bottom, expected.right);
@@ -7104,9 +7097,7 @@ static void test_format_rect(void)
SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc);
expected = clientRect;
SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc);
- ok(rc.top == expected.top && rc.left == expected.left &&
- rc.bottom == expected.bottom && rc.right == expected.right,
- "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
+ ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
rc.top, rc.left, rc.bottom, rc.right,
expected.top, expected.left, expected.bottom, expected.right);
@@ -7117,9 +7108,7 @@ static void test_format_rect(void)
ok(!(options & ECO_SELECTIONBAR), "EM_SETOPTIONS failed to remove selectionbar.\n");
expected.left -= 8; /* selection bar width */
SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc);
- ok(rc.top == expected.top && rc.left == expected.left &&
- rc.bottom == expected.bottom && rc.right == expected.right,
- "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
+ ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
rc.top, rc.left, rc.bottom, rc.right,
expected.top, expected.left, expected.bottom, expected.right);
@@ -7128,8 +7117,7 @@ static void test_format_rect(void)
SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc);
expected = clientRect;
SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc);
- ok(rc.top == expected.top && rc.left == expected.left &&
- rc.bottom == expected.bottom && rc.right == expected.right,
+ ok(EqualRect(&rc, &expected),
"[n=%d] rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
n, rc.top, rc.left, rc.bottom, rc.right,
expected.top, expected.left, expected.bottom, expected.right);
@@ -7144,9 +7132,7 @@ static void test_format_rect(void)
expected = rc;
SendMessageA(hwnd, EM_SETRECT, 1, (LPARAM)&rc);
SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc);
- ok(rc.top == expected.top && rc.left == expected.left &&
- rc.bottom == expected.bottom && rc.right == expected.right,
- "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
+ ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
rc.top, rc.left, rc.bottom, rc.right,
expected.top, expected.left, expected.bottom, expected.right);
@@ -7159,9 +7145,7 @@ static void test_format_rect(void)
expected = rc;
SendMessageA(hwnd, EM_SETRECT, 1, (LPARAM)&rc);
SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc);
- ok(rc.top == expected.top && rc.left == expected.left &&
- rc.bottom == expected.bottom && rc.right == expected.right,
- "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
+ ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
rc.top, rc.left, rc.bottom, rc.right,
expected.top, expected.left, expected.bottom, expected.right);
@@ -7176,9 +7160,7 @@ static void test_format_rect(void)
expected.left += 1;
expected.right -= 1;
SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc);
- ok(rc.top == expected.top && rc.left == expected.left &&
- rc.bottom == expected.bottom && rc.right == expected.right,
- "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
+ ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
rc.top, rc.left, rc.bottom, rc.right,
expected.top, expected.left, expected.bottom, expected.right);
@@ -7189,9 +7171,7 @@ static void test_format_rect(void)
expected.left += 1;
expected.right -= 1;
SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc);
- ok(rc.top == expected.top && rc.left == expected.left &&
- rc.bottom == expected.bottom && rc.right == expected.right,
- "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
+ ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
rc.top, rc.left, rc.bottom, rc.right,
expected.top, expected.left, expected.bottom, expected.right);
@@ -7202,9 +7182,7 @@ static void test_format_rect(void)
expected.left += 1;
expected.right -= 1;
SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc);
- ok(rc.top == expected.top && rc.left == expected.left &&
- rc.bottom == expected.bottom && rc.right == expected.right,
- "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
+ ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
rc.top, rc.left, rc.bottom, rc.right,
expected.top, expected.left, expected.bottom, expected.right);
@@ -7223,9 +7201,7 @@ static void test_format_rect(void)
expected.top += 1;
expected.right -= 1;
SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc);
- ok(rc.top == expected.top && rc.left == expected.left &&
- rc.bottom == expected.bottom && rc.right == expected.right,
- "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
+ ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
rc.top, rc.left, rc.bottom, rc.right,
expected.top, expected.left, expected.bottom, expected.right);
@@ -7240,9 +7216,7 @@ static void test_format_rect(void)
expected.right += 1;
SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc);
SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc);
- ok(rc.top == expected.top && rc.left == expected.left &&
- rc.bottom == expected.bottom && rc.right == expected.right,
- "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
+ ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",
rc.top, rc.left, rc.bottom, rc.right,
expected.top, expected.left, expected.bottom, expected.right);
More information about the wine-cvs
mailing list