Javier Cantero : user32/tests: New test cases for SubtractRect().

Alexandre Julliard julliard at winehq.org
Thu Mar 27 14:40:05 CDT 2014


Module: wine
Branch: master
Commit: ee5c64f583668988e04cae38169641f647833d7c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ee5c64f583668988e04cae38169641f647833d7c

Author: Javier Cantero <jcantero at escomposlinux.org>
Date:   Wed Mar 26 23:05:16 2014 +0100

user32/tests: New test cases for SubtractRect().

---

 dlls/user32/tests/uitools.c |   22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/dlls/user32/tests/uitools.c b/dlls/user32/tests/uitools.c
index 0401448..5f10b00 100644
--- a/dlls/user32/tests/uitools.c
+++ b/dlls/user32/tests/uitools.c
@@ -70,7 +70,7 @@ static void test_SubtractRect(void)
     RECT rectr;
     BOOL result;
 
-    /* case 1: source rectangles don't intersect */
+    /* source rectangles don't intersect */
     SetRect(&rect1, 50, 50, 150, 100);
     SetRect(&rect2, 250, 200, 1500, 1000);
     result = SubtractRect(&rectr, &rect1, &rect2);
@@ -79,7 +79,7 @@ static void test_SubtractRect(void)
         && rectr.bottom == 100, "wrong rect subtraction of SubtractRect "
         "(dest rect={%d, %d, %d, %d})\n", rectr.left, rectr.top, rectr.right, rectr.bottom);
 
-    /* case 2: source rect 2 partially overlaps rect 1 */
+    /* source rect 2 partially overlaps rect 1 */
     SetRect(&rect1, 2431, 626, 3427, 1608);
     SetRect(&rect2, 2499, 626, 3427, 1608);
     result = SubtractRect(&rectr, &rect1, &rect2);
@@ -88,12 +88,28 @@ static void test_SubtractRect(void)
         && rectr.bottom == 1608, "wrong rect subtraction of SubtractRect "
         "(dest rect={%d, %d, %d, %d})\n", rectr.left, rectr.top, rectr.right, rectr.bottom);
 
-    /* case 3: source rect 2 completely overlaps rect 1 */
+    /* source rect 2 partially overlaps rect 1 - dest is src rect 2 */
+    SetRect(&rect1, 2431, 626, 3427, 1608);
+    SetRect(&rect2, 2499, 626, 3427, 1608);
+    result = SubtractRect(&rect2, &rect1, &rect2);
+    ok(result, "SubtractRect returned FALSE but subtraction should not be empty\n");
+    ok(result && rectr.left == 2431 && rectr.top == 626 && rectr.right == 2499
+        && rectr.bottom == 1608, "wrong rect subtraction of SubtractRect "
+        "(dest rect={%d, %d, %d, %d})\n", rectr.left, rectr.top, rectr.right, rectr.bottom);
+
+    /* source rect 2 completely overlaps rect 1 */
     SetRect(&rect1, 250, 250, 400, 500);
     SetRect(&rect2, 50, 50, 1500, 1000);
     result = SubtractRect(&rectr, &rect1, &rect2);
     ok(!result, "SubtractRect returned TRUE but subtraction should be empty "
         "(dest rect={%d, %d, %d, %d})\n", rectr.left, rectr.top, rectr.right, rectr.bottom);
+
+    /* source rect 2 completely overlaps rect 1 - dest is src rect 2 */
+    SetRect(&rect1, 250, 250, 400, 500);
+    SetRect(&rect2, 50, 50, 1500, 1000);
+    result = SubtractRect(&rect2, &rect1, &rect2);
+    ok(!result, "SubtractRect returned TRUE but subtraction should be empty "
+        "(dest rect={%d, %d, %d, %d})\n", rect2.left, rect2.top, rect2.right, rect2.bottom);
 }
 
 START_TEST(uitools)




More information about the wine-cvs mailing list