=?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: mshtml/tests: Use todo_wine_if() in tests.

[Alexandre Julliard]

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

Author: Frédéric Delanoy <frederic.delanoy at gmail.com>
Date:   Wed Feb 17 21:55:03 2016 +0100

mshtml/tests: Use todo_wine_if() in tests.

Signed-off-by: Frédéric Delanoy <frederic.delanoy at gmail.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mshtml/tests/dom.c            | 11 ++---------
 dlls/mshtml/tests/htmldoc.c        | 24 ++++++------------------
 dlls/mshtml/tests/xmlhttprequest.c |  4 +---
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 7b5b395..4b2b825 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -7603,12 +7603,7 @@ static void _test_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet,
 
     hres = IHTMLStyleSheet_get_cssText(stylesheet, &str);
     ok_(__FILE__,line)(hres == S_OK, "get_cssText failed: %08x\n", hres);
-    if(!is_todo) {
-        if(exstr)
-            ok_(__FILE__,line)(is_prefix_wa(str, exstr), "cssText = %s\n", wine_dbgstr_w(str));
-        else
-            ok_(__FILE__,line)(!str, "cssText = %s\n", wine_dbgstr_w(str));
-    }else todo_wine {
+    todo_wine_if(is_todo) {
         if(exstr)
             ok_(__FILE__,line)(is_prefix_wa(str, exstr), "cssText = %s\n", wine_dbgstr_w(str));
         else
@@ -7625,10 +7620,8 @@ static void _set_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet,
     HRESULT hres;
 
     hres = IHTMLStyleSheet_put_cssText(stylesheet, str);
-    if(!is_todo)
+    todo_wine_if(is_todo)
         ok_(__FILE__,line)(hres == S_OK, "put_cssText failed: %08x\n", hres);
-    else
-        todo_wine ok_(__FILE__,line)(hres == S_OK, "put_cssText failed: %08x\n", hres);
     SysFreeString(str);
 }
 
diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index 87f17d6..71519ed 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -427,9 +427,7 @@ static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, c
         hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url);
         ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres);
 
-        if(is_todo)
-            todo_wine ok_(__FILE__,line)(!strcmp_wa(url, exurl), "unexpected url %s\n", wine_dbgstr_w(url));
-        else
+        todo_wine_if(is_todo)
             ok_(__FILE__,line)(!strcmp_wa(url, exurl), "unexpected url %s\n", wine_dbgstr_w(url));
         if(!*ptr)
             ok_(__FILE__,line)(!lstrcmpW(url, doc_url), "url %s != doc_url %s\n", wine_dbgstr_w(url), wine_dbgstr_w(doc_url));
@@ -2613,10 +2611,8 @@ static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface, D
     CHECK_EXPECT(TranslateUrl);
     ok(iface == expect_uihandler_iface, "called on unexpected iface\n");
     ok(!dwTranslate, "dwTranslate = %x\n", dwTranslate);
-    if(!loading_hash)
+    todo_wine_if(loading_hash)
         ok(!strcmp_wa(pchURLIn, nav_serv_url), "pchURLIn = %s, expected %s\n", wine_dbgstr_w(pchURLIn), nav_serv_url);
-    else
-        todo_wine ok(!strcmp_wa(pchURLIn, nav_serv_url), "pchURLIn = %s, expected %s\n", wine_dbgstr_w(pchURLIn), nav_serv_url);
     ok(ppchURLOut != NULL, "ppchURLOut == NULL\n");
     ok(!*ppchURLOut, "*ppchURLOut = %p\n", *ppchURLOut);
 
@@ -5793,9 +5789,7 @@ static void test_download(DWORD flags)
     if(flags & DWL_HTTP)
         SET_CALLED(Exec_SETPROGRESSMAX);
     if(flags &  DWL_EX_GETHOSTINFO) {
-        if(nav_url)
-            todo_wine CHECK_CALLED(GetHostInfo);
-        else
+        todo_wine_if(nav_url)
             CHECK_CALLED(GetHostInfo);
     }
     CHECK_CALLED(SetStatusText);
@@ -5818,10 +5812,8 @@ static void test_download(DWORD flags)
     if(flags & DWL_ONREADY_LOADING)
         CHECK_CALLED(Invoke_OnReadyStateChange_Loading);
     if(!(flags & (DWL_EMPTY|DWL_JAVASCRIPT))) {
-        if(!is_extern)
+        todo_wine_if(is_extern)
             CHECK_CALLED(Invoke_OnReadyStateChange_Interactive);
-        else
-            todo_wine CHECK_CALLED(Invoke_OnReadyStateChange_Interactive);
     }
     if(!is_js && !is_extern)
         CHECK_CALLED(Invoke_OnReadyStateChange_Complete);
@@ -5853,10 +5845,8 @@ static void test_download(DWORD flags)
         todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS);
     }
     if(!(flags & DWL_EMPTY)) {
-        if(!is_extern)
+        todo_wine_if(is_extern)
             CHECK_CALLED(Exec_SETDOWNLOADSTATE_0);
-        else
-            todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_0);
     }
     CLEAR_CALLED(Exec_ShellDocView_103);
     CLEAR_CALLED(Exec_ShellDocView_105);
@@ -5883,10 +5873,8 @@ static void test_download(DWORD flags)
     if(!is_js && !is_extern) {
         if(!editmode && !(flags & DWL_REFRESH)) {
             if(!(flags & DWL_EMPTY)) {
-                if(support_wbapp)
+                todo_wine_if(!support_wbapp)
                     CHECK_CALLED(FireNavigateComplete2);
-                else
-                    todo_wine CHECK_CALLED(FireNavigateComplete2);
             }
             CHECK_CALLED(FireDocumentComplete);
         }
diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c
index dd8e797..5d11ec0 100644
--- a/dlls/mshtml/tests/xmlhttprequest.c
+++ b/dlls/mshtml/tests/xmlhttprequest.c
@@ -850,10 +850,8 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char
     CHECK_CALLED(xmlhttprequest_onreadystatechange_loading);
     CHECK_CALLED(xmlhttprequest_onreadystatechange_done);
     /* Workaround for loading large files */
-    if(expect_text)
+    todo_wine_if(!expect_text)
         ok(loading_cnt == 1, "loading_cnt = %d\n", loading_cnt);
-    else
-        todo_wine ok(loading_cnt == 1, "loading_cnt = %d\n", loading_cnt);
 
     if(FAILED(hres)) {
         IHTMLXMLHttpRequest_Release(xhr);