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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e7065e0c5154d2d5a1b8d38ed7a56d66f2834b5d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e7065e0c5154d2d5a1b8d38ed7a56d66f2834b5d

Author: Francois Gouget <fgouget at free.fr>
Date:   Sun Mar 20 07:14:49 2016 +0100

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 at free.fr>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/shell32/tests/shlexec.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c
index 9b1ec11..1255eec 100644
--- 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");
 }