gdi32/tests: Improve test output for font tests

André Hentschel nerv at dawncrow.de
Mon Aug 5 16:39:26 CDT 2013


---
 dlls/gdi32/tests/font.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 2fc7069..bce099e 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -1891,29 +1891,29 @@ static void test_SetTextJustification(void)
     SetTextJustification(hdc, 0, 0);
     GetTextExtentPoint32(hdc, " ", 1, &expect);
     GetTextExtentPoint32(hdc, "   ", 3, &size);
-    ok( size.cx == 3 * expect.cx, "wrong size %d/%d\n", size.cx, expect.cx );
+    ok( size.cx == 3 * expect.cx, "wrong size %d, expected %d\n", size.cx, 3 * expect.cx );
     SetTextJustification(hdc, 4, 1);
     GetTextExtentPoint32(hdc, " ", 1, &size);
-    ok( size.cx == expect.cx + 4, "wrong size %d/%d\n", size.cx, expect.cx );
+    ok( size.cx == expect.cx + 4, "wrong size %d, expected %d\n", size.cx, expect.cx + 4 );
     SetTextJustification(hdc, 9, 2);
     GetTextExtentPoint32(hdc, "  ", 2, &size);
-    ok( size.cx == 2 * expect.cx + 9, "wrong size %d/%d\n", size.cx, expect.cx );
+    ok( size.cx == 2 * expect.cx + 9, "wrong size %d, expected %d\n", size.cx, 2 * expect.cx + 9 );
     SetTextJustification(hdc, 7, 3);
     GetTextExtentPoint32(hdc, "   ", 3, &size);
-    ok( size.cx == 3 * expect.cx + 7, "wrong size %d/%d\n", size.cx, expect.cx );
+    ok( size.cx == 3 * expect.cx + 7, "wrong size %d, expected %d\n", size.cx, 3 * expect.cx + 7 );
     SetTextJustification(hdc, 7, 3);
     SetTextCharacterExtra(hdc, 2 );
     GetTextExtentPoint32(hdc, "   ", 3, &size);
-    ok( size.cx == 3 * (expect.cx + 2) + 7, "wrong size %d/%d\n", size.cx, expect.cx );
+    ok( size.cx == 3 * (expect.cx + 2) + 7, "wrong size %d, expected %d\n", size.cx, 3 * (expect.cx + 2) + 7 );
     SetTextJustification(hdc, 0, 0);
     SetTextCharacterExtra(hdc, 0);
     size.cx = size.cy = 1234;
     GetTextExtentPoint32(hdc, " ", 0, &size);
-    ok( size.cx == 0 && size.cy == 0, "wrong size %d,%d\n", size.cx, size.cy );
+    ok( size.cx == 0 && size.cy == 0, "wrong size (%d,%d), expected (0,0)\n", size.cx, size.cy );
     pGetTextExtentExPointI(hdc, indices, 2, -1, NULL, NULL, &expect);
     SetTextJustification(hdc, 5, 1);
     pGetTextExtentExPointI(hdc, indices, 2, -1, NULL, NULL, &size);
-    ok( size.cx == expect.cx + 5, "wrong size %d/%d\n", size.cx, expect.cx );
+    ok( size.cx == expect.cx + 5, "wrong size %d, expected %d\n", size.cx, expect.cx + 5 );
     SetTextJustification(hdc, 0, 0);
 
     SetMapMode( hdc, MM_ANISOTROPIC );
@@ -1927,7 +1927,7 @@ static void test_SetTextJustification(void)
     {
         SetTextCharacterExtra(hdc, i);
         GetTextExtentPoint32(hdc, "A", 1, &size);
-        ok( size.cx == expect.cx + i, "wrong size %d/%d+%d\n", size.cx, expect.cx, i );
+        ok( size.cx == expect.cx + i, "wrong size %d, expected %d+%d\n", size.cx, expect.cx, i );
     }
     SetTextCharacterExtra(hdc, 0);
     pGetTextExtentExPointI(hdc, indices, 1, -1, NULL, NULL, &expect);
@@ -1935,7 +1935,7 @@ static void test_SetTextJustification(void)
     {
         SetTextCharacterExtra(hdc, i);
         pGetTextExtentExPointI(hdc, indices, 1, -1, NULL, NULL, &size);
-        ok( size.cx == expect.cx + i, "wrong size %d/%d+%d\n", size.cx, expect.cx, i );
+        ok( size.cx == expect.cx + i, "wrong size %d, expected %d+%d\n", size.cx, expect.cx, i );
     }
     SetTextCharacterExtra(hdc, 0);
 
@@ -1949,7 +1949,7 @@ static void test_SetTextJustification(void)
     {
         SetTextCharacterExtra(hdc, i);
         GetTextExtentPoint32(hdc, "A", 1, &size);
-        ok( size.cx == expect.cx + i, "wrong size %d/%d+%d\n", size.cx, expect.cx, i );
+        ok( size.cx == expect.cx + i, "wrong size %d, expected %d+%d\n", size.cx, expect.cx, i );
     }
 
 done:
-- 
1.8.1.2



More information about the wine-patches mailing list