webservices/tests: Use todo_wine_if() in tests.

Signed-off-by: André Hentschel <nerv@dawncrow.de> Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

webservices/tests: Use todo_wine_if() in tests.
68b92d05 · André Hentschel · Alexandre Julliard · c957ff6c · 68b92d05
Commit 68b92d05 authored Feb 19, 2016 by André Hentschel Committed by Alexandre Julliard Feb 23, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 14 deletions

reader.c dlls/webservices/tests/reader.c +3 -14

No files found.
--- a/dlls/webservices/tests/reader.c
+++ b/dlls/webservices/tests/reader.c
@@ -486,13 +486,7 @@ static void test_WsSetInput(void)
        charset = 0xdeadbeef;
        size = sizeof(charset);
        hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_CHARSET, &charset, size, NULL );
-        if (tests[i].todo)
+        todo_wine_if (tests[i].todo)
-        {
-            todo_wine ok( hr == tests[i].hr, "%u: got %08x expected %08x\n", i, hr, tests[i].hr );
-            if (hr == S_OK)
-                todo_wine ok( charset == tests[i].charset, "%u: got %u expected %u\n", i, charset, tests[i].charset );
-        }
-        else
        {
            ok( hr == tests[i].hr, "%u: got %08x expected %08x\n", i, hr, tests[i].hr );
            if (hr == S_OK)
@@ -1082,9 +1076,7 @@ static void test_WsReadNode(void)
        ok( hr == S_OK, "%u: got %08x\n", i, hr );
        hr = WsReadNode( reader, NULL );
-        if (tests[i].todo)
+        todo_wine_if (tests[i].todo)
-            todo_wine ok( hr == tests[i].hr, "%u: got %08x\n", i, hr );
-        else
            ok( hr == tests[i].hr, "%u: got %08x\n", i, hr );
        if (hr == S_OK)
        {
@@ -1094,10 +1086,7 @@ static void test_WsReadNode(void)
            ok( node != NULL, "%u: node not set\n", i );
            if (node)
            {
-                if (tests[i].todo)
+                todo_wine_if (tests[i].todo)
-                    todo_wine
-                    ok( node->nodeType == tests[i].type, "%u: got %u\n", i, node->nodeType );
-                else
                    ok( node->nodeType == tests[i].type, "%u: got %u\n", i, node->nodeType );
            }
        }