Add trailing '\n's to ok() calls
Francois Gouget
fgouget at free.fr
Wed Jul 6 10:04:04 CDT 2005
Changelog:
* dlls/comctl32/tests/treeview.c
dlls/dinput/tests/joystick.c
dlls/ntdll/tests/info.c
dlls/oleaut32/tests/vartest.c
dlls/psapi/tests/psapi_main.c
dlls/user/tests/menu.c
dlls/user/tests/win.c
Francois Gouget <fgouget at free.fr>
Add trailing '\n's to ok() calls.
--
Francois Gouget fgouget at free.fr http://fgouget.free.fr/
There are 10 types of people in the world...
those who understand binary and those who don't.
-------------- next part --------------
Index: dlls/comctl32/tests/treeview.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/tests/treeview.c,v
retrieving revision 1.2
diff -u -p -r1.2 treeview.c
--- dlls/comctl32/tests/treeview.c 16 Jun 2005 15:52:44 -0000 1.2
+++ dlls/comctl32/tests/treeview.c 5 Jul 2005 13:51:41 -0000
@@ -89,7 +89,7 @@ static void FillRoot(void)
assert(hChild);
AddItem('.');
- ok(!strcmp(sequence, "AB."), "Item creation");
+ ok(!strcmp(sequence, "AB."), "Item creation\n");
}
static void DoTest1(void)
@@ -107,7 +107,7 @@ static void DoTest1(void)
AddItem('5');
TreeView_SelectItem(hTree, hRoot);
AddItem('.');
- ok(!strcmp(sequence, "1(nR)nR23(Rn)Rn45(nR)nR."), "root-none select test");
+ ok(!strcmp(sequence, "1(nR)nR23(Rn)Rn45(nR)nR."), "root-none select test\n");
}
static void DoTest2(void)
@@ -125,7 +125,7 @@ static void DoTest2(void)
AddItem('5');
TreeView_SelectItem(hTree, hRoot);
AddItem('.');
- ok(!strcmp(sequence, "1(nR)nR23(RC)RC45(CR)CR."), "root-child select test");
+ ok(!strcmp(sequence, "1(nR)nR23(RC)RC45(CR)CR."), "root-child select test\n");
}
LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
Index: dlls/dinput/tests/joystick.c
===================================================================
RCS file: /var/cvs/wine/dlls/dinput/tests/joystick.c,v
retrieving revision 1.4
diff -u -p -r1.4 joystick.c
--- dlls/dinput/tests/joystick.c 20 Jun 2005 14:18:05 -0000 1.4
+++ dlls/dinput/tests/joystick.c 5 Jul 2005 17:27:43 -0000
@@ -270,7 +270,7 @@ static BOOL CALLBACK EnumJoysticks(
break;
trace("X%5ld Y%5ld Z%5ld Rx%5ld Ry%5ld Rz%5ld "
"S0%5ld S1%5ld POV0%5ld POV1%5ld POV2%5ld POV3%5ld "
- "B %d %d %d %d %d %d %d %d %d %d %d %d\r",
+ "B %d %d %d %d %d %d %d %d %d %d %d %d\n",
js.lX, js.lY, js.lZ, js.lRx, js.lRy, js.lRz,
js.rglSlider[0], js.rglSlider[1],
js.rgdwPOV[0], js.rgdwPOV[1], js.rgdwPOV[2], js.rgdwPOV[3],
Index: dlls/ntdll/tests/info.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/tests/info.c,v
retrieving revision 1.13
diff -u -p -r1.13 info.c
--- dlls/ntdll/tests/info.c 5 Jul 2005 11:46:53 -0000 1.13
+++ dlls/ntdll/tests/info.c 5 Jul 2005 15:05:43 -0000
@@ -291,7 +291,7 @@ static void test_query_process(void)
last_pid = spi->dwProcessID;
- ok( spi->dwThreadCount > 0, "Expected some threads for this process, got 0\"");
+ ok( spi->dwThreadCount > 0, "Expected some threads for this process, got 0\n");
/* Loop through the threads, skip NT4 for now */
Index: dlls/oleaut32/tests/vartest.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/tests/vartest.c,v
retrieving revision 1.43
diff -u -p -r1.43 vartest.c
--- dlls/oleaut32/tests/vartest.c 23 Jun 2005 09:48:07 -0000 1.43
+++ dlls/oleaut32/tests/vartest.c 5 Jul 2005 13:51:51 -0000
@@ -4714,12 +4714,12 @@ if (HAVE_OLEAUT32_I8) {
V_UI1(&right) = 9;
hres = VarMul(&cy, &right, &result);
- ok(hres == S_OK && V_VT(&result) == VT_CY, "VarMul: expected coerced type VT_CY, got %s!\n'", vtstr(V_VT(&result)));
+ ok(hres == S_OK && V_VT(&result) == VT_CY, "VarMul: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result)));
hres = VarR8FromCy(V_CY(&result), &r);
ok(hres == S_OK && EQ_DOUBLE(r, 42399), "VarMul: CY value %f, expected %f\n", r, (double)42399);
hres = VarMul(&left, &dec, &result);
- ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarMul: expected coerced type VT_DECIMAL, got %s!\n'", vtstr(V_VT(&result)));
+ ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarMul: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result)));
hres = VarR8FromDec(&V_DECIMAL(&result), &r);
ok(hres == S_OK && EQ_DOUBLE(r, 46.2), "VarMul: DECIMAL value %f, expected %f\n", r, (double)46.2);
}
@@ -4897,7 +4897,7 @@ static void test_VarAdd(void)
V_VT(&right) = VT_BSTR;
V_BSTR(&right) = rbstr;
hres = VarAdd(&left, &right, &result);
- ok(hres == S_OK && V_VT(&result) == VT_BSTR, "VarAdd: expected coerced type VT_BSTR, got %s!\n'", vtstr(V_VT(&result)));
+ ok(hres == S_OK && V_VT(&result) == VT_BSTR, "VarAdd: expected coerced type VT_BSTR, got %s!\n", vtstr(V_VT(&result)));
hres = VarR8FromStr(V_BSTR(&result), 0, 0, &r);
ok(hres == S_OK && EQ_DOUBLE(r, 1212), "VarAdd: BSTR value %f, expected %f\n", r, (double)1212);
@@ -4916,12 +4916,12 @@ static void test_VarAdd(void)
V_UI1(&right) = 9;
hres = VarAdd(&cy, &right, &result);
- ok(hres == S_OK && V_VT(&result) == VT_CY, "VarAdd: expected coerced type VT_CY, got %s!\n'", vtstr(V_VT(&result)));
+ ok(hres == S_OK && V_VT(&result) == VT_CY, "VarAdd: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result)));
hres = VarR8FromCy(V_CY(&result), &r);
ok(hres == S_OK && EQ_DOUBLE(r, 4720), "VarAdd: CY value %f, expected %f\n", r, (double)4720);
hres = VarAdd(&left, &dec, &result);
- ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarAdd: expected coerced type VT_DECIMAL, got %s!\n'", vtstr(V_VT(&result)));
+ ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarAdd: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result)));
hres = VarR8FromDec(&V_DECIMAL(&result), &r);
ok(hres == S_OK && EQ_DOUBLE(r, -15.2), "VarAdd: DECIMAL value %f, expected %f\n", r, (double)-15.2);
}
Index: dlls/psapi/tests/psapi_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/psapi/tests/psapi_main.c,v
retrieving revision 1.1
diff -u -p -r1.1 psapi_main.c
--- dlls/psapi/tests/psapi_main.c 27 Jun 2005 19:47:48 -0000 1.1
+++ dlls/psapi/tests/psapi_main.c 6 Jul 2005 13:33:40 -0000
@@ -150,11 +150,11 @@ static void test_GetMappedFileName(void)
if(!w32_suc(ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath))))
return;
ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%ld\n", szMapPath, ret);
- ok(szMapPath[0] == '\\', "szMapPath=\"%s\"", szMapPath);
+ ok(szMapPath[0] == '\\', "szMapPath=\"%s\"\n", szMapPath);
szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for us */
if(!szMapBaseName || !*szMapBaseName)
{
- ok(0, "szMapPath=\"%s\"", szMapPath);
+ ok(0, "szMapPath=\"%s\"\n", szMapPath);
return;
}
GetModuleFileNameA(NULL, szModPath, sizeof(szModPath));
@@ -211,7 +211,7 @@ static void test_GetModuleFileNameEx(voi
ok(ret == strlen(szModExPath), "szModExPath=\"%s\" ret=%ld\n", szModExPath, ret);
GetModuleFileNameA(NULL, szModPath, sizeof(szModPath));
ok(!strncmp(szModExPath, szModPath, MAX_PATH),
- "szModExPath=\"%s\" szModPath=\"%s\"", szModExPath, szModPath);
+ "szModExPath=\"%s\" szModPath=\"%s\"\n", szModExPath, szModPath);
}
static void test_GetModuleBaseName(void)
@@ -250,7 +250,7 @@ static void test_ws_functions(void)
if(!VirtualLock(addr, 1))
{
- trace("locking failed (error=%ld) - skipping test", GetLastError());
+ trace("locking failed (error=%ld) - skipping test\n", GetLastError());
goto free_page;
}
Index: dlls/user/tests/menu.c
===================================================================
RCS file: /var/cvs/wine/dlls/user/tests/menu.c,v
retrieving revision 1.4
diff -u -p -r1.4 menu.c
--- dlls/user/tests/menu.c 27 Jun 2005 09:57:28 -0000 1.4
+++ dlls/user/tests/menu.c 5 Jul 2005 13:51:58 -0000
@@ -222,7 +222,7 @@ static void test_menu_ownerdraw(void)
MOD_rc[0].right - MOD_rc[0].left , 2*MOD_avec + MOD_SIZE);
/* and height */
ok( MOD_rc[0].bottom - MOD_rc[0].top == MOD_SIZE,
- "Height is incorrect. Got %ld expected %d",
+ "Height is incorrect. Got %ld expected %d\n",
MOD_rc[0].bottom - MOD_rc[0].top, MOD_SIZE);
/* test width/height of a OD menu bar as well */
Index: dlls/user/tests/win.c
===================================================================
RCS file: /var/cvs/wine/dlls/user/tests/win.c,v
retrieving revision 1.64
diff -u -p -r1.64 win.c
--- dlls/user/tests/win.c 5 Jul 2005 10:59:46 -0000 1.64
+++ dlls/user/tests/win.c 5 Jul 2005 13:51:58 -0000
@@ -3078,7 +3078,7 @@ static void test_IsWindowUnicode(void)
ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE\n");
SetClassLongPtrW(hwnd, GCLP_WNDPROC, (ULONG_PTR)DefWindowProcW);
- ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE");
+ ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE\n");
DestroyWindow(hwnd);
More information about the wine-patches
mailing list