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

Side by Side 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: revert enum name change Created 8 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ppapi/c/ppb_websocket.h ('k') | webkit/plugins/ppapi/ppb_websocket_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ppapi/tests/test_websocket.h" 5 #include "ppapi/tests/test_websocket.h"
6 6
7 #include <stdio.h> 7 #include <stdio.h>
8 #include <string.h> 8 #include <string.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 PP_Resource ws = Connect(GetFullURL(kEchoServerURL), &result, ""); 546 PP_Resource ws = Connect(GetFullURL(kEchoServerURL), &result, "");
547 ASSERT_TRUE(ws); 547 ASSERT_TRUE(ws);
548 ASSERT_EQ(PP_OK, result); 548 ASSERT_EQ(PP_OK, result);
549 callback.WaitForResult(websocket_interface_->Close( 549 callback.WaitForResult(websocket_interface_->Close(
550 ws, PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, reason, 550 ws, PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, reason,
551 callback.GetCallback().pp_completion_callback())); 551 callback.GetCallback().pp_completion_callback()));
552 CHECK_CALLBACK_BEHAVIOR(callback); 552 CHECK_CALLBACK_BEHAVIOR(callback);
553 ASSERT_EQ(PP_OK, callback.result()); 553 ASSERT_EQ(PP_OK, callback.result());
554 core_interface_->ReleaseResource(ws); 554 core_interface_->ReleaseResource(ws);
555 555
556 // Close without code and reason.
557 ws = Connect(GetFullURL(kEchoServerURL), &result, "");
558 ASSERT_TRUE(ws);
559 ASSERT_EQ(PP_OK, result);
560 callback.WaitForResult(websocket_interface_->Close(
561 ws, PP_WEBSOCKETSTATUSCODE_NOT_SPECIFIED, reason,
562 callback.GetCallback().pp_completion_callback()));
563 ASSERT_EQ(PP_OK, callback.result());
564 core_interface_->ReleaseResource(ws);
565
556 // Close with PP_VARTYPE_UNDEFINED. 566 // Close with PP_VARTYPE_UNDEFINED.
557 ws = Connect(GetFullURL(kEchoServerURL), &result, ""); 567 ws = Connect(GetFullURL(kEchoServerURL), &result, "");
558 ASSERT_TRUE(ws); 568 ASSERT_TRUE(ws);
559 ASSERT_EQ(PP_OK, result); 569 ASSERT_EQ(PP_OK, result);
560 callback.WaitForResult(websocket_interface_->Close( 570 callback.WaitForResult(websocket_interface_->Close(
561 ws, PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, PP_MakeUndefined(), 571 ws, PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, PP_MakeUndefined(),
562 callback.GetCallback().pp_completion_callback())); 572 callback.GetCallback().pp_completion_callback()));
563 CHECK_CALLBACK_BEHAVIOR(callback); 573 CHECK_CALLBACK_BEHAVIOR(callback);
564 ASSERT_EQ(PP_OK, callback.result()); 574 ASSERT_EQ(PP_OK, callback.result());
565 core_interface_->ReleaseResource(ws); 575 core_interface_->ReleaseResource(ws);
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after
1397 size_t last_event = events_on_closed - 1; 1407 size_t last_event = events_on_closed - 1;
1398 for (uint32_t i = 1; i < last_event; ++i) { 1408 for (uint32_t i = 1; i < last_event; ++i) {
1399 ASSERT_EQ(WebSocketEvent::EVENT_MESSAGE, events[i].event_type); 1409 ASSERT_EQ(WebSocketEvent::EVENT_MESSAGE, events[i].event_type);
1400 ASSERT_TRUE(AreEqualWithString(events[i].var.pp_var(), message)); 1410 ASSERT_TRUE(AreEqualWithString(events[i].var.pp_var(), message));
1401 } 1411 }
1402 ASSERT_EQ(WebSocketEvent::EVENT_CLOSE, events[last_event].event_type); 1412 ASSERT_EQ(WebSocketEvent::EVENT_CLOSE, events[last_event].event_type);
1403 ASSERT_TRUE(events[last_event].was_clean); 1413 ASSERT_TRUE(events[last_event].was_clean);
1404 1414
1405 PASS(); 1415 PASS();
1406 } 1416 }
OLDNEW
« no previous file with comments | « ppapi/c/ppb_websocket.h ('k') | webkit/plugins/ppapi/ppb_websocket_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698