OLD | NEW |
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 <string.h> | 7 #include <string.h> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ppapi/c/dev/ppb_testing_dev.h" | 10 #include "ppapi/c/dev/ppb_testing_dev.h" |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 CreateVarString("x-test"), | 238 CreateVarString("x-test"), |
239 CreateVarString("x-test") | 239 CreateVarString("x-test") |
240 }; | 240 }; |
241 PP_Var good_protocols[] = { | 241 PP_Var good_protocols[] = { |
242 CreateVarString("x-test"), | 242 CreateVarString("x-test"), |
243 CreateVarString("x-yatest") | 243 CreateVarString("x-yatest") |
244 }; | 244 }; |
245 | 245 |
246 PP_Resource ws = websocket_interface_->Create(instance_->pp_instance()); | 246 PP_Resource ws = websocket_interface_->Create(instance_->pp_instance()); |
247 ASSERT_TRUE(ws); | 247 ASSERT_TRUE(ws); |
| 248 TestCompletionCallback callback(instance_->pp_instance(), force_async_); |
248 int32_t result = websocket_interface_->Connect( | 249 int32_t result = websocket_interface_->Connect( |
249 ws, url, bad_protocols, 2U, PP_BlockUntilComplete()); | 250 ws, url, bad_protocols, 2U, |
| 251 static_cast<pp::CompletionCallback>(callback).pp_completion_callback()); |
| 252 if (result == PP_OK_COMPLETIONPENDING) |
| 253 result = callback.WaitForResult(); |
250 ASSERT_EQ(PP_ERROR_BADARGUMENT, result); | 254 ASSERT_EQ(PP_ERROR_BADARGUMENT, result); |
251 core_interface_->ReleaseResource(ws); | 255 core_interface_->ReleaseResource(ws); |
252 | 256 |
253 ws = websocket_interface_->Create(instance_->pp_instance()); | 257 ws = websocket_interface_->Create(instance_->pp_instance()); |
254 ASSERT_TRUE(ws); | 258 ASSERT_TRUE(ws); |
255 result = websocket_interface_->Connect( | 259 result = websocket_interface_->Connect( |
256 ws, url, good_protocols, 2U, PP_BlockUntilComplete()); | 260 ws, url, good_protocols, 2U, PP_BlockUntilComplete()); |
257 ASSERT_EQ(PP_ERROR_BLOCKS_MAIN_THREAD, result); | 261 ASSERT_EQ(PP_ERROR_BLOCKS_MAIN_THREAD, result); |
258 core_interface_->ReleaseResource(ws); | 262 core_interface_->ReleaseResource(ws); |
259 | 263 |
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
613 ASSERT_EQ(kCloseCodeNormalClosure, ws.GetCloseCode()); | 617 ASSERT_EQ(kCloseCodeNormalClosure, ws.GetCloseCode()); |
614 ASSERT_TRUE(AreEqualWithString(ws.GetCloseReason().pp_var(), reason.c_str())); | 618 ASSERT_TRUE(AreEqualWithString(ws.GetCloseReason().pp_var(), reason.c_str())); |
615 ASSERT_EQ(true, ws.GetCloseWasClean()); | 619 ASSERT_EQ(true, ws.GetCloseWasClean()); |
616 ASSERT_TRUE(AreEqualWithString(ws.GetExtensions().pp_var(), "")); | 620 ASSERT_TRUE(AreEqualWithString(ws.GetExtensions().pp_var(), "")); |
617 ASSERT_TRUE(AreEqualWithString(ws.GetProtocol().pp_var(), "")); | 621 ASSERT_TRUE(AreEqualWithString(ws.GetProtocol().pp_var(), "")); |
618 ASSERT_EQ(PP_WEBSOCKETREADYSTATE_CLOSED_DEV, ws.GetReadyState()); | 622 ASSERT_EQ(PP_WEBSOCKETREADYSTATE_CLOSED_DEV, ws.GetReadyState()); |
619 ASSERT_TRUE(AreEqualWithString(ws.GetURL().pp_var(), kCloseServerURL)); | 623 ASSERT_TRUE(AreEqualWithString(ws.GetURL().pp_var(), kCloseServerURL)); |
620 | 624 |
621 PASS(); | 625 PASS(); |
622 } | 626 } |
OLD | NEW |