urlmon/tests: Use todo_wine_if() in tests
André Hentschel
nerv at dawncrow.de
Fri Feb 19 16:12:23 CST 2016
Signed-off-by: André Hentschel <nerv at dawncrow.de>
---
dlls/urlmon/tests/misc.c | 22 ++++-------------
dlls/urlmon/tests/sec_mgr.c | 57 ++++++---------------------------------------
2 files changed, 11 insertions(+), 68 deletions(-)
diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c
index d63f1fe..dcf0970 100644
--- a/dlls/urlmon/tests/misc.c
+++ b/dlls/urlmon/tests/misc.c
@@ -1724,14 +1724,9 @@ static void test_internet_feature_defaults(void) {
for(i = 0; i < sizeof(default_feature_tests)/sizeof(default_feature_tests[0]); ++i) {
hres = pCoInternetIsFeatureEnabled(default_feature_tests[i].feature, default_feature_tests[i].get_flags);
- if(default_feature_tests[i].todo) {
- todo_wine
+ todo_wine_if (default_feature_tests[i].todo)
ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n",
hres, default_feature_tests[i].expected, i);
- } else {
- ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n",
- hres, default_feature_tests[i].expected, i);
- }
}
}
@@ -1877,24 +1872,15 @@ static void test_CoInternetSetFeatureEnabled(void) {
for(i = 0; i < sizeof(internet_feature_tests)/sizeof(internet_feature_tests[0]); ++i) {
hres = pCoInternetSetFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags,
internet_feature_tests[i].enable);
- if(internet_feature_tests[i].set_todo) {
- todo_wine
- ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n",
- hres, internet_feature_tests[i].set_expected, i);
- } else {
+ todo_wine_if (internet_feature_tests[i].set_todo)
ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n",
hres, internet_feature_tests[i].set_expected, i);
- }
hres = pCoInternetIsFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags);
- if(internet_feature_tests[i].get_todo) {
- todo_wine
- ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n",
- hres, internet_feature_tests[i].get_expected, i);
- } else {
+ todo_wine_if (internet_feature_tests[i].get_todo)
ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n",
hres, internet_feature_tests[i].get_expected, i);
- }
+
}
}
diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c
index 4092842..ad0fcf6 100644
--- a/dlls/urlmon/tests/sec_mgr.c
+++ b/dlls/urlmon/tests/sec_mgr.c
@@ -940,11 +940,7 @@ static void test_zone_domain_mappings(void)
hres = IInternetSecurityManager_MapUrlToZone(secmgr, urlW, &zone, 0);
ok(hres == S_OK, "MapUrlToZone failed: %08x\n", hres);
- if(test->todo)
- todo_wine
- ok(zone == test->zone || broken(test->broken_zone == zone),
- "Expected %d, but got %d on test %d\n", test->zone, zone, i);
- else
+ todo_wine_if (test->todo)
ok(zone == test->zone || broken(test->broken_zone == zone),
"Expected %d, but got %d on test %d\n", test->zone, zone, i);
@@ -1636,12 +1632,7 @@ static void test_InternetGetSecurityUrlEx(void)
result = NULL;
hr = pCoInternetGetSecurityUrlEx(uri, &result, PSU_DEFAULT, 0);
- if(sec_url_ex_tests[i].todo) {
- todo_wine
- ok(hr == sec_url_ex_tests[i].default_hres,
- "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n",
- hr, sec_url_ex_tests[i].default_hres, i);
- } else {
+ todo_wine_if (sec_url_ex_tests[i].todo) {
ok(hr == sec_url_ex_tests[i].default_hres,
"CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n",
hr, sec_url_ex_tests[i].default_hres, i);
@@ -1652,12 +1643,7 @@ static void test_InternetGetSecurityUrlEx(void)
hr = IUri_GetDisplayUri(result, &received);
ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i);
if(hr == S_OK) {
- if(sec_url_ex_tests[i].todo) {
- todo_wine
- ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received),
- "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri,
- wine_dbgstr_w(received), i);
- } else {
+ todo_wine_if (sec_url_ex_tests[i].todo) {
ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received),
"Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri,
wine_dbgstr_w(received), i);
@@ -1669,12 +1655,7 @@ static void test_InternetGetSecurityUrlEx(void)
result = NULL;
hr = pCoInternetGetSecurityUrlEx(uri, &result, PSU_SECURITY_URL_ONLY, 0);
- if(sec_url_ex_tests[i].todo) {
- todo_wine
- ok(hr == sec_url_ex_tests[i].default_hres,
- "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n",
- hr, sec_url_ex_tests[i].default_hres, i);
- } else {
+ todo_wine_if (sec_url_ex_tests[i].todo) {
ok(hr == sec_url_ex_tests[i].default_hres,
"CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n",
hr, sec_url_ex_tests[i].default_hres, i);
@@ -1685,12 +1666,7 @@ static void test_InternetGetSecurityUrlEx(void)
hr = IUri_GetDisplayUri(result, &received);
ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i);
if(hr == S_OK) {
- if(sec_url_ex_tests[i].todo) {
- todo_wine
- ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received),
- "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri,
- wine_dbgstr_w(received), i);
- } else {
+ todo_wine_if (sec_url_ex_tests[i].todo) {
ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received),
"Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri,
wine_dbgstr_w(received), i);
@@ -1858,14 +1834,7 @@ static void test_SecurityManagerEx2(void)
ok(hres == S_OK, "CreateUri returned %08x for '%s'\n", hres, sec_mgr_ex2_tests[i].uri);
hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, uri, &zone, 0, NULL, NULL);
- if(sec_mgr_ex2_tests[i].map_todo) {
- todo_wine
- ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlZoneToEx2 returned %08x, expected %08x for '%s'\n",
- hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri);
- todo_wine
- ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d for '%s'\n", sec_mgr_ex2_tests[i].zone,
- zone, sec_mgr_ex2_tests[i].uri);
- } else {
+ todo_wine_if (sec_mgr_ex2_tests[i].map_todo) {
ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlToZoneEx2 returned %08x, expected %08x for '%s'\n",
hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri);
ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d for '%s'\n", sec_mgr_ex2_tests[i].zone,
@@ -1876,19 +1845,7 @@ static void test_SecurityManagerEx2(void)
memset(buf, 0xf0, buf_size);
hres = IInternetSecurityManagerEx2_GetSecurityIdEx2(sec_mgr2, uri, buf, &buf_size, 0);
- if(sec_mgr_ex2_tests[i].secid_todo) {
- todo_wine
- ok(hres == sec_mgr_ex2_tests[i].secid_hres, "GetSecurityIdEx2 returned %08x, expected %08x on test '%s'\n",
- hres, sec_mgr_ex2_tests[i].secid_hres, sec_mgr_ex2_tests[i].uri);
- if(sec_mgr_ex2_tests[i].secid) {
- todo_wine {
- ok(buf_size == sec_mgr_ex2_tests[i].secid_size, "Got wrong security id size=%d, expected %d on test '%s'\n",
- buf_size, sec_mgr_ex2_tests[i].secid_size, sec_mgr_ex2_tests[i].uri);
- ok(!memcmp(buf, sec_mgr_ex2_tests[i].secid, sec_mgr_ex2_tests[i].secid_size), "Got wrong security id on test '%s'\n",
- sec_mgr_ex2_tests[i].uri);
- }
- }
- } else {
+ todo_wine_if (sec_mgr_ex2_tests[i].secid_todo) {
ok(hres == sec_mgr_ex2_tests[i].secid_hres, "GetSecurityIdEx2 returned %08x, expected %08x on test '%s'\n",
hres, sec_mgr_ex2_tests[i].secid_hres, sec_mgr_ex2_tests[i].uri);
if(sec_mgr_ex2_tests[i].secid) {
--
1.9.1
More information about the wine-patches
mailing list