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

tst_QPixmapCache: rewrite QVERIFY(x != 0) to QVERIFY(x)

Browse Source 
This is just confusing. QPixmapCache::find() already returns bool,
comparing it to a literal zero just makes it hard to read.

Change-Id: I43c000890377cca2111daa48799f10cc99aad8cf
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 6032845ca2fc69fb67971ea9f7e06588ffcbe9f3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2023-06-07 16:33:17 +02:00 committed by Qt Cherry-pick Bot
parent 41389ce13a
commit fd1c04fda7
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp
View File

@ -124,16 +124,16 @@ void tst_QPixmapCache::setCacheLimit()
//The int part of the API //The int part of the API
p1 = new QPixmap(2, 3); p1 = new QPixmap(2, 3);
QPixmapCache::Key key = QPixmapCache::insert(*p1); QPixmapCache::Key key = QPixmapCache::insert(*p1);
QVERIFY(QPixmapCache::find(key, p1) != 0); QVERIFY(QPixmapCache::find(key, p1));
delete p1; delete p1;
QPixmapCache::setCacheLimit(0); QPixmapCache::setCacheLimit(0);
QVERIFY(QPixmapCache::find(key, p1) == 0); QVERIFY(!QPixmapCache::find(key, p1));
p1 = new QPixmap(2, 3); p1 = new QPixmap(2, 3);
QPixmapCache::setCacheLimit(1000); QPixmapCache::setCacheLimit(1000);
QPixmapCache::replace(key, *p1); QPixmapCache::replace(key, *p1);
QVERIFY(QPixmapCache::find(key, p1) == 0); QVERIFY(!QPixmapCache::find(key, p1));
delete p1; delete p1;
@ -142,10 +142,10 @@ void tst_QPixmapCache::setCacheLimit()
QPixmapCache::clear(); QPixmapCache::clear();
p1 = new QPixmap(2, 3); p1 = new QPixmap(2, 3);
key = QPixmapCache::insert(*p1); key = QPixmapCache::insert(*p1);
QVERIFY(QPixmapCache::find(key, p1) != 0); QVERIFY(QPixmapCache::find(key, p1));
p1->detach(); // dectach so that the cache thinks no-one is using it. p1->detach(); // dectach so that the cache thinks no-one is using it.
QPixmapCache::setCacheLimit(0); QPixmapCache::setCacheLimit(0);
QVERIFY(QPixmapCache::find(key, p1) == 0); QVERIFY(!QPixmapCache::find(key, p1));
QPixmapCache::setCacheLimit(1000); QPixmapCache::setCacheLimit(1000);
key = QPixmapCache::insert(*p1); key = QPixmapCache::insert(*p1);
QVERIFY(key.isValid()); QVERIFY(key.isValid());
@ -159,7 +159,7 @@ void tst_QPixmapCache::setCacheLimit()
QPixmap p2; QPixmap p2;
p1 = new QPixmap(2, 3); p1 = new QPixmap(2, 3);
key = QPixmapCache::insert(*p1); key = QPixmapCache::insert(*p1);
QVERIFY(QPixmapCache::find(key, &p2) != 0); QVERIFY(QPixmapCache::find(key, &p2));
//we flush the cache //we flush the cache
p1->detach(); p1->detach();
p2.detach(); p2.detach();
@ -167,8 +167,8 @@ void tst_QPixmapCache::setCacheLimit()
QPixmapCache::setCacheLimit(1000); QPixmapCache::setCacheLimit(1000);
QPixmapCache::Key key2 = QPixmapCache::insert(*p1); QPixmapCache::Key key2 = QPixmapCache::insert(*p1);
QCOMPARE(getPrivate(key2)->key, 1); QCOMPARE(getPrivate(key2)->key, 1);
QVERIFY(QPixmapCache::find(key, &p2) == 0); QVERIFY(!QPixmapCache::find(key, &p2));
QVERIFY(QPixmapCache::find(key2, &p2) != 0); QVERIFY(QPixmapCache::find(key2, &p2));
QCOMPARE(p2, *p1); QCOMPARE(p2, *p1);
delete p1; delete p1;
@ -191,7 +191,7 @@ void tst_QPixmapCache::setCacheLimit()
QCOMPARE(getPrivate(key2)->key, 1); QCOMPARE(getPrivate(key2)->key, 1);
//This old key is not valid anymore after the flush //This old key is not valid anymore after the flush
QVERIFY(!key.isValid()); QVERIFY(!key.isValid());
QVERIFY(QPixmapCache::find(key, &p2) == 0); QVERIFY(!QPixmapCache::find(key, &p2));
delete p1; delete p1;
} }
@ -229,7 +229,7 @@ void tst_QPixmapCache::find()
QPixmapCache::insert(p5); QPixmapCache::insert(p5);
//at that time the first key has been erase because no more place in the cache //at that time the first key has been erase because no more place in the cache
QVERIFY(QPixmapCache::find(key, &p1) == 0); QVERIFY(!QPixmapCache::find(key, &p1));
QVERIFY(!key.isValid()); QVERIFY(!key.isValid());
} }
@ -362,11 +362,11 @@ void tst_QPixmapCache::remove()
QVERIFY(p1.toImage() == p1.toImage()); // sanity check QVERIFY(p1.toImage() == p1.toImage()); // sanity check
QPixmapCache::remove(key); QPixmapCache::remove(key);
QVERIFY(QPixmapCache::find(key, &p1) == 0); QVERIFY(!QPixmapCache::find(key, &p1));
//Broken key //Broken key
QPixmapCache::remove(QPixmapCache::Key()); QPixmapCache::remove(QPixmapCache::Key());
QVERIFY(QPixmapCache::find(QPixmapCache::Key(), &p1) == 0); QVERIFY(!QPixmapCache::find(QPixmapCache::Key(), &p1));
//Test if keys are release //Test if keys are release
QPixmapCache::clear(); QPixmapCache::clear();
@ -380,7 +380,7 @@ void tst_QPixmapCache::remove()
QPixmapCache::clear(); QPixmapCache::clear();
key = QPixmapCache::insert(p1); key = QPixmapCache::insert(p1);
QCOMPARE(getPrivate(key)->key, 1); QCOMPARE(getPrivate(key)->key, 1);
QVERIFY(QPixmapCache::find(key, &p1) != 0); QVERIFY(QPixmapCache::find(key, &p1));
QPixmapCache::remove(key); QPixmapCache::remove(key);
QCOMPARE(p1.isDetached(), true); QCOMPARE(p1.isDetached(), true);
@ -390,8 +390,8 @@ void tst_QPixmapCache::remove()
QPixmapCache::insert("red", p1); QPixmapCache::insert("red", p1);
key = QPixmapCache::insert(p1); key = QPixmapCache::insert(p1);
QPixmapCache::remove(key); QPixmapCache::remove(key);
QVERIFY(QPixmapCache::find(key, &p1) == 0); QVERIFY(!QPixmapCache::find(key, &p1));
QVERIFY(QPixmapCache::find("red", &p1) != 0); QVERIFY(QPixmapCache::find("red", &p1));
} }
void tst_QPixmapCache::clear() void tst_QPixmapCache::clear()
@ -435,7 +435,7 @@ void tst_QPixmapCache::clear()
QPixmapCache::clear(); QPixmapCache::clear();
for (int k = 0; k < numberOfKeys; ++k) { for (int k = 0; k < numberOfKeys; ++k) {
QVERIFY(QPixmapCache::find(keys.at(k), &p1) == 0); QVERIFY(!QPixmapCache::find(keys.at(k), &p1));
QVERIFY(!keys[k].isValid()); QVERIFY(!keys[k].isValid());
} }
} }