Changeset 48872 in webkit

Timestamp:

Sep 29, 2009 7:06:36 AM (15 years ago)

Author:

Simon Hausmann

Message:

​https://bugs.webkit.org/show_bug.cgi?id=29844

Patch by Jedrzej Nowacki <​jedrzej.nowacki@nokia.com> on 2009-09-29
Reviewed by Simon Hausmann.

QWebPage dependency autotest fix.

Fix for database() autotest. All opened databases should be removed at
end of test.

• tests/qwebpage/tst_qwebpage.cpp:

(tst_QWebPage::database):

Location:

trunk/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• tests/qwebpage/tst_qwebpage.cpp (modified) (1 diff)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-09-29  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29844
+
+        QWebPage dependency autotest fix.
+
+        Fix for database() autotest. All opened databases should be removed at
+        end of test.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::database):
+
 2009-09-29  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
 

trunk/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

@@ -465 +465 @@
     QTest::qWait(200);
 
+    // Remove all databases.
     QWebSecurityOrigin origin = m_page->mainFrame()->securityOrigin();
     QList<QWebDatabase> dbs = origin.databases();
-    if (dbs.count() > 0) {
-        QString fileName = dbs[0].fileName();
+    for (int i = 0; i < dbs.count(); i++) {
+        QString fileName = dbs[i].fileName();
         QVERIFY(QFile::exists(fileName));
-        QWebDatabase::removeDatabase(dbs[0]);
+        QWebDatabase::removeDatabase(dbs[i]);
         QVERIFY(!QFile::exists(fileName));
     }
+    QVERIFY(!origin.databases().size());
+    // Remove removed test :-)
+    QWebDatabase::removeAllDatabases();
+    QVERIFY(!origin.databases().size());
     QTest::qWait(1000);
 }