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

Tests: Replace Q[TRY]_VERIFY(v == true|false) by QVERIFY(v)|QVERIFY(!v).

Browse Source 
Preparing the replacement of Q[TRY]_VERIFY(a == b) by
Q[TRY]_COMPARE(a, b) for non-boolean types.

Change-Id: Iab6ec2f0a89a3adc79e18304573994965013dab5
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2015-07-23 13:26:28 +02:00
parent 4c3c6bab30
commit c067c012dc
30 changed files with 130 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
View File

@ -1443,45 +1443,45 @@ void tst_QtConcurrentFilter::noDetach()
QVERIFY(l.isDetached());
QList<int> ll = l;
QVERIFY(l.isDetached() == false);
QVERIFY(!l.isDetached());
QtConcurrent::filtered(l, waitFilterfn).waitForFinished();
QVERIFY(l.isDetached() == false);
QVERIFY(ll.isDetached() == false);
QVERIFY(!l.isDetached());
QVERIFY(!ll.isDetached());
QtConcurrent::blockingFiltered(l, waitFilterfn);
QVERIFY(l.isDetached() == false);
QVERIFY(ll.isDetached() == false);
QVERIFY(!l.isDetached());
QVERIFY(!ll.isDetached());
QtConcurrent::filteredReduced(l, waitFilterfn, intSumReduce).waitForFinished();
QVERIFY(l.isDetached() == false);
QVERIFY(ll.isDetached() == false);
QVERIFY(!l.isDetached());
QVERIFY(!ll.isDetached());
QtConcurrent::filter(l, waitFilterfn).waitForFinished();
if (!l.isDetached())
QEXPECT_FAIL("", "QTBUG-20688: Known unstable failure", Abort);
QVERIFY(l.isDetached() == true);
QVERIFY(ll.isDetached() == true);
QVERIFY(l.isDetached());
QVERIFY(ll.isDetached());
}
{
const QList<int> l = QList<int>() << 1;
QVERIFY(l.isDetached());
const QList<int> ll = l;
QVERIFY(l.isDetached() == false);
QVERIFY(!l.isDetached());
QtConcurrent::filtered(l, waitFilterfn).waitForFinished();
QVERIFY(l.isDetached() == false);
QVERIFY(ll.isDetached() == false);
QVERIFY(!l.isDetached());
QVERIFY(!ll.isDetached());
QtConcurrent::filteredReduced(l, waitFilterfn, intSumReduce).waitForFinished();
QVERIFY(l.isDetached() == false);
QVERIFY(ll.isDetached() == false);
QVERIFY(!l.isDetached());
QVERIFY(!ll.isDetached());
}
}

24
tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
View File

@ -2250,38 +2250,38 @@ void tst_QtConcurrentMap::noDetach()
QVERIFY(l.isDetached());
QList<int> ll = l;
QVERIFY(l.isDetached() == false);
QVERIFY(!l.isDetached());
QtConcurrent::mapped(l, mapper).waitForFinished();
QVERIFY(l.isDetached() == false);
QVERIFY(ll.isDetached() == false);
QVERIFY(!l.isDetached());
QVERIFY(!ll.isDetached());
QtConcurrent::mappedReduced(l, mapper, intSumReduce).waitForFinished();
QVERIFY(l.isDetached() == false);
QVERIFY(ll.isDetached() == false);
QVERIFY(!l.isDetached());
QVERIFY(!ll.isDetached());
QtConcurrent::map(l, multiplyBy2Immutable).waitForFinished();
QVERIFY(l.isDetached() == true);
QVERIFY(ll.isDetached() == true);
QVERIFY(l.isDetached());
QVERIFY(ll.isDetached());
}
{
const QList<int> l = QList<int>() << 1;
QVERIFY(l.isDetached());
const QList<int> ll = l;
QVERIFY(l.isDetached() == false);
QVERIFY(!l.isDetached());
QtConcurrent::mapped(l, mapper).waitForFinished();
QVERIFY(l.isDetached() == false);
QVERIFY(ll.isDetached() == false);
QVERIFY(!l.isDetached());
QVERIFY(!ll.isDetached());
QtConcurrent::mappedReduced(l, mapper, intSumReduce).waitForFinished();
QVERIFY(l.isDetached() == false);
QVERIFY(ll.isDetached() == false);
QVERIFY(!l.isDetached());
QVERIFY(!ll.isDetached());
}
}

2
tests/auto/corelib/global/qglobal/tst_qglobal.cpp
View File

@ -457,7 +457,7 @@ void tst_QGlobal::isEnum()
// fallback type traits implementation. Any compiler
// supported by Qt that supports C++0x class enums
// should also support the __is_enum intrinsic.
QVERIFY(Q_IS_ENUM(isEnum_G) == true);
QVERIFY(Q_IS_ENUM(isEnum_G));
#endif
#undef IS_ENUM_TRUE

2
tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
View File

@ -379,7 +379,7 @@ void tst_QAbstractItemModel::hasChildren()
{
QtTestModel model(1, 1);
QModelIndex idx = model.index(0, 0, QModelIndex());
QVERIFY(model.hasChildren(idx) == false);
QVERIFY(!model.hasChildren(idx));
}
void tst_QAbstractItemModel::data()

2
tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
View File

@ -1530,7 +1530,7 @@ void tst_QItemSelectionModel::resetModel()
model.reset();
QVERIFY(selectionModel->selection().isEmpty());
QVERIFY(selectionModel->hasSelection() == false);
QVERIFY(!selectionModel->hasSelection());
selectionModel->select(QItemSelection(model.index(0, 0), model.index(5, 5)), QItemSelectionModel::Select);

40
tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp
View File

@ -70,7 +70,7 @@ void tst_QMimeData::clear() const
mimeData.setData("text/plain", "pirates");
QVERIFY(mimeData.hasText());
mimeData.clear();
QVERIFY(mimeData.hasText() == false);
QVERIFY(!mimeData.hasText());
// repopulate, verify not empty
mimeData.setData("text/plain", "pirates");
@ -136,7 +136,7 @@ void tst_QMimeData::hasColor() const
QMimeData mimeData;
// initial state
QVERIFY(mimeData.hasColor() == false);
QVERIFY(!mimeData.hasColor());
// set, verify
mimeData.setColorData(QColor(Qt::red));
@ -144,11 +144,11 @@ void tst_QMimeData::hasColor() const
// clear, verify
mimeData.clear();
QVERIFY(mimeData.hasColor() == false);
QVERIFY(!mimeData.hasColor());
// set something else, verify
mimeData.setData("text/plain", "pirates");
QVERIFY(mimeData.hasColor() == false);
QVERIFY(!mimeData.hasColor());
}
void tst_QMimeData::hasFormat() const
@ -156,17 +156,17 @@ void tst_QMimeData::hasFormat() const
QMimeData mimeData;
// initial state
QVERIFY(mimeData.hasFormat("text/plain") == false);
QVERIFY(!mimeData.hasFormat("text/plain"));
// add, verify
mimeData.setData("text/plain", "pirates");
QVERIFY(mimeData.hasFormat("text/plain"));
QVERIFY(mimeData.hasFormat("text/html") == false);
QVERIFY(!mimeData.hasFormat("text/html"));
// clear, verify
mimeData.clear();
QVERIFY(mimeData.hasFormat("text/plain") == false);
QVERIFY(mimeData.hasFormat("text/html") == false);
QVERIFY(!mimeData.hasFormat("text/plain"));
QVERIFY(!mimeData.hasFormat("text/html"));
}
void tst_QMimeData::hasHtml() const
@ -174,11 +174,11 @@ void tst_QMimeData::hasHtml() const
QMimeData mimeData;
// initial state
QVERIFY(mimeData.hasHtml() == false);
QVERIFY(!mimeData.hasHtml());
// add plain, verify false
mimeData.setData("text/plain", "pirates");
QVERIFY(mimeData.hasHtml() == false);
QVERIFY(!mimeData.hasHtml());
// add html, verify
mimeData.setData("text/html", "ninjas");
@ -186,7 +186,7 @@ void tst_QMimeData::hasHtml() const
// clear, verify
mimeData.clear();
QVERIFY(mimeData.hasHtml() == false);
QVERIFY(!mimeData.hasHtml());
// readd, verify
mimeData.setData("text/html", "ninjas");
@ -198,11 +198,11 @@ void tst_QMimeData::hasImage() const
QMimeData mimeData;
// initial state
QVERIFY(mimeData.hasImage() == false);
QVERIFY(!mimeData.hasImage());
// add text, verify false
mimeData.setData("text/plain", "pirates");
QVERIFY(mimeData.hasImage() == false);
QVERIFY(!mimeData.hasImage());
// add image
mimeData.setImageData(QImage());
@ -210,7 +210,7 @@ void tst_QMimeData::hasImage() const
// clear, verify
mimeData.clear();
QVERIFY(mimeData.hasImage() == false);
QVERIFY(!mimeData.hasImage());
}
void tst_QMimeData::imageData() const
@ -244,13 +244,13 @@ void tst_QMimeData::removeFormat() const
// remove, verify
mimeData.removeFormat("text/plain");
QVERIFY(mimeData.hasFormat("text/plain") == false);
QVERIFY(!mimeData.hasFormat("text/plain"));
QVERIFY(mimeData.hasFormat("text/html"));
// remove, verify
mimeData.removeFormat("text/html");
QVERIFY(mimeData.hasFormat("text/plain") == false);
QVERIFY(mimeData.hasFormat("text/html") == false);
QVERIFY(!mimeData.hasFormat("text/plain"));
QVERIFY(!mimeData.hasFormat("text/html"));
}
void tst_QMimeData::setHtml() const
@ -258,7 +258,7 @@ void tst_QMimeData::setHtml() const
QMimeData mimeData;
// initial state
QVERIFY(mimeData.hasHtml() == false);
QVERIFY(!mimeData.hasHtml());
// add html, verify
mimeData.setHtml("ninjas");
@ -277,7 +277,7 @@ void tst_QMimeData::setText() const
// verify initial state
QCOMPARE(mimeData.text(), QLatin1String(""));
QVERIFY(mimeData.hasText() == false);
QVERIFY(!mimeData.hasText());
// set, verify
mimeData.setText("pirates");
@ -294,7 +294,7 @@ void tst_QMimeData::setText() const
// clear, verify
mimeData.clear();
QCOMPARE(mimeData.text(), QLatin1String(""));
QVERIFY(mimeData.hasText() == false);
QVERIFY(!mimeData.hasText());
}
// Publish retrieveData for verifying content validity

34
tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
View File

@ -648,7 +648,7 @@ void tst_QFuture::cancel()
result.reportStarted();
f = result.future();
QVERIFY(f.isCanceled() == false);
QVERIFY(!f.isCanceled());
result.reportCanceled();
QVERIFY(f.isCanceled());
result.reportFinished();
@ -663,14 +663,14 @@ void tst_QFuture::cancel()
QFutureInterface<void> result;
QFuture<void> f;
QVERIFY(f.isStarted() == true);
QVERIFY(f.isStarted());
result.reportStarted();
f = result.future();
QVERIFY(f.isStarted() == true);
QVERIFY(f.isStarted());
QVERIFY(result.isCanceled() == false);
QVERIFY(!result.isCanceled());
f.cancel();
QVERIFY(result.isCanceled());
@ -683,12 +683,12 @@ void tst_QFuture::cancel()
QFutureInterface<void> result;
QFuture<void> f;
QVERIFY(f.isStarted() == true);
QVERIFY(f.isStarted());
result.reportStarted();
f = result.future();
QVERIFY(f.isStarted() == true);
QVERIFY(f.isStarted());
result.reportFinished();
@ -805,12 +805,12 @@ void tst_QFuture::indexedResults()
{
QFutureInterface<QChar> Interface;
QFuture<QChar> f;
QVERIFY(f.isStarted() == true);
QVERIFY(f.isStarted());
Interface.reportStarted();
f = Interface.future();
QVERIFY(f.isStarted() == true);
QVERIFY(f.isStarted());
QChar result;
@ -1126,14 +1126,14 @@ void tst_QFuture::iterators()
QVERIFY(it.hasNext());
QCOMPARE(it.peekNext(), resultCount - 1);
QCOMPARE(it.next(), resultCount - 1);
QVERIFY(it.hasNext() == false);
QVERIFY(!it.hasNext());
}
{
QFutureIterator<int> it(f);
QVERIFY(it.hasNext());
it.toBack();
QVERIFY(it.hasNext() == false);
QVERIFY(!it.hasNext());
it.toFront();
QVERIFY(it.hasNext());
}
@ -1192,15 +1192,15 @@ void tst_QFuture::pause()
Interface.reportStarted();
QFuture<void> f = Interface.future();
QVERIFY(Interface.isPaused() == false);
QVERIFY(!Interface.isPaused());
f.pause();
QVERIFY(Interface.isPaused() == true);
QVERIFY(Interface.isPaused());
f.resume();
QVERIFY(Interface.isPaused() == false);
QVERIFY(!Interface.isPaused());
f.togglePaused();
QVERIFY(Interface.isPaused() == true);
QVERIFY(Interface.isPaused());
f.togglePaused();
QVERIFY(Interface.isPaused() == false);
QVERIFY(!Interface.isPaused());
Interface.reportFinished();
}
@ -1228,13 +1228,13 @@ void tst_QFuture::throttling()
i.reportStarted();
QFuture<void> f = i.future();
QVERIFY(i.isThrottled() == false);
QVERIFY(!i.isThrottled());
i.setThrottled(true);
QVERIFY(i.isThrottled());
i.setThrottled(false);
QVERIFY(i.isThrottled() == false);
QVERIFY(!i.isThrottled());
i.setThrottled(true);
QVERIFY(i.isThrottled());

8
tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
View File

@ -743,7 +743,7 @@ void tst_QFutureWatcher::finishedState()
iface.reportFinished();
QVERIFY(future.isFinished());
QVERIFY(watcher.isFinished() == false);
QVERIFY(!watcher.isFinished());
QTest::qWait(10);
QVERIFY(watcher.isFinished());
@ -761,18 +761,18 @@ void tst_QFutureWatcher::throttling()
QFutureWatcher<int> watcher;
watcher.setFuture(future);
QVERIFY(iface.isThrottled() == false);
QVERIFY(!iface.isThrottled());
for (int i = 0; i < 1000; ++i) {
int result = 0;
iface.reportResult(result);
}
QVERIFY(iface.isThrottled() == true);
QVERIFY(iface.isThrottled());
QTest::qWait(100); // process events.
QVERIFY(iface.isThrottled() == false);
QVERIFY(!iface.isThrottled());
iface.reportFinished();
}

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

@ -2235,7 +2235,7 @@ void tst_Collections::qstring()
void tst_Collections::bitArray()
{
QBitArray ba(20);
QVERIFY(ba.testBit(17) == false);
QVERIFY(!ba.testBit(17));
ba.setBit(17);
QVERIFY(ba.size() == 20);
QVERIFY(ba.testBit(17)==true);

4
tests/auto/corelib/tools/qlinkedlist/tst_qlinkedlist.cpp
View File

@ -527,12 +527,12 @@ void tst_QLinkedList::contains() const
QLinkedList<T> list;
list << T_FOO << T_BAR << T_BAZ;
QVERIFY(list.contains(T_FOO) == true);
QVERIFY(list.contains(T_FOO));
QVERIFY(list.contains(T_BLAH) != true);
// add it and make sure it matches
list.append(T_BLAH);
QVERIFY(list.contains(T_BLAH) == true);
QVERIFY(list.contains(T_BLAH));
}
void tst_QLinkedList::containsInt() const

4
tests/auto/corelib/tools/qlist/tst_qlist.cpp
View File

@ -976,12 +976,12 @@ void tst_QList::contains() const
QList<T> list;
list << T_FOO << T_BAR << T_BAZ;
QVERIFY(list.contains(T_FOO) == true);
QVERIFY(list.contains(T_FOO));
QVERIFY(list.contains(T_BLAH) != true);
// add it and make sure it matches
list.append(T_BLAH);
QVERIFY(list.contains(T_BLAH) == true);
QVERIFY(list.contains(T_BLAH));
}
void tst_QList::containsOptimal() const

2
tests/auto/gui/image/qmovie/tst_qmovie.cpp
View File

@ -188,7 +188,7 @@ void tst_QMovie::jumpToFrame()
QMovie movie(QFINDTESTDATA(fileName));
movie.start();
movie.stop();
QVERIFY(movie.jumpToFrame(-1) == false);
QVERIFY(!movie.jumpToFrame(-1));
QVERIFY(movie.currentFrameNumber() == 0);
}

2
tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
View File

@ -743,7 +743,7 @@ void tst_QPixmap::isNull()
{
{
QPixmap pixmap(1,1);
QVERIFY(pixmap.isNull() == false);
QVERIFY(!pixmap.isNull());
}
{
QPixmap pixmap(0,0);

2
tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
View File

@ -497,7 +497,7 @@ void tst_QTextCursor::navigation10()
QVERIFY(ok);
QCOMPARE(cursor.position(), 99);
ok = cursor.movePosition(QTextCursor::NextCell);
QVERIFY(ok == false);
QVERIFY(!ok);
QCOMPARE(cursor.position(), 99); // didn't move.
QVERIFY(cursor.currentTable());

10
tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
View File

@ -873,7 +873,7 @@ void tst_QTextDocumentFragment::hrefAnchor()
setHtml(QString::fromLatin1(html));
QVERIFY(doc->begin().begin().fragment().charFormat().isAnchor());
QCOMPARE(doc->begin().begin().fragment().charFormat().anchorHref(), QString::fromLatin1("test"));
QVERIFY(doc->begin().begin().fragment().charFormat().fontUnderline() == true);
QVERIFY(doc->begin().begin().fragment().charFormat().fontUnderline());
}
{
@ -881,7 +881,7 @@ void tst_QTextDocumentFragment::hrefAnchor()
const char html[] = "<a>blah</a>";
setHtml(QString::fromLatin1(html));
QVERIFY(doc->begin().begin().fragment().charFormat().isAnchor());
QVERIFY(doc->begin().begin().fragment().charFormat().fontUnderline() == false);
QVERIFY(!doc->begin().begin().fragment().charFormat().fontUnderline());
}
}
@ -901,7 +901,7 @@ void tst_QTextDocumentFragment::namedAnchorFragments()
// the 'a'
QVERIFY(it.fragment().isValid());
QCOMPARE(it.fragment().text(), QString::fromLatin1("a"));
QVERIFY(it.fragment().charFormat().isAnchor() == false);
QVERIFY(!it.fragment().charFormat().isAnchor());
// the 'b' of 'blah' as separate fragment with the anchor attribute
++it;
@ -913,7 +913,7 @@ void tst_QTextDocumentFragment::namedAnchorFragments()
++it;
QVERIFY(it.fragment().isValid());
QVERIFY(it.fragment().text().startsWith("lah"));
QVERIFY(it.fragment().charFormat().isAnchor() == false);
QVERIFY(!it.fragment().charFormat().isAnchor());
}
void tst_QTextDocumentFragment::namedAnchorFragments2()
@ -1837,7 +1837,7 @@ void tst_QTextDocumentFragment::html_doNotInheritBackground()
for (QTextBlock block = doc->begin();
block.isValid(); block = block.next()) {
QVERIFY(block.blockFormat().hasProperty(QTextFormat::BackgroundBrush) == false);
QVERIFY(!block.blockFormat().hasProperty(QTextFormat::BackgroundBrush));
}
QVERIFY(doc->rootFrame()->frameFormat().hasProperty(QTextFormat::BackgroundBrush));

6
tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
View File

@ -561,13 +561,13 @@ void tst_QHostInfo::cache()
QHostInfo result = qt_qhostinfo_lookup("localhost", this, SLOT(resultsReady(QHostInfo)), &valid, &id);
QTestEventLoop::instance().enterLoop(5);
QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(valid == false);
QVERIFY(!valid);
QVERIFY(result.addresses().isEmpty());
// loopkup second time, result should come directly
valid = false;
result = qt_qhostinfo_lookup("localhost", this, SLOT(resultsReady(QHostInfo)), &valid, &id);
QVERIFY(valid == true);
QVERIFY(valid);
QVERIFY(!result.addresses().isEmpty());
// clear the cache
@ -578,7 +578,7 @@ void tst_QHostInfo::cache()
result = qt_qhostinfo_lookup("localhost", this, SLOT(resultsReady(QHostInfo)), &valid, &id);
QTestEventLoop::instance().enterLoop(5);
QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(valid == false);
QVERIFY(!valid);
QVERIFY(result.addresses().isEmpty());
// the slot should have been called 2 times.

4
tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
View File

@ -1128,7 +1128,7 @@ void tst_QSslCertificate::extensions()
QVariantMap basicValue = basic.value().toMap();
QCOMPARE(basicValue.keys(), QList<QString>() << QStringLiteral("ca"));
QVERIFY(basicValue[QStringLiteral("ca")].toBool() == false);
QVERIFY(!basicValue[QStringLiteral("ca")].toBool());
// Subject key identifier
QSslCertificateExtension subjectKey = extensions[subject_key_idx];
@ -1185,7 +1185,7 @@ void tst_QSslCertificate::extensionsCritical()
QVariantMap basicValue = basic.value().toMap();
QCOMPARE(basicValue.keys(), QList<QString>() << QStringLiteral("ca"));
QVERIFY(basicValue[QStringLiteral("ca")].toBool() == false);
QVERIFY(!basicValue[QStringLiteral("ca")].toBool());
// Key Usage
QSslCertificateExtension keyUsage = extensions[key_usage_idx];

12
tests/auto/other/compiler/tst_compiler.cpp
View File

@ -336,17 +336,17 @@ struct Qxxx {};
void tst_Compiler::detectDataStream()
{
QVERIFY(QtTestInternal::DataStreamChecker<int>::HasDataStream == true);
QVERIFY(QtTestInternal::DataStreamChecker<uint>::HasDataStream == true);
QVERIFY(QtTestInternal::DataStreamChecker<int>::HasDataStream);
QVERIFY(QtTestInternal::DataStreamChecker<uint>::HasDataStream);
QVERIFY(QtTestInternal::DataStreamChecker<char *>::HasDataStream == true);
QVERIFY(QtTestInternal::DataStreamChecker<const int>::HasInDataStream == true);
QVERIFY(QtTestInternal::DataStreamChecker<const int>::HasOutDataStream == false);
QVERIFY(QtTestInternal::DataStreamChecker<const int>::HasDataStream == false);
QVERIFY(QtTestInternal::DataStreamChecker<double>::HasDataStream == true);
QVERIFY(QtTestInternal::DataStreamChecker<double>::HasDataStream);
QVERIFY(QtTestInternal::DataStreamChecker<QString>::HasDataStream == true);
QVERIFY(QtTestInternal::DataStreamChecker<MyString>::HasDataStream == true);
QVERIFY(QtTestInternal::DataStreamChecker<Qxxx>::HasDataStream == false);
QVERIFY(QtTestInternal::DataStreamChecker<QString>::HasDataStream);
QVERIFY(QtTestInternal::DataStreamChecker<MyString>::HasDataStream);
QVERIFY(!QtTestInternal::DataStreamChecker<Qxxx>::HasDataStream);
QVERIFY(QtTestInternal::getSaveOperator<int>() != 0);
QVERIFY(QtTestInternal::getSaveOperator<uint>() != 0);

2
tests/auto/other/macgui/tst_macgui.cpp
View File

@ -146,7 +146,7 @@ void tst_MacGui::splashScreenModality()
connect(wn.getWidget(interface), SIGNAL(clicked()), SLOT(exitLoopSlot()));
const int timeout = 4;
QTestEventLoop::instance().enterLoop(timeout);
QVERIFY(QTestEventLoop::instance().timeout() == false);
QVERIFY(!QTestEventLoop::instance().timeout());
}
class PrimaryWindowDialog : public QDialog

2
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
View File

@ -1303,7 +1303,7 @@ void tst_QAccessibility::tabTest()
QCOMPARE(child1->text(QAccessible::Description), QLatin1String("Cool tool tip"));
QCOMPARE(child1->text(QAccessible::Help), QLatin1String("I don't know"));
QVERIFY((child1->state().invisible) == false);
QVERIFY(!(child1->state().invisible));
tabBar->hide();
QCoreApplication::processEvents();

4
tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
View File

@ -1026,7 +1026,7 @@ void tst_QSqlRelationalTableModel::invalidData()
QCOMPARE(model.data(model.index(0, 2)).toString(), QString("herr"));
//try to set data in non valid index
QVERIFY(model.setData(model.index(0,10),5) == false);
QVERIFY(!model.setData(model.index(0,10),5));
//same test with LeftJoin mode
model.setJoinMode(QSqlRelationalTableModel::LeftJoin);
@ -1037,7 +1037,7 @@ void tst_QSqlRelationalTableModel::invalidData()
QCOMPARE(model.data(model.index(0, 2)).toString(), QString("herr"));
//try to set data in non valid index
QVERIFY(model.setData(model.index(0,10),5) == false);
QVERIFY(!model.setData(model.index(0,10),5));
}
void tst_QSqlRelationalTableModel::relationModel()

4
tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
View File

@ -439,7 +439,7 @@ void tst_QWizard::setPixmap()
QVERIFY(wizard.pixmap(QWizard::LogoPixmap).isNull());
QVERIFY(wizard.pixmap(QWizard::WatermarkPixmap).isNull());
#ifdef Q_OS_OSX
QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull() == false);
QVERIFY(!wizard.pixmap(QWizard::BackgroundPixmap).isNull());
#else
QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull());
#endif
@ -448,7 +448,7 @@ void tst_QWizard::setPixmap()
QVERIFY(page->pixmap(QWizard::LogoPixmap).isNull());
QVERIFY(page->pixmap(QWizard::WatermarkPixmap).isNull());
#ifdef Q_OS_OSX
QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull() == false);
QVERIFY(!wizard.pixmap(QWizard::BackgroundPixmap).isNull());
#else
QVERIFY(page->pixmap(QWizard::BackgroundPixmap).isNull());
#endif

2
tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
View File

@ -653,7 +653,7 @@ void tst_QGraphicsAnchorLayout::snake()
QCOMPARE(c->geometry(), QRectF(90.0, 200.0, 100.0, 100.0));
QCOMPARE(p.size(), layoutMaximumSize);
QVERIFY(layoutHasConflict(l) == false);
QVERIFY(!layoutHasConflict(l));
// Test QSizePolicy::ExpandFlag, it shouldn't change the extreme
// points of the layout...

12
tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp
View File

@ -210,36 +210,36 @@ void tst_QGraphicsObject::enabled()
{
MyGraphicsObject object;
QSignalSpy spy(&object, SIGNAL(enabledChanged()));
QVERIFY(object.isEnabled() == true);
QVERIFY(object.isEnabled());
object.setEnabled(false);
QCOMPARE(spy.count(), 1);
QVERIFY(object.isEnabled() == false);
QVERIFY(!object.isEnabled());
object.setEnabled(false);
QCOMPARE(spy.count(), 1);
object.setProperty("enabled", true);
QCOMPARE(spy.count(), 2);
QVERIFY(object.property("enabled") == true);
QVERIFY(object.property("enabled").toBool());
}
void tst_QGraphicsObject::visible()
{
MyGraphicsObject object;
QSignalSpy spy(&object, SIGNAL(visibleChanged()));
QVERIFY(object.isVisible() == true);
QVERIFY(object.isVisible());
object.setVisible(false);
QCOMPARE(spy.count(), 1);
QVERIFY(object.isVisible() == false);
QVERIFY(!object.isVisible());
object.setVisible(false);
QCOMPARE(spy.count(), 1);
object.setProperty("visible", true);
QCOMPARE(spy.count(), 2);
QVERIFY(object.property("visible") == true);
QVERIFY(object.property("visible").toBool());
}
class DeleteTester : public QGraphicsObject

14
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -3079,12 +3079,12 @@ void tst_QWidget::saveRestoreGeometry()
const QByteArray four("abca");
const QByteArray garbage("abcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabc");
QVERIFY(widget.restoreGeometry(empty) == false);
QVERIFY(widget.restoreGeometry(one) == false);
QVERIFY(widget.restoreGeometry(two) == false);
QVERIFY(widget.restoreGeometry(three) == false);
QVERIFY(widget.restoreGeometry(four) == false);
QVERIFY(widget.restoreGeometry(garbage) == false);
QVERIFY(!widget.restoreGeometry(empty));
QVERIFY(!widget.restoreGeometry(one));
QVERIFY(!widget.restoreGeometry(two));
QVERIFY(!widget.restoreGeometry(three));
QVERIFY(!widget.restoreGeometry(four));
QVERIFY(!widget.restoreGeometry(garbage));
QVERIFY(widget.restoreGeometry(savedGeometry));
widget.showNormal();
@ -4496,7 +4496,7 @@ void tst_QWidget::qobject_castInDestroyedSlot()
QObject::connect(widget, SIGNAL(destroyed(QObject*)), &checker, SLOT(destroyedSlot(QObject*)));
delete widget;
QVERIFY(checker.wasQWidget == true);
QVERIFY(checker.wasQWidget);
}
// Since X11 WindowManager operations are all async, and we have no way to know if the window

2
tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
View File

@ -544,7 +544,7 @@ void tst_QMenu::onStatusTipTimer()
menu->close(); //goes out of the menu
QCOMPARE(st, QString("sub action"));
QVERIFY(menu->isVisible() == false);
QVERIFY(!menu->isVisible());
m_onStatusTipTimerExecuted = true;
}

6
tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
View File

@ -1560,7 +1560,7 @@ void tst_QPlainTextEdit::findWithRegExp()
bool found = ed->find(rx);
QVERIFY(found == true);
QVERIFY(found);
QCOMPARE(ed->textCursor().selectedText(), QStringLiteral("text"));
}
@ -1574,7 +1574,7 @@ void tst_QPlainTextEdit::findBackwardWithRegExp()
bool found = ed->find(rx, QTextDocument::FindBackward);
QVERIFY(found == true);
QVERIFY(found);
QCOMPARE(ed->textCursor().selectedText(), QStringLiteral("arbit"));
}
@ -1586,7 +1586,7 @@ void tst_QPlainTextEdit::findWithRegExpReturnsFalseIfNoMoreResults()
bool found = ed->find(rx);
QVERIFY(found == false);
QVERIFY(!found);
QCOMPARE(ed->textCursor().selectedText(), QStringLiteral("text"));
}
#endif

2
tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
View File

@ -238,7 +238,7 @@ void tst_QTabWidget::tabPosition()
void tst_QTabWidget::tabEnabled()
{
// Test bad arguments
QVERIFY(tw->isTabEnabled(-1) == false);
QVERIFY(!tw->isTabEnabled(-1));
tw->setTabEnabled(-1, false);
int index = addPage();

16
tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
View File

@ -168,12 +168,12 @@ void tst_QTextBrowser::forwardButton()
QVERIFY(!forwardEmissions.isEmpty());
QVariant val = forwardEmissions.takeLast()[0];
QVERIFY(val.type() == QVariant::Bool);
QVERIFY(val.toBool() == false);
QVERIFY(!val.toBool());
QVERIFY(!backwardEmissions.isEmpty());
val = backwardEmissions.takeLast()[0];
QVERIFY(val.type() == QVariant::Bool);
QVERIFY(val.toBool() == false);
QVERIFY(!val.toBool());
QVERIFY(browser->historyTitle(-1).isEmpty());
QCOMPARE(browser->historyUrl(0), QUrl::fromLocalFile("pagewithbg.html"));
@ -186,12 +186,12 @@ void tst_QTextBrowser::forwardButton()
QVERIFY(!forwardEmissions.isEmpty());
val = forwardEmissions.takeLast()[0];
QVERIFY(val.type() == QVariant::Bool);
QVERIFY(val.toBool() == false);
QVERIFY(!val.toBool());
QVERIFY(!backwardEmissions.isEmpty());
val = backwardEmissions.takeLast()[0];
QVERIFY(val.type() == QVariant::Bool);
QVERIFY(val.toBool() == true);
QVERIFY(val.toBool());
QCOMPARE(browser->historyTitle(-1), QString("Page With BG"));
QCOMPARE(browser->historyTitle(0), QString("Sample Anchor"));
@ -202,12 +202,12 @@ void tst_QTextBrowser::forwardButton()
QVERIFY(!forwardEmissions.isEmpty());
val = forwardEmissions.takeLast()[0];
QVERIFY(val.type() == QVariant::Bool);
QVERIFY(val.toBool() == true);
QVERIFY(val.toBool());
QVERIFY(!backwardEmissions.isEmpty());
val = backwardEmissions.takeLast()[0];
QVERIFY(val.type() == QVariant::Bool);
QVERIFY(val.toBool() == false);
QVERIFY(!val.toBool());
QVERIFY(browser->historyTitle(-1).isEmpty());
QCOMPARE(browser->historyTitle(0), QString("Page With BG"));
@ -218,12 +218,12 @@ void tst_QTextBrowser::forwardButton()
QVERIFY(!forwardEmissions.isEmpty());
val = forwardEmissions.takeLast()[0];
QVERIFY(val.type() == QVariant::Bool);
QVERIFY(val.toBool() == false);
QVERIFY(!val.toBool());
QVERIFY(!backwardEmissions.isEmpty());
val = backwardEmissions.takeLast()[0];
QVERIFY(val.type() == QVariant::Bool);
QVERIFY(val.toBool() == true);
QVERIFY(val.toBool());
}
void tst_QTextBrowser::viewportPositionInHistory()

6
tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
View File

@ -2522,7 +2522,7 @@ void tst_QTextEdit::findWithRegExp()
bool found = ed->find(rx);
QVERIFY(found == true);
QVERIFY(found);
QCOMPARE(ed->textCursor().selectedText(), QStringLiteral("text"));
}
@ -2536,7 +2536,7 @@ void tst_QTextEdit::findBackwardWithRegExp()
bool found = ed->find(rx, QTextDocument::FindBackward);
QVERIFY(found == true);
QVERIFY(found);
QCOMPARE(ed->textCursor().selectedText(), QStringLiteral("arbit"));
}
@ -2548,7 +2548,7 @@ void tst_QTextEdit::findWithRegExpReturnsFalseIfNoMoreResults()
bool found = ed->find(rx);
QVERIFY(found == false);
QVERIFY(!found);
QCOMPARE(ed->textCursor().selectedText(), QStringLiteral("text"));
}
#endif