Changeset 86154 in webkit

Timestamp:

May 10, 2011 8:32:44 AM (13 years ago)

Author:

Ademar Reis

Message:

2011-05-10 Ademar de Souza Reis Jr. <Ademar Reis>

Reviewed by Csaba Osztrogonác.

[Qt] tst_QWebPage creates temporary files in the current working dir
​https://bugs.webkit.org/show_bug.cgi?id=60497

tst_QWebPage was using QDir::currentPath when creating temporary dirs
and leaving them after the test was run. I basically borrowed the fix
from tst_QDeclarativeWebView.

• tests/qwebpage/tst_qwebpage.cpp: (removeRecursive): (tst_QWebPage::tmpDirPath): (tst_QWebPage::cleanupFiles): (tst_QWebPage::database): (tst_QWebPage::multiplePageGroupsAndLocalStorage):

Location:

trunk/Source/WebKit/qt

Files:

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

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-05-10  Ademar de Souza Reis Jr.  <ademar.reis@openbossa.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] tst_QWebPage creates temporary files in the current working dir
+        https://bugs.webkit.org/show_bug.cgi?id=60497
+
+        tst_QWebPage was using QDir::currentPath when creating temporary dirs
+        and leaving them after the test was run. I basically borrowed the fix
+        from tst_QDeclarativeWebView.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (removeRecursive):
+        (tst_QWebPage::tmpDirPath):
+        (tst_QWebPage::cleanupFiles):
+        (tst_QWebPage::database):
+        (tst_QWebPage::multiplePageGroupsAndLocalStorage):
+
 2011-05-09  Chang Shu  <cshu@webkit.org>
 

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

@@ -45 +45 @@
 #include <qwebview.h>
 #include <qimagewriter.h>
+
+static void removeRecursive(const QString& dirname)
+{
+    QDir dir(dirname);
+    QFileInfoList entries(dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot));
+    for (int i = 0; i < entries.count(); ++i)
+        if (entries[i].isDir())
+            removeRecursive(entries[i].filePath());
+        else
+            dir.remove(entries[i].fileName());
+    QDir().rmdir(dirname);
+}
 
 class EventSpy : public QObject, public QList<QEvent::Type>
@@ -146 +158 @@
     void macCopyUnicodeToClipboard();
 #endif
-    
+
 private:
     QWebView* m_view;
     QWebPage* m_page;
+    QString tmpDirPath() const
+    {
+        static QString tmpd = QDir::tempPath() + "/tst_qwebpage-"
+            + QDateTime::currentDateTime().toString(QLatin1String("yyyyMMddhhmmss"));
+        return tmpd;
+    }
 };
 
@@ -173 +191 @@
 void tst_QWebPage::cleanupFiles()
 {
-    QFile::remove("Databases.db");
-    QDir::current().rmdir("http_www.myexample.com_0");
-    QFile::remove("http_www.myexample.com_0.localstorage");
+    removeRecursive(tmpDirPath());
 }
 
@@ -554 +570 @@
 void tst_QWebPage::database()
 {
-    QString path = QDir::currentPath();
+    QString path = tmpDirPath();
     m_page->settings()->setOfflineStoragePath(path);
     QVERIFY(m_page->settings()->offlineStoragePath() == path);
@@ -908 +924 @@
 void tst_QWebPage::multiplePageGroupsAndLocalStorage()
 {
-    QDir dir(QDir::currentPath());
+    QDir dir(tmpDirPath());
     dir.mkdir("path1");
     dir.mkdir("path2");
@@ -916 +932 @@
 
     view1.page()->settings()->setAttribute(QWebSettings::LocalStorageEnabled, true);
-    view1.page()->settings()->setLocalStoragePath(QDir::toNativeSeparators(QDir::currentPath() + "/path1"));
+    view1.page()->settings()->setLocalStoragePath(QDir::toNativeSeparators(tmpDirPath() + "/path1"));
     DumpRenderTreeSupportQt::webPageSetGroupName(view1.page(), "group1");
     view2.page()->settings()->setAttribute(QWebSettings::LocalStorageEnabled, true);    
-    view2.page()->settings()->setLocalStoragePath(QDir::toNativeSeparators(QDir::currentPath() + "/path2"));
+    view2.page()->settings()->setLocalStoragePath(QDir::toNativeSeparators(tmpDirPath() + "/path2"));
     DumpRenderTreeSupportQt::webPageSetGroupName(view2.page(), "group2");
     QCOMPARE(DumpRenderTreeSupportQt::webPageGroupName(view1.page()), QString("group1"));
@@ -942 +958 @@
     QTest::qWait(1000);
 
-    QFile::remove(QDir::toNativeSeparators(QDir::currentPath() + "/path1/http_www.myexample.com_0.localstorage"));
-    QFile::remove(QDir::toNativeSeparators(QDir::currentPath() + "/path2/http_www.myexample.com_0.localstorage"));
+    QFile::remove(QDir::toNativeSeparators(tmpDirPath() + "/path1/http_www.myexample.com_0.localstorage"));
+    QFile::remove(QDir::toNativeSeparators(tmpDirPath() + "/path2/http_www.myexample.com_0.localstorage"));
     dir.rmdir(QDir::toNativeSeparators("./path1"));
     dir.rmdir(QDir::toNativeSeparators("./path2"));