diff options
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp | 11 | ||||
-rw-r--r-- | tests/auto/corelib/tools/qduplicatetracker/tst_qduplicatetracker.cpp | 5 |
2 files changed, 13 insertions, 3 deletions
diff --git a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp index e57cc732ee2..fcda3cf6756 100644 --- a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp +++ b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp @@ -15,6 +15,8 @@ #include <QtTest/private/qtesthelpers_p.h> +#include <QtCore/qscopeguard.h> + #if defined(Q_OS_WIN) # include <shlwapi.h> # include <qt_windows.h> @@ -552,6 +554,12 @@ void tst_QTemporaryFile::stressTest() const int iterations = 1000; QSet<QString> names; + + const auto remover = qScopeGuard([&] { + for (const QString &s : std::as_const(names)) + QFile::remove(s); + }); + for (int i = 0; i < iterations; ++i) { QTemporaryFile file; file.setAutoRemove(false); @@ -559,9 +567,6 @@ void tst_QTemporaryFile::stressTest() QVERIFY(!names.contains(file.fileName())); names.insert(file.fileName()); } - for (QSet<QString>::const_iterator it = names.constBegin(); it != names.constEnd(); ++it) { - QFile::remove(*it); - } } void tst_QTemporaryFile::rename() diff --git a/tests/auto/corelib/tools/qduplicatetracker/tst_qduplicatetracker.cpp b/tests/auto/corelib/tools/qduplicatetracker/tst_qduplicatetracker.cpp index eecc8b52d28..bd95174c932 100644 --- a/tests/auto/corelib/tools/qduplicatetracker/tst_qduplicatetracker.cpp +++ b/tests/auto/corelib/tools/qduplicatetracker/tst_qduplicatetracker.cpp @@ -120,6 +120,11 @@ void tst_QDuplicateTracker::appendTo() QList<int> b; tracker.appendTo(b); + // iteration order is append order: + QVERIFY(std::equal(b.cbegin(), b.cend(), + tracker.cbegin(), tracker.cend())); + QVERIFY(std::equal(b.cbegin(), b.cend(), + tracker.begin(), tracker.end())); std::sort(b.begin(), b.end()); QCOMPARE(b, QList<int>({ 0, 1 })); |