IDL: make optional arguments (without default) explicit sometimes

Source/modules/websockets/DOMWebSocketTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "modules/websockets/DOMWebSocket.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/V8Binding.h"
@@ skipping 296 matching lines @@
         EXPECT_CALL(channel(), fail(_, _, _, _));
     }
     String reason;
     for (size_t i = 0; i < 123; ++i)
         reason.append("a");
     m_websocket->connect("ws://example.com/", Vector<String>(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
 
-    m_websocket->close(1000, reason, m_exceptionState);
+    m_websocket->close(makeOptional(1000), reason, m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState());
 }
 
 TEST_F(DOMWebSocketTest, reasonSizeExceeding)
 {
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true));
     }
     String reason;
     for (size_t i = 0; i < 124; ++i)
         reason.append("a");
     m_websocket->connect("ws://example.com/", Vector<String>(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
 
-    m_websocket->close(1000, reason, m_exceptionState);
+    m_websocket->close(makeOptional(1000), reason, m_exceptionState);
 
     EXPECT_TRUE(m_exceptionState.hadException());
     EXPECT_EQ(SyntaxError, m_exceptionState.code());
     EXPECT_EQ("The message must not be greater than 123 bytes.", m_exceptionState.message());
     EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
 }
 
 TEST_F(DOMWebSocketTest, closeWhenConnecting)
 {
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true));
         EXPECT_CALL(channel(), fail(String("WebSocket is closed before the connection is established."), WarningMessageLevel, String(), 0));
     }
     m_websocket->connect("ws://example.com/", Vector<String>(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
 
-    m_websocket->close(1000, "bye", m_exceptionState);
+    m_websocket->close(makeOptional(1000), "bye", m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState());
 }
 
 TEST_F(DOMWebSocketTest, close)
 {
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true));
         EXPECT_CALL(channel(), close(3005, String("bye")));
     }
     m_websocket->connect("ws://example.com/", Vector<String>(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
 
     m_websocket->didConnect("", "");
     EXPECT_EQ(DOMWebSocket::OPEN, m_websocket->readyState());
-    m_websocket->close(3005, "bye", m_exceptionState);
+    m_websocket->close(makeOptional(3005), "bye", m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState());
 }
 
 TEST_F(DOMWebSocketTest, closeWithoutReason)
 {
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true));
         EXPECT_CALL(channel(), close(3005, String()));
     }
     m_websocket->connect("ws://example.com/", Vector<String>(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
 
     m_websocket->didConnect("", "");
     EXPECT_EQ(DOMWebSocket::OPEN, m_websocket->readyState());
-    m_websocket->close(3005, m_exceptionState);
+    m_websocket->close(makeOptional(3005), String(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState());
 }
 
 TEST_F(DOMWebSocketTest, closeWithoutCodeAndReason)
 {
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true));
         EXPECT_CALL(channel(), close(-1, String()));
     }
     m_websocket->connect("ws://example.com/", Vector<String>(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
 
     m_websocket->didConnect("", "");
     EXPECT_EQ(DOMWebSocket::OPEN, m_websocket->readyState());
-    m_websocket->close(m_exceptionState);
+    m_websocket->close(makeOptionalMissing<int>(), String(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState());
 }
 
 TEST_F(DOMWebSocketTest, closeWhenClosing)
 {
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true));
         EXPECT_CALL(channel(), close(-1, String()));
     }
     m_websocket->connect("ws://example.com/", Vector<String>(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
 
     m_websocket->didConnect("", "");
     EXPECT_EQ(DOMWebSocket::OPEN, m_websocket->readyState());
-    m_websocket->close(m_exceptionState);
+    m_websocket->close(makeOptionalMissing<int>(), String(), m_exceptionState);
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState());
 
-    m_websocket->close(m_exceptionState);
+    m_websocket->close(makeOptionalMissing<int>(), String(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState());
 }
 
 TEST_F(DOMWebSocketTest, closeWhenClosed)
 {
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true));
         EXPECT_CALL(channel(), close(-1, String()));
         EXPECT_CALL(channel(), disconnect());
     }
     m_websocket->connect("ws://example.com/", Vector<String>(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
 
     m_websocket->didConnect("", "");
     EXPECT_EQ(DOMWebSocket::OPEN, m_websocket->readyState());
-    m_websocket->close(m_exceptionState);
+    m_websocket->close(makeOptionalMissing<int>(), String(), m_exceptionState);
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState());
 
     m_websocket->didClose(WebSocketChannelClient::ClosingHandshakeComplete, 1000, String());
     EXPECT_EQ(DOMWebSocket::CLOSED, m_websocket->readyState());
-    m_websocket->close(m_exceptionState);
+    m_websocket->close(makeOptionalMissing<int>(), String(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CLOSED, m_websocket->readyState());
 }
 
 TEST_F(DOMWebSocketTest, sendStringWhenConnecting)
 {
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true));
@@ skipping 15 matching lines @@
     Checkpoint checkpoint;
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true));
         EXPECT_CALL(channel(), fail(_, _, _, _));
     }
     m_websocket->connect("ws://example.com/", Vector<String>(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
 
-    m_websocket->close(m_exceptionState);
+    m_websocket->close(makeOptionalMissing<int>(), String(), m_exceptionState);
     EXPECT_FALSE(m_exceptionState.hadException());
 
     m_websocket->send("hello", m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState());
 }
 
 TEST_F(DOMWebSocketTest, sendStringWhenClosed)
 {
@@ skipping 59 matching lines @@
     RefPtr<ArrayBufferView> view = Uint8Array::create(8);
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true));
         EXPECT_CALL(channel(), fail(_, _, _, _));
     }
     m_websocket->connect("ws://example.com/", Vector<String>(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
 
-    m_websocket->close(m_exceptionState);
+    m_websocket->close(makeOptionalMissing<int>(), String(), m_exceptionState);
     EXPECT_FALSE(m_exceptionState.hadException());
 
     m_websocket->send(view->buffer().get(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState());
 }
 
 TEST_F(DOMWebSocketTest, sendArrayBufferWhenClosed)
 {
@@ skipping 76 matching lines @@
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true));
         EXPECT_CALL(channel(), fail(_, _, _, _));
     }
     m_websocket->connect("ws://example.com/", Vector<String>(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
 
-    m_websocket->close(GetParam(), "bye", m_exceptionState);
+    m_websocket->close(makeOptional(GetParam()), "bye", m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState());
 }
 
 INSTANTIATE_TEST_CASE_P(DOMWebSocketValidClosing, DOMWebSocketValidClosingTest, ::testing::Values(1000, 3000, 3001, 4998, 4999));
 
 class DOMWebSocketInvalidClosingCodeTest : public DOMWebSocketTestBase, public ::testing::TestWithParam<unsigned short> {
 public:
 };
 
 TEST_P(DOMWebSocketInvalidClosingCodeTest, test)
 {
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true));
     }
     m_websocket->connect("ws://example.com/", Vector<String>(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
 
-    m_websocket->close(GetParam(), "bye", m_exceptionState);
+    m_websocket->close(makeOptional(GetParam()), "bye", m_exceptionState);
 
     EXPECT_TRUE(m_exceptionState.hadException());
     EXPECT_EQ(InvalidAccessError, m_exceptionState.code());
     EXPECT_EQ(String::format("The code must be either 1000, or between 3000 and 4999. %d is neither.", GetParam()), m_exceptionState.message());
     EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
 }
 
 INSTANTIATE_TEST_CASE_P(DOMWebSocketInvalidClosingCode, DOMWebSocketInvalidClosingCodeTest, ::testing::Values(0, 1, 998, 999, 1001, 2999, 5000, 9999, 65535));
 
 } // namespace
 
 } // namespace blink