1
=== modified file 'tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp'
2
--- tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp	2015-09-21 19:41:22 +0000
3
+++ tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp	2015-10-07 17:51:27 +0000
4
@@ -52,7 +52,9 @@
5
52
public:
52
public:
6
53
    TestHTTPServer(QObject* parent = 0)
53
    TestHTTPServer(QObject* parent = 0)
7
54
        : QTcpServer(parent)
54
        : QTcpServer(parent)
9
55
    {}
55
    {
10
56
        connect(this, SIGNAL(newConnection()), SLOT(onNewConnection()));
11
57
    }
12
56
58
13
57
    QString baseURL() const
59
    QString baseURL() const
14
58
    {
60
    {
15
@@ -61,17 +63,18 @@
16
61
63
17
62
Q_SIGNALS:
64
Q_SIGNALS:
18
63
    void gotRequest(const QString& path) const;
65
    void gotRequest(const QString& path) const;
19
66
    void gotError() const;
20
64
67
28
65
protected:
68
private Q_SLOTS:
29
66
    void incomingConnection(qintptr socketDescriptor)
69
    void onNewConnection() {
30
67
    {
70
        if (hasPendingConnections()) {
31
68
        QTcpSocket* socket = new QTcpSocket(this);
71
            QTcpSocket* socket = nextPendingConnection();
32
69
        connect(socket, SIGNAL(readyRead()), SLOT(readClient()));
72
            connect(socket, SIGNAL(readyRead()), SLOT(readClient()));
33
70
        connect(socket, SIGNAL(disconnected()), SLOT(discardClient()));
73
            connect(socket, SIGNAL(disconnected()), SLOT(discardClient()));
34
71
        socket->setSocketDescriptor(socketDescriptor);
74
            connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), SIGNAL(gotError()));
35
75
        }
36
72
    }
76
    }
37
73
77
38
74
private Q_SLOTS:
39
75
    void readClient()
78
    void readClient()
40
76
    {
79
    {
41
77
        QTcpSocket* socket = qobject_cast<QTcpSocket*>(sender());
80
        QTcpSocket* socket = qobject_cast<QTcpSocket*>(sender());
42
@@ -141,6 +144,7 @@
43
141
    QSignalSpy* fetcherSpy;
144
    QSignalSpy* fetcherSpy;
44
142
    TestHTTPServer* server;
145
    TestHTTPServer* server;
45
143
    QSignalSpy* serverSpy;
146
    QSignalSpy* serverSpy;
46
147
    QSignalSpy* errorSpy;
47
144
148
48
145
private Q_SLOTS:
149
private Q_SLOTS:
49
146
    void init()
150
    void init()
50
@@ -154,10 +158,12 @@
51
154
        server = new TestHTTPServer;
158
        server = new TestHTTPServer;
52
155
        server->listen();
159
        server->listen();
53
156
        serverSpy = new QSignalSpy(server, SIGNAL(gotRequest(const QString&)));
160
        serverSpy = new QSignalSpy(server, SIGNAL(gotRequest(const QString&)));
54
161
        errorSpy = new QSignalSpy(server, SIGNAL(gotError()));
55
157
    }
162
    }
56
158
163
57
159
    void cleanup()
164
    void cleanup()
58
160
    {
165
    {
59
166
        delete errorSpy;
60
161
        delete serverSpy;
167
        delete serverSpy;
61
162
        delete server;
168
        delete server;
62
163
        delete fetcherSpy;
169
        delete fetcherSpy;
63
@@ -278,14 +284,17 @@
64
278
    void shouldCancelRequests()
284
    void shouldCancelRequests()
65
279
    {
285
    {
66
280
        // Issue several requests rapidly in succession, and verify that
286
        // Issue several requests rapidly in succession, and verify that
69
281
        // all the previous ones are discarded
287
        // all the previous ones are discarded. Take into account possible
70
282
        for (int i = 1; i < 10; ++i) {
288
        // errors (see https://launchpad.net/bugs/1498539).
71
289
        int requests = 100;
72
290
        int errors = 0;
73
291
        for (int i = 1; i <= requests; ++i) {
74
283
            QUrl url(server->baseURL() + "/favicon" + QString::number(i) + ".ico");
292
            QUrl url(server->baseURL() + "/favicon" + QString::number(i) + ".ico");
75
284
            fetcher->setUrl(url);
293
            fetcher->setUrl(url);
77
285
            QVERIFY(serverSpy->wait());
294
            QVERIFY(serverSpy->wait(500) || (errorSpy->count() == ++errors));
78
286
        }
295
        }
79
287
        QVERIFY(fetcherSpy->wait());
296
        QVERIFY(fetcherSpy->wait());
81
288
        QCOMPARE(serverSpy->count(), 9);
297
        QCOMPARE(serverSpy->count() + errorSpy->count(), requests);
82
289
        QCOMPARE(fetcherSpy->count(), 1);
298
        QCOMPARE(fetcherSpy->count(), 1);
83
290
    }
299
    }
84
291
};
300
};
Reviewer	Review Type	Date Requested	Status
Ugo Riboni (community)		2015-10-07	Approve on 2015-10-13
PS Jenkins bot	continuous-integration		Approve on 2015-10-08
Review via email: mp+273735@code.launchpad.net