Add SetProperty() in the PPB_Transport_Dev interface.

ppapi/tests/test_transport.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/tests/test_transport.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <list>
@@ skipping 85 matching lines @@
 }  // namespace
 
 bool TestTransport::Init() {
   transport_interface_ = reinterpret_cast<PPB_Transport_Dev const*>(
       pp::Module::Get()->GetBrowserInterface(PPB_TRANSPORT_DEV_INTERFACE));
   return transport_interface_ && InitTestingInterface();
 }
 
 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(SetConfig);
+  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) {
   transport1_.reset(new pp::Transport_Dev(instance_, kTestChannelName, proto));
   transport2_.reset(new pp::Transport_Dev(instance_, kTestChannelName, proto));
 
   ASSERT_TRUE(transport1_.get() != NULL);
   ASSERT_TRUE(transport2_.get() != NULL);
 
   PASS();
@@ skipping 38 matching lines @@
 }
 
 std::string TestTransport::TestCreate() {
   RUN_SUBTEST(InitTargets("udp"));
 
   Clean();
 
   PASS();
 }
 
+std::string TestTransport::TestSetConfig() {
+  RUN_SUBTEST(InitTargets("udp"));
+
+  const char kEmptyConfig[] = "{}";
+  ASSERT_EQ(transport1_->SetConfig(kEmptyConfig), PP_OK);
+
+  const char kTestConfig1[] =
+      "{\"stunServer\": [\"stun1.a.com:31323\", \"stun2.a.com:54324\"],"
+      "\"relayServer\": [\"relay.google.com\", \"relay.google.com\"],"
+      "\"relayToken\": \"34t34f234f12\","
+      "\"tcpReceiveWindow\": 32768,"
+      "\"tcpSendWindow\": 32768,}";
+  ASSERT_EQ(transport1_->SetConfig(kTestConfig1), PP_OK);
+
+  const char kTestConfig2[] =
+      "{\"stunServer\": \"stun1.a.com:31323\","
+      "\"relayServer\": \"relay.google.com\","
+      "\"relayToken\": \"34t34f234f12\"}";
+  ASSERT_EQ(transport1_->SetConfig(kTestConfig2), PP_OK);
+
+  const char kInvalidConfig[] =
+      "{\"stunServer\": \"stun1.a.com:31323\","
+      "\"relayServer\": 44,"
+      "\"relayToken\": \"34t34f234f12\"}";
+  ASSERT_EQ(transport1_->SetConfig(kInvalidConfig), PP_ERROR_BADARGUMENT);
+
+  RUN_SUBTEST(Connect());
+
+  // SetConfig() should fail after we've connected.
+  ASSERT_EQ(transport1_->SetConfig(kEmptyConfig), PP_ERROR_FAILED);
+
+  Clean();
+
+  PASS();
+}
+
 std::string TestTransport::TestConnect() {
   RUN_SUBTEST(InitTargets("udp"));
   RUN_SUBTEST(Connect());
 
   Clean();
 
   PASS();
 }
 
 // Creating datagram connection and try sending data over it. Verify
@@ skipping 25 matching lines @@
     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;
   }
 
   // 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);

[Sergey Ulanov, 2011/08/22 23:25:10]

I changed this code and removed timeout in TestSendDataTcp() because otherwise
the callback passed to CallOnMainThread() may be called later when
TestCompletionCallback object is destroyed, which sometimes causes crashes or
often quits renderer main loop.

+  ASSERT_EQ(timeout_cb.WaitForResult(), PP_OK);
 
   ASSERT_TRUE(reader.errors().size() == 0);
   ASSERT_TRUE(reader.received().size() > 0);
   for (std::list<std::vector<char> >::const_iterator it =
            reader.received().begin(); it != reader.received().end(); ++it) {
     int index;
     memcpy(&index, &(*it)[0], sizeof(index));
     ASSERT_TRUE(sent_packets[index] == *it);
   }
 
   Clean();
 
   PASS();
 }
 
 // Creating reliable (TCP-like) connection and try sending data over
 // it. Verify that all data is received correctly.
 std::string TestTransport::TestSendDataTcp() {
   RUN_SUBTEST(InitTargets("tcp"));
   RUN_SUBTEST(Connect());
 
   const int kTcpSendSize = 100000;
-  const int kTimeoutMs = 20000;  // 20 seconds.
 
   TestCompletionCallback done_cb(instance_->pp_instance());
   StreamReader reader(transport1_.get(), kTcpSendSize,
                       done_cb);
 
   std::vector<char> send_buffer(kTcpSendSize);
   for (size_t j = 0; j < send_buffer.size(); ++j) {
     send_buffer[j] = rand() % 256;
   }
 
   int pos = 0;
   while (pos < static_cast<int>(send_buffer.size())) {
     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);
     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);
 
   std::vector<char> received_data;
   for (std::list<std::vector<char> >::const_iterator it =
            reader.received().begin(); it != reader.received().end(); ++it) {
     received_data.insert(received_data.end(), it->begin(), it->end());
   }
   ASSERT_EQ(send_buffer, received_data);
@@ skipping 37 matching lines @@
   // Close the transport and verify that callback is aborted.
   ASSERT_EQ(transport1_->Close(), PP_OK);
 
   ASSERT_EQ(recv_cb.run_count(), 1);
   ASSERT_EQ(recv_cb.result(), PP_ERROR_ABORTED);
 
   Clean();
 
   PASS();
 }