shell32/tests: Move a file URL test to test_fileurl().

This way it's integrated with the rest of the matching tests and skipped on plaforms where file URLs don't work right (old Windows XP versions). Signed-off-by: Francois Gouget <fgouget@free.fr> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32/tests: Move a file URL test to test_fileurl().
e7065e0c · Francois Gouget · Alexandre Julliard · 11d77e51 · e7065e0c
Commit e7065e0c authored Mar 20, 2016 by Francois Gouget Committed by Alexandre Julliard Mar 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

shlexec.c dlls/shell32/tests/shlexec.c +3 -4

No files found.
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -1818,6 +1818,9 @@ static fileurl_tests_t fileurl_tests[]=
    /* Test shortcuts vs. URLs */
    {"file://///", "%s\\test_shortcut_shlexec.lnk", 0, 0x1d},

+    /* Confuse things by mixing protocols */
+    {"file://", "shlproto://foo/bar", USE_COLON, 0},
+
    {NULL, NULL, 0, 0}
 };

@@ -1989,10 +1992,6 @@ static void test_urls(void)
    todo_wine ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc);
    SetEnvironmentVariableA("urlprefix", NULL);

-    /* Try to confuse ShellExecute() by mixing protocols */
-    rc = shell_execute(NULL, "file://shlproto://foo/bar", NULL, NULL);
-    ok(rc == SE_ERR_FNF || rc == SE_ERR_PNF, "%s returned %lu\n", shell_call, rc);
-
    delete_test_class("fakeproto");
    delete_test_class("shlpaverb");
 }