summaryrefslogtreecommitdiffstats
path: root/tests/auto/qnetworksession
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-01-05 05:05:41 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-01-05 05:05:41 (GMT)
commitc9a68d0c2b83d67359d153e0323b10147ef9b2e0 (patch)
treec2121c6d7e129cd30e7496e98013ab41e0d00422 /tests/auto/qnetworksession
parent31e6fc5ae7f7fbe2f23b519cb76dcc579dac1f41 (diff)
parentca7fe1713ff82dcde8fb2fdfb0664b5dfa830bd7 (diff)
downloadQt-c9a68d0c2b83d67359d153e0323b10147ef9b2e0.zip
Qt-c9a68d0c2b83d67359d153e0323b10147ef9b2e0.tar.gz
Qt-c9a68d0c2b83d67359d153e0323b10147ef9b2e0.tar.bz2
Merge branch 'bearermanagement/corewlan' into bearermanagement/integration-2
Conflicts: config.tests/mac/corewlan/corewlan.pro examples/network/bearercloud/bearercloud.pro examples/network/bearermonitor/bearermonitor.pro src/network/bearer/bearer.pro src/network/bearer/qnativewifiengine_win.cpp src/network/bearer/qnetworkconfigmanager_p.cpp src/network/bearer/qnetworkconfiguration_s60_p.cpp src/network/bearer/qnetworksession.cpp src/network/bearer/qnetworksession_p.cpp src/network/bearer/qnmwifiengine_unix.cpp src/network/bearer/qnmwifiengine_unix_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/bearer/generic/qgenericengine.cpp src/plugins/bearer/nla/main.cpp src/plugins/bearer/nla/qnlaengine.cpp tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro tests/auto/qnetworksession/lackey/lackey.pro tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro tests/manual/bearerex/bearerex.pro tests/manual/networkmanager/networkmanager.pro
Diffstat (limited to 'tests/auto/qnetworksession')
-rw-r--r--tests/auto/qnetworksession/lackey/lackey.pro9
-rw-r--r--tests/auto/qnetworksession/lackey/main.cpp4
-rw-r--r--tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp10
-rw-r--r--tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro17
4 files changed, 10 insertions, 30 deletions
diff --git a/tests/auto/qnetworksession/lackey/lackey.pro b/tests/auto/qnetworksession/lackey/lackey.pro
index b8a006b..6cc1b43 100644
--- a/tests/auto/qnetworksession/lackey/lackey.pro
+++ b/tests/auto/qnetworksession/lackey/lackey.pro
@@ -1,13 +1,4 @@
SOURCES += main.cpp
TARGET = qnetworksessionlackey
-INCLUDEPATH += ../../../../src/bearer
-DEPENDPATH += ../../../../src/bearer
QT = core network
-
-CONFIG+= testcase
-
-include(../../../../common.pri)
-
-CONFIG += mobility
-MOBILITY = bearer
diff --git a/tests/auto/qnetworksession/lackey/main.cpp b/tests/auto/qnetworksession/lackey/main.cpp
index f3a7a07..a84021d 100644
--- a/tests/auto/qnetworksession/lackey/main.cpp
+++ b/tests/auto/qnetworksession/lackey/main.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -48,7 +48,7 @@
#include <QDebug>
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
#define NO_DISCOVERED_CONFIGURATIONS_ERROR 1
diff --git a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
index 86b3e46..061108a 100644
--- a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
+++ b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -51,7 +51,7 @@
#include <iapconf.h>
#endif
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
Q_DECLARE_METATYPE(QNetworkConfiguration)
Q_DECLARE_METATYPE(QNetworkSession::State);
@@ -170,7 +170,7 @@ void tst_QNetworkSession::initTestCase()
dbus_send.waitForFinished();
#endif
- inProcessSessionManagementCount = 0;
+ inProcessSessionManagementCount = -1;
QSignalSpy spy(&manager, SIGNAL(updateCompleted()));
manager.updateConfigurations();
@@ -426,6 +426,8 @@ void tst_QNetworkSession::sessionOpenCloseStop_data()
QTest::newRow((name + QLatin1String(" stop")).toLocal8Bit().constData())
<< config << true;
}
+
+ inProcessSessionManagementCount = 0;
}
void tst_QNetworkSession::sessionOpenCloseStop()
@@ -817,7 +819,7 @@ void tst_QNetworkSession::outOfProcessSession()
output = oopSocket->readLine().trimmed();
if (output.startsWith("Started session ")) {
- QString identifier = QString::fromLocal8Bit(output.mid(16).constData());
+ QString identifier = QString::fromLocal8Bit(output.mid(20).constData());
QNetworkConfiguration changed;
diff --git a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
index ccc405e..85aa5aa 100644
--- a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
+++ b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
@@ -1,22 +1,9 @@
+load(qttest_p4)
SOURCES += tst_qnetworksession.cpp
HEADERS += ../../qbearertestcommon.h
-TARGET = tst_qnetworksession
-CONFIG += testcase
QT = core network
-INCLUDEPATH += ../../../../src/bearer
-
-include(../../../../common.pri)
-CONFIG += mobility
-MOBILITY = bearer
-
-wince* {
- LACKEY.sources = $$OUTPUT_DIR/build/tests/bin/qnetworksessionlackey.exe
- LACKEY.path = .
- DEPLOYMENT += LACKEY
-}
-
symbian {
TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData
-}
+} \ No newline at end of file