| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ppapi/tests/test_tcp_socket.h" | 5 #include "ppapi/tests/test_tcp_socket.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ppapi/cpp/message_loop.h" | 9 #include "ppapi/cpp/message_loop.h" |
| 10 #include "ppapi/cpp/tcp_socket.h" | 10 #include "ppapi/cpp/tcp_socket.h" |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 ASSERT_FALSE(accepted_sockets[i]->is_null()); | 278 ASSERT_FALSE(accepted_sockets[i]->is_null()); |
| 279 } | 279 } |
| 280 | 280 |
| 281 for (size_t i = 0; i < kBacklog; ++i) { | 281 for (size_t i = 0; i < kBacklog; ++i) { |
| 282 connect_callbacks[i]->WaitForResult(connect_rv[i]); | 282 connect_callbacks[i]->WaitForResult(connect_rv[i]); |
| 283 CHECK_CALLBACK_BEHAVIOR(*connect_callbacks[i]); | 283 CHECK_CALLBACK_BEHAVIOR(*connect_callbacks[i]); |
| 284 ASSERT_EQ(PP_OK, connect_callbacks[i]->result()); | 284 ASSERT_EQ(PP_OK, connect_callbacks[i]->result()); |
| 285 } | 285 } |
| 286 | 286 |
| 287 for (size_t i = 0; i < kBacklog; ++i) { | 287 for (size_t i = 0; i < kBacklog; ++i) { |
| 288 const char byte = 'a' + i; | 288 const char byte = static_cast<char>('a' + i); |
| 289 ASSERT_SUBTEST_SUCCESS(WriteToSocket(client_sockets[i], | 289 ASSERT_SUBTEST_SUCCESS(WriteToSocket(client_sockets[i], |
| 290 std::string(1, byte))); | 290 std::string(1, byte))); |
| 291 } | 291 } |
| 292 | 292 |
| 293 bool byte_received[kBacklog] = {}; | 293 bool byte_received[kBacklog] = {}; |
| 294 for (size_t i = 0; i < kBacklog; ++i) { | 294 for (size_t i = 0; i < kBacklog; ++i) { |
| 295 char byte; | 295 char byte; |
| 296 ASSERT_SUBTEST_SUCCESS(ReadFromSocket( | 296 ASSERT_SUBTEST_SUCCESS(ReadFromSocket( |
| 297 accepted_sockets[i], &byte, sizeof(byte))); | 297 accepted_sockets[i], &byte, sizeof(byte))); |
| 298 const size_t index = byte - 'a'; | 298 const size_t index = byte - 'a'; |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 377 } | 377 } |
| 378 PASS(); | 378 PASS(); |
| 379 } | 379 } |
| 380 | 380 |
| 381 std::string TestTCPSocket::ReadFromSocket(pp::TCPSocket* socket, | 381 std::string TestTCPSocket::ReadFromSocket(pp::TCPSocket* socket, |
| 382 char* buffer, | 382 char* buffer, |
| 383 size_t num_bytes) { | 383 size_t num_bytes) { |
| 384 while (num_bytes > 0) { | 384 while (num_bytes > 0) { |
| 385 TestCompletionCallback callback(instance_->pp_instance(), callback_type()); | 385 TestCompletionCallback callback(instance_->pp_instance(), callback_type()); |
| 386 callback.WaitForResult( | 386 callback.WaitForResult( |
| 387 socket->Read(buffer, num_bytes, callback.GetCallback())); | 387 socket->Read(buffer, static_cast<int32_t>(num_bytes), |
| 388 callback.GetCallback())); |
| 388 CHECK_CALLBACK_BEHAVIOR(callback); | 389 CHECK_CALLBACK_BEHAVIOR(callback); |
| 389 ASSERT_GT(callback.result(), 0); | 390 ASSERT_GT(callback.result(), 0); |
| 390 buffer += callback.result(); | 391 buffer += callback.result(); |
| 391 num_bytes -= callback.result(); | 392 num_bytes -= callback.result(); |
| 392 } | 393 } |
| 393 ASSERT_EQ(0u, num_bytes); | 394 ASSERT_EQ(0u, num_bytes); |
| 394 PASS(); | 395 PASS(); |
| 395 } | 396 } |
| 396 | 397 |
| 397 std::string TestTCPSocket::WriteToSocket(pp::TCPSocket* socket, | 398 std::string TestTCPSocket::WriteToSocket(pp::TCPSocket* socket, |
| 398 const std::string& s) { | 399 const std::string& s) { |
| 399 const char* buffer = s.data(); | 400 const char* buffer = s.data(); |
| 400 size_t written = 0; | 401 size_t written = 0; |
| 401 while (written < s.size()) { | 402 while (written < s.size()) { |
| 402 TestCompletionCallback cb(instance_->pp_instance(), callback_type()); | 403 TestCompletionCallback cb(instance_->pp_instance(), callback_type()); |
| 403 cb.WaitForResult( | 404 cb.WaitForResult( |
| 404 socket->Write(buffer + written, s.size() - written, cb.GetCallback())); | 405 socket->Write(buffer + written, |
| 406 static_cast<int32_t>(s.size() - written), |
| 407 cb.GetCallback())); |
| 405 CHECK_CALLBACK_BEHAVIOR(cb); | 408 CHECK_CALLBACK_BEHAVIOR(cb); |
| 406 ASSERT_GT(cb.result(), 0); | 409 ASSERT_GT(cb.result(), 0); |
| 407 written += cb.result(); | 410 written += cb.result(); |
| 408 } | 411 } |
| 409 ASSERT_EQ(written, s.size()); | 412 ASSERT_EQ(written, s.size()); |
| 410 PASS(); | 413 PASS(); |
| 411 } | 414 } |
| 412 | 415 |
| 413 std::string TestTCPSocket::WriteToSocket_1_0( | 416 std::string TestTCPSocket::WriteToSocket_1_0( |
| 414 PP_Resource socket, | 417 PP_Resource socket, |
| 415 const std::string& s) { | 418 const std::string& s) { |
| 416 const char* buffer = s.data(); | 419 const char* buffer = s.data(); |
| 417 size_t written = 0; | 420 size_t written = 0; |
| 418 while (written < s.size()) { | 421 while (written < s.size()) { |
| 419 TestCompletionCallback cb(instance_->pp_instance(), callback_type()); | 422 TestCompletionCallback cb(instance_->pp_instance(), callback_type()); |
| 420 cb.WaitForResult(socket_interface_1_0_->Write( | 423 cb.WaitForResult(socket_interface_1_0_->Write( |
| 421 socket, buffer + written, s.size() - written, | 424 socket, buffer + written, |
| 425 static_cast<int32_t>(s.size() - written), |
| 422 cb.GetCallback().pp_completion_callback())); | 426 cb.GetCallback().pp_completion_callback())); |
| 423 CHECK_CALLBACK_BEHAVIOR(cb); | 427 CHECK_CALLBACK_BEHAVIOR(cb); |
| 424 ASSERT_GT(cb.result(), 0); | 428 ASSERT_GT(cb.result(), 0); |
| 425 written += cb.result(); | 429 written += cb.result(); |
| 426 } | 430 } |
| 427 ASSERT_EQ(written, s.size()); | 431 ASSERT_EQ(written, s.size()); |
| 428 PASS(); | 432 PASS(); |
| 429 } | 433 } |
| 430 | 434 |
| 431 std::string TestTCPSocket::GetAddressToBind(pp::NetAddress* address) { | 435 std::string TestTCPSocket::GetAddressToBind(pp::NetAddress* address) { |
| (...skipping 19 matching lines...) Expand all Loading... |
| 451 CHECK_CALLBACK_BEHAVIOR(callback); | 455 CHECK_CALLBACK_BEHAVIOR(callback); |
| 452 ASSERT_EQ(PP_OK, callback.result()); | 456 ASSERT_EQ(PP_OK, callback.result()); |
| 453 | 457 |
| 454 callback.WaitForResult( | 458 callback.WaitForResult( |
| 455 socket->Listen(backlog, callback.GetCallback())); | 459 socket->Listen(backlog, callback.GetCallback())); |
| 456 CHECK_CALLBACK_BEHAVIOR(callback); | 460 CHECK_CALLBACK_BEHAVIOR(callback); |
| 457 ASSERT_EQ(PP_OK, callback.result()); | 461 ASSERT_EQ(PP_OK, callback.result()); |
| 458 | 462 |
| 459 PASS(); | 463 PASS(); |
| 460 } | 464 } |
| OLD | NEW |