Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(704)

Unified Diff: ppapi/tests/test_websocket.cc

Issue 10332138: WebSocket Pepper API: allow to close connection without code and reason (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: uint16_t -> enum Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/tests/test_websocket.cc
diff --git a/ppapi/tests/test_websocket.cc b/ppapi/tests/test_websocket.cc
index 30926551b0c8992183ad1dca85c81681e74b3ab9..9547e0e6ed981068fc4cd9d432914d1c6264b76e 100644
--- a/ppapi/tests/test_websocket.cc
+++ b/ppapi/tests/test_websocket.cc
@@ -467,7 +467,8 @@ std::string TestWebSocket::TestInvalidClose() {
ASSERT_TRUE(ws);
ASSERT_EQ(PP_OK, result);
callback.WaitForResult(websocket_interface_->Close(
- ws, 1U, reason, callback.GetCallback().pp_completion_callback()));
+ ws, static_cast<PP_WebSocketStatusCode>(1), reason,
+ callback.GetCallback().pp_completion_callback()));
ASSERT_EQ(PP_ERROR_NOACCESS, callback.result());
core_interface_->ReleaseResource(ws);
@@ -553,6 +554,16 @@ std::string TestWebSocket::TestValidClose() {
ASSERT_EQ(PP_OK, callback.result());
core_interface_->ReleaseResource(ws);
+ // Close without code and reason.
+ ws = Connect(GetFullURL(kEchoServerURL), &result, "");
+ ASSERT_TRUE(ws);
+ ASSERT_EQ(PP_OK, result);
+ callback.WaitForResult(websocket_interface_->Close(
+ ws, PP_WEBSOCKETSTATUSCODE_NOT_SPECIFIED, reason,
+ callback.GetCallback().pp_completion_callback()));
+ ASSERT_EQ(PP_OK, callback.result());
+ core_interface_->ReleaseResource(ws);
+
// Close with PP_VARTYPE_UNDEFINED.
ws = Connect(GetFullURL(kEchoServerURL), &result, "");
ASSERT_TRUE(ws);
@@ -1174,7 +1185,7 @@ std::string TestWebSocket::TestUtilityInvalidClose() {
NULL, 0);
ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
websocket.WaitForConnected();
- result = websocket.Close(1U, reason);
+ result = websocket.Close(static_cast<PP_WebSocketStatusCode>(1), reason);
ASSERT_EQ(PP_ERROR_NOACCESS, result);
const std::vector<WebSocketEvent>& events = websocket.GetSeenEvents();
ASSERT_EQ(1U, events.size());

Powered by Google App Engine
This is Rietveld 408576698