ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32/tests: Move DlgDirList tests to avoid changing the current directory for other tests.

Browse Source
This commit is contained in:
Alexandre Julliard 2012-07-17 14:50:47 +02:00
parent c412d6f521
commit d8c90fa40b
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
dlls/user32/tests/listbox.c
View File

@ -1335,28 +1335,6 @@ static void test_listbox_dlgdir(void)
ok (itemCount == itemCount_justDrives + itemCount_allDirs, ok (itemCount == itemCount_justDrives + itemCount_allDirs,
"DlgDirList() incorrectly filled the listbox!\n"); "DlgDirList() incorrectly filled the listbox!\n");
/* Test behavior when loading folders from root with and without wildcard */
strcpy(pathBuffer, "C:\\");
res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE);
ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\ folders\n");
todo_wine ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */,
"DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer);
strcpy(pathBuffer, "C:\\*");
res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE);
ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\* folders\n");
ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */,
"DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer);
/* Try loading files from an invalid folder */
SetLastError(0xdeadbeef);
strcpy(pathBuffer, "C:\\INVALID$$DIR");
res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE);
todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res);
todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS,
"GetLastError should return 0x589, got 0x%X\n",GetLastError());
/* Now test DlgDirSelectEx() in normal operation */ /* Now test DlgDirSelectEx() in normal operation */
/* Fill with everything - drives, directory and all plain files. */ /* Fill with everything - drives, directory and all plain files. */
strcpy(pathBuffer, "*"); strcpy(pathBuffer, "*");
@ -1433,6 +1411,8 @@ static void test_listbox_dlgdir(void)
} }
} }
DeleteFileA( "wtest1.tmp.c" );
/* Now test DlgDirSelectEx() in abnormal operation */ /* Now test DlgDirSelectEx() in abnormal operation */
/* Fill list with bogus entries, that look somewhat valid */ /* Fill list with bogus entries, that look somewhat valid */
SendMessage(g_listBox, LB_RESETCONTENT, 0, 0); SendMessage(g_listBox, LB_RESETCONTENT, 0, 0);
@ -1493,9 +1473,29 @@ static void test_listbox_dlgdir(void)
ok (!strcmp(pathBuffer, tempBuffer), "Formatted file should be %s, got %s\n", tempBuffer, pathBuffer); ok (!strcmp(pathBuffer, tempBuffer), "Formatted file should be %s, got %s\n", tempBuffer, pathBuffer);
} }
} }
DestroyWindow(hWnd);
DeleteFileA( "wtest1.tmp.c" ); /* Test behavior when loading folders from root with and without wildcard */
strcpy(pathBuffer, "C:\\");
res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE);
ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\ folders\n");
todo_wine ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */,
"DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer);
strcpy(pathBuffer, "C:\\*");
res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE);
ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\* folders\n");
ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */,
"DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer);
/* Try loading files from an invalid folder */
SetLastError(0xdeadbeef);
strcpy(pathBuffer, "C:\\INVALID$$DIR");
res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE);
todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res);
todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS,
"GetLastError should return 0x589, got 0x%X\n",GetLastError());
DestroyWindow(hWnd);
} }
START_TEST(listbox) START_TEST(listbox)