From 68b92d052a08435931581fe700da8d88504b70bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Hentschel?= Date: Fri, 19 Feb 2016 23:12:16 +0100 Subject: [PATCH] webservices/tests: Use todo_wine_if() in tests. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Hans Leidekker Signed-off-by: Alexandre Julliard --- dlls/webservices/tests/reader.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 4416a846ec5..8fba4eb4b23 100644 --- 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 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 + todo_wine_if (tests[i].todo) { 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 ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); - else + todo_wine_if (tests[i].todo) 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 - ok( node->nodeType == tests[i].type, "%u: got %u\n", i, node->nodeType ); - else + todo_wine_if (tests[i].todo) ok( node->nodeType == tests[i].type, "%u: got %u\n", i, node->nodeType ); } } -- 2.11.4.GIT