Alexandre Julliard : urlmon/tests: Don' t bother testing unimplemented functions to reduce test output.

Alexandre Julliard julliard at winehq.org
Wed Jul 28 10:45:07 CDT 2010


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jul 28 14:29:54 2010 +0200

urlmon/tests: Don't bother testing unimplemented functions to reduce test output.

---

 dlls/urlmon/tests/uri.c |   54 ++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c
index ed45513..b8b9d41 100644
--- a/dlls/urlmon/tests/uri.c
+++ b/dlls/urlmon/tests/uri.c
@@ -2334,6 +2334,12 @@ static void test_IUri_GetPropertyBSTR(void) {
                         ok(!strcmp_aw(prop.value, received), "Expected %s but got %s on uri_tests[%d].str_props[%d].\n",
                                 prop.value, wine_dbgstr_w(received), i, j);
                     }
+                    if (hr == E_NOTIMPL)  /* no point in continuing */
+                    {
+                        if(uri) IUri_Release(uri);
+                        heap_free(uriW);
+                        return;
+                    }
                 } else {
                     ok(hr == prop.expected, "GetPropertyBSTR returned 0x%08x, expected 0x%08x. On uri_tests[%d].str_props[%d].\n",
                             hr, prop.expected, i, j);
@@ -2405,6 +2411,12 @@ static void test_IUri_GetPropertyDWORD(void) {
                         ok(prop.value == received, "Expected %d but got %d on uri_tests[%d].dword_props[%d].\n",
                                 prop.value, received, i, j);
                     }
+                    if (hr == E_NOTIMPL)  /* no point in continuing */
+                    {
+                        if(uri) IUri_Release(uri);
+                        heap_free(uriW);
+                        return;
+                    }
                 } else {
                     ok(hr == prop.expected, "GetPropertyDWORD returned 0x%08x, expected 0x%08x. On uri_tests[%d].dword_props[%d].\n",
                             hr, prop.expected, i, j);
@@ -2501,6 +2513,7 @@ static void test_IUri_GetStrProperties(void) {
             /* GetAbsoluteUri() tests. */
             prop = test.str_props[Uri_PROPERTY_ABSOLUTE_URI];
             hr = IUri_GetAbsoluteUri(uri, &received);
+            if (hr == E_NOTIMPL) goto skip_unimplemented;
             if(prop.todo) {
                 todo_wine {
                     ok(hr == prop.expected, "Error: GetAbsoluteUri returned 0x%08x, expected 0x%08x on uri_tests[%d].\n",
@@ -2624,12 +2637,12 @@ static void test_IUri_GetStrProperties(void) {
             SysFreeString(received);
             received = NULL;
 
-            /* GetHost() tests. */
-            prop = test.str_props[Uri_PROPERTY_HOST];
-            hr = IUri_GetHost(uri, &received);
+            /* GetPassword() tests. */
+            prop = test.str_props[Uri_PROPERTY_PASSWORD];
+            hr = IUri_GetPassword(uri, &received);
             if(prop.todo) {
                 todo_wine {
-                    ok(hr == prop.expected, "Error: GetHost returned 0x%08x, expected 0x%08x on uri_tests[%d].\n",
+                    ok(hr == prop.expected, "Error: GetPassword returned 0x%08x, expected 0x%08x on uri_tests[%d].\n",
                             hr, prop.expected, i);
                 }
                 todo_wine {
@@ -2637,7 +2650,7 @@ static void test_IUri_GetStrProperties(void) {
                             prop.value, wine_dbgstr_w(received), i);
                 }
             } else {
-                ok(hr == prop.expected, "Error: GetHost returned 0x%08x, expected 0x%08x on uri_tests[%d].\n",
+                ok(hr == prop.expected, "Error: GetPassword returned 0x%08x, expected 0x%08x on uri_tests[%d].\n",
                         hr, prop.expected, i);
                 ok(!strcmp_aw(prop.value, received), "Error: Expected %s but got %s on uri_tests[%d].\n",
                         prop.value, wine_dbgstr_w(received), i);
@@ -2645,12 +2658,13 @@ static void test_IUri_GetStrProperties(void) {
             SysFreeString(received);
             received = NULL;
 
-            /* GetPassword() tests. */
-            prop = test.str_props[Uri_PROPERTY_PASSWORD];
-            hr = IUri_GetPassword(uri, &received);
+        skip_unimplemented:
+            /* GetHost() tests. */
+            prop = test.str_props[Uri_PROPERTY_HOST];
+            hr = IUri_GetHost(uri, &received);
             if(prop.todo) {
                 todo_wine {
-                    ok(hr == prop.expected, "Error: GetPassword returned 0x%08x, expected 0x%08x on uri_tests[%d].\n",
+                    ok(hr == prop.expected, "Error: GetHost returned 0x%08x, expected 0x%08x on uri_tests[%d].\n",
                             hr, prop.expected, i);
                 }
                 todo_wine {
@@ -2658,7 +2672,7 @@ static void test_IUri_GetStrProperties(void) {
                             prop.value, wine_dbgstr_w(received), i);
                 }
             } else {
-                ok(hr == prop.expected, "Error: GetPassword returned 0x%08x, expected 0x%08x on uri_tests[%d].\n",
+                ok(hr == prop.expected, "Error: GetHost returned 0x%08x, expected 0x%08x on uri_tests[%d].\n",
                         hr, prop.expected, i);
                 ok(!strcmp_aw(prop.value, received), "Error: Expected %s but got %s on uri_tests[%d].\n",
                         prop.value, wine_dbgstr_w(received), i);
@@ -2871,6 +2885,7 @@ static void test_IUri_GetDwordProperties(void) {
             /* GetHostType() tests. */
             prop = test.dword_props[Uri_PROPERTY_HOST_TYPE-Uri_PROPERTY_DWORD_START];
             hr = IUri_GetHostType(uri, &received);
+            if (hr == E_NOTIMPL) goto skip_unimplemented;
             if(prop.todo) {
                 todo_wine {
                     ok(hr == prop.expected, "Error: GetHostType returned 0x%08x, expected 0x%08x on uri_tests[%d].\n",
@@ -2904,6 +2919,7 @@ static void test_IUri_GetDwordProperties(void) {
             }
             received = -9999999;
 
+        skip_unimplemented:
             /* GetScheme() tests. */
             prop = test.dword_props[Uri_PROPERTY_SCHEME-Uri_PROPERTY_DWORD_START];
             hr = IUri_GetScheme(uri, &received);
@@ -3005,6 +3021,12 @@ static void test_IUri_GetPropertyLength(void) {
                         ok(receivedLen == expectedLen, "Error: Expected a length of %d but got %d on uri_tests[%d].str_props[%d].\n",
                                 expectedLen, receivedLen, i, j);
                     }
+                    if (hr == E_NOTIMPL)  /* no point in continuing */
+                    {
+                        if(uri) IUri_Release(uri);
+                        heap_free(uriW);
+                        return;
+                    }
                 } else {
                     ok(hr == prop.expected, "Error: GetPropertyLength returned 0x%08x, expected 0x%08x on uri_tests[%d].str_props[%d].\n",
                             hr, prop.expected, i, j);
@@ -3057,6 +3079,12 @@ static void test_IUri_GetProperties(void) {
                 todo_wine {
                     ok(hr == S_OK, "Error: GetProperties returned 0x%08x, expected 0x%08x.\n", hr, S_OK);
                 }
+                if (hr == E_NOTIMPL)  /* no point in continuing */
+                {
+                    if(uri) IUri_Release(uri);
+                    heap_free(uriW);
+                    return;
+                }
             } else {
                 ok(hr == S_OK, "Error: GetProperties returned 0x%08x, expected 0x%08x.\n", hr, S_OK);
             }
@@ -3128,6 +3156,12 @@ static void test_IUri_HasProperty(void) {
                         ok(hr == S_OK, "Error: HasProperty returned 0x%08x, expected 0x%08x for property %d on uri_tests[%d].\n",
                                 hr, S_OK, j, i);
                     }
+                    if (hr == E_NOTIMPL)  /* no point in continuing */
+                    {
+                        if(uri) IUri_Release(uri);
+                        heap_free(uriW);
+                        return;
+                    }
 
                     /* Check if the property should be true. */
                     if(test.props & (1 << j)) {




More information about the wine-cvs mailing list