Author: pschweitzer
Date: Tue Jan 3 20:41:32 2012
New Revision: 54828
URL:
http://svn.reactos.org/svn/reactos?rev=54828&view=rev
Log:
[SHELL32_WINETEST]
Get back previously commented out tests
Modified:
trunk/rostests/winetests/shell32/shlfileop.c
trunk/rostests/winetests/shell32/shlfolder.c
Modified: trunk/rostests/winetests/shell32/shlfileop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile…
==============================================================================
--- trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] Tue Jan 3 20:41:32 2012
@@ -116,7 +116,6 @@
return GetFileAttributesW(name) != INVALID_FILE_ATTRIBUTES;
}
-#if 0
static BOOL file_has_content(const CHAR *name, const CHAR *content)
{
CHAR buf[MAX_PATH];
@@ -131,7 +130,6 @@
CloseHandle(file);
return strcmp(buf, content)==0;
}
-#endif
/* initializes the tests */
static void init_shfo_tests(void)
@@ -813,7 +811,6 @@
}
/* tests the FO_COPY action */
-#if 0
static void test_copy(void)
{
SHFILEOPSTRUCTA shfo, shfo2;
@@ -1760,10 +1757,8 @@
ok(DeleteFileA("dir\\abcdefgh.abc"), "Expected file to
exist\n");
ok(RemoveDirectoryA("dir"), "Expected dir to exist\n");
}
-#endif
/* tests the FO_MOVE action */
-#if 0
static void test_move(void)
{
SHFILEOPSTRUCTA shfo, shfo2;
@@ -2041,7 +2036,6 @@
ok(file_exists("test3.txt"), "Expected test3.txt to
exist\n");
}
}
-#endif
static void test_sh_create_dir(void)
{
@@ -2402,7 +2396,6 @@
test_rename();
clean_after_shfo_tests();
-#if 0
init_shfo_tests();
test_copy();
clean_after_shfo_tests();
@@ -2410,7 +2403,6 @@
init_shfo_tests();
test_move();
clean_after_shfo_tests();
-#endif
test_sh_create_dir();
clean_after_shfo_tests();
Modified: trunk/rostests/winetests/shell32/shlfolder.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold…
==============================================================================
--- trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] Tue Jan 3 20:41:32 2012
@@ -348,7 +348,6 @@
RemoveDirectoryA(".\\testdir");
}
-#if 0
/* perform test */
static void test_EnumObjects(IShellFolder *iFolder)
{
@@ -434,7 +433,6 @@
for (i=0;i<5;i++)
IMalloc_Free(ppM, idlArr[i]);
}
-#endif
static void test_BindToObject(void)
{
@@ -1336,7 +1334,6 @@
ok(result, "SHGetPathFromIDListW failed\n");
}
-#if 0
static void test_EnumObjects_and_CompareIDs(void)
{
ITEMIDLIST *newPIDL;
@@ -1381,7 +1378,6 @@
IShellFolder_Release(IDesktopFolder);
}
-#endif
/* A simple implementation of an IPropertyBag, which returns fixed values for
* 'Target' and 'Attributes' properties.
@@ -4591,9 +4587,7 @@
test_ParseDisplayName();
test_SHParseDisplayName();
test_BindToObject();
-#if 0
test_EnumObjects_and_CompareIDs();
-#endif
test_GetDisplayName();
test_GetAttributesOf();
test_SHGetPathFromIDList();