Skip to content

Commit 7b7a229

Browse files
committed
Fixed class/struct identifier clash in authentication_tests.cpp.
1 parent 25d9ac1 commit 7b7a229

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

Release/tests/functional/http/client/authentication_tests.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ TEST_FIXTURE(uri_address, auth_no_data, "Ignore:Linux", "89", "Ignore:Apple", "8
8787
{
8888
test_http_server::scoped_server scoped(m_uri);
8989
http_client_config client_config;
90-
credentials cred(U("some_user"), U("some_password")); // WinHTTP requires non-empty password
90+
web::credentials cred(U("some_user"), U("some_password")); // WinHTTP requires non-empty password
9191
client_config.set_credentials(cred);
9292
http_client client(m_uri, client_config);
9393
const method mtd = methods::POST;
@@ -126,7 +126,7 @@ TEST_FIXTURE(uri_address, proxy_auth_known_contentlength, "Ignore:Linux", "88",
126126
{
127127
test_http_server::scoped_server scoped(m_uri);
128128
http_client_config client_config;
129-
credentials cred(U("some_user"), U("some_password")); // WinHTTP requires non-empty password
129+
web::credentials cred(U("some_user"), U("some_password")); // WinHTTP requires non-empty password
130130
client_config.set_credentials(cred);
131131
http_client client(m_uri, client_config);
132132
const method mtd = methods::POST;
@@ -199,7 +199,7 @@ TEST_FIXTURE(uri_address, proxy_auth_unknown_contentlength, "Ignore:Linux", "88"
199199
{
200200
test_http_server::scoped_server scoped(m_uri);
201201
http_client_config client_config;
202-
credentials cred(U("some_user"), U("some_password")); // WinHTTP requires non-empty password
202+
web::credentials cred(U("some_user"), U("some_password")); // WinHTTP requires non-empty password
203203
client_config.set_credentials(cred);
204204
http_client client(m_uri, client_config);
205205
const method mtd = methods::POST;
@@ -271,7 +271,7 @@ TEST_FIXTURE(uri_address, error_after_valid_credentials, "Ignore:Linux", "89", "
271271
web::http::uri uri(U("http://localhost:34569/"));
272272
test_http_server::scoped_server scoped(uri);
273273
http_client_config client_config;
274-
credentials cred(U("some_user"), U("some_password"));
274+
web::credentials cred(U("some_user"), U("some_password"));
275275
client_config.set_credentials(cred);
276276
http_client client(uri, client_config);
277277

@@ -379,7 +379,7 @@ TEST_FIXTURE(server_properties, unsuccessful_auth_with_basic_cred, "Requires", "
379379
load_parameters();
380380

381381
http_client_config config;
382-
config.set_credentials(credentials(m_username, m_password));
382+
config.set_credentials(web::credentials(m_username, m_password));
383383

384384
http_client client(m_uri, config);
385385
http_response response = client.request(methods::GET).get();
@@ -391,7 +391,7 @@ TEST_FIXTURE(server_properties, basic_anonymous_auth_with_basic_cred, "Requires"
391391
load_parameters();
392392

393393
http_client_config config;
394-
config.set_credentials(credentials(m_username, m_password));
394+
config.set_credentials(web::credentials(m_username, m_password));
395395
http_client client(m_uri, config);
396396
http_request req(methods::GET);
397397
req.headers().add(U("UserName"), m_username);
@@ -405,7 +405,7 @@ TEST_FIXTURE(server_properties, none_auth_with_cred, "Requires", "Server;UserNam
405405
load_parameters();
406406

407407
http_client_config config;
408-
config.set_credentials(credentials(m_username, m_password));
408+
config.set_credentials(web::credentials(m_username, m_password));
409409
http_client client(m_uri, config);
410410
http_response response = client.request(methods::GET).get();
411411
VERIFY_ARE_EQUAL(status_codes::Forbidden, response.status_code());
@@ -417,7 +417,7 @@ TEST_FIXTURE(server_properties, successful_auth_with_domain_cred, "Requires", "S
417417
load_parameters();
418418

419419
http_client_config config;
420-
config.set_credentials(credentials(m_username, m_password));
420+
config.set_credentials(web::credentials(m_username, m_password));
421421
http_client client(m_uri, config);
422422
http_request req(methods::GET);
423423
req.headers().add(U("UserName"), m_username);
@@ -432,7 +432,7 @@ TEST_FIXTURE(server_properties, failed_authentication_resend_request_error, "Req
432432
load_parameters();
433433

434434
http_client_config config;
435-
config.set_credentials(credentials(m_username, m_password));
435+
config.set_credentials(web::credentials(m_username, m_password));
436436
http_client client(m_uri, config);
437437

438438
const size_t rawDataSize = 8;
@@ -477,7 +477,7 @@ TEST_FIXTURE(server_properties, set_user_options, "Requires", "Server;UserName;P
477477
load_parameters();
478478

479479
http_client_config config;
480-
config.set_credentials(credentials(m_username, m_password));
480+
config.set_credentials(web::credentials(m_username, m_password));
481481

482482
config.set_nativehandle_options([&](native_handle handle)->void{
483483
DWORD policy = WINHTTP_AUTOLOGON_SECURITY_LEVEL_LOW;
@@ -519,7 +519,7 @@ TEST_FIXTURE(uri_address, auth_producer_comsumer_buffer)
519519
VERIFY_IS_FALSE(config.buffer_request());
520520
config.set_buffer_request(true);
521521
VERIFY_IS_TRUE(config.buffer_request());
522-
config.set_credentials(credentials(U("USERNAME"), U("PASSWORD")));
522+
config.set_credentials(web::credentials(U("USERNAME"), U("PASSWORD")));
523523

524524
http_client client(m_uri, config);
525525

@@ -583,7 +583,7 @@ TEST_FIXTURE(uri_address, auth_producer_comsumer_buffer_fail)
583583

584584
http_client_config config;
585585
config.set_buffer_request(true);
586-
config.set_credentials(credentials(U("USERNAME"), U("PASSWORD")));
586+
config.set_credentials(web::credentials(U("USERNAME"), U("PASSWORD")));
587587

588588
http_client client(m_uri, config);
589589

@@ -634,7 +634,7 @@ TEST_FIXTURE(uri_address, failed_authentication_attempt, "Ignore:Linux", "89", "
634634
handle_timeout([]
635635
{
636636
http_client_config config;
637-
credentials cred(U("user"), U("schmuser"));
637+
web::credentials cred(U("user"), U("schmuser"));
638638
config.set_credentials(cred);
639639
http_client client(U("https://apis.live.net"), config);
640640
http_response response = client.request(methods::GET, U("V5.0/me/skydrive/files")).get();

0 commit comments

Comments
 (0)