From dbdeae0da8702379c1dabb11bfe8440438c1fd98 Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Thu, 20 Aug 2009 08:53:10 +0200 Subject: Removing unnecessary comments and enabling additional test rows that were forgotten. --- tests/auto/qsslsocket/tst_qsslsocket.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp index 9c5086a..ba5ef70 100644 --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp @@ -249,13 +249,13 @@ void tst_QSslSocket::initTestCase_data() QTest::addColumn("setProxy"); QTest::addColumn("proxyType"); - //QTest::newRow("WithoutProxy") << false << 0; + QTest::newRow("WithoutProxy") << false << 0; #ifdef TEST_QNETWORK_PROXY QTest::newRow("WithSocks5Proxy") << true << int(Socks5Proxy); - //QTest::newRow("WithSocks5ProxyAuth") << true << int(Socks5Proxy | AuthBasic); + QTest::newRow("WithSocks5ProxyAuth") << true << int(Socks5Proxy | AuthBasic); - //QTest::newRow("WithHttpProxy") << true << int(HttpProxy); - //QTest::newRow("WithHttpProxyBasicAuth") << true << int(HttpProxy | AuthBasic); + QTest::newRow("WithHttpProxy") << true << int(HttpProxy); + QTest::newRow("WithHttpProxyBasicAuth") << true << int(HttpProxy | AuthBasic); // uncomment the line below when NTLM works // QTest::newRow("WithHttpProxyNtlmAuth") << true << int(HttpProxy | AuthNtlm); #endif -- cgit v0.12 From 5ce1ce19cc34c389ac4705d85582ee1c57519175 Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Thu, 20 Aug 2009 09:08:31 +0200 Subject: No need to use more time in QTimer::singleShot() than on other platforms. --- tests/auto/qhttp/tst_qhttp.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/qhttp/tst_qhttp.cpp index b0835ac..fcc80ab 100644 --- a/tests/auto/qhttp/tst_qhttp.cpp +++ b/tests/auto/qhttp/tst_qhttp.cpp @@ -1242,11 +1242,7 @@ void tst_QHttp::unexpectedRemoteClose() QCoreApplication::instance()->processEvents(); QEventLoop loop; -#ifndef Q_OS_SYMBIAN QTimer::singleShot(3000, &loop, SLOT(quit())); -#else - QTimer::singleShot(30000, &loop, SLOT(quit())); -#endif QHttp http; QObject::connect(&http, SIGNAL(done(bool)), &loop, SLOT(quit())); -- cgit v0.12 From b0743dd4e6f72108ac1fd989a418969fd241335d Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Thu, 20 Aug 2009 09:26:22 +0200 Subject: Removing commented lines. --- tests/auto/qftp/tst_qftp.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/auto/qftp/tst_qftp.cpp b/tests/auto/qftp/tst_qftp.cpp index c60a5cd..34b42a9 100644 --- a/tests/auto/qftp/tst_qftp.cpp +++ b/tests/auto/qftp/tst_qftp.cpp @@ -1556,16 +1556,10 @@ void tst_QFtp::binaryAscii() ResMapIt it2 = resultMap.find(QFtp::Get); QVERIFY(it2 != resultMap.end()); QVERIFY(it2.value().success); -/* -#ifdef Q_OS_SYMBIAN - QVERIFY(getData.size() == putData.size()); -#else -*/ // most modern ftp servers leave the file as it is by default // (and do not remove the windows line ending), the -1 below could be // deleted in the future QVERIFY(getData.size() == putData.size()-1); -//#endi ////////////////////////////////////////////////////////////////// // cleanup (i.e. remove the file) -- this also tests the remove command init(); -- cgit v0.12 From 78c4473499a9269615e0001fd6afa245d4674277 Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Thu, 20 Aug 2009 09:31:52 +0200 Subject: Make qprintdialog_unix.cpp compile on some Unices. As part of the exception changes, the include of qfiledialog_p.h was removed and this then removed the inclusion of qevent.h which is needed by the showEvent() function in order to call accept(). Reviewed-by: Miikka Heikkinen --- src/gui/dialogs/qprintdialog_unix.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/dialogs/qprintdialog_unix.cpp b/src/gui/dialogs/qprintdialog_unix.cpp index a491532..eb66ecb 100644 --- a/src/gui/dialogs/qprintdialog_unix.cpp +++ b/src/gui/dialogs/qprintdialog_unix.cpp @@ -48,6 +48,7 @@ #include "qprintdialog.h" #include "qfiledialog.h" #include +#include #include #include #include -- cgit v0.12 From d2551a711786b3c43ac6fef6cabd8555142f1924 Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Thu, 20 Aug 2009 09:41:21 +0200 Subject: We can use runs = 100 in the test case. On Symbian platform it will take longer time. --- tests/auto/qhostinfo/tst_qhostinfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp index e129f87..6dbada1 100644 --- a/tests/auto/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp @@ -391,7 +391,7 @@ protected: void tst_QHostInfo::threadSafety() { const int nattempts = 5; -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WINCE) const int runs = 10; #else const int runs = 100; -- cgit v0.12 From 1e496321d0fe7e1f1b40f1f94a18c17f7e38f9cd Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Thu, 20 Aug 2009 10:46:11 +0200 Subject: Removuing lines that were commented. --- tests/auto/qtcpsocket/tst_qtcpsocket.cpp | 3 +-- tests/auto/qudpsocket/tst_qudpsocket.cpp | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp index 5ee615b..9bbb344 100644 --- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp @@ -81,7 +81,7 @@ #include #include #ifndef TEST_QNETWORK_PROXY -//#define TEST_QNETWORK_PROXY +#define TEST_QNETWORK_PROXY #endif // RVCT compiles also unused inline methods # include @@ -2231,7 +2231,6 @@ void tst_QTcpSocket::invalidProxy_data() << "this-host-will-never-exist.troll.no" << 3128 << false << int(QAbstractSocket::ProxyNotFoundError); #if !defined(Q_OS_SYMBIAN) - //QSKIP("On Symbian Emulator not clear what to expect + server settings", SkipAll); QTest::newRow("http-on-socks5") << int(QNetworkProxy::HttpProxy) << fluke << 1080 << false << int(QAbstractSocket::ProxyConnectionClosedError); QTest::newRow("socks5-on-http") << int(QNetworkProxy::Socks5Proxy) << fluke << 3128 << false diff --git a/tests/auto/qudpsocket/tst_qudpsocket.cpp b/tests/auto/qudpsocket/tst_qudpsocket.cpp index 0ae2521..8d09924 100644 --- a/tests/auto/qudpsocket/tst_qudpsocket.cpp +++ b/tests/auto/qudpsocket/tst_qudpsocket.cpp @@ -552,8 +552,6 @@ void tst_QUdpSocket::bindMode() QUdpSocket socket2; QVERIFY(!socket2.bind(socket.localPort())); #if defined(Q_OS_SYMBIAN) - - //RPRocess me; if(RProcess().HasCapability(ECapabilityNetworkControl)) { qDebug("Test executed *with* NetworkControl capability"); // In Symbian OS ReuseAddressHint together with NetworkControl capability -- cgit v0.12