1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some fixes to collection autotest

Browse Source 
Split QHash and QMultiHash, and get rid of some compiler warnings.

Change-Id: I48991f097f408ad5c1aa349443e26ab816e0b736
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Lars Knoll 2020-01-17 15:56:12 +01:00
parent f98a20a690
commit 866174307a
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/auto/corelib/tools/collections/tst_collections.cpp
View File

@ -1551,12 +1551,12 @@ void tst_Collections::hash()
} }
{ {
QHash<int, QString> hash1, hash2; QMultiHash<int, QString> hash1, hash2;
hash1.insertMulti(1, "Alpha"); hash1.insert(1, "Alpha");
hash1.insertMulti(1, "Gamma"); hash1.insert(1, "Gamma");
hash2.insertMulti(1, "Beta"); hash2.insert(1, "Beta");
hash2.insertMulti(1, "Gamma"); hash2.insert(1, "Gamma");
hash2.insertMulti(1, "Gamma"); hash2.insert(1, "Gamma");
hash1.unite(hash2); hash1.unite(hash2);
QCOMPARE(hash1.size(), 5); QCOMPARE(hash1.size(), 5);
@ -1986,15 +1986,6 @@ void tst_Collections::qstring()
QVERIFY(null.isNull()); QVERIFY(null.isNull());
QVERIFY(!nonNull.isNull()); QVERIFY(!nonNull.isNull());
#if QT_DEPRECATED_SINCE(5, 9)
QVERIFY(null == QString::null);
QVERIFY(QString::null == null);
QVERIFY(nonNull != QString::null);
QVERIFY(QString::null != nonNull);
QVERIFY(null == nonNull);
QVERIFY(QString::null == QString::null);
#endif
QString fill = "123"; QString fill = "123";
fill.fill('a'); fill.fill('a');
QCOMPARE(fill, QLatin1String("aaa")); QCOMPARE(fill, QLatin1String("aaa"));