From 70e6c71f7e8e4c12672075e7477f4f1d99f320e6 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Thu, 29 Sep 2011 16:01:54 +1000
Subject: [PATCH] Remove Symbian-specific code from tests.
Symbian is not a supported platform for Qt5, so this code is no longer
required.
Change-Id: I273c8bffdeec2bb026936d93c00ef3c79b7a1ad9
Reviewed-on: http://codereview.qt-project.org/5775
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
tests/auto/network-settings.h | 258 ---------------------
tests/auto/qxmlquery/tst_qxmlquery.cpp | 1 -
tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 1 -
3 files changed, 260 deletions(-)
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h
index 919d197e..171a94d5 100644
--- a/tests/auto/network-settings.h
+++ b/tests/auto/network-settings.h
@@ -44,82 +44,20 @@
#include <QtNetwork/QHostInfo>
#endif
-
-#ifdef Q_OS_SYMBIAN
-#include <e32base.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <QSharedPointer>
-#include <QHash>
-#endif
-#if defined(Q_OS_SYMBIAN)
-#if defined(Q_CC_NOKIAX86)
-// In emulator we use WINSOCK connectivity by default. Unfortunately winsock
-// does not work very well with UDP sockets. This defines skips some test
-// cases which have known problems.
-
-// NOTE: Prefer to use WINPCAP based connectivity in S60 emulator when running
-// network tests. WINPCAP connectivity uses Symbian OS IP stack,
-// correspondingly as HW does. When using WINPCAP disable this define
-//#define SYMBIAN_WINSOCK_CONNECTIVITY
-#endif // Q_CC_NOKIAX86
-
-// FIXME: any reason we do this for symbian only, and not other platforms?
-class QtNetworkSettingsRecord {
-public:
- QtNetworkSettingsRecord() { }
-
- QtNetworkSettingsRecord(const QString& recName, const QString& recVal)
- : strRecordName(recName), strRecordValue(recVal) { }
-
- QtNetworkSettingsRecord(const QtNetworkSettingsRecord & other)
- : strRecordName(other.strRecordName), strRecordValue(other.strRecordValue) { }
-
- ~QtNetworkSettingsRecord() { }
-
- const QString& recordName() const { return strRecordName; }
- const QString& recordValue() const { return strRecordValue; }
-
-private:
- QString strRecordName;
- QString strRecordValue;
-};
-
-#endif // Q_OS_SYMBIAN
-
class QtNetworkSettings
{
public:
static QString serverLocalName()
{
-#ifdef Q_OS_SYMBIAN
- loadTestSettings();
-
- if(QtNetworkSettings::entries.contains("server.localname")) {
- QtNetworkSettingsRecord* entry = entries["server.localname"];
- return entry->recordValue();
- }
-#endif
return QString("qt-test-server");
}
static QString serverDomainName()
{
-#ifdef Q_OS_SYMBIAN
- loadTestSettings();
-
- if(QtNetworkSettings::entries.contains("server.domainname")) {
- QtNetworkSettingsRecord* entry = entries["server.domainname"];
- return entry->recordValue();
- }
-#endif
return QString("qt-test-net");
}
static QString serverName()
{
-#ifdef Q_OS_SYMBIAN
- loadTestSettings();
-#endif
return serverLocalName() + "." + serverDomainName();
}
static QString winServerName()
@@ -134,17 +72,6 @@ public:
#ifdef QT_NETWORK_LIB
static QHostAddress serverIP()
{
-#ifdef Q_OS_SYMBIAN
- loadTestSettings();
-
- if(QtNetworkSettings::entries.contains("server.ip")) {
- QtNetworkSettingsRecord* entry = entries["server.ip"];
- if(serverIp.isNull()) {
- serverIp = entry->recordValue().toAscii();
- }
- return QHostAddress(serverIp.data());
- }
-#endif // Q_OS_SYMBIAN
return QHostInfo::fromName(serverName()).addresses().first();
}
#endif
@@ -153,19 +80,6 @@ public:
{
QList<QByteArray> expected;
-#ifdef Q_OS_SYMBIAN
- loadTestSettings();
-
- if(QtNetworkSettings::entries.contains("imap.expectedreply")) {
- QtNetworkSettingsRecord* entry = entries["imap.expectedreply"];
- if(imapExpectedReply.isNull()) {
- imapExpectedReply = entry->recordValue().toAscii();
- imapExpectedReply.append('\r').append('\n');
- }
- expected << imapExpectedReply.data();
- }
-#endif
-
// Mandriva; old test server
expected << QByteArray( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] " )
.append(QtNetworkSettings::serverName().toAscii())
@@ -191,18 +105,6 @@ public:
{
QList<QByteArray> expected;
-#ifdef Q_OS_SYMBIAN
- loadTestSettings();
-
- if(QtNetworkSettings::entries.contains("imap.expectedreplyssl")) {
- QtNetworkSettingsRecord* entry = entries["imap.expectedreplyssl"];
- if(imapExpectedReplySsl.isNull()) {
- imapExpectedReplySsl = entry->recordValue().toAscii();
- imapExpectedReplySsl.append('\r').append('\n');
- }
- expected << imapExpectedReplySsl.data();
- }
-#endif
// Mandriva; old test server
expected << QByteArray( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID AUTH=PLAIN SASL-IR] " )
.append(QtNetworkSettings::serverName().toAscii())
@@ -241,171 +143,12 @@ public:
return false;
}
-
-#ifdef Q_OS_SYMBIAN
- static void setDefaultIap()
- {
- loadDefaultIap();
-
- struct ifreq ifReq;
- if(entries.contains("iap.default")) {
- QtNetworkSettingsRecord* entry = entries["iap.default"];
- QByteArray tmp(entry->recordValue().toAscii());
- strcpy( ifReq.ifr_name, tmp.data());
- }
- else // some default value
- strcpy( ifReq.ifr_name, "Lab");
-
- int err = setdefaultif( &ifReq );
- if(err)
- printf("Setting default IAP - '%s' failed: %d\n", ifReq.ifr_name, err);
- else
- printf("'%s' used as an default IAP\n", ifReq.ifr_name);
- }
-#endif
-
-private:
-
-#ifdef Q_OS_SYMBIAN
-
- static QHash<QString, QtNetworkSettingsRecord* > entries;
- static bool bDefaultIapLoaded;
- static bool bTestSettingsLoaded;
- static QString iapFileFullPath;
- static QByteArray serverIp;
- static QByteArray imapExpectedReply;
- static QByteArray imapExpectedReplySsl;
-
- static bool loadDefaultIap() {
- if(bDefaultIapLoaded)
- return true;
-
- QFile iapCfgFile(iapFileFullPath);
-
- bool bFoundDefaultIapTag = false;
-
- if (iapCfgFile.open(QFile::ReadOnly)) {
- QTextStream input(&iapCfgFile);
- QString line;
- do {
- line = input.readLine().trimmed();
- if(line.startsWith(QString("#")))
- continue; // comment found
-
- if(line.contains(QString("[DEFAULT]"))) {
- bFoundDefaultIapTag = true;
- } else if(line.contains(QString("[")) && bFoundDefaultIapTag) {
- break;
- }
-
- if(bFoundDefaultIapTag && line.contains("name")) {
- int position = line.indexOf(QString("="));
- position += QString("=").length();
-
- //create record
- QtNetworkSettingsRecord *entry =
- new QtNetworkSettingsRecord( QString("iap.default"), line.mid(position).trimmed() );
- entries.insert(entry->recordName(), entry);
- break;
- }
- } while (!line.isNull());
- }
-
- return bDefaultIapLoaded = bFoundDefaultIapTag;
- }
-
- static bool loadTestSettings() {
- if(bTestSettingsLoaded)
- return true;
-
- QFile cfgFile(iapFileFullPath);
- bool bFoundTestTag = false;
-
- if (cfgFile.open(QFile::ReadOnly)) {
- QTextStream input(&cfgFile);
- QString line;
- do {
- line = input.readLine().trimmed();
-
- if(line.startsWith(QString("#")) || line.length() == 0)
- continue; // comment or empty line found
-
- if(line.contains(QString("[TEST]"))) {
- bFoundTestTag = true;
- } else if(line.startsWith(QString("[")) && bFoundTestTag) {
- bFoundTestTag = false;
- break; // finished with test tag
- }
-
- if(bFoundTestTag) { // non-empty line
- int position = line.indexOf(QString("="));
-
- if(position <= 0) // not found
- continue;
-
- // found - extract
-
- QString recname = line.mid(0, position - QString("=").length()).trimmed();
- QString recval = line.mid(position + QString("=").length()).trimmed();
-
- //create record
- QtNetworkSettingsRecord *entry = new QtNetworkSettingsRecord(recname, recval);
- entries.insert(entry->recordName(), entry);
- }
- } while (!line.isNull());
- }
-
- return bTestSettingsLoaded = true;
- }
-#endif
-
-
};
-#ifdef Q_OS_SYMBIAN
-QHash<QString, QtNetworkSettingsRecord* > QtNetworkSettings::entries = QHash<QString, QtNetworkSettingsRecord* > ();
-bool QtNetworkSettings::bDefaultIapLoaded = false;
-bool QtNetworkSettings::bTestSettingsLoaded = false;
-QString QtNetworkSettings::iapFileFullPath = QString("C:\\Data\\iap.txt");
-QByteArray QtNetworkSettings::serverIp;
-QByteArray QtNetworkSettings::imapExpectedReply;
-QByteArray QtNetworkSettings::imapExpectedReplySsl;
-#endif
-
-#ifdef Q_OS_SYMBIAN
-#define Q_SET_DEFAULT_IAP QtNetworkSettings::setDefaultIap();
-#else
-#define Q_SET_DEFAULT_IAP
-#endif
#ifdef QT_NETWORK_LIB
class QtNetworkSettingsInitializerCode {
public:
QtNetworkSettingsInitializerCode() {
-#ifdef Q_OS_SYMBIAN
-#ifdef Q_CC_NOKIAX86
- // We have a non-trivial constructor in global static.
- // The QtNetworkSettings::serverName() uses native API which assumes
- // Cleanup-stack to exist. That's why we create it here and install
- // top level TRAP harness.
- CTrapCleanup *cleanupStack = q_check_ptr(CTrapCleanup::New());
- TRAPD(err,
- QHostInfo testServerResult = QHostInfo::fromName(QtNetworkSettings::serverName());
- if (testServerResult.error() != QHostInfo::NoError) {
- qWarning() << "Could not lookup" << QtNetworkSettings::serverName();
- qWarning() << "Please configure the test environment!";
- qWarning() << "See /etc/hosts or network-settings.h";
- qFatal("Exiting");
- }
- )
- delete cleanupStack;
-//#else
- // In Symbian HW there is no sense to run this check since global statics are
- // initialized before QTestLib initializes the output channel for QWarnigns.
- // So if there is problem network setup, also all QtCore etc tests whcih have
- // QtNetwork dependency will crash with panic "0 - Exiciting"
-#endif
-
-#else
QHostInfo testServerResult = QHostInfo::fromName(QtNetworkSettings::serverName());
if (testServerResult.error() != QHostInfo::NoError) {
qWarning() << "Could not lookup" << QtNetworkSettings::serverName();
@@ -413,7 +156,6 @@ public:
qWarning() << "See /etc/hosts or network-settings.h";
qFatal("Exiting");
}
-#endif
}
};
QtNetworkSettingsInitializerCode qtNetworkSettingsInitializer;
diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp
index 024301e5..b56c3731 100644
--- a/tests/auto/qxmlquery/tst_qxmlquery.cpp
+++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp
@@ -95,7 +95,6 @@ public:
, m_pushTestsCount(0)
, m_testNetwork(true)
{
- Q_SET_DEFAULT_IAP
}
private Q_SLOTS:
diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
index 9f8de462..d52d3bc6 100644
--- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
+++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
@@ -106,7 +106,6 @@ tst_XmlPatterns::tst_XmlPatterns() : m_generatedTests(0)
, m_command(QLatin1String("xmlpatterns"))
, m_dontRun(false)
{
- Q_SET_DEFAULT_IAP
}
void tst_XmlPatterns::initTestCase()
--
GitLab