Changeset 161473 in webkit

Timestamp:

Jan 7, 2014 5:03:46 PM (10 years ago)

Author:

Simon Fraser

Message:

Add message-generation test for non-legacy message receiver
​https://bugs.webkit.org/show_bug.cgi?id=126603

Reviewed by Anders Carlsson.

Add expected output files for a non-legacy message receiver, and add
testing for same.

• Scripts/webkit2/LegacyMessageReceiver-expected.cpp: Copied from Source/WebKit2/Scripts/webkit2/MessageReceiver-expected.cpp.
• Scripts/webkit2/LegacyMessages-expected.h: Added.
• Scripts/webkit2/MessageReceiver-expected.cpp:

(WebKit::WebPage::didReceiveMessage):
(WebKit::WebPage::didReceiveSyncMessage):

• Scripts/webkit2/messages_unittest.py:

(MessagesTest.setUp):
(ParsingTest.test_receiver):
(HeaderTest.test_header):
(ReceiverImplementationTest.test_receiver_implementation):

• Scripts/webkit2/test-legacy-messages.in: Copied from Source/WebKit2/Scripts/webkit2/test-messages.in.
• Scripts/webkit2/test-messages.in:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkit2/LegacyMessageReceiver-expected.cpp (copied) (copied from trunk/Source/WebKit2/Scripts/webkit2/MessageReceiver-expected.cpp)
• Scripts/webkit2/LegacyMessages-expected.h (added)
• Scripts/webkit2/MessageReceiver-expected.cpp (modified) (3 diffs)
• Scripts/webkit2/messages_unittest.py (modified) (4 diffs)
• Scripts/webkit2/test-legacy-messages.in (copied) (copied from trunk/Source/WebKit2/Scripts/webkit2/test-messages.in)
• Scripts/webkit2/test-messages.in (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-07  Simon Fraser  <simon.fraser@apple.com>
+
+        Add message-generation test for non-legacy message receiver
+        https://bugs.webkit.org/show_bug.cgi?id=126603
+
+        Reviewed by Anders Carlsson.
+        
+        Add expected output files for a non-legacy message receiver, and add
+        testing for same.
+
+        * Scripts/webkit2/LegacyMessageReceiver-expected.cpp: Copied from Source/WebKit2/Scripts/webkit2/MessageReceiver-expected.cpp.
+        * Scripts/webkit2/LegacyMessages-expected.h: Added.
+        * Scripts/webkit2/MessageReceiver-expected.cpp:
+        (WebKit::WebPage::didReceiveMessage):
+        (WebKit::WebPage::didReceiveSyncMessage):
+        * Scripts/webkit2/messages_unittest.py:
+        (MessagesTest.setUp):
+        (ParsingTest.test_receiver):
+        (HeaderTest.test_header):
+        (ReceiverImplementationTest.test_receiver_implementation):
+        * Scripts/webkit2/test-legacy-messages.in: Copied from Source/WebKit2/Scripts/webkit2/test-messages.in.
+        * Scripts/webkit2/test-messages.in:
+
 2014-01-07  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/Scripts/webkit2/MessageReceiver-expected.cpp

@@ -104 +104 @@
 namespace WebKit {
 
-void WebPage::didReceiveWebPageMessage(IPC::Connection*, IPC::MessageDecoder& decoder)
+void WebPage::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
 {
     if (decoder.messageName() == Messages::WebPage::LoadURL::name()) {
@@ -180 +180 @@
     }
 #endif
+    UNUSED_PARAM(connection);
     ASSERT_NOT_REACHED();
 }
 
-void WebPage::didReceiveSyncWebPageMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
+void WebPage::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
 {
     if (decoder.messageName() == Messages::WebPage::CreatePlugin::name()) {
@@ -211 +212 @@
     }
 #endif
+    UNUSED_PARAM(connection);
     ASSERT_NOT_REACHED();
 }

trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py

@@ -32 +32 @@
 script_directory = os.path.dirname(os.path.realpath(__file__))
 
+with open(os.path.join(script_directory, 'test-legacy-messages.in')) as file:
+    _legacy_messages_file_contents = file.read()
+
 with open(os.path.join(script_directory, 'test-messages.in')) as file:
     _messages_file_contents = file.read()
 
+with open(os.path.join(script_directory, 'LegacyMessages-expected.h')) as file:
+    _expected_legacy_receiver_header = file.read()
+
 with open(os.path.join(script_directory, 'Messages-expected.h')) as file:
-    _expected_header = file.read()
+    _expected_receiver_header = file.read()
 
 with open(os.path.join(script_directory, 'MessageReceiver-expected.cpp')) as file:
     _expected_receiver_implementation = file.read()
+
+with open(os.path.join(script_directory, 'LegacyMessageReceiver-expected.cpp')) as file:
+    _expected_legacy_receiver_implementation = file.read()
 
 _expected_results = {
@@ -219 +228 @@
     def setUp(self):
         self.receiver = parser.parse(StringIO(_messages_file_contents))
+        self.legacy_receiver = parser.parse(StringIO(_legacy_messages_file_contents))
 
 
@@ -251 +261 @@
             self.check_message(message, _expected_results['messages'][index])
 
+        self.assertEquals(self.legacy_receiver.name, _expected_results['name'])
+        self.assertEquals(self.legacy_receiver.condition, _expected_results['conditions'])
+        self.assertEquals(len(self.legacy_receiver.messages), len(_expected_results['messages']))
+        for index, message in enumerate(self.legacy_receiver.messages):
+            self.check_message(message, _expected_results['messages'][index])
+
 
 
@@ -266 +282 @@
 class HeaderTest(GeneratedFileContentsTest):
     def test_header(self):
+        legacy_file_contents = messages.generate_messages_header(StringIO(_legacy_messages_file_contents))
+        self.assertGeneratedFileContentsEqual(legacy_file_contents, _expected_legacy_receiver_header)
+
         file_contents = messages.generate_messages_header(StringIO(_messages_file_contents))
-        self.assertGeneratedFileContentsEqual(file_contents, _expected_header)
+        self.assertGeneratedFileContentsEqual(file_contents, _expected_receiver_header)
 
 
 class ReceiverImplementationTest(GeneratedFileContentsTest):
     def test_receiver_implementation(self):
+        legacy_file_contents = messages.generate_message_handler(StringIO(_legacy_messages_file_contents))
+        self.assertGeneratedFileContentsEqual(legacy_file_contents, _expected_legacy_receiver_implementation)
+
         file_contents = messages.generate_message_handler(StringIO(_messages_file_contents))
         self.assertGeneratedFileContentsEqual(file_contents, _expected_receiver_implementation)

trunk/Source/WebKit2/Scripts/webkit2/test-messages.in

@@ -24 +24 @@
 #if NESTED_MASTER_CONDITION || MASTER_OR && MASTER_AND
 
-messages -> WebPage LegacyReceiver {
+messages -> WebPage {
     LoadURL(String url)
 #if ENABLE(TOUCH_EVENTS)