WebSocket Pepper API: Add unit test to call Close()

ppapi/tests/test_websocket.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_websocket.h"
 
 #include <string.h>
 
 #include "ppapi/c/dev/ppb_websocket_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/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/tests/test_utils.h"
 #include "ppapi/tests/testing_instance.h"
 
-static const char kEchoServerURL[] =

[Takashi Toyoshima, 2011/12/06 08:26:48]

Constant variables are not exported out of file by default in C++.
We can remove the static safely.

+const char kEchoServerURL[] =
     "ws://localhost:8880/websocket/tests/hybi/echo";
 
-static const char kProtocolTestServerURL[] =
+const char kProtocolTestServerURL[] =
     "ws://localhost:8880/websocket/tests/hybi/protocol-test?protocol=";
 
-static const char* kInvalidURLs[] = {
+const char* kInvalidURLs[] = {
   "http://www.google.com/invalid_scheme",
   "ws://www.google.com/invalid#fragment",
   "ws://www.google.com:65535/invalid_port",
   NULL
 };
 
+const uint16_t kCloseCodeNormalClosure = 1000;

[Takashi Toyoshima, 2011/12/06 08:26:48]

This value is defined in WebSocket protocol spec.

[dmichael (off chromium), 2011/12/06 17:59:01]

Can you add a comment with a reference to it?

[Takashi Toyoshima, 2011/12/06 18:27:26]

Done.

+
 REGISTER_TEST_CASE(WebSocket);
 
 bool TestWebSocket::Init() {
   websocket_interface_ = static_cast<const PPB_WebSocket_Dev*>(
       pp::Module::Get()->GetBrowserInterface(PPB_WEBSOCKET_DEV_INTERFACE));
   var_interface_ = static_cast<const PPB_Var*>(
       pp::Module::Get()->GetBrowserInterface(PPB_VAR_INTERFACE));
   core_interface_ = static_cast<const PPB_Core*>(
       pp::Module::Get()->GetBrowserInterface(PPB_CORE_INTERFACE));
   if (!websocket_interface_ || !var_interface_ || !core_interface_)
     return false;
 
   return true;
 }
 
 void TestWebSocket::RunTests(const std::string& filter) {
   RUN_TEST(IsWebSocket, filter);
   RUN_TEST(InvalidConnect, filter);
+  RUN_TEST(InvalidClose, filter);
   RUN_TEST(GetURL, filter);
   RUN_TEST(ValidConnect, filter);
+  RUN_TEST(ValidClose, filter);
   RUN_TEST(GetProtocol, filter);
   RUN_TEST(TextSendReceive, filter);
 }
 
 PP_Var TestWebSocket::CreateVar(const char* string) {
   return var_interface_->VarFromUtf8(
       pp::Module::Get()->pp_module(), string, strlen(string));
 }
 
 void TestWebSocket::ReleaseVar(const PP_Var& var) {
@@ skipping 82 matching lines @@
     ASSERT_EQ(PP_ERROR_BADARGUMENT, result);
 
     core_interface_->ReleaseResource(ws);
   }
 
   // TODO(toyoshim): Add invalid protocols tests
 
   PASS();
 }
 
+std::string TestWebSocket::TestInvalidClose() {
+  PP_Var reason = CreateVar("close for test");
+  TestCompletionCallback callback(instance_->pp_instance());
+
+  // Close before connect.
+  PP_Resource ws = websocket_interface_->Create(instance_->pp_instance());
+  int32_t result = websocket_interface_->Close(
+      ws, kCloseCodeNormalClosure, reason,
+      static_cast<pp::CompletionCallback>(callback).pp_completion_callback());
+  ASSERT_EQ(PP_ERROR_FAILED, result);
+  core_interface_->ReleaseResource(ws);
+
+  // Close with bad arguments.
+  ws = Connect(kEchoServerURL, &result, NULL);
+  ASSERT_TRUE(ws);
+  ASSERT_EQ(PP_OK, result);
+  result = websocket_interface_->Close(ws, 1, reason,
+      static_cast<pp::CompletionCallback>(callback).pp_completion_callback());
+  ASSERT_EQ(PP_ERROR_NOACCESS, result);
+  core_interface_->ReleaseResource(ws);
+
+  ReleaseVar(reason);
+
+  PASS();
+}
+
 std::string TestWebSocket::TestGetURL() {
   for (int i = 0; kInvalidURLs[i]; ++i) {
     int32_t result;
     PP_Resource ws = Connect(kInvalidURLs[i], &result, NULL);
     ASSERT_TRUE(ws);
     PP_Var url = websocket_interface_->GetURL(ws);
     ASSERT_TRUE(AreEqual(url, kInvalidURLs[i]));
     ASSERT_EQ(PP_ERROR_BADARGUMENT, result);
 
     ReleaseVar(url);
     core_interface_->ReleaseResource(ws);
   }
 
   PASS();
 }
 
 std::string TestWebSocket::TestValidConnect() {
   int32_t result;
   PP_Resource ws = Connect(kEchoServerURL, &result, NULL);
   ASSERT_TRUE(ws);
   ASSERT_EQ(PP_OK, result);
   core_interface_->ReleaseResource(ws);
 
   PASS();
 }
 
+std::string TestWebSocket::TestValidClose() {
+  PP_Var reason = CreateVar("close for test");
+  PP_Var url = CreateVar(kEchoServerURL);
+  PP_Var protocols[] = { PP_MakeUndefined() };
+  TestCompletionCallback callback(instance_->pp_instance());
+  TestCompletionCallback another_callback(instance_->pp_instance());
+
+  // Close.
+  int32_t result;
+  PP_Resource ws = Connect(kEchoServerURL, &result, NULL);
+  ASSERT_TRUE(ws);
+  ASSERT_EQ(PP_OK, result);
+  result = websocket_interface_->Close(ws, kCloseCodeNormalClosure, reason,
+      static_cast<pp::CompletionCallback>(callback).pp_completion_callback());
+  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
+  result = callback.WaitForResult();
+  core_interface_->ReleaseResource(ws);
+
+  // Close in connecting.
+  // The ongoing connect failed with PP_ERROR_ABORTED, then the close is done
+  // successfully.
+  ws = websocket_interface_->Create(instance_->pp_instance());
+  result = websocket_interface_->Connect(ws, url, protocols, 0,
+      static_cast<pp::CompletionCallback>(callback).pp_completion_callback());
+  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
+  result = websocket_interface_->Close(ws, kCloseCodeNormalClosure, reason,
+      static_cast<pp::CompletionCallback>(
+          another_callback).pp_completion_callback());
+  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
+  result = callback.WaitForResult();
+  ASSERT_EQ(PP_ERROR_ABORTED, result);
+  result = another_callback.WaitForResult();
+  ASSERT_EQ(PP_OK, result);
+  core_interface_->ReleaseResource(ws);
+
+  // Close in closing.
+  // The first close will be done successfully, then the second one failed with
+  // with PP_ERROR_INPROGRESS immediately.
+  ws = Connect(kEchoServerURL, &result, NULL);
+  ASSERT_TRUE(ws);
+  ASSERT_EQ(PP_OK, result);
+  result = websocket_interface_->Close(ws, kCloseCodeNormalClosure, reason,
+      static_cast<pp::CompletionCallback>(callback).pp_completion_callback());
+  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
+  result = websocket_interface_->Close(ws, kCloseCodeNormalClosure, reason,
+      static_cast<pp::CompletionCallback>(
+          another_callback).pp_completion_callback());
+  ASSERT_EQ(PP_ERROR_INPROGRESS, result);
+  result = callback.WaitForResult();
+  ASSERT_EQ(PP_OK, result);
+  core_interface_->ReleaseResource(ws);
+
+  // Close with ongoing receive message.
+  ws = Connect(kEchoServerURL, &result, NULL);
+  ASSERT_TRUE(ws);
+  ASSERT_EQ(PP_OK, result);
+  PP_Var receive_message_var;
+  result = websocket_interface_->ReceiveMessage(ws, &receive_message_var,
+      static_cast<pp::CompletionCallback>(callback).pp_completion_callback());
+  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
+  result = websocket_interface_->Close(ws, kCloseCodeNormalClosure, reason,
+      static_cast<pp::CompletionCallback>(
+          another_callback).pp_completion_callback());
+  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
+  result = callback.WaitForResult();

[Takashi Toyoshima, 2011/12/06 08:26:48]

This |WaitForResult| found the bug.

+  ASSERT_EQ(PP_ERROR_ABORTED, result);
+  result = another_callback.WaitForResult();
+  ASSERT_EQ(PP_OK, result);
+  core_interface_->ReleaseResource(ws);
+
+  PASS();
+}
+
 std::string TestWebSocket::TestGetProtocol() {
   const char* expected_protocols[] = {
     "x-chat",
     "hoehoe",
     NULL
   };
   for (int i = 0; expected_protocols[i]; ++i) {
     std::string url(kProtocolTestServerURL);
     url += expected_protocols[i];
     int32_t result;
@@ skipping 41 matching lines @@
   PASS();
 }
 
 // TODO(toyoshim): Add tests for GetBufferedAmount().
 // For now, the function doesn't work fine because update callback in WebKit is
 // not landed yet.
 
 // TODO(toyoshim): Add tests for didReceiveMessageError().
 
 // TODO(toyoshim): Add other function tests.