diff options
Diffstat (limited to 'subversion/tests/libsvn_subr/auth-test.c')
| -rw-r--r-- | subversion/tests/libsvn_subr/auth-test.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/subversion/tests/libsvn_subr/auth-test.c b/subversion/tests/libsvn_subr/auth-test.c index 9d7d866..bbe7933 100644 --- a/subversion/tests/libsvn_subr/auth-test.c +++ b/subversion/tests/libsvn_subr/auth-test.c @@ -63,13 +63,14 @@ test_platform_specific_auth_providers(apr_pool_t *pool) number_of_providers += 2; #endif #if defined(WIN32) && !defined(__MINGW32__) - number_of_providers += 2; + number_of_providers += 4; #endif if (providers->nelts != number_of_providers) return svn_error_createf (SVN_ERR_TEST_FAILED, NULL, "svn_auth_get_platform_specific_client_providers should return " \ - "an array of %d providers", number_of_providers); + "an array of %d providers, but returned %d providers", + number_of_providers, providers->nelts); /* Test Keychain auth providers */ #ifdef SVN_HAVE_KEYCHAIN_SERVICES @@ -219,8 +220,8 @@ cleanup_callback(svn_boolean_t *delete_cred, { svn_auth_baton_t *b = walk_baton; - SVN_TEST_ASSERT(strcmp(cred_kind, SVN_AUTH_CRED_SIMPLE) == 0); - SVN_TEST_ASSERT(strcmp(realmstring, "<http://my.host> My realm") == 0); + SVN_TEST_STRING_ASSERT(cred_kind, SVN_AUTH_CRED_SIMPLE); + SVN_TEST_STRING_ASSERT(realmstring, "<http://my.host> My realm"); SVN_ERR(svn_auth_forget_credentials(b, cred_kind, realmstring, scratch_pool)); @@ -271,7 +272,7 @@ test_auth_clear(apr_pool_t *pool) pool)); creds = credentials; - SVN_TEST_ASSERT(strcmp(creds->username, "jrandom") == 0); + SVN_TEST_STRING_ASSERT(creds->username, "jrandom"); SVN_TEST_ASSERT(creds->may_save); /* And tell that they are ok and can be saved */ @@ -291,7 +292,7 @@ test_auth_clear(apr_pool_t *pool) SVN_TEST_ASSERT(credentials); creds = credentials; - SVN_TEST_ASSERT(strcmp(creds->username, "jrandom") == 0); + SVN_TEST_STRING_ASSERT(creds->username, "jrandom"); SVN_TEST_ASSERT(creds->may_save); /* Use our walker function to delete credentials (and forget them @@ -314,18 +315,16 @@ test_auth_clear(apr_pool_t *pool) /* The test table. */ -struct svn_test_descriptor_t test_funcs[] = +static int max_threads = 1; + +static struct svn_test_descriptor_t test_funcs[] = { SVN_TEST_NULL, SVN_TEST_PASS2(test_platform_specific_auth_providers, "test retrieving platform-specific auth providers"), -#ifndef SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE SVN_TEST_PASS2(test_auth_clear, "test svn_auth_clear()"), -#else - SVN_TEST_WIMP(test_auth_clear, - "test svn_auth_clear()", - "Needs testing with SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE"), -#endif SVN_TEST_NULL }; + +SVN_TEST_MAIN |