WebSocket Pepper API: PPB_WebSocket::close must accept undefined reason

ppapi/tests/test_websocket.cc

Index: ppapi/tests/test_websocket.cc
diff --git a/ppapi/tests/test_websocket.cc b/ppapi/tests/test_websocket.cc
index 8e0c29bbeb28f3d6305392b577b7fca2a39867d7..eff333ad5e3c02c738da6813fb7f6ff309495406 100644
--- a/ppapi/tests/test_websocket.cc
+++ b/ppapi/tests/test_websocket.cc
@@ -450,11 +450,12 @@ std::string TestWebSocket::TestValidConnect() {
 std::string TestWebSocket::TestInvalidClose() {
   PP_Var reason = CreateVarString("close for test");
   TestCompletionCallback callback(instance_->pp_instance());
+  TestCompletionCallback another_callback(instance_->pp_instance());
 
   // Close before connect.
   PP_Resource ws = websocket_interface_->Create(instance_->pp_instance());
-  int32_t result = websocket_interface_->Close(
-      ws, PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, reason,
+  int32_t result = websocket_interface_->Close(ws,
+      PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, reason,
       callback.GetCallback().pp_completion_callback());
   ASSERT_EQ(PP_ERROR_FAILED, result);
   core_interface_->ReleaseResource(ws);
@@ -468,6 +469,39 @@ std::string TestWebSocket::TestInvalidClose() {
   ASSERT_EQ(PP_ERROR_NOACCESS, result);
   core_interface_->ReleaseResource(ws);
 
+  // Close with PP_VARTYPE_NULL.
+  ws = Connect(GetFullURL(kEchoServerURL), &result, "");
+  ASSERT_TRUE(ws);
+  ASSERT_EQ(PP_OK, result);
+  result = websocket_interface_->Close(ws,
+      PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, PP_MakeNull(),
+      callback.GetCallback().pp_completion_callback());
+  ASSERT_EQ(PP_ERROR_BADARGUMENT, result);
+  core_interface_->ReleaseResource(ws);
+
+  // Close with PP_VARTYPE_NULL and ongoing receive message.
+  ws = Connect(GetFullURL(kEchoServerURL), &result, "");
+  ASSERT_TRUE(ws);
+  ASSERT_EQ(PP_OK, result);
+  PP_Var receive_message_var;
+  result = websocket_interface_->ReceiveMessage(ws, &receive_message_var,
+      callback.GetCallback().pp_completion_callback());
+  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
+  result = websocket_interface_->Close(ws,
+      PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, PP_MakeNull(),
+      another_callback.GetCallback().pp_completion_callback());
+  ASSERT_EQ(PP_ERROR_BADARGUMENT, result);
+  const char* send_message = "hi";
+  PP_Var send_message_var = CreateVarString(send_message);
+  result = websocket_interface_->SendMessage(ws, send_message_var);
+  ReleaseVar(send_message_var);
+  ASSERT_EQ(PP_OK, result);
+  result = callback.WaitForResult();
+  ASSERT_EQ(PP_OK, result);
+  ASSERT_TRUE(AreEqualWithString(receive_message_var, send_message));
+  ReleaseVar(receive_message_var);
+  core_interface_->ReleaseResource(ws);
+
   ReleaseVar(reason);
 
   PASS();
@@ -493,6 +527,18 @@ std::string TestWebSocket::TestValidClose() {
   ASSERT_EQ(PP_OK, result);
   core_interface_->ReleaseResource(ws);
 
+  // Close with PP_VARTYPE_UNDEFINED.
+  ws = Connect(GetFullURL(kEchoServerURL), &result, "");
+  ASSERT_TRUE(ws);
+  ASSERT_EQ(PP_OK, result);
+  result = websocket_interface_->Close(ws,
+      PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, PP_MakeUndefined(),

[dmichael (off chromium), 2012/04/23 15:14:46]

For what it's worth, I don't think supporting Undefined matters as much for
Pepper as it does for JavaScript, since the parameter is required anyway for
pepper. In JavaScript you could completely omit it. But it seems fine to support
it as you have.

[Takashi Toyoshima, 2012/04/24 06:44:57]

Actually, code and reason arguments are optional not only for JavaScript API,
but also wireframe protocol. The difference can be seen from a server. I wil
make another change to define a constant to omit status code.

+      callback.GetCallback().pp_completion_callback());
+  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
+  result = callback.WaitForResult();
+  ASSERT_EQ(PP_OK, result);
+  core_interface_->ReleaseResource(ws);
+
   // Close in connecting.
   // The ongoing connect failed with PP_ERROR_ABORTED, then the close is done
   // successfully.
@@ -546,6 +592,23 @@ std::string TestWebSocket::TestValidClose() {
   ASSERT_EQ(PP_OK, result);
   core_interface_->ReleaseResource(ws);
 
+  // Close with PP_VARTYPE_UNDEFINED and ongoing receive message.
+  ws = Connect(GetFullURL(kEchoServerURL), &result, "");
+  ASSERT_TRUE(ws);
+  ASSERT_EQ(PP_OK, result);
+  result = websocket_interface_->ReceiveMessage(ws, &receive_message_var,
+      callback.GetCallback().pp_completion_callback());
+  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
+  result = websocket_interface_->Close(ws,
+      PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, PP_MakeUndefined(),
+      another_callback.GetCallback().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);
+
   ReleaseVar(reason);
   ReleaseVar(url);
 
@@ -1311,4 +1374,3 @@ std::string TestWebSocket::TestUtilityBufferedAmount() {
 
   PASS();
 }
-