34755 2010-02-09 07:59:53 -0800 [Qt] Unit test for window.showModalDialog 2010-02-09 18:30:54 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Qt P2 Normal --- 1 yael webkit-unassigned hausmann oldest_to_newest 189021 0 yael 2010-02-09 07:59:53 -0800 After r54550, QtWebKit supports window.runModalDialog, but it does not have a unit test yet. 189106 1 48434 yael 2010-02-09 12:02:29 -0800 Created attachment 48434 Patch v1 Add unit test for window.showModalDialog 189110 2 48434 abarth 2010-02-09 12:05:44 -0800 Comment on attachment 48434 Patch v1 LGTM 189206 3 yael 2010-02-09 18:30:14 -0800 Landed as: http://trac.webkit.org/changeset/54578 189207 4 48434 yael 2010-02-09 18:30:54 -0800 Comment on attachment 48434 Patch v1 > Index: WebKit/qt/tests/qwebpage/tst_qwebpage.cpp > =================================================================== > --- WebKit/qt/tests/qwebpage/tst_qwebpage.cpp (revision 54545) > +++ WebKit/qt/tests/qwebpage/tst_qwebpage.cpp (working copy) > @@ -110,6 +110,7 @@ > > void originatingObjectInNetworkRequests(); > void testJSPrompt(); > + void showModalDialog(); > > private: > QWebView* m_view; > @@ -1828,5 +1829,26 @@ > QVERIFY(res); > } > > +class TestModalPage : public QWebPage > +{ > + Q_OBJECT > +public: > + TestModalPage(QObject* parent = 0) : QWebPage(parent) { > + } > + virtual QWebPage* createWindow(WebWindowType) { > + QWebPage* page = new TestModalPage(); > + connect(page, SIGNAL(windowCloseRequested()), page, SLOT(deleteLater())); > + return page; > + } > +}; > + > +void tst_QWebPage::showModalDialog() > +{ > + TestModalPage page; > + page.mainFrame()->setHtml(QString("<html></html>")); > + QString res = page.mainFrame()->evaluateJavaScript("window.showModalDialog('javascript:window.returnValue=dialogArguments; window.close();', 'This is a test');").toString(); > + QCOMPARE(res, QString("This is a test")); > +} > + > QTEST_MAIN(tst_QWebPage) > #include "tst_qwebpage.moc" > Index: WebKit/qt/ChangeLog > =================================================================== > --- WebKit/qt/ChangeLog (revision 54561) > +++ WebKit/qt/ChangeLog (working copy) > @@ -1,5 +1,17 @@ > 2010-02-09 Yael Aharon <yael.aharon@nokia.com> > > + Reviewed by NOBODY (OOPS!). > + > + [Qt] Unit test for window.runModalDialog > + https://bugs.webkit.org/show_bug.cgi?id=34755 > + > + * tests/qwebpage/tst_qwebpage.cpp: > + (TestModalPage::TestModalPage): > + (TestModalPage::createWindow): > + (tst_QWebPage::showModalDialog): > + > +2010-02-09 Yael Aharon <yael.aharon@nokia.com> > + > Reviewed by Kenneth Rohde Christiansen. > > [Qt] Webkit in Qt does not have window.showModalDialog Clearing flags. 48434 2010-02-09 12:02:29 -0800 2010-02-09 18:30:54 -0800 Patch v1 34755.patch text/plain 1935 yael SW5kZXg6IFdlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCShyZXZpc2lv biA1NDU0NSkKKysrIFdlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xMTAsNiArMTEwLDcgQEAKIAogICAgIHZvaWQgb3JpZ2luYXRpbmdP YmplY3RJbk5ldHdvcmtSZXF1ZXN0cygpOwogICAgIHZvaWQgdGVzdEpTUHJvbXB0KCk7CisgICAg dm9pZCBzaG93TW9kYWxEaWFsb2coKTsKIAogcHJpdmF0ZToKICAgICBRV2ViVmlldyogbV92aWV3 OwpAQCAtMTgyOCw1ICsxODI5LDI2IEBACiAgICAgUVZFUklGWShyZXMpOwogfQogCitjbGFzcyBU ZXN0TW9kYWxQYWdlIDogcHVibGljIFFXZWJQYWdlCit7CisgICAgUV9PQkpFQ1QKK3B1YmxpYzoK KyAgICBUZXN0TW9kYWxQYWdlKFFPYmplY3QqIHBhcmVudCA9IDApIDogUVdlYlBhZ2UocGFyZW50 KSB7CisgICAgfQorICAgIHZpcnR1YWwgUVdlYlBhZ2UqIGNyZWF0ZVdpbmRvdyhXZWJXaW5kb3dU eXBlKSB7CisgICAgICAgIFFXZWJQYWdlKiBwYWdlID0gbmV3IFRlc3RNb2RhbFBhZ2UoKTsKKyAg ICAgICAgY29ubmVjdChwYWdlLCBTSUdOQUwod2luZG93Q2xvc2VSZXF1ZXN0ZWQoKSksIHBhZ2Us IFNMT1QoZGVsZXRlTGF0ZXIoKSkpOworICAgICAgICByZXR1cm4gcGFnZTsKKyAgICB9Cit9Owor Cit2b2lkIHRzdF9RV2ViUGFnZTo6c2hvd01vZGFsRGlhbG9nKCkKK3sKKyAgICBUZXN0TW9kYWxQ YWdlIHBhZ2U7CisgICAgcGFnZS5tYWluRnJhbWUoKS0+c2V0SHRtbChRU3RyaW5nKCI8aHRtbD48 L2h0bWw+IikpOworICAgIFFTdHJpbmcgcmVzID0gcGFnZS5tYWluRnJhbWUoKS0+ZXZhbHVhdGVK YXZhU2NyaXB0KCJ3aW5kb3cuc2hvd01vZGFsRGlhbG9nKCdqYXZhc2NyaXB0OndpbmRvdy5yZXR1 cm5WYWx1ZT1kaWFsb2dBcmd1bWVudHM7IHdpbmRvdy5jbG9zZSgpOycsICdUaGlzIGlzIGEgdGVz dCcpOyIpLnRvU3RyaW5nKCk7CisgICAgUUNPTVBBUkUocmVzLCBRU3RyaW5nKCJUaGlzIGlzIGEg dGVzdCIpKTsKK30KKwogUVRFU1RfTUFJTih0c3RfUVdlYlBhZ2UpCiAjaW5jbHVkZSAidHN0X3F3 ZWJwYWdlLm1vYyIKSW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L3F0L0NoYW5nZUxvZwkocmV2aXNpb24gNTQ1NjEpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTAtMDItMDkgIFlhZWwgQWhhcm9u ICA8eWFlbC5haGFyb25Abm9raWEuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtRdF0gVW5pdCB0ZXN0IGZvciB3aW5kb3cucnVuTW9kYWxEaWFs b2cKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0NzU1 CisKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAo VGVzdE1vZGFsUGFnZTo6VGVzdE1vZGFsUGFnZSk6CisgICAgICAgIChUZXN0TW9kYWxQYWdlOjpj cmVhdGVXaW5kb3cpOgorICAgICAgICAodHN0X1FXZWJQYWdlOjpzaG93TW9kYWxEaWFsb2cpOgor CisyMDEwLTAyLTA5ICBZYWVsIEFoYXJvbiAgPHlhZWwuYWhhcm9uQG5va2lhLmNvbT4KKwogICAg ICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KIAogICAgICAgICBb UXRdIFdlYmtpdCBpbiBRdCBkb2VzIG5vdCBoYXZlIHdpbmRvdy5zaG93TW9kYWxEaWFsb2cK