[SHELL32_WINETEST]

Get back previously commented out tests

svn path=/trunk/; revision=54828
This commit is contained in:
Pierre Schweitzer 2012-01-03 20:41:32 +00:00
parent da309e313f
commit de15bc1cbb
2 changed files with 0 additions and 14 deletions

View file

@ -116,7 +116,6 @@ static BOOL file_existsW(LPCWSTR name)
return GetFileAttributesW(name) != INVALID_FILE_ATTRIBUTES; return GetFileAttributesW(name) != INVALID_FILE_ATTRIBUTES;
} }
#if 0
static BOOL file_has_content(const CHAR *name, const CHAR *content) static BOOL file_has_content(const CHAR *name, const CHAR *content)
{ {
CHAR buf[MAX_PATH]; CHAR buf[MAX_PATH];
@ -131,7 +130,6 @@ static BOOL file_has_content(const CHAR *name, const CHAR *content)
CloseHandle(file); CloseHandle(file);
return strcmp(buf, content)==0; return strcmp(buf, content)==0;
} }
#endif
/* initializes the tests */ /* initializes the tests */
static void init_shfo_tests(void) static void init_shfo_tests(void)
@ -813,7 +811,6 @@ static void test_rename(void)
} }
/* tests the FO_COPY action */ /* tests the FO_COPY action */
#if 0
static void test_copy(void) static void test_copy(void)
{ {
SHFILEOPSTRUCTA shfo, shfo2; SHFILEOPSTRUCTA shfo, shfo2;
@ -1760,10 +1757,8 @@ static void test_copy(void)
ok(DeleteFileA("dir\\abcdefgh.abc"), "Expected file to exist\n"); ok(DeleteFileA("dir\\abcdefgh.abc"), "Expected file to exist\n");
ok(RemoveDirectoryA("dir"), "Expected dir to exist\n"); ok(RemoveDirectoryA("dir"), "Expected dir to exist\n");
} }
#endif
/* tests the FO_MOVE action */ /* tests the FO_MOVE action */
#if 0
static void test_move(void) static void test_move(void)
{ {
SHFILEOPSTRUCTA shfo, shfo2; SHFILEOPSTRUCTA shfo, shfo2;
@ -2041,7 +2036,6 @@ static void test_move(void)
ok(file_exists("test3.txt"), "Expected test3.txt to exist\n"); ok(file_exists("test3.txt"), "Expected test3.txt to exist\n");
} }
} }
#endif
static void test_sh_create_dir(void) static void test_sh_create_dir(void)
{ {
@ -2402,7 +2396,6 @@ START_TEST(shlfileop)
test_rename(); test_rename();
clean_after_shfo_tests(); clean_after_shfo_tests();
#if 0
init_shfo_tests(); init_shfo_tests();
test_copy(); test_copy();
clean_after_shfo_tests(); clean_after_shfo_tests();
@ -2410,7 +2403,6 @@ START_TEST(shlfileop)
init_shfo_tests(); init_shfo_tests();
test_move(); test_move();
clean_after_shfo_tests(); clean_after_shfo_tests();
#endif
test_sh_create_dir(); test_sh_create_dir();
clean_after_shfo_tests(); clean_after_shfo_tests();

View file

@ -348,7 +348,6 @@ static void Cleanup(void)
RemoveDirectoryA(".\\testdir"); RemoveDirectoryA(".\\testdir");
} }
#if 0
/* perform test */ /* perform test */
static void test_EnumObjects(IShellFolder *iFolder) static void test_EnumObjects(IShellFolder *iFolder)
{ {
@ -434,7 +433,6 @@ static void test_EnumObjects(IShellFolder *iFolder)
for (i=0;i<5;i++) for (i=0;i<5;i++)
IMalloc_Free(ppM, idlArr[i]); IMalloc_Free(ppM, idlArr[i]);
} }
#endif
static void test_BindToObject(void) static void test_BindToObject(void)
{ {
@ -1336,7 +1334,6 @@ static void test_SHGetPathFromIDList(void)
ok(result, "SHGetPathFromIDListW failed\n"); ok(result, "SHGetPathFromIDListW failed\n");
} }
#if 0
static void test_EnumObjects_and_CompareIDs(void) static void test_EnumObjects_and_CompareIDs(void)
{ {
ITEMIDLIST *newPIDL; ITEMIDLIST *newPIDL;
@ -1381,7 +1378,6 @@ static void test_EnumObjects_and_CompareIDs(void)
IShellFolder_Release(IDesktopFolder); IShellFolder_Release(IDesktopFolder);
} }
#endif
/* A simple implementation of an IPropertyBag, which returns fixed values for /* A simple implementation of an IPropertyBag, which returns fixed values for
* 'Target' and 'Attributes' properties. * 'Target' and 'Attributes' properties.
@ -4591,9 +4587,7 @@ START_TEST(shlfolder)
test_ParseDisplayName(); test_ParseDisplayName();
test_SHParseDisplayName(); test_SHParseDisplayName();
test_BindToObject(); test_BindToObject();
#if 0
test_EnumObjects_and_CompareIDs(); test_EnumObjects_and_CompareIDs();
#endif
test_GetDisplayName(); test_GetDisplayName();
test_GetAttributesOf(); test_GetAttributesOf();
test_SHGetPathFromIDList(); test_SHGetPathFromIDList();