Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2235)

Unified Diff: ppapi/tests/test_transport.cc

Issue 6899055: PPAPI: Force async callback invocation option. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/tests/test_transport.cc
===================================================================
--- ppapi/tests/test_transport.cc (revision 88104)
+++ ppapi/tests/test_transport.cc (working copy)
@@ -104,10 +104,10 @@
void TestTransport::RunTest() {
RUN_TEST(Create);
RUN_TEST(Connect);
- RUN_TEST(SendDataUdp);
- RUN_TEST(SendDataTcp);
- RUN_TEST(ConnectAndCloseUdp);
- RUN_TEST(ConnectAndCloseTcp);
+ RUN_ASYNC_TEST(SendDataUdp);
+ RUN_ASYNC_TEST(SendDataTcp);
+ RUN_ASYNC_TEST(ConnectAndCloseUdp);
+ RUN_ASYNC_TEST(ConnectAndCloseTcp);
}
std::string TestTransport::InitTargets(const char* proto) {
@@ -198,10 +198,15 @@
// Put packet index in the beginning.
memcpy(&send_buffer[0], &i, sizeof(i));
- TestCompletionCallback send_cb(instance_->pp_instance());
- ASSERT_EQ(
- transport2_->Send(&send_buffer[0], send_buffer.size(), send_cb),
- static_cast<int>(send_buffer.size()));
+ TestCompletionCallback send_cb(instance_->pp_instance(), force_async_);
+ int32_t result = transport2_->Send(&send_buffer[0], send_buffer.size(),
+ send_cb);
+ if (force_async_) {
+ ASSERT_EQ(result, PP_OK_COMPLETIONPENDING);
+ ASSERT_EQ(send_cb.WaitForResult(), static_cast<int>(send_buffer.size()));
+ } else {
+ ASSERT_EQ(result, static_cast<int>(send_buffer.size()));
+ }
sent_packets[i] = send_buffer;
}
@@ -243,9 +248,11 @@
int pos = 0;
while (pos < static_cast<int>(send_buffer.size())) {
- TestCompletionCallback send_cb(instance_->pp_instance());
+ TestCompletionCallback send_cb(instance_->pp_instance(), force_async_);
int result = transport2_->Send(
&send_buffer[0] + pos, send_buffer.size() - pos, send_cb);
+ if (force_async_)
+ ASSERT_EQ(result, PP_OK_COMPLETIONPENDING);
if (result == PP_OK_COMPLETIONPENDING)
result = send_cb.WaitForResult();
ASSERT_TRUE(result > 0);
@@ -275,7 +282,7 @@
RUN_SUBTEST(Connect());
std::vector<char> recv_buffer(kReadBufferSize);
- TestCompletionCallback recv_cb(instance_->pp_instance());
+ TestCompletionCallback recv_cb(instance_->pp_instance(), force_async_);
ASSERT_EQ(
transport1_->Recv(&recv_buffer[0], recv_buffer.size(), recv_cb),
PP_OK_COMPLETIONPENDING);
@@ -296,7 +303,7 @@
RUN_SUBTEST(Connect());
std::vector<char> recv_buffer(kReadBufferSize);
- TestCompletionCallback recv_cb(instance_->pp_instance());
+ TestCompletionCallback recv_cb(instance_->pp_instance(), force_async_);
ASSERT_EQ(
transport1_->Recv(&recv_buffer[0], recv_buffer.size(), recv_cb),
PP_OK_COMPLETIONPENDING);

Powered by Google App Engine
This is Rietveld 408576698