diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 14:35:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 16:27:28 +0100 |
| commit | a15c3d086dafea83e4760f0b447be43d26b80697 (patch) | |
| tree | fd224a3f83942ff4c432e1e3a3f8583d14d6a11c /tests/auto/corelib/io/qdatastream | |
| parent | 87abfd351af6309691d921ca0aef077d74df4732 (diff) | |
| parent | 397061a6a92db9f962360d5db96f69b315f93074 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
src/dbus/qdbusconnection_p.h
src/dbus/qdbusintegrator.cpp
src/dbus/qdbusintegrator_p.h
tests/auto/corelib/io/qdir/qdir.pro
tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
Change-Id: I3d3fd07aed015c74b1f545f1327aa73d5f365fcc
Diffstat (limited to 'tests/auto/corelib/io/qdatastream')
| -rw-r--r-- | tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp index ad463488ed..f5a546ebf1 100644 --- a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp @@ -45,6 +45,7 @@ public: void stream_data(int noOfElements); public slots: + void initTestCase(); void cleanupTestCase(); private slots: @@ -243,6 +244,10 @@ private: void readqint64(QDataStream *s); void readQIcon(QDataStream *s); void readQEasingCurve(QDataStream *s); + +private: + QSharedPointer<QTemporaryDir> m_tempDir; + QString m_previousCurrent; }; static int NColorRoles[] = { @@ -293,10 +298,20 @@ void tst_QDataStream::getSetCheck() QCOMPARE(QDataStream::ReadCorruptData, obj1.status()); } +void tst_QDataStream::initTestCase() +{ + m_previousCurrent = QDir::currentPath(); + m_tempDir = QSharedPointer<QTemporaryDir>(new QTemporaryDir); + QVERIFY2(!m_tempDir.isNull(), qPrintable("Could not create temporary directory.")); + QVERIFY2(QDir::setCurrent(m_tempDir->path()), qPrintable("Could not switch current directory")); +} + void tst_QDataStream::cleanupTestCase() { QFile::remove(QLatin1String("qdatastream.out")); QFile::remove(QLatin1String("datastream.tmp")); + + QDir::setCurrent(m_previousCurrent); } static int dataIndex(const QString &tag) |