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

Unified Diff: ppapi/tests/test_transport.cc

Issue 7713021: Add SetProperty() in the PPB_Transport_Dev interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 9 years, 4 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_transport.h ('k') | ppapi/thunk/ppb_transport_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/tests/test_transport.cc
diff --git a/ppapi/tests/test_transport.cc b/ppapi/tests/test_transport.cc
index 1295f75518a43274bf944b2953f13c5b06de339c..0df56cfefd33aeb7d32fc6b28b12f118e6749749 100644
--- a/ppapi/tests/test_transport.cc
+++ b/ppapi/tests/test_transport.cc
@@ -13,9 +13,10 @@
#include "ppapi/c/dev/ppb_testing_dev.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/cpp/completion_callback.h"
+#include "ppapi/cpp/dev/transport_dev.h"
#include "ppapi/cpp/instance.h"
#include "ppapi/cpp/module.h"
-#include "ppapi/cpp/dev/transport_dev.h"
+#include "ppapi/cpp/var.h"
#include "ppapi/tests/test_utils.h"
#include "ppapi/tests/testing_instance.h"
@@ -103,11 +104,12 @@ bool TestTransport::Init() {
void TestTransport::RunTest() {
RUN_TEST(Create);
- RUN_TEST(Connect);
- RUN_TEST_FORCEASYNC(SendDataUdp);
- RUN_TEST(SendDataTcp);
- RUN_TEST(ConnectAndCloseUdp);
- RUN_TEST(ConnectAndCloseTcp);
+ RUN_TEST_FORCEASYNC_AND_NOT(Connect);
+ RUN_TEST(SetProperty);
+ RUN_TEST_FORCEASYNC_AND_NOT(SendDataUdp);
+ RUN_TEST_FORCEASYNC_AND_NOT(SendDataTcp);
+ RUN_TEST_FORCEASYNC_AND_NOT(ConnectAndCloseUdp);
+ RUN_TEST_FORCEASYNC_AND_NOT(ConnectAndCloseTcp);
}
std::string TestTransport::InitTargets(const char* proto) {
@@ -166,6 +168,47 @@ std::string TestTransport::TestCreate() {
PASS();
}
+std::string TestTransport::TestSetProperty() {
+ RUN_SUBTEST(InitTargets("tcp"));
+
+ // Try settings STUN and Relay properties.
+ ASSERT_EQ(transport1_->SetProperty(
+ PP_TRANSPORTPROPERTY_STUN_SERVER,
+ pp::Var("stun.example.com:19302")), PP_OK);
+
+ ASSERT_EQ(transport1_->SetProperty(
+ PP_TRANSPORTPROPERTY_RELAY_SERVER,
+ pp::Var("ralay.example.com:80")), PP_OK);
+
+ ASSERT_EQ(transport1_->SetProperty(
+ PP_TRANSPORTPROPERTY_RELAY_TOKEN,
+ pp::Var("INVALID_TOKEN")), PP_OK);
+
+ // Try changing TCP window size.
+ ASSERT_EQ(transport1_->SetProperty(PP_TRANSPORTPROPERTY_TCP_RECEIVE_WINDOW,
+ pp::Var(65536)), PP_OK);
+ ASSERT_EQ(transport1_->SetProperty(PP_TRANSPORTPROPERTY_TCP_RECEIVE_WINDOW,
+ pp::Var(10000000)), PP_ERROR_BADARGUMENT);
+
+ ASSERT_EQ(transport1_->SetProperty(PP_TRANSPORTPROPERTY_TCP_SEND_WINDOW,
+ pp::Var(65536)), PP_OK);
+ ASSERT_EQ(transport1_->SetProperty(PP_TRANSPORTPROPERTY_TCP_SEND_WINDOW,
+ pp::Var(10000000)), PP_ERROR_BADARGUMENT);
+
+ TestCompletionCallback connect_cb(instance_->pp_instance());
+ ASSERT_EQ(transport1_->Connect(connect_cb), PP_OK_COMPLETIONPENDING);
+
+ // SetProperty() should fail after we've connected.
+ ASSERT_EQ(transport1_->SetProperty(
+ PP_TRANSPORTPROPERTY_STUN_SERVER,
+ pp::Var("stun.example.com:31323")), PP_ERROR_FAILED);
+
+ Clean();
+ ASSERT_EQ(connect_cb.WaitForResult(), PP_ERROR_ABORTED);
+
+ PASS();
+}
+
std::string TestTransport::TestConnect() {
RUN_SUBTEST(InitTargets("udp"));
RUN_SUBTEST(Connect());
@@ -211,8 +254,9 @@ std::string TestTransport::TestSendDataUdp() {
}
// Limit waiting time.
- pp::Module::Get()->core()->CallOnMainThread(kUdpWaitTimeMs, done_cb);
- ASSERT_EQ(done_cb.WaitForResult(), PP_OK);
+ TestCompletionCallback timeout_cb(instance_->pp_instance());
+ pp::Module::Get()->core()->CallOnMainThread(kUdpWaitTimeMs, timeout_cb);
+ ASSERT_EQ(timeout_cb.WaitForResult(), PP_OK);
ASSERT_TRUE(reader.errors().size() == 0);
ASSERT_TRUE(reader.received().size() > 0);
@@ -235,7 +279,6 @@ std::string TestTransport::TestSendDataTcp() {
RUN_SUBTEST(Connect());
const int kTcpSendSize = 100000;
- const int kTimeoutMs = 20000; // 20 seconds.
TestCompletionCallback done_cb(instance_->pp_instance());
StreamReader reader(transport1_.get(), kTcpSendSize,
@@ -259,8 +302,6 @@ std::string TestTransport::TestSendDataTcp() {
pos += result;
}
- // Limit waiting time.
- pp::Module::Get()->core()->CallOnMainThread(kTimeoutMs, done_cb);
ASSERT_EQ(done_cb.WaitForResult(), PP_OK);
ASSERT_TRUE(reader.errors().size() == 0);
« no previous file with comments | « ppapi/tests/test_transport.h ('k') | ppapi/thunk/ppb_transport_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698