WebSocket Pepper API: Implement extensions

ppapi/tests/test_websocket.cc

 // Copyright (c) 2012 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_websocket.h"
 
 #include <string.h>
 #include <vector>
 
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/c/ppb_var_array_buffer.h"
 #include "ppapi/c/ppb_websocket.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/var_array_buffer.h"
 #include "ppapi/cpp/websocket.h"
 #include "ppapi/tests/test_utils.h"
 #include "ppapi/tests/testing_instance.h"
 #include "ppapi/utility/websocket/websocket_api.h"
 
 // These servers are provided by pywebsocket server side handlers in
 // LayoutTests/http/tests/websocket/tests/hybi/*_wsh.
 // pywebsocket server itself is launched in ppapi_ui_test.cc.
 const char kEchoServerURL[] =
-    "ws://localhost:8880/websocket/tests/hybi/echo";
+    "ws://localhost:8880/websocket/tests/hybi/echo-with-no-extension";
 
 const char kCloseServerURL[] =
     "ws://localhost:8880/websocket/tests/hybi/close";
 
 const char kProtocolTestServerURL[] =
     "ws://localhost:8880/websocket/tests/hybi/protocol-test?protocol=";
 
 const char* const kInvalidURLs[] = {
   "http://www.google.com/invalid_scheme",
   "ws://www.google.com/invalid#fragment",
@@ skipping 368 matching lines @@
   }
 
   PASS();
 }
 
 std::string TestWebSocket::TestValidConnect() {
   int32_t result;
   PP_Resource ws = Connect(kEchoServerURL, &result, NULL);
   ASSERT_TRUE(ws);
   ASSERT_EQ(PP_OK, result);
+  PP_Var extensions = websocket_interface_->GetExtensions(ws);
+  ASSERT_TRUE(AreEqualWithString(extensions, ""));
   core_interface_->ReleaseResource(ws);
 
   PASS();
 }
 
 std::string TestWebSocket::TestInvalidClose() {
   PP_Var reason = CreateVarString("close for test");
   TestCompletionCallback callback(instance_->pp_instance());
 
   // Close before connect.
@@ skipping 312 matching lines @@
       PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, pp::Var(reason), close_callback);
   ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
   result = close_callback.WaitForResult();
   ASSERT_EQ(PP_OK, result);
 
   // Check initialized properties access.
   ASSERT_EQ(0, ws.GetBufferedAmount());
   ASSERT_EQ(PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, ws.GetCloseCode());
   ASSERT_TRUE(AreEqualWithString(ws.GetCloseReason().pp_var(), reason.c_str()));
   ASSERT_EQ(true, ws.GetCloseWasClean());
-  ASSERT_TRUE(AreEqualWithString(ws.GetExtensions().pp_var(), ""));

[Takashi Toyoshima, 2012/03/09 19:26:43]

CcInterfaces test doesn't use kEchoServer, so I move this initialized extension
property check to TestValidConnect for C API, and to TestUtilityValidConnect for
C++ API.

   ASSERT_TRUE(AreEqualWithString(ws.GetProtocol().pp_var(), ""));
   ASSERT_EQ(PP_WEBSOCKETREADYSTATE_CLOSED, ws.GetReadyState());
   ASSERT_TRUE(AreEqualWithString(ws.GetURL().pp_var(), kCloseServerURL));
 
   PASS();
 }
 
 std::string TestWebSocket::TestUtilityInvalidConnect() {
   const pp::Var protocols[] = { pp::Var() };
 
@@ skipping 68 matching lines @@
 std::string TestWebSocket::TestUtilityValidConnect() {
   const pp::Var protocols[] = { pp::Var() };
   TestWebSocketAPI websocket(instance_);
   int32_t result = websocket.Connect(
       pp::Var(std::string(kEchoServerURL)), protocols, 0U);
   ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
   websocket.WaitForConnected();
   const std::vector<WebSocketEvent>& events = websocket.GetSeenEvents();
   ASSERT_EQ(1U, events.size());
   ASSERT_EQ(WebSocketEvent::EVENT_OPEN, events[0].event_type);
+  ASSERT_TRUE(AreEqualWithString(websocket.GetExtensions().pp_var(), ""));
 
   PASS();
 }
 
 std::string TestWebSocket::TestUtilityInvalidClose() {
   const pp::Var reason = pp::Var(std::string("close for test"));
 
   // Close before connect.
   {
     TestWebSocketAPI websocket(instance_);
@@ skipping 235 matching lines @@
   size_t last_event = events_on_closed - 1;
   for (uint32_t i = 1; i < last_event; ++i) {
     ASSERT_EQ(WebSocketEvent::EVENT_MESSAGE, events[i].event_type);
     ASSERT_TRUE(AreEqualWithString(events[i].var.pp_var(), message_char));
   }
   ASSERT_EQ(WebSocketEvent::EVENT_CLOSE, events[last_event].event_type);
   ASSERT_TRUE(events[last_event].was_clean);
 
   PASS();
 }