Pepper WebSocket API: Implement new design Chrome IPC

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 <stdio.h>
 #include <string.h>
 
 #include <algorithm>
@@ skipping 1130 matching lines @@
   ASSERT_EQ(PP_ERROR_BADARGUMENT, result);
   ASSERT_EQ(0U, websocket.GetSeenEvents().size());
 
   result = websocket.Connect(pp::Var(), protocols, 1U);
   ASSERT_EQ(PP_ERROR_INPROGRESS, result);
   ASSERT_EQ(0U, websocket.GetSeenEvents().size());
 
   for (int i = 0; kInvalidURLs[i]; ++i) {
     TestWebSocketAPI ws(instance_);
     result = ws.Connect(pp::Var(std::string(kInvalidURLs[i])), protocols, 0U);
-    ASSERT_EQ(PP_ERROR_BADARGUMENT, result);
-    ASSERT_EQ(0U, ws.GetSeenEvents().size());
+    if (result == PP_OK_COMPLETIONPENDING) {
+      ws.WaitForClosed();
+      const std::vector<WebSocketEvent>& events = ws.GetSeenEvents();
+      ASSERT_EQ(WebSocketEvent::EVENT_ERROR, events[0].event_type);
+      ASSERT_EQ(WebSocketEvent::EVENT_CLOSE, events[1].event_type);
+      ASSERT_EQ(2U, ws.GetSeenEvents().size());
+    } else {
+      ASSERT_EQ(PP_ERROR_BADARGUMENT, result);
+      ASSERT_EQ(0U, ws.GetSeenEvents().size());
+    }
   }
 
   PASS();
 }
 
 std::string TestWebSocket::TestUtilityProtocols() {
   const pp::Var bad_protocols[] = {
       pp::Var(std::string("x-test")), pp::Var(std::string("x-test")) };
   const pp::Var good_protocols[] = {
       pp::Var(std::string("x-test")), pp::Var(std::string("x-yatest")) };
@@ skipping 25 matching lines @@
   PASS();
 }
 
 std::string TestWebSocket::TestUtilityGetURL() {
   const pp::Var protocols[] = { pp::Var() };
 
   for (int i = 0; kInvalidURLs[i]; ++i) {
     TestWebSocketAPI websocket(instance_);
     int32_t result = websocket.Connect(
         pp::Var(std::string(kInvalidURLs[i])), protocols, 0U);
-    ASSERT_EQ(PP_ERROR_BADARGUMENT, result);
+    if (result == PP_OK_COMPLETIONPENDING) {
+      websocket.WaitForClosed();
+      const std::vector<WebSocketEvent>& events = websocket.GetSeenEvents();
+      ASSERT_EQ(WebSocketEvent::EVENT_ERROR, events[0].event_type);
+      ASSERT_EQ(WebSocketEvent::EVENT_CLOSE, events[1].event_type);
+      ASSERT_EQ(2U, events.size());
+    } else {
+      ASSERT_EQ(PP_ERROR_BADARGUMENT, result);
+      ASSERT_EQ(0U, websocket.GetSeenEvents().size());
+    }
     pp::Var url = websocket.GetURL();
     ASSERT_TRUE(AreEqualWithString(url.pp_var(), kInvalidURLs[i]));
-    ASSERT_EQ(0U, websocket.GetSeenEvents().size());
   }
 
   PASS();
 }
 
 std::string TestWebSocket::TestUtilityValidConnect() {
   const pp::Var protocols[] = { pp::Var() };
   TestWebSocketAPI websocket(instance_);
   int32_t result = websocket.Connect(
       pp::Var(GetFullURL(kEchoServerURL)), protocols, 0U);
@@ skipping 118 matching lines @@
   ASSERT_TRUE(AreEqualWithString(
       websocket.GetProtocol().pp_var(), protocol.c_str()));
   const std::vector<WebSocketEvent>& events = websocket.GetSeenEvents();
   // The server to which this test connect returns the decided protocol as a
   // text frame message. So the WebSocketEvent records EVENT_MESSAGE event
   // after EVENT_OPEN event.
   ASSERT_EQ(2U, events.size());
   ASSERT_EQ(WebSocketEvent::EVENT_OPEN, events[0].event_type);
   ASSERT_EQ(WebSocketEvent::EVENT_MESSAGE, events[1].event_type);
   ASSERT_TRUE(AreEqualWithString(events[1].var.pp_var(), protocol.c_str()));
-  ASSERT_TRUE(events[1].was_clean);
 
   PASS();
 }
 
 std::string TestWebSocket::TestUtilityTextSendReceive() {
   const pp::Var protocols[] = { pp::Var() };
   TestWebSocketAPI websocket(instance_);
   int32_t result =
       websocket.Connect(pp::Var(GetFullURL(kEchoServerURL)), protocols, 0U);
   ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
@@ skipping 110 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));
   }
   ASSERT_EQ(WebSocketEvent::EVENT_CLOSE, events[last_event].event_type);
   ASSERT_TRUE(events[last_event].was_clean);
 
   PASS();
 }