[PATCH 2/2] urlmon/tests: Add FTP encoded url test

[Alistair Leslie-Hughes]

Signed-off-by: Alistair Leslie-Hughes 
---
 dlls/urlmon/tests/Makefile.in |  2 +-
 dlls/urlmon/tests/url.c       | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/dlls/urlmon/tests/Makefile.in b/dlls/urlmon/tests/Makefile.in
index 2eef129..48afdc9 100644
--- a/dlls/urlmon/tests/Makefile.in
+++ b/dlls/urlmon/tests/Makefile.in
@@ -1,5 +1,5 @@
 TESTDLL   = urlmon.dll
-IMPORTS   = urlmon wininet ole32 oleaut32 user32 advapi32
+IMPORTS   = urlmon wininet ole32 oleaut32 user32 advapi32 shlwapi

C_SRCS = \
    generated.c \
diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c
index ada78c9..d67a193 100644
--- a/dlls/urlmon/tests/url.c
+++ b/dlls/urlmon/tests/url.c
@@ -32,6 +32,7 @@
 #include "urlmon.h"
 #include "wininet.h"
 #include "mshtml.h"
+#include "shlwapi.h"

#include "wine/test.h"

@@ -191,6 +192,7 @@ static BOOL async_switch = FALSE;
 static BOOL strict_bsc_qi;
 static DWORD bindtest_flags;
 static const char *test_file;
+static const char *ftp_url;

static WCHAR file_url[INTERNET_MAX_URL_LENGTH], current_url[INTERNET_MAX_URL_LENGTH];

@@ -2905,7 +2907,10 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t)
         url_a = (flags & BINDTEST_INVALID_CN) ? "https://4.15.184.77/favicon.ico" : "https://test.winehq.org/tests/hello.html";
         break;
     case FTP_TEST:
-        url_a = "ftp://ftp.winehq.org/welcome.msg";
+        if(!ftp_url)
+            url_a = "ftp://ftp.winehq.org/welcome.msg";
+        else
+            url_a = ftp_url;
         break;
     default:
         url_a = "winetest:test";
@@ -2969,6 +2974,13 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t)
     if(FAILED(hres))
         return;

+    if(protocol == FTP_TEST)
+    {
+        /* FTP url dont have any escape characters, so convert the url to what is expected */
+        DWORD size = 0;
+        UrlUnescapeW(current_url, NULL, &size, URL_UNESCAPE_INPLACE);
+    }
+
     hres = IMoniker_QueryInterface(mon, &IID_IBinding, (void**)&bind);
     ok(hres == E_NOINTERFACE, "IMoniker should not have IBinding interface\n");
     if(SUCCEEDED(hres))
@@ -4144,6 +4156,9 @@ START_TEST(url)
         trace("ftp test...\n");
         test_BindToStorage(FTP_TEST, 0, TYMED_ISTREAM);

+        ftp_url = "ftp://ftp.winehq.org/welcome%2emsg";
+        test_BindToStorage(FTP_TEST, 0, TYMED_ISTREAM);
+
         trace("test failures...\n");
         test_BindToStorage_fail();

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=49716

Your paranoid android.

=== w864 (32 bit report) ===

urlmon:
url.c:1669: Test failed: unexpected call OnProgress_FINDINGRESOURCE

=== w2008s64 (64 bit report) ===

urlmon:
url.c:3679: Test failed: expected OnProgress_DOWNLOADINGDATA

=== w864 (64 bit report) ===

urlmon:
url.c:1671: Test failed: unexpected call OnProgress_FINDINGRESOURCE

=== debian9 (32 bit report) ===

urlmon:
protocol.c:1174: Test failed: unexpected call ReportResult
protocol.c:1180: Test failed: hrResult = 800c0005, expected E_PENDING or S_OK
protocol.c:3600: Test failed: Start failed: 800c0005
url.c:1880: Test failed: binding failed: 800c0005, expected 00000000
url.c:3098: Test failed: IMoniker_BindToStorage failed: 800c0005
url.c:1880: Test failed: binding failed: 800c0005, expected 00000000
url.c:3098: Test failed: IMoniker_BindToStorage failed: 800c0005

=== debian9 (32 bit French report) ===

urlmon:
url.c:1880: Test failed: binding failed: 800c0005, expected 00000000
url.c:3098: Test failed: IMoniker_BindToStorage failed: 800c0005
url.c:1880: Test failed: binding failed: 800c0005, expected 00000000
url.c:3098: Test failed: IMoniker_BindToStorage failed: 800c0005

=== debian9 (32 bit Japanese:Japan report) ===

urlmon:
url.c:1880: Test failed: binding failed: 800c0005, expected 00000000
url.c:3098: Test failed: IMoniker_BindToStorage failed: 800c0005
url.c:1880: Test failed: binding failed: 800c0005, expected 00000000
url.c:3098: Test failed: IMoniker_BindToStorage failed: 800c0005

=== debian9 (32 bit Chinese:China report) ===

urlmon:
protocol.c:1174: Test failed: unexpected call ReportResult
protocol.c:1180: Test failed: hrResult = 800c0005, expected E_PENDING or S_OK
protocol.c:3600: Test failed: Start failed: 800c0005
url.c:1880: Test failed: binding failed: 800c0005, expected 00000000
url.c:3098: Test failed: IMoniker_BindToStorage failed: 800c0005
url.c:1880: Test failed: binding failed: 800c0005, expected 00000000
url.c:3098: Test failed: IMoniker_BindToStorage failed: 800c0005

=== debian9b (32 bit WoW report) ===

urlmon:
protocol.c:1174: Test failed: unexpected call ReportResult
protocol.c:1180: Test failed: hrResult = 800c0005, expected E_PENDING or S_OK
protocol.c:3600: Test failed: Start failed: 800c0005
url.c:1880: Test failed: binding failed: 800c0005, expected 00000000
url.c:3098: Test failed: IMoniker_BindToStorage failed: 800c0005
url.c:1880: Test failed: binding failed: 800c0005, expected 00000000
url.c:3098: Test failed: IMoniker_BindToStorage failed: 800c0005

=== debian9b (64 bit WoW report) ===

urlmon:
protocol.c:1174: Test failed: unexpected call ReportResult
protocol.c:1180: Test failed: hrResult = 800c0005, expected E_PENDING or S_OK
protocol.c:3600: Test failed: Start failed: 800c0005
url.c:1880: Test failed: binding failed: 800c0005, expected 00000000
url.c:3098: Test failed: IMoniker_BindToStorage failed: 800c0005
url.c:1880: Test failed: binding failed: 800c0005, expected 00000000
url.c:3098: Test failed: IMoniker_BindToStorage failed: 800c0005

[Jacek Caban]

Hi Alistair,

On 3/22/19 5:50 AM, Alistair Leslie-Hughes wrote:
> +static const char *ftp_url;
>
> static WCHAR file_url[INTERNET_MAX_URL_LENGTH], current_url[INTERNET_MAX_URL_LENGTH];
>
> @@ -2905,7 +2907,10 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t)
>           url_a = (flags & BINDTEST_INVALID_CN) ?"https://4.15.184.77/favicon.ico"  :"https://test.winehq.org/tests/hello.html";
>           break;
>       case FTP_TEST:
> -
>    url_a ="ftp://ftp.winehq.org/welcome.msg";
> -
>    if(!ftp_url)
> -
>        url_a ="ftp://ftp.winehq.org/welcome.msg";
> -
>    else
> -
>        url_a = ftp_url;

Is there any reason to run almost the same tests twice? FTP tests are 
rather slow. Could you just change current test to use escaped URL?

Thanks,

Jacek