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

Side by Side Diff: Source/modules/websockets/DOMWebSocketTest.cpp

Issue 1053013006: Revert of Use enum BinaryType for WebSocket.binaryType, instead of DOMString (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « Source/modules/websockets/DOMWebSocket.cpp ('k') | Source/modules/websockets/WebSocket.idl » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "config.h" 5 #include "config.h"
6 #include "modules/websockets/DOMWebSocket.h" 6 #include "modules/websockets/DOMWebSocket.h"
7 7
8 #include "bindings/core/v8/ExceptionState.h" 8 #include "bindings/core/v8/ExceptionState.h"
9 #include "bindings/core/v8/V8Binding.h" 9 #include "bindings/core/v8/V8Binding.h"
10 #include "bindings/core/v8/V8BindingForTesting.h" 10 #include "bindings/core/v8/V8BindingForTesting.h"
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 // We can't create a Blob because the blob registration cannot be mocked yet. 659 // We can't create a Blob because the blob registration cannot be mocked yet.
660 660
661 // FIXME: We should add tests for bufferedAmount. 661 // FIXME: We should add tests for bufferedAmount.
662 662
663 // FIXME: We should add tests for data receiving. 663 // FIXME: We should add tests for data receiving.
664 664
665 TEST_F(DOMWebSocketTest, binaryType) 665 TEST_F(DOMWebSocketTest, binaryType)
666 { 666 {
667 EXPECT_EQ("blob", m_websocket->binaryType()); 667 EXPECT_EQ("blob", m_websocket->binaryType());
668 668
669 m_websocket->setBinaryType("hoge");
670
671 EXPECT_EQ("blob", m_websocket->binaryType());
672
669 m_websocket->setBinaryType("arraybuffer"); 673 m_websocket->setBinaryType("arraybuffer");
670 674
671 EXPECT_EQ("arraybuffer", m_websocket->binaryType()); 675 EXPECT_EQ("arraybuffer", m_websocket->binaryType());
672 676
677 m_websocket->setBinaryType("fuga");
678
679 EXPECT_EQ("arraybuffer", m_websocket->binaryType());
680
673 m_websocket->setBinaryType("blob"); 681 m_websocket->setBinaryType("blob");
674 682
675 EXPECT_EQ("blob", m_websocket->binaryType()); 683 EXPECT_EQ("blob", m_websocket->binaryType());
676 } 684 }
677 685
678 class DOMWebSocketDeathTest : public DOMWebSocketTestBase, public ::testing::Tes t {
679 public:
680 };
681
682 TEST_F(DOMWebSocketDeathTest, binaryType)
683 {
684 m_websocket->setBinaryType("arraybuffer");
685
686 EXPECT_EQ("arraybuffer", m_websocket->binaryType());
687 EXPECT_DEATH(m_websocket->setBinaryType("hoge"), "");
688 EXPECT_EQ("arraybuffer", m_websocket->binaryType());
689 }
690
691 // FIXME: We should add tests for suspend / resume. 686 // FIXME: We should add tests for suspend / resume.
692 687
693 class DOMWebSocketValidClosingTest : public DOMWebSocketTestBase, public ::testi ng::TestWithParam<unsigned short> { 688 class DOMWebSocketValidClosingTest : public DOMWebSocketTestBase, public ::testi ng::TestWithParam<unsigned short> {
694 public: 689 public:
695 }; 690 };
696 691
697 TEST_P(DOMWebSocketValidClosingTest, test) 692 TEST_P(DOMWebSocketValidClosingTest, test)
698 { 693 {
699 { 694 {
700 InSequence s; 695 InSequence s;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 EXPECT_EQ(InvalidAccessError, m_exceptionState.code()); 730 EXPECT_EQ(InvalidAccessError, m_exceptionState.code());
736 EXPECT_EQ(String::format("The code must be either 1000, or between 3000 and 4999. %d is neither.", GetParam()), m_exceptionState.message()); 731 EXPECT_EQ(String::format("The code must be either 1000, or between 3000 and 4999. %d is neither.", GetParam()), m_exceptionState.message());
737 EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState()); 732 EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
738 } 733 }
739 734
740 INSTANTIATE_TEST_CASE_P(DOMWebSocketInvalidClosingCode, DOMWebSocketInvalidClosi ngCodeTest, ::testing::Values(0, 1, 998, 999, 1001, 2999, 5000, 9999, 65535)); 735 INSTANTIATE_TEST_CASE_P(DOMWebSocketInvalidClosingCode, DOMWebSocketInvalidClosi ngCodeTest, ::testing::Values(0, 1, 998, 999, 1001, 2999, 5000, 9999, 65535));
741 736
742 } // namespace 737 } // namespace
743 738
744 } // namespace blink 739 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/websockets/DOMWebSocket.cpp ('k') | Source/modules/websockets/WebSocket.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698