diff options
Diffstat (limited to 'tests/auto/corelib/io')
4 files changed, 19 insertions, 18 deletions
diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp index 9cc3f29e49..a63e140ef8 100644 --- a/tests/auto/corelib/io/qdir/tst_qdir.cpp +++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp @@ -1869,7 +1869,7 @@ void tst_QDir::equalityOperator_data() #if defined (Q_OS_WIN) QString pathinroot("c:/windows/.."); #else - QString pathinroot("/sbin/.."); + QString pathinroot("/usr/.."); #endif QTest::newRow("QTBUG-20495-root") << pathinroot << "*.cpp" << int(QDir::Name) << int(QDir::Files) << QDir::rootPath() << "*.cpp" << int(QDir::Name) << int(QDir::Files) diff --git a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp index a302e40574..76fa6022ba 100644 --- a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp +++ b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp @@ -120,7 +120,7 @@ void tst_QFileSystemWatcher::basicTest() watcher.setObjectName(QLatin1String("_qt_autotest_force_engine_") + backend); QVERIFY(watcher.addPath(testFile.fileName())); - QSignalSpy changedSpy(&watcher, SIGNAL(fileChanged(const QString &))); + QSignalSpy changedSpy(&watcher, SIGNAL(fileChanged(QString))); QVERIFY(changedSpy.isValid()); QEventLoop eventLoop; QTimer timer; @@ -253,7 +253,7 @@ void tst_QFileSystemWatcher::watchDirectory() watcher.setObjectName(QLatin1String("_qt_autotest_force_engine_") + backend); QVERIFY(watcher.addPath(testDir.absolutePath())); - QSignalSpy changedSpy(&watcher, SIGNAL(directoryChanged(const QString &))); + QSignalSpy changedSpy(&watcher, SIGNAL(directoryChanged(QString))); QVERIFY(changedSpy.isValid()); QEventLoop eventLoop; QTimer timer; @@ -410,8 +410,8 @@ void tst_QFileSystemWatcher::watchFileAndItsDirectory() QVERIFY(watcher.addPath(testDir.absolutePath())); QVERIFY(watcher.addPath(testFileName)); - QSignalSpy fileChangedSpy(&watcher, SIGNAL(fileChanged(const QString &))); - QSignalSpy dirChangedSpy(&watcher, SIGNAL(directoryChanged(const QString &))); + QSignalSpy fileChangedSpy(&watcher, SIGNAL(fileChanged(QString))); + QSignalSpy dirChangedSpy(&watcher, SIGNAL(directoryChanged(QString))); QVERIFY(fileChangedSpy.isValid()); QVERIFY(dirChangedSpy.isValid()); QEventLoop eventLoop; diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp index 9ec5eb489e..22c88ca1fa 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -312,7 +312,7 @@ void tst_QProcess::crashTest() qRegisterMetaType<QProcess::ProcessError>("QProcess::ExitStatus"); QSignalSpy spy(process, SIGNAL(error(QProcess::ProcessError))); - QSignalSpy spy2(process, SIGNAL(finished(int, QProcess::ExitStatus))); + QSignalSpy spy2(process, SIGNAL(finished(int,QProcess::ExitStatus))); QVERIFY(spy.isValid()); QVERIFY(spy2.isValid()); @@ -350,7 +350,7 @@ void tst_QProcess::crashTest2() qRegisterMetaType<QProcess::ProcessError>("QProcess::ExitStatus"); QSignalSpy spy(process, SIGNAL(error(QProcess::ProcessError))); - QSignalSpy spy2(process, SIGNAL(finished(int, QProcess::ExitStatus))); + QSignalSpy spy2(process, SIGNAL(finished(int,QProcess::ExitStatus))); QVERIFY(spy.isValid()); QVERIFY(spy2.isValid()); @@ -922,8 +922,8 @@ public: SoftExitProcess(int n) : waitedForFinished(false), n(n), killing(false) { - connect(this, SIGNAL(finished(int, QProcess::ExitStatus)), - this, SLOT(finishedSlot(int, QProcess::ExitStatus))); + connect(this, SIGNAL(finished(int,QProcess::ExitStatus)), + this, SLOT(finishedSlot(int,QProcess::ExitStatus))); switch (n) { case 0: @@ -1488,7 +1488,7 @@ void tst_QProcess::failToStart() QSignalSpy stateSpy(&process, SIGNAL(stateChanged(QProcess::ProcessState))); QSignalSpy errorSpy(&process, SIGNAL(error(QProcess::ProcessError))); QSignalSpy finishedSpy(&process, SIGNAL(finished(int))); - QSignalSpy finishedSpy2(&process, SIGNAL(finished(int, QProcess::ExitStatus))); + QSignalSpy finishedSpy2(&process, SIGNAL(finished(int,QProcess::ExitStatus))); QVERIFY(stateSpy.isValid()); QVERIFY(errorSpy.isValid()); @@ -1554,7 +1554,7 @@ void tst_QProcess::failToStartWithWait() QEventLoop loop; QSignalSpy errorSpy(&process, SIGNAL(error(QProcess::ProcessError))); QSignalSpy finishedSpy(&process, SIGNAL(finished(int))); - QSignalSpy finishedSpy2(&process, SIGNAL(finished(int, QProcess::ExitStatus))); + QSignalSpy finishedSpy2(&process, SIGNAL(finished(int,QProcess::ExitStatus))); QVERIFY(errorSpy.isValid()); QVERIFY(finishedSpy.isValid()); @@ -1581,7 +1581,7 @@ void tst_QProcess::failToStartWithEventLoop() QEventLoop loop; QSignalSpy errorSpy(&process, SIGNAL(error(QProcess::ProcessError))); QSignalSpy finishedSpy(&process, SIGNAL(finished(int))); - QSignalSpy finishedSpy2(&process, SIGNAL(finished(int, QProcess::ExitStatus))); + QSignalSpy finishedSpy2(&process, SIGNAL(finished(int,QProcess::ExitStatus))); QVERIFY(errorSpy.isValid()); QVERIFY(finishedSpy.isValid()); @@ -1819,7 +1819,7 @@ void tst_QProcess::waitForReadyReadForNonexistantProcess() QProcess process; QSignalSpy errorSpy(&process, SIGNAL(error(QProcess::ProcessError))); QSignalSpy finishedSpy1(&process, SIGNAL(finished(int))); - QSignalSpy finishedSpy2(&process, SIGNAL(finished(int, QProcess::ExitStatus))); + QSignalSpy finishedSpy2(&process, SIGNAL(finished(int,QProcess::ExitStatus))); QVERIFY(errorSpy.isValid()); QVERIFY(finishedSpy1.isValid()); @@ -2153,7 +2153,7 @@ void tst_QProcess::onlyOneStartedSignal() QProcess process; QSignalSpy spyStarted(&process, SIGNAL(started())); - QSignalSpy spyFinished(&process, SIGNAL(finished(int, QProcess::ExitStatus))); + QSignalSpy spyFinished(&process, SIGNAL(finished(int,QProcess::ExitStatus))); QVERIFY(spyStarted.isValid()); QVERIFY(spyFinished.isValid()); diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index 914f88ecda..84fbfb4131 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -106,7 +106,9 @@ private slots: void testThreadSafety(); void testEmptyData(); void testResourceFiles(); +#ifdef Q_OS_MAC void fileName(); +#endif void isWritable_data(); void isWritable(); void registerFormat(); @@ -2576,9 +2578,10 @@ void tst_QSettings::testCaseSensitivity() } } +#ifdef Q_OS_MAC +// Please write a fileName() test for the other platforms void tst_QSettings::fileName() { -#ifdef Q_OS_MAC QSettings s1(QSettings::UserScope, "Apple", "Console"); QSettings s2(QSettings::UserScope, "Apple"); QSettings s3(QSettings::SystemScope, "Apple", "Console"); @@ -2642,10 +2645,8 @@ void tst_QSettings::fileName() QSettings s21(QSettings::SystemScope, QLatin1String(" ") + QChar(0xbd) + QLatin1String("Foo//:/Bar,,, Baz!()#"), "Console"); QCOMPARE(s21.fileName(), QString("/Library/Preferences/com.foo-bar-baz.Console.plist")); -#else - QSKIP("Please write a fileName() test for the other platforms"); -#endif } +#endif void tst_QSettings::isWritable_data() { |