summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/network/access
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-09-27 19:53:01 +1000
committerQt by Nokia <qt-info@nokia.com>2011-09-29 06:41:42 +0200
commit95cebd34ebc5b4d39b11dc91610309a35e488663 (patch)
tree90ceffef5acea093dd2b8f8f7e8c30593023b85a /tests/benchmarks/network/access
parentab061e3e436fab35eac8666f3e950e98f66c4d3e (diff)
Remove Symbian-specific code from tests.
Symbian is not a supported platform for Qt5, so this code is no longer required. Change-Id: I1172e6a42d518490e63e9599bf10579df08259aa Reviewed-on: http://codereview.qt-project.org/5657 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/benchmarks/network/access')
-rw-r--r--tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp6
-rw-r--r--tests/benchmarks/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp21
-rw-r--r--tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp8
3 files changed, 5 insertions, 30 deletions
diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp
index 464dd11034..54f0c71c1e 100644
--- a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp
+++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp
@@ -50,8 +50,6 @@
class qfile_vs_qnetworkaccessmanager : public QObject
{
Q_OBJECT
- // do not use on symbian.. 100 MB is too large..
- // but.. this is a manual test anyway, so :)
protected:
void qnamFileRead_iteration(QNetworkAccessManager &manager, QNetworkRequest &request);
void qnamImmediateFileRead_iteration(QNetworkAccessManager &manager, QNetworkRequest &request);
@@ -77,11 +75,7 @@ void qfile_vs_qnetworkaccessmanager::initTestCase()
{
testFile.open();
QByteArray qba(1*1024*1024, 'x'); // 1 MB
-#ifdef Q_OS_SYMBIAN
- for (int i = 0; i < 10; i++) { // for Symbian only 10 MB
-#else
for (int i = 0; i < 100; i++) {
-#endif
testFile.write(qba);
testFile.flush();
size += qba.size();
diff --git a/tests/benchmarks/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/benchmarks/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
index ddbf6c40d0..3e1168e6fc 100644
--- a/tests/benchmarks/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
+++ b/tests/benchmarks/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
@@ -111,11 +111,6 @@ void tst_qnetworkdiskcache::timeInsertion_data()
QString cacheLoc = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
QTest::newRow("QDesktopServices Cache Location") << cacheLoc;
-#ifdef Q_OS_SYMBIAN
- if (QDir::drives().contains(QFileInfo("E:\\")))
- QTest::newRow("Symbian E: drive") << cacheLoc.replace(0, 1, QString("E"));
-#endif
-
}
//This functions times an insert() operation.
@@ -177,11 +172,6 @@ void tst_qnetworkdiskcache::timeRead_data()
QString cacheLoc = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
QTest::newRow("QDesktopServices Cache Location") << cacheLoc;
-#ifdef Q_OS_SYMBIAN
- if (QDir::drives().contains(QFileInfo("E:\\")))
- QTest::newRow("Symbian E: drive") << cacheLoc.replace(0, 1, QString("E"));
-#endif
-
}
//Times metadata as well payload lookup
@@ -241,11 +231,6 @@ void tst_qnetworkdiskcache::timeRemoval_data()
QString cacheLoc = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
QTest::newRow("QDesktopServices Cache Location") << cacheLoc;
-#ifdef Q_OS_SYMBIAN
- if (QDir::drives().contains(QFileInfo("E:\\")))
- QTest::newRow("Symbian E: drive") << cacheLoc.replace(0, 1, QString("E"));
-#endif
-
}
void tst_qnetworkdiskcache::timeRemoval()
@@ -296,12 +281,8 @@ void tst_qnetworkdiskcache::timeExpiration_data()
QString cacheLoc = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
QTest::newRow("QDesktopServices Cache Location") << cacheLoc;
-#ifdef Q_OS_SYMBIAN
- if (QDir::drives().contains(QFileInfo("E:\\")))
- QTest::newRow("Symbian E: drive") << cacheLoc.replace(0, 1, QString("E"));
-#endif
-
}
+
void tst_qnetworkdiskcache::timeExpiration()
{
diff --git a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
index d96b110d54..565bdd70fd 100644
--- a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -559,8 +559,8 @@ void tst_qnetworkreply::uploadPerformance()
void tst_qnetworkreply::httpUploadPerformance()
{
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_WINCE_WM)
- // SHow some mercy for non-desktop platform/s
+#if defined(Q_WS_WINCE_WM)
+ // Show some mercy for non-desktop platform/s
enum {UploadSize = 4*1024*1024}; // 4 MB
#else
enum {UploadSize = 128*1024*1024}; // 128 MB
@@ -630,7 +630,7 @@ void tst_qnetworkreply::httpDownloadPerformance()
{
QFETCH(bool, serverSendsContentLength);
QFETCH(bool, chunkedEncoding);
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_WINCE_WM)
+#if defined(Q_WS_WINCE_WM)
// Show some mercy to non-desktop platform/s
enum {UploadSize = 4*1024*1024}; // 4 MB
#else
@@ -714,7 +714,7 @@ void tst_qnetworkreply::httpDownloadPerformanceDownloadBuffer()
QFETCH(HttpDownloadPerformanceDownloadBufferTestType, testType);
// On my Linux Desktop the results are already visible with 128 kB, however we use this to have good results.
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_WINCE_WM)
+#if defined(Q_WS_WINCE_WM)
// Show some mercy to non-desktop platform/s
enum {UploadSize = 4*1024*1024}; // 4 MB
#else