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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp

Issue 2572603002: ABANDONED CL: Rename readyState() to getReadyState(). (Closed)
Patch Set: Created 4 years 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
« third_party/WebKit/Source/modules/websockets/DOMWebSocket.h ('K') | « third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp ('k') | third_party/WebKit/Source/modules/websockets/WebSocket.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp
diff --git a/third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp b/third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp
index 9ed57cfd007888b9bbe1cd49fe39ec30bef5efeb..102a556fef04a28cc3c3ebdf97bf84c0ffe3c244 100644
--- a/third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp
+++ b/third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp
@@ -139,7 +139,7 @@ TEST(DOMWebSocketTest, connectToBadURL) {
EXPECT_TRUE(scope.getExceptionState().hadException());
EXPECT_EQ(SyntaxError, scope.getExceptionState().code());
EXPECT_EQ("The URL 'xxx' is invalid.", scope.getExceptionState().message());
- EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, connectToNonWsURL) {
@@ -153,7 +153,7 @@ TEST(DOMWebSocketTest, connectToNonWsURL) {
EXPECT_EQ(
"The URL's scheme must be either 'ws' or 'wss'. 'http' is not allowed.",
scope.getExceptionState().message());
- EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, connectToURLHavingFragmentIdentifier) {
@@ -168,7 +168,7 @@ TEST(DOMWebSocketTest, connectToURLHavingFragmentIdentifier) {
"The URL contains a fragment identifier ('fragment'). Fragment "
"identifiers are not allowed in WebSocket URLs.",
scope.getExceptionState().message());
- EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, invalidPort) {
@@ -180,7 +180,7 @@ TEST(DOMWebSocketTest, invalidPort) {
EXPECT_TRUE(scope.getExceptionState().hadException());
EXPECT_EQ(SecurityError, scope.getExceptionState().code());
EXPECT_EQ("The port 7 is not allowed.", scope.getExceptionState().message());
- EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().getReadyState());
}
// FIXME: Add a test for Content Security Policy.
@@ -199,7 +199,7 @@ TEST(DOMWebSocketTest, invalidSubprotocols) {
EXPECT_EQ(
"The subprotocol '@subprotocol-|'\"x\\u0001\\u0002\\u0003x' is invalid.",
scope.getExceptionState().message());
- EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, insecureRequestsUpgrade) {
@@ -217,7 +217,7 @@ TEST(DOMWebSocketTest, insecureRequestsUpgrade) {
scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
EXPECT_EQ(KURL(KURL(), "wss://example.com/endpoint"),
webSocketScope.socket().url());
}
@@ -237,7 +237,7 @@ TEST(DOMWebSocketTest, insecureRequestsDoNotUpgrade) {
scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
EXPECT_EQ(KURL(KURL(), "ws://example.com/endpoint"),
webSocketScope.socket().url());
}
@@ -262,7 +262,7 @@ TEST(DOMWebSocketTest, channelConnectSuccess) {
scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
EXPECT_EQ(KURL(KURL(), "ws://example.com/hoge"),
webSocketScope.socket().url());
}
@@ -292,7 +292,7 @@ TEST(DOMWebSocketTest, channelConnectFail) {
"An insecure WebSocket connection may not be initiated from a page "
"loaded over HTTPS.",
scope.getExceptionState().message());
- EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, isValidSubprotocolString) {
@@ -337,11 +337,11 @@ TEST(DOMWebSocketTest, connectSuccess) {
scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
webSocketScope.socket().didConnect("bb", "cc");
- EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().getReadyState());
EXPECT_EQ("bb", webSocketScope.socket().protocol());
EXPECT_EQ("cc", webSocketScope.socket().extensions());
}
@@ -360,12 +360,12 @@ TEST(DOMWebSocketTest, didClose) {
scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
webSocketScope.socket().didClose(
WebSocketChannelClient::ClosingHandshakeIncomplete, 1006, "");
- EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, maximumReasonSize) {
@@ -385,13 +385,13 @@ TEST(DOMWebSocketTest, maximumReasonSize) {
scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
webSocketScope.socket().close(1000, reason.toString(),
scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, reasonSizeExceeding) {
@@ -410,7 +410,7 @@ TEST(DOMWebSocketTest, reasonSizeExceeding) {
scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
webSocketScope.socket().close(1000, reason.toString(),
scope.getExceptionState());
@@ -419,7 +419,7 @@ TEST(DOMWebSocketTest, reasonSizeExceeding) {
EXPECT_EQ(SyntaxError, scope.getExceptionState().code());
EXPECT_EQ("The message must not be greater than 123 bytes.",
scope.getExceptionState().message());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, closeWhenConnecting) {
@@ -440,12 +440,12 @@ TEST(DOMWebSocketTest, closeWhenConnecting) {
scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
webSocketScope.socket().close(1000, "bye", scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, close) {
@@ -462,14 +462,14 @@ TEST(DOMWebSocketTest, close) {
scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
webSocketScope.socket().didConnect("", "");
- EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().getReadyState());
webSocketScope.socket().close(3005, "bye", scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, closeWithoutReason) {
@@ -486,14 +486,14 @@ TEST(DOMWebSocketTest, closeWithoutReason) {
scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
webSocketScope.socket().didConnect("", "");
- EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().getReadyState());
webSocketScope.socket().close(3005, scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, closeWithoutCodeAndReason) {
@@ -510,14 +510,14 @@ TEST(DOMWebSocketTest, closeWithoutCodeAndReason) {
scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
webSocketScope.socket().didConnect("", "");
- EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().getReadyState());
webSocketScope.socket().close(scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, closeWhenClosing) {
@@ -534,18 +534,18 @@ TEST(DOMWebSocketTest, closeWhenClosing) {
scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
webSocketScope.socket().didConnect("", "");
- EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().getReadyState());
webSocketScope.socket().close(scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().getReadyState());
webSocketScope.socket().close(scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, closeWhenClosed) {
@@ -563,21 +563,21 @@ TEST(DOMWebSocketTest, closeWhenClosed) {
scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
webSocketScope.socket().didConnect("", "");
- EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().getReadyState());
webSocketScope.socket().close(scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().getReadyState());
webSocketScope.socket().didClose(
WebSocketChannelClient::ClosingHandshakeComplete, 1000, String());
- EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().getReadyState());
webSocketScope.socket().close(scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, sendStringWhenConnecting) {
@@ -599,7 +599,7 @@ TEST(DOMWebSocketTest, sendStringWhenConnecting) {
EXPECT_TRUE(scope.getExceptionState().hadException());
EXPECT_EQ(InvalidStateError, scope.getExceptionState().code());
EXPECT_EQ("Still in CONNECTING state.", scope.getExceptionState().message());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, sendStringWhenClosing) {
@@ -624,7 +624,7 @@ TEST(DOMWebSocketTest, sendStringWhenClosing) {
webSocketScope.socket().send("hello", scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, sendStringWhenClosed) {
@@ -651,7 +651,7 @@ TEST(DOMWebSocketTest, sendStringWhenClosed) {
webSocketScope.socket().send("hello", scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, sendStringSuccess) {
@@ -673,7 +673,7 @@ TEST(DOMWebSocketTest, sendStringSuccess) {
webSocketScope.socket().send("hello", scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, sendNonLatin1String) {
@@ -697,7 +697,7 @@ TEST(DOMWebSocketTest, sendNonLatin1String) {
webSocketScope.socket().send(nonLatin1String, scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, sendArrayBufferWhenConnecting) {
@@ -720,7 +720,7 @@ TEST(DOMWebSocketTest, sendArrayBufferWhenConnecting) {
EXPECT_TRUE(scope.getExceptionState().hadException());
EXPECT_EQ(InvalidStateError, scope.getExceptionState().code());
EXPECT_EQ("Still in CONNECTING state.", scope.getExceptionState().message());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, sendArrayBufferWhenClosing) {
@@ -745,7 +745,7 @@ TEST(DOMWebSocketTest, sendArrayBufferWhenClosing) {
webSocketScope.socket().send(view->buffer(), scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, sendArrayBufferWhenClosed) {
@@ -773,7 +773,7 @@ TEST(DOMWebSocketTest, sendArrayBufferWhenClosed) {
webSocketScope.socket().send(view->buffer(), scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosed, webSocketScope.socket().getReadyState());
}
TEST(DOMWebSocketTest, sendArrayBufferSuccess) {
@@ -796,7 +796,7 @@ TEST(DOMWebSocketTest, sendArrayBufferSuccess) {
webSocketScope.socket().send(view->buffer(), scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kOpen, webSocketScope.socket().getReadyState());
}
// FIXME: We should have Blob tests here.
@@ -839,12 +839,12 @@ TEST_P(DOMWebSocketValidClosingTest, test) {
scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
webSocketScope.socket().close(GetParam(), "bye", scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kClosing, webSocketScope.socket().getReadyState());
}
INSTANTIATE_TEST_CASE_P(DOMWebSocketValidClosing,
@@ -867,7 +867,7 @@ TEST_P(DOMWebSocketInvalidClosingCodeTest, test) {
scope.getExceptionState());
EXPECT_FALSE(scope.getExceptionState().hadException());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
webSocketScope.socket().close(GetParam(), "bye", scope.getExceptionState());
@@ -877,7 +877,7 @@ TEST_P(DOMWebSocketInvalidClosingCodeTest, test) {
"4999. %d is neither.",
GetParam()),
scope.getExceptionState().message());
- EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().readyState());
+ EXPECT_EQ(DOMWebSocket::kConnecting, webSocketScope.socket().getReadyState());
}
INSTANTIATE_TEST_CASE_P(
« third_party/WebKit/Source/modules/websockets/DOMWebSocket.h ('K') | « third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp ('k') | third_party/WebKit/Source/modules/websockets/WebSocket.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698