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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ppapi/tests/test_udp_socket_private.cc

Issue 14139012: PPAPI: More test cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Provide a message loop for "background thread" test so we can use a REQUIRED callback Created 7 years, 8 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
« no previous file with comments | « ppapi/tests/test_tcp_socket_private_trusted.cc ('k') | ppapi/tests/test_udp_socket_private_disallowed.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/tests/test_udp_socket_private.cc
diff --git a/ppapi/tests/test_udp_socket_private.cc b/ppapi/tests/test_udp_socket_private.cc
index 995b53a71a8519743b135016e533aaf23e239bea..1380135944ebee93c71c540fb62639006e4ada71 100644
--- a/ppapi/tests/test_udp_socket_private.cc
+++ b/ppapi/tests/test_udp_socket_private.cc
@@ -54,25 +54,21 @@ bool TestUDPSocketPrivate::Init() {
}
void TestUDPSocketPrivate::RunTests(const std::string& filter) {
- RUN_TEST_FORCEASYNC_AND_NOT(Connect, filter);
- RUN_TEST_FORCEASYNC_AND_NOT(ConnectFailure, filter);
- RUN_TEST_FORCEASYNC_AND_NOT(Broadcast, filter);
- RUN_TEST_FORCEASYNC_AND_NOT(SetSocketFeatureErrors, filter);
+ RUN_CALLBACK_TEST(TestUDPSocketPrivate, Connect, filter);
+ RUN_CALLBACK_TEST(TestUDPSocketPrivate, ConnectFailure, filter);
+ RUN_CALLBACK_TEST(TestUDPSocketPrivate, Broadcast, filter);
+ RUN_CALLBACK_TEST(TestUDPSocketPrivate, SetSocketFeatureErrors, filter);
}
std::string TestUDPSocketPrivate::GetLocalAddress(
PP_NetAddress_Private* address) {
pp::TCPSocketPrivate socket(instance_);
- TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket.Connect(host_.c_str(), port_, callback.GetCallback());
- if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
- return ReportError("PPB_TCPSocket_Private::Connect force_async", rv);
- if (rv == PP_OK_COMPLETIONPENDING)
- rv = callback.WaitForResult();
- if (rv != PP_OK)
- return ReportError("PPB_TCPSocket_Private::Connect", rv);
- if (!socket.GetLocalAddress(address))
- return "PPB_TCPSocket_Private::GetLocalAddress: Failed";
+ TestCompletionCallback callback(instance_->pp_instance(), callback_type());
+ callback.WaitForResult(
+ socket.Connect(host_.c_str(), port_, callback.GetCallback()));
+ CHECK_CALLBACK_BEHAVIOR(callback);
+ ASSERT_EQ(PP_OK, callback.result());
+ ASSERT_TRUE(socket.GetLocalAddress(address));
socket.Disconnect();
PASS();
}
@@ -94,14 +90,10 @@ std::string TestUDPSocketPrivate::SetBroadcastOptions(
std::string TestUDPSocketPrivate::BindUDPSocket(
pp::UDPSocketPrivate* socket,
PP_NetAddress_Private* address) {
- TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket->Bind(address, callback.GetCallback());
- if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
- return ReportError("PPB_UDPSocket_Private::Bind force_async", rv);
- if (rv == PP_OK_COMPLETIONPENDING)
- rv = callback.WaitForResult();
- if (rv != PP_OK)
- return ReportError("PPB_UDPSocket_Private::Bind", rv);
+ TestCompletionCallback callback(instance_->pp_instance(), callback_type());
+ callback.WaitForResult(socket->Bind(address, callback.GetCallback()));
+ CHECK_CALLBACK_BEHAVIOR(callback);
+ ASSERT_EQ(PP_OK, callback.result());
PASS();
}
@@ -130,16 +122,11 @@ std::string TestUDPSocketPrivate::LookupPortAndBindUDPSocket(
std::string TestUDPSocketPrivate::BindUDPSocketFailure(
pp::UDPSocketPrivate* socket,
PP_NetAddress_Private *address) {
- TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket->Bind(address, callback.GetCallback());
- if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
- return ReportError("PPB_UDPSocket_Private::Bind force_async", rv);
- if (rv == PP_OK_COMPLETIONPENDING)
- rv = callback.WaitForResult();
- if (rv == PP_OK)
- return ReportError("PPB_UDPSocket_Private::Bind", rv);
- if (socket->GetBoundAddress(address))
- return "PPB_UDPSocket_Private::GetBoundAddress: Failed";
+ TestCompletionCallback callback(instance_->pp_instance(), callback_type());
+ callback.WaitForResult(socket->Bind(address, callback.GetCallback()));
+ CHECK_CALLBACK_BEHAVIOR(callback);
+ ASSERT_NE(PP_OK, callback.result());
+ ASSERT_FALSE(socket->GetBoundAddress(address));
PASS();
}
@@ -148,14 +135,12 @@ std::string TestUDPSocketPrivate::ReadSocket(pp::UDPSocketPrivate* socket,
size_t size,
std::string* message) {
std::vector<char> buffer(size);
- TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket->RecvFrom(&buffer[0], size, callback.GetCallback());
- if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
- return ReportError("PPB_UDPSocket_Private::RecvFrom force_async", rv);
- if (rv == PP_OK_COMPLETIONPENDING)
- rv = callback.WaitForResult();
- if (rv < 0 || size != static_cast<size_t>(rv))
- return ReportError("PPB_UDPSocket_Private::RecvFrom", rv);
+ TestCompletionCallback callback(instance_->pp_instance(), callback_type());
+ callback.WaitForResult(
+ socket->RecvFrom(&buffer[0], size, callback.GetCallback()));
+ CHECK_CALLBACK_BEHAVIOR(callback);
+ ASSERT_FALSE(callback.result() < 0);
+ ASSERT_EQ(size, static_cast<size_t>(callback.result()));
message->assign(buffer.begin(), buffer.end());
PASS();
}
@@ -164,20 +149,16 @@ std::string TestUDPSocketPrivate::PassMessage(pp::UDPSocketPrivate* target,
pp::UDPSocketPrivate* source,
PP_NetAddress_Private* address,
const std::string& message) {
- TestCompletionCallback callback(instance_->pp_instance(), force_async_);
+ TestCompletionCallback callback(instance_->pp_instance(), callback_type());
int32_t rv = source->SendTo(message.c_str(), message.size(), address,
callback.GetCallback());
- if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
- return ReportError("PPB_UDPSocket_Private::SendTo force_async", rv);
-
std::string str;
ASSERT_SUBTEST_SUCCESS(ReadSocket(target, address, message.size(), &str));
- if (rv == PP_OK_COMPLETIONPENDING)
- rv = callback.WaitForResult();
- if (rv < 0 || message.size() != static_cast<size_t>(rv))
- return ReportError("PPB_UDPSocket_Private::SendTo", rv);
-
+ callback.WaitForResult(rv);
+ CHECK_CALLBACK_BEHAVIOR(callback);
+ ASSERT_FALSE(callback.result() < 0);
+ ASSERT_EQ(message.size(), static_cast<size_t>(callback.result()));
ASSERT_EQ(message, str);
PASS();
}
« no previous file with comments | « ppapi/tests/test_tcp_socket_private_trusted.cc ('k') | ppapi/tests/test_udp_socket_private_disallowed.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698