Changeset 237298 in webkit

Timestamp:

Oct 19, 2018, 1:18:28 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Update and add python tests after r237294
​https://bugs.webkit.org/show_bug.cgi?id=190746

• Scripts/Makefile: Added to help updating expectations.
• Scripts/webkit/LegacyMessageReceiver-expected.cpp:
• Scripts/webkit/MessageReceiverSuperclass-expected.cpp:

(Messages::WebPage::TestAsyncMessage::callReply):
(Messages::WebPage::TestAsyncMessage::cancelReply):
(Messages::WebPage::TestAsyncMessage::send):
(WebKit::WebPage::didReceiveMessage):

• Scripts/webkit/MessagesSuperclass-expected.h:

(Messages::WebPage::TestAsyncMessage::receiverName):
(Messages::WebPage::TestAsyncMessage::name):
(Messages::WebPage::TestAsyncMessage::asyncMessageReplyName):
(Messages::WebPage::TestAsyncMessage::TestAsyncMessage):
(Messages::WebPage::TestAsyncMessage::arguments const):

• Scripts/webkit/test-superclass-messages.in:

Adding the extra newline made python tests fail.
I also added more tests for the new functionality introduced in r237924.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Scripts/Makefile (added)
• Scripts/webkit/LegacyMessageReceiver-expected.cpp (modified) (1 diff)
• Scripts/webkit/MessageReceiverSuperclass-expected.cpp (modified) (2 diffs)
• Scripts/webkit/MessagesSuperclass-expected.h (modified) (2 diffs)
• Scripts/webkit/test-superclass-messages.in (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-10-19  Alex Christensen  <achristensen@webkit.org>
+
+        Update and add python tests after r237294
+        https://bugs.webkit.org/show_bug.cgi?id=190746
+
+        * Scripts/Makefile: Added to help updating expectations.
+        * Scripts/webkit/LegacyMessageReceiver-expected.cpp:
+        * Scripts/webkit/MessageReceiverSuperclass-expected.cpp:
+        (Messages::WebPage::TestAsyncMessage::callReply):
+        (Messages::WebPage::TestAsyncMessage::cancelReply):
+        (Messages::WebPage::TestAsyncMessage::send):
+        (WebKit::WebPage::didReceiveMessage):
+        * Scripts/webkit/MessagesSuperclass-expected.h:
+        (Messages::WebPage::TestAsyncMessage::receiverName):
+        (Messages::WebPage::TestAsyncMessage::name):
+        (Messages::WebPage::TestAsyncMessage::asyncMessageReplyName):
+        (Messages::WebPage::TestAsyncMessage::TestAsyncMessage):
+        (Messages::WebPage::TestAsyncMessage::arguments const):
+        * Scripts/webkit/test-superclass-messages.in:
+        Adding the extra newline made python tests fail.
+        I also added more tests for the new functionality introduced in r237924.
+
 2018-10-19  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/Scripts/webkit/LegacyMessageReceiver-expected.cpp

@@ -198 +198 @@
 } // namespace WebKit
 
+
 #endif // (ENABLE(WEBKIT2) && (NESTED_MASTER_CONDITION || MASTER_OR && MASTER_AND))

trunk/Source/WebKit/Scripts/webkit/MessageReceiverSuperclass-expected.cpp

@@ -30 +30 @@
 #include "Decoder.h"
 #include "HandleMessage.h"
+#if ENABLE(TEST_FEATURE)
+#include "TestTwoStateEnum.h"
+#endif
 #include "WebPageMessages.h"
 #include <wtf/text/WTFString.h>
+
+namespace Messages {
+
+namespace WebPage {
+
+#if ENABLE(TEST_FEATURE)
+
+void TestAsyncMessage::callReply(IPC::Decoder& decoder, CompletionHandler<void(uint64_t&&)>&& completionHandler)
+{
+    std::optional<uint64_t> result;
+    decoder >> result;
+    if (!result) {
+        ASSERT_NOT_REACHED();
+        return;
+    }
+    completionHandler(WTFMove(*result));
+}
+
+void TestAsyncMessage::cancelReply(CompletionHandler<void(uint64_t&&)>&& completionHandler)
+{
+    completionHandler({ });
+}
+
+void TestAsyncMessage::send(std::unique_ptr<IPC::Encoder>&& encoder, IPC::Connection& connection, uint64_t result)
+{
+    *encoder << result;
+    connection.sendSyncReply(WTFMove(encoder));
+}
+
+#endif
+
+} // namespace WebPage
+
+} // namespace Messages
 
 namespace WebKit {
@@ -41 +78 @@
         return;
     }
+#if ENABLE(TEST_FEATURE)
+    if (decoder.messageName() == Messages::WebPage::TestAsyncMessage::name()) {
+        IPC::handleMessageAsync<Messages::WebPage::TestAsyncMessage>(connection, decoder, this, &WebPage::testAsyncMessage);
+        return;
+    }
+#endif
     WebPageBase::didReceiveMessage(connection, decoder);
 }
 
 } // namespace WebKit
+

trunk/Source/WebKit/Scripts/webkit/MessagesSuperclass-expected.h

@@ -29 +29 @@
 #include <wtf/text/WTFString.h>
 
+namespace WebKit {
+    enum class TestTwoStateEnum : bool;
+}
 
 namespace Messages {
@@ -60 +63 @@
 };
 
+#if ENABLE(TEST_FEATURE)
+class TestAsyncMessage {
+public:
+    typedef std::tuple<WebKit::TestTwoStateEnum> Arguments;
+
+    static IPC::StringReference receiverName() { return messageReceiverName(); }
+    static IPC::StringReference name() { return IPC::StringReference("TestAsyncMessage"); }
+    static const bool isSync = false;
+
+    static void callReply(IPC::Decoder&, CompletionHandler<void(uint64_t&&)>&&);
+    static void cancelReply(CompletionHandler<void(uint64_t&&)>&&);
+    static IPC::StringReference asyncMessageReplyName() { return { "TestAsyncMessageReply" }; }
+    using AsyncReply = CompletionHandler<void(uint64_t result)>;
+    static void send(std::unique_ptr<IPC::Encoder>&&, IPC::Connection&, uint64_t result);
+    typedef std::tuple<uint64_t&> Reply;
+    explicit TestAsyncMessage(WebKit::TestTwoStateEnum twoStateEnum)
+        : m_arguments(twoStateEnum)
+    {
+    }
+
+    const Arguments& arguments() const
+    {
+        return m_arguments;
+    }
+
+private:
+    Arguments m_arguments;
+};
+#endif
+
 } // namespace WebPage
 } // namespace Messages

trunk/Source/WebKit/Scripts/webkit/test-superclass-messages.in

@@ -23 +23 @@
 messages -> WebPage : WebPageBase {
     LoadURL(String url)
+#if ENABLE(TEST_FEATURE)
+    TestAsyncMessage(enum:bool WebKit::TestTwoStateEnum twoStateEnum) -> (uint64_t result) Async
+#endif
 }