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

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

Issue 1257203002: Fix ODR violation that can break WTF::String pretty printing in tests. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Really fix Created 5 years, 4 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
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"
11 #include "core/dom/DOMTypedArray.h" 11 #include "core/dom/DOMTypedArray.h"
12 #include "core/dom/Document.h" 12 #include "core/dom/Document.h"
13 #include "core/dom/ExceptionCode.h" 13 #include "core/dom/ExceptionCode.h"
14 #include "core/dom/SecurityContext.h" 14 #include "core/dom/SecurityContext.h"
15 #include "core/fileapi/Blob.h" 15 #include "core/fileapi/Blob.h"
16 #include "core/frame/ConsoleTypes.h" 16 #include "core/frame/ConsoleTypes.h"
17 #include "core/testing/DummyPageHolder.h" 17 #include "core/testing/DummyPageHolder.h"
18 #include "platform/heap/Handle.h" 18 #include "platform/heap/Handle.h"
19 #include "wtf/OwnPtr.h" 19 #include "wtf/OwnPtr.h"
20 #include "wtf/Vector.h" 20 #include "wtf/Vector.h"
21 #include "wtf/testing/WTFTestHelpers.h"
22 #include "wtf/text/CString.h" 21 #include "wtf/text/CString.h"
23 #include "wtf/text/WTFString.h" 22 #include "wtf/text/WTFString.h"
24 #include <gmock/gmock.h> 23 #include <gmock/gmock.h>
25 #include <gtest/gtest.h> 24 #include <gtest/gtest.h>
26 #include <v8.h> 25 #include <v8.h>
27 26
28 using testing::_; 27 using testing::_;
29 using testing::AnyNumber; 28 using testing::AnyNumber;
30 using testing::InSequence; 29 using testing::InSequence;
31 using testing::Ref; 30 using testing::Ref;
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 EXPECT_EQ(InvalidAccessError, m_exceptionState.code()); 746 EXPECT_EQ(InvalidAccessError, m_exceptionState.code());
748 EXPECT_EQ(String::format("The code must be either 1000, or between 3000 and 4999. %d is neither.", GetParam()), m_exceptionState.message()); 747 EXPECT_EQ(String::format("The code must be either 1000, or between 3000 and 4999. %d is neither.", GetParam()), m_exceptionState.message());
749 EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState()); 748 EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
750 } 749 }
751 750
752 INSTANTIATE_TEST_CASE_P(DOMWebSocketInvalidClosingCode, DOMWebSocketInvalidClosi ngCodeTest, ::testing::Values(0, 1, 998, 999, 1001, 2999, 5000, 9999, 65535)); 751 INSTANTIATE_TEST_CASE_P(DOMWebSocketInvalidClosingCode, DOMWebSocketInvalidClosi ngCodeTest, ::testing::Values(0, 1, 998, 999, 1001, 2999, 5000, 9999, 65535));
753 752
754 } // namespace 753 } // namespace
755 754
756 } // namespace blink 755 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698