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

Refactor tst_Collections

Browse Source 
This improves the readability and avoids code duplication
in tst_Collections::forwardDeclared. Also some warnings
are fixed:
* qSort is deprecated.
* The = operator for LargeStatic needs to be implemented
  explicitly when a copy constructor is given.
* QMap::insertMulti is deprecated, a MultiMap is required.

Task-number: QTBUG-82978
Change-Id: I577f851394edfaa30154bd3417ce391635cc546d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Lars Schmertmann 2020-06-29 16:23:28 +02:00 committed by Lars Schmertmann
parent a5025efccf
commit 11b3092cc4
1 changed files with 50 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,6 +129,12 @@ struct LargeStatic {
static int count; static int count;
LargeStatic():c(count) { ++count; } LargeStatic():c(count) { ++count; }
LargeStatic(const LargeStatic& o):c(o.c) { ++count; } LargeStatic(const LargeStatic& o):c(o.c) { ++count; }
LargeStatic &operator=(const LargeStatic &o)
{
c = o.c;
++count;
return *this;
};
~LargeStatic() { --count; } ~LargeStatic() { --count; }
int c; int c;
int data[8]; int data[8];
@ -1326,19 +1332,19 @@ void tst_Collections::hash()
hash1.unite(hash2); hash1.unite(hash2);
QCOMPARE(hash1.size(), 5); QCOMPARE(hash1.size(), 5);
auto values = hash1.values(); auto values = hash1.values();
qSort(values); std::sort(values.begin(), values.end());
QList<QString> expected; QList<QString> expected;
expected << "Gamma" << "Gamma" << "Beta" << "Gamma" << "Alpha"; expected << "Gamma" << "Gamma" << "Beta" << "Gamma" << "Alpha";
qSort(expected); std::sort(expected.begin(), expected.end());
QCOMPARE(values, expected); QCOMPARE(values, expected);
hash2 = hash1; hash2 = hash1;
hash2.unite(hash2); hash2.unite(hash2);
QCOMPARE(hash2.size(), 10); QCOMPARE(hash2.size(), 10);
values = hash2.values(); values = hash2.values();
qSort(values); std::sort(values.begin(), values.end());
expected += expected; expected += expected;
qSort(expected); std::sort(expected.begin(), expected.end());
QCOMPARE(values, expected); QCOMPARE(values, expected);
} }
} }
@ -1645,12 +1651,12 @@ void tst_Collections::map()
} }
{ {
QMap<int, QString> map1, map2; QMultiMap<int, QString> map1, map2;
map1.insertMulti(1, "Alpha"); map1.insert(1, "Alpha");
map1.insertMulti(1, "Gamma"); map1.insert(1, "Gamma");
map2.insertMulti(1, "Beta"); map2.insert(1, "Beta");
map2.insertMulti(1, "Gamma"); map2.insert(1, "Gamma");
map2.insertMulti(1, "Gamma"); map2.insert(1, "Gamma");
map1.unite(map2); map1.unite(map2);
QCOMPARE(map1.size(), 5); QCOMPARE(map1.size(), 5);
@ -2895,16 +2901,40 @@ class T2;
void tst_Collections::forwardDeclared() void tst_Collections::forwardDeclared()
{ {
{ typedef QHash<Key1, T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) } #define COMMA ,
{ typedef QMultiHash<Key1, T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) } #define TEST(type) do { \
{ typedef QMap<Key1, T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) } using C = type; \
{ typedef QMultiMap<Key1, T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) } C *x = nullptr; \
{ typedef QPair<T1, T2> C; C *x = 0; Q_UNUSED(x) } C::iterator i; \
{ typedef QList<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) } C::const_iterator j; \
{ typedef QVector<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) Q_UNUSED(i) Q_UNUSED(j) } Q_UNUSED(x); \
{ typedef QStack<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) Q_UNUSED(i) Q_UNUSED(j) } Q_UNUSED(i); \
{ typedef QQueue<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) } Q_UNUSED(j); \
{ typedef QSet<T1> C; C *x = 0; /* C::iterator i; */ C::const_iterator j; Q_UNUSED(x) } } while (false)
TEST(QHash<Key1 COMMA T1>);
TEST(QMap<Key1 COMMA T1>);
TEST(QMultiMap<Key1 COMMA T1>);
TEST(QList<T1>);
TEST(QVector<T1>);
TEST(QStack<T1>);
TEST(QQueue<T1>);
#undef TEST
#undef COMMA
{
using C = QPair<T1, T2>;
C *x = nullptr;
Q_UNUSED(x);
}
{
using C = QSet<T1>;
C *x = nullptr;
C::const_iterator j;
Q_UNUSED(x);
Q_UNUSED(j);
}
} }
class alignas(4) Aligned4 class alignas(4) Aligned4