WebSocket Pepper API: the second Close() should not return error code.

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 484 matching lines @@
   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);
 
+  // Close twice.
+  ws = Connect(GetFullURL(kEchoServerURL), &result, "");
+  ASSERT_TRUE(ws);
+  ASSERT_EQ(PP_OK, result);
+  result = websocket_interface_->Close(ws,
+      PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, reason,
+      callback.GetCallback().pp_completion_callback());
+  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
+  // Call another Close() before previous one is in progress.
+  result = websocket_interface_->Close(ws,
+      PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, reason,
+      another_callback.GetCallback().pp_completion_callback());
+  ASSERT_EQ(PP_ERROR_INPROGRESS, result);
+  result = callback.WaitForResult();
+  ASSERT_EQ(PP_OK, result);
+  // Call another Close() after previous one is completed.
+  // This Close() must do nothing and reports no error.
+  result = websocket_interface_->Close(ws,
+      PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, reason,
+      callback.GetCallback().pp_completion_callback());
+  if (result == PP_OK_COMPLETIONPENDING)
+    result = callback.WaitForResult();
+  ASSERT_EQ(PP_OK, result);

[dmichael (off chromium), 2012/04/24 20:10:14]

optional: I have made a change to TestCompletionCallback and haven't spread it
through all the tests yet. The idea is to call a new WaitForResult that takes an
integer parameter of the result, so that it will automatically do the right
thing (wait for PP_OK_COMPLETIONPENDING, just return otherwise). You can also
use it to make sure the callback is being executed in the right way with the
"CHECK_CALLBACK_BEHAVIOR" macro. You can update this file if you like (here or
in a separate CL). If you don't, I'll do it when I update all the tests. Here's
the CL that had the update:
http://codereview.chromium.org/9937001
Here's an example of how the test code changes:
http://codereview.chromium.org/9937001/diff/12002/ppapi/tests/test_url_loader.cc

[Takashi Toyoshima, 2012/04/25 02:53:30]

OK, I'll make a separate CL for this file.

+  core_interface_->ReleaseResource(ws);
+
   ReleaseVar(reason);
 
   PASS();
 }
 
 std::string TestWebSocket::TestValidClose() {
   PP_Var reason = CreateVarString("close for test");
   PP_Var url = CreateVarString(GetFullURL(kEchoServerURL).c_str());
   PP_Var protocols[] = { PP_MakeUndefined() };
   TestCompletionCallback callback(instance_->pp_instance());
@@ skipping 852 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();
 }