Add trailing '\n's to ok() calls (user 1)
Francois Gouget
fgouget at free.fr
Fri Jan 23 11:04:53 CST 2004
Changelog:
* dlls/user/tests/listbox.c,
dlls/user/tests/resource.c,
dlls/user/tests/sysparams.c,
dlls/user/tests/wsprintf.c
Add trailing '\n's to ok() calls.
Index: dlls/user/tests/listbox.c
===================================================================
RCS file: /home/cvs/wine/dlls/user/tests/listbox.c,v
retrieving revision 1.1
diff -u -r1.1 listbox.c
--- dlls/user/tests/listbox.c 26 Apr 2003 02:09:43 -0000 1.1
+++ dlls/user/tests/listbox.c 23 Jan 2004 12:44:34 -0000
@@ -99,7 +99,7 @@
#define listbox_field_ok(t, s, f, got) \
ok (t.s.f==got.f, "style %#x, step " #s ", field " #f \
- ": expected %d, got %d", (unsigned int)t.prop.add_style, \
+ ": expected %d, got %d\n", (unsigned int)t.prop.add_style, \
t.s.f, got.f)
#define listbox_todo_field_ok(t, s, f, got) \
Index: dlls/user/tests/resource.c
===================================================================
RCS file: /home/cvs/wine/dlls/user/tests/resource.c,v
retrieving revision 1.1
diff -u -r1.1 resource.c
--- dlls/user/tests/resource.c 9 Jan 2004 00:36:51 -0000 1.1
+++ dlls/user/tests/resource.c 23 Jan 2004 12:44:35 -0000
@@ -43,12 +43,12 @@
const int expected = tests[i].expected;
const int len = LoadStringA (hInst, 0, buf, bufsiz);
- ok (len == expected, "bufsiz=%d: got %d, expected %d",
+ ok (len == expected, "bufsiz=%d: got %d, expected %d\n",
bufsiz, len, expected);
ok (!memcmp (buf, str, len),
- "bufsiz=%d: got '%s', expected '%.*s'",
+ "bufsiz=%d: got '%s', expected '%.*s'\n",
bufsiz, buf, len, str);
- ok (buf[len] == 0, "bufsiz=%d: NUL termination missing",
+ ok (buf[len] == 0, "bufsiz=%d: NUL termination missing\n",
bufsiz);
}
}
Index: dlls/user/tests/sysparams.c
===================================================================
RCS file: /home/cvs/wine/dlls/user/tests/sysparams.c,v
retrieving revision 1.19
diff -u -r1.19 sysparams.c
--- dlls/user/tests/sysparams.c 6 Oct 2003 21:03:32 -0000 1.19
+++ dlls/user/tests/sysparams.c 23 Jan 2004 12:44:35 -0000
@@ -133,10 +133,10 @@
if (change_counter==0 && optional==1)
return;
ok( 1 == change_counter,
- "Missed a message: change_counter=%d", change_counter );
+ "Missed a message: change_counter=%d\n", change_counter );
change_counter = 0;
ok( action == change_last_param,
- "Wrong action got %d expected %d", change_last_param, action );
+ "Wrong action got %d expected %d\n", change_last_param, action );
change_last_param = 0;
}
@@ -166,13 +166,13 @@
if (rc==ERROR_SUCCESS)
{
ok( !strcmp( testValue, value ),
- "Wrong value in registry: subKey=%s, valName=%s, testValue=%s, value=%s",
+ "Wrong value in registry: subKey=%s, valName=%s, testValue=%s, value=%s\n",
subKey1, valName, testValue, value );
found++;
}
else if (strict)
{
- ok(0,"Missing registry entry: subKey=%s, valName=%s",
+ ok(0,"Missing registry entry: subKey=%s, valName=%s\n",
subKey1, valName);
}
if (subKey2 && !strict)
@@ -185,12 +185,12 @@
if (rc==ERROR_SUCCESS)
{
ok( !strcmp( testValue, value ),
- "Wrong value in registry: subKey=%s, valName=%s, testValue=%s, value=%s",
+ "Wrong value in registry: subKey=%s, valName=%s, testValue=%s, value=%s\n",
subKey2, valName, testValue, value );
found++;
}
}
- ok(found,"Missing registry entry: %s in %s or %s",
+ ok(found,"Missing registry entry: %s in %s or %s\n",
valName, subKey1, (subKey2?subKey2:"<n/a>") );
}
@@ -250,7 +250,7 @@
ok(rc!=0,"SystemParametersInfoW: rc=%d err=%ld\n",rc,GetLastError());
eq( b, curr_val, "SystemParametersInfoW", "%d" );
}
- ok( MessageBeep( MB_OK ), "Return value of MessageBeep when sound is disabled" );
+ ok( MessageBeep( MB_OK ), "Return value of MessageBeep when sound is disabled\n" );
rc=SystemParametersInfoA( SPI_SETBEEP, old_b, 0, SPIF_UPDATEINIFILE );
ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%ld\n",rc,GetLastError());
@@ -294,7 +294,7 @@
for (i = 0; i < 3; i++)
{
ok(mi[i] == curr_val[i],
- "incorrect value for %d: %d != %d", i, mi[i], curr_val[i]);
+ "incorrect value for %d: %d != %d\n", i, mi[i], curr_val[i]);
}
rc=SystemParametersInfoW( SPI_GETMOUSE, 0, mi, 0 );
@@ -304,7 +304,7 @@
for (i = 0; i < 3; i++)
{
ok(mi[i] == curr_val[i],
- "incorrect value for %d: %d != %d", i, mi[i], curr_val[i]);
+ "incorrect value for %d: %d != %d\n", i, mi[i], curr_val[i]);
}
}
@@ -315,8 +315,8 @@
mouse_event( MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, 0, 0, 0, 0 );
mouse_event( MOUSEEVENTF_MOVE, req_change[i].x, req_change[i].y, 0, 0 );
GetCursorPos( &mv );
- ok( proj_change[i].x == mv.x, "Projected dx and real dx comparison. May fail under high load." );
- ok( proj_change[i].y == mv.y, "Projected dy equals real dy. May fail under high load." );
+ ok( proj_change[i].x == mv.x, "Projected dx and real dx comparison. May fail under high load.\n" );
+ ok( proj_change[i].y == mv.y, "Projected dy equals real dy. May fail under high load.\n" );
}
#endif
}
Index: dlls/user/tests/wsprintf.c
===================================================================
RCS file: /home/cvs/wine/dlls/user/tests/wsprintf.c,v
retrieving revision 1.4
diff -u -r1.4 wsprintf.c
--- dlls/user/tests/wsprintf.c 5 Sep 2003 23:08:29 -0000 1.4
+++ dlls/user/tests/wsprintf.c 23 Jan 2004 12:44:35 -0000
@@ -30,9 +30,9 @@
int rc;
rc=wsprintfA(buf, "%010ld", -1);
- ok(rc == 10, "wsPrintfA length failure: rc=%d error=%ld",rc,GetLastError());
+ ok(rc == 10, "wsPrintfA length failure: rc=%d error=%ld\n",rc,GetLastError());
ok((lstrcmpA(buf, "-000000001") == 0),
- "wsprintfA zero padded negative value failure: buf=[%s]",buf);
+ "wsprintfA zero padded negative value failure: buf=[%s]\n",buf);
}
static void wsprintfWTest(void)
@@ -45,9 +45,9 @@
rc=wsprintfW(buf, fmt, -1);
if (rc==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED)
return;
- ok(rc == 10, "wsPrintfW length failure: rc=%d error=%ld",rc,GetLastError());
+ ok(rc == 10, "wsPrintfW length failure: rc=%d error=%ld\n",rc,GetLastError());
ok((lstrcmpW(buf, target) == 0),
- "wsprintfW zero padded negative value failure");
+ "wsprintfW zero padded negative value failure\n");
}
START_TEST(wsprintf)
--
Francois Gouget fgouget at free.fr http://fgouget.free.fr/
The nice thing about meditation is that it makes doing nothing quite respectable
-- Paul Dean
More information about the wine-patches
mailing list