Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-04 20:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32_APITEST]: Improve a bit the output of the CShellLink test.

Browse source 
svn path=/trunk/; revision=73541
This commit is contained in:
Hermès Bélusca-Maïto 2017-01-13 19:00:33 +00:00
parent e1a81c6804
commit 7f0502d36e
1 changed files with 21 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

48
rostests/apitests/shell32/CShellLink.cpp
View file

@ -85,18 +85,16 @@ static struct _TestShellLinkDef linkTestList[] =
L"", SLGP_SHORTPATH, ERROR_INVALID_FUNCTION, FALSE, L"", SLGP_SHORTPATH, ERROR_INVALID_FUNCTION, FALSE,
L"", SLGP_RAWPATH, ERROR_INVALID_FUNCTION, FALSE L"", SLGP_RAWPATH, ERROR_INVALID_FUNCTION, FALSE
}, },
{ NULL, 0, NULL, 0, 0, NULL, 0, 0 }
}; };
static const UINT evVarChLen = 255;
static WCHAR evVar[evVarChLen];
static static
VOID VOID
test_checklinkpath(TestShellLinkDef* testDef) test_checklinkpath(UINT i, TestShellLinkDef* testDef)
{ {
static WCHAR evVar[MAX_PATH];
HRESULT hr, expectedHr; HRESULT hr, expectedHr;
WCHAR wPathOut[255]; WCHAR wPathOut[MAX_PATH];
bool expandPathOut; bool expandPathOut;
const WCHAR* expectedPathOut; const WCHAR* expectedPathOut;
IShellLinkW *psl; IShellLinkW *psl;
@ -115,7 +113,7 @@ test_checklinkpath(TestShellLinkDef* testDef)
} }
hr = psl->SetPath(testDef->pathIn); hr = psl->SetPath(testDef->pathIn);
ok(hr == testDef->hrSetPath, "IShellLink::SetPath, got hr = %lx, expected %lx\n", hr, testDef->hrSetPath); ok(hr == testDef->hrSetPath, "IShellLink::SetPath(%lu), got hr = %lx, expected %lx\n", i, hr, testDef->hrSetPath);
expectedPathOut = NULL; expectedPathOut = NULL;
for (i1 = 0; i1 <= 1; i1++ ) for (i1 = 0; i1 <= 1; i1++ )
@ -138,18 +136,18 @@ test_checklinkpath(TestShellLinkDef* testDef)
/* Patch some variables */ /* Patch some variables */
if (expandPathOut == TRUE) if (expandPathOut == TRUE)
{ {
ExpandEnvironmentStringsW(expectedPathOut,evVar,evVarChLen); ExpandEnvironmentStringsW(expectedPathOut, evVar, _countof(evVar));
DPRINT("** %S **\n",evVar); DPRINT("** %S **\n",evVar);
expectedPathOut = evVar; expectedPathOut = evVar;
} }
hr = psl->GetPath(wPathOut,sizeof(wPathOut),NULL,flags); hr = psl->GetPath(wPathOut, _countof(wPathOut), NULL, flags);
ok(hr == expectedHr, ok(hr == expectedHr,
"IShellLink::GetPath, flags %lx, got hr = %lx, expected %lx\n", "IShellLink::GetPath(%lu), flags %lx, got hr = %lx, expected %lx\n",
flags, hr, expectedHr); i, flags, hr, expectedHr);
ok(wcsicmp(wPathOut,expectedPathOut) == 0, ok(wcsicmp(wPathOut, expectedPathOut) == 0,
"IShellLink::GetPath, flags %lx, in %S, got %S, expected %S\n", "IShellLink::GetPath(%lu), flags %lx, in %S, got %S, expected %S\n",
flags,testDef->pathIn,wPathOut,expectedPathOut); i, flags, testDef->pathIn, wPathOut, expectedPathOut);
} }
psl->Release(); psl->Release();
@ -200,31 +198,26 @@ TestDescription(void)
ok(hr == S_OK, "IShellLink::GetDescription returned hr = %lx\n", hr); ok(hr == S_OK, "IShellLink::GetDescription returned hr = %lx\n", hr);
ok(buffer[0] == 0, "buffer[0] = %x\n", buffer[0]); ok(buffer[0] == 0, "buffer[0] = %x\n", buffer[0]);
ok(buffer[1] == 0x5555, "buffer[1] = %x\n", buffer[1]); ok(buffer[1] == 0x5555, "buffer[1] = %x\n", buffer[1]);
psl->Release();
} }
static static
VOID VOID
TestShellLink(void) TestShellLink(void)
{ {
TestShellLinkDef *testDef; UINT i;
UINT i1 = 0;
/* needed for test */ /* Needed for test */
SetEnvironmentVariableW(L"shell",L"cmd.exe"); SetEnvironmentVariableW(L"shell", L"cmd.exe");
testDef = &linkTestList[i1]; for (i = 0; i < ARRAYSIZE(linkTestList); ++i)
while (testDef->pathIn != NULL)
{ {
DPRINT("IShellLink-Test(%lu): %S\n", i, linkTestList[i].pathIn);
DPRINT("IShellLink-Test: %S\n", testDef->pathIn); test_checklinkpath(i, &linkTestList[i]);
test_checklinkpath(testDef);
i1++;
testDef = &linkTestList[i1];
} }
SetEnvironmentVariableW(L"shell",NULL); SetEnvironmentVariableW(L"shell",NULL);
TestDescription();
} }
START_TEST(CShellLink) START_TEST(CShellLink)
@ -232,4 +225,5 @@ START_TEST(CShellLink)
CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
TestShellLink(); TestShellLink();
TestDescription();
} }