Changeset 85772 in webkit

Timestamp:

May 4, 2011 12:00:43 PM (13 years ago)

Author:

caio.oliveira@openbossa.org

Message:

2011-05-04 Caio Marcelo de Oliveira Filho <​caio.oliveira@openbossa.org>

Reviewed by Benjamin Poulain.

[Qt] Fix signals emitted in FakeReply used in autotests
​https://bugs.webkit.org/show_bug.cgi?id=60049

The signals emitted for each case of FakeReply were swapped (error case
emitting metaDataChanged() and redirect case emitting error()). Emitting
readyRead() is not necessary.

• tests/qwebframe/tst_qwebframe.cpp: (FakeReply::FakeReply): Choose the different continue function for each case of FakeReply. This removes the need of the if-statement in timeout() and let us replace timeout() with two simpler functions.

(FakeReply::continueRedirect):
(FakeReply::continueError):
Continuation cases, emitting the minimal set of signals needed for each case.

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• tests/qwebframe/tst_qwebframe.cpp (modified) (2 diffs)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-05-04  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] Fix signals emitted in FakeReply used in autotests
+        https://bugs.webkit.org/show_bug.cgi?id=60049
+
+        The signals emitted for each case of FakeReply were swapped (error case
+        emitting metaDataChanged() and redirect case emitting error()). Emitting
+        readyRead() is not necessary.
+
+        * tests/qwebframe/tst_qwebframe.cpp:
+        (FakeReply::FakeReply):
+        Choose the different continue function for each case of FakeReply. This removes
+        the need of the if-statement in timeout() and let us replace timeout() with two
+        simpler functions.
+
+        (FakeReply::continueRedirect):
+        (FakeReply::continueError):
+        Continuation cases, emitting the minimal set of signals needed for each case.
+
 2011-05-03  Julien Chaffraix  <jchaffraix@codeaurora.org>
 

trunk/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp

@@ -2310 +2310 @@
             setHeader(QNetworkRequest::LocationHeader, QString("qrc:/test2.html"));
             setAttribute(QNetworkRequest::RedirectionTargetAttribute, QUrl("qrc:/test2.html"));
+            QTimer::singleShot(0, this, SLOT(continueRedirect()));
         }
 #ifndef QT_NO_OPENSSL
-        else if (request.url() == QUrl("qrc:/fake-ssl-error.html"))
-            setError(QNetworkReply::SslHandshakeFailedError, tr("Fake error !")); // force a ssl error
+        else if (request.url() == QUrl("qrc:/fake-ssl-error.html")) {
+            setError(QNetworkReply::SslHandshakeFailedError, tr("Fake error!"));
+            QTimer::singleShot(0, this, SLOT(continueError()));
+        }
 #endif
-        else if (request.url().host() == QLatin1String("abcdef.abcdef"))
+        else if (request.url().host() == QLatin1String("abcdef.abcdef")) {
             setError(QNetworkReply::HostNotFoundError, tr("Invalid URL"));
+            QTimer::singleShot(0, this, SLOT(continueError()));
+        }
 
         open(QIODevice::ReadOnly);
-        QTimer::singleShot(0, this, SLOT(timeout()));
     }
     ~FakeReply()
@@ -2335 +2339 @@
 
 private slots:
-    void timeout()
-    {
-        if (request().url() == QUrl("qrc://test1.html"))
-            emit error(this->error());
-        else if (request().url() == QUrl("http://abcdef.abcdef/"))
-            emit metaDataChanged();
-#ifndef QT_NO_OPENSSL
-        else if (request().url() == QUrl("qrc:/fake-ssl-error.html"))
-            return;
-#endif
-
-        emit readyRead();
+    void continueRedirect()
+    {
+        emit metaDataChanged();
+        emit finished();
+    }
+
+    void continueError()
+    {
+        emit error(this->error());
         emit finished();
     }