diff options
Diffstat (limited to 'tests/auto/corelib')
10 files changed, 26 insertions, 32 deletions
diff --git a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp index b92794ee78..736b4d20ff 100644 --- a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp +++ b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp @@ -301,14 +301,14 @@ void tst_QAnimationGroup::setParentAutoAdd() void tst_QAnimationGroup::beginNestedGroup() { - QAnimationGroup *subGroup; QAnimationGroup *parent = new QParallelAnimationGroup(); for (int i = 0; i < 10; ++i) { - if (i & 1) - subGroup = new QParallelAnimationGroup(parent); - else - subGroup = new QSequentialAnimationGroup(parent); + if (i & 1) { + new QParallelAnimationGroup(parent); + } else { + new QSequentialAnimationGroup(parent); + } QCOMPARE(parent->animationCount(), 1); QAnimationGroup *child = static_cast<QAnimationGroup *>(parent->animationAt(0)); diff --git a/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp b/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp index 964b834fa7..b959dcb6f9 100644 --- a/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp +++ b/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp @@ -95,7 +95,6 @@ void tst_QFuture::resultStore() { ResultStore<int> store; - ResultIteratorBase it = store.begin(); QVERIFY(store.begin() == store.end()); QVERIFY(store.resultAt(0) == store.end()); QVERIFY(store.resultAt(1) == store.end()); diff --git a/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp b/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp index ed714101e7..96ba71b156 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp +++ b/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp @@ -233,7 +233,8 @@ public: bool shouldThrottleThread() { - return (iterations > 100 && iterations < 200); + const int load = iterations.load(); + return (load > 100 && load < 200); } bool throttling; }; diff --git a/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp index 1c60621763..a1dd1c7ab9 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -1285,6 +1285,7 @@ void tst_QtConcurrentMap::mappedReduced() // test Q_DECLARE_OPERATORS_FOR_FLAGS QtConcurrent::ReduceOptions opt = (QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce); + QVERIFY(opt); // functor-functor { diff --git a/tests/auto/corelib/concurrent/qtconcurrentresultstore/tst_qtconcurrentresultstore.cpp b/tests/auto/corelib/concurrent/qtconcurrentresultstore/tst_qtconcurrentresultstore.cpp index 1728be68fe..f5b3f2965e 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentresultstore/tst_qtconcurrentresultstore.cpp +++ b/tests/auto/corelib/concurrent/qtconcurrentresultstore/tst_qtconcurrentresultstore.cpp @@ -88,7 +88,6 @@ void tst_QtConcurrentResultStore::iterators() { { ResultStore<int> store; - ResultIteratorBase it = store.begin(); QVERIFY(store.begin() == store.end()); QVERIFY(store.resultAt(0) == store.end()); QVERIFY(store.resultAt(1) == store.end()); diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp index 719b20e766..7ad020c356 100644 --- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp +++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp @@ -1023,12 +1023,12 @@ void tst_QMetaObjectBuilder::removeNotifySignal() { QMetaObjectBuilder builder; - QMetaMethodBuilder method1 = builder.addSignal("foo(const QString&, int)"); - QMetaMethodBuilder method2 = builder.addSignal("bar(QString)"); + builder.addSignal("foo(const QString&, int)"); + QMetaMethodBuilder method = builder.addSignal("bar(QString)"); // Setup property QMetaPropertyBuilder prop = builder.addProperty("prop", "const QString &"); - prop.setNotifySignal(method2); + prop.setNotifySignal(method); QVERIFY(prop.hasNotifySignal()); QCOMPARE(prop.notifySignal().index(), 1); diff --git a/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp index a1c943e877..90c537b9fc 100644 --- a/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp +++ b/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp @@ -129,10 +129,8 @@ void tst_QSocketNotifier::unexpectedDisconnection() NATIVESOCKETENGINE readEnd1; readEnd1.initialize(QAbstractSocket::TcpSocket); - bool b = readEnd1.connectToHost(server.serverAddress(), server.serverPort()); + readEnd1.connectToHost(server.serverAddress(), server.serverPort()); QVERIFY(readEnd1.waitForWrite()); -// while (!b && readEnd1.state() != QAbstractSocket::ConnectedState) -// b = readEnd1.connectToHost(server.serverAddress(), server.serverPort()); QVERIFY(readEnd1.state() == QAbstractSocket::ConnectedState); QVERIFY(server.waitForNewConnection()); QTcpSocket *writeEnd1 = server.nextPendingConnection(); @@ -140,10 +138,8 @@ void tst_QSocketNotifier::unexpectedDisconnection() NATIVESOCKETENGINE readEnd2; readEnd2.initialize(QAbstractSocket::TcpSocket); - b = readEnd2.connectToHost(server.serverAddress(), server.serverPort()); + readEnd2.connectToHost(server.serverAddress(), server.serverPort()); QVERIFY(readEnd2.waitForWrite()); -// while (!b) -// b = readEnd2.connectToHost(server.serverAddress(), server.serverPort()); QVERIFY(readEnd2.state() == QAbstractSocket::ConnectedState); QVERIFY(server.waitForNewConnection()); QTcpSocket *writeEnd2 = server.nextPendingConnection(); diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp index 73330b1da2..f70c380c4a 100644 --- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp +++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp @@ -430,7 +430,6 @@ public: m_timer.stop(); - QTime now = QTime::currentTime(); int elapsed = m_startedTime.elapsed(); if (elapsed < m_interval / 2) { diff --git a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp index cc36af8b56..82b0c98522 100644 --- a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp +++ b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp @@ -576,28 +576,28 @@ public: quint64 i = 0; while (t.elapsed() < one_minute) { i++; - uint nb = (i * 9 + lockCount * 13) % threadCount; + uint nb = (i * 9 + lockCount.load() * 13) % threadCount; QMutexLocker locker(&mutex[nb]); - if (sentinel[nb]) errorCount.ref(); + if (sentinel[nb].load()) errorCount.ref(); if (sentinel[nb].fetchAndAddRelaxed(5)) errorCount.ref(); if (!sentinel[nb].testAndSetRelaxed(5, 0)) errorCount.ref(); - if (sentinel[nb]) errorCount.ref(); + if (sentinel[nb].load()) errorCount.ref(); lockCount.ref(); - nb = (nb * 17 + i * 5 + lockCount * 3) % threadCount; + nb = (nb * 17 + i * 5 + lockCount.load() * 3) % threadCount; if (mutex[nb].tryLock()) { - if (sentinel[nb]) errorCount.ref(); + if (sentinel[nb].load()) errorCount.ref(); if (sentinel[nb].fetchAndAddRelaxed(16)) errorCount.ref(); if (!sentinel[nb].testAndSetRelaxed(16, 0)) errorCount.ref(); - if (sentinel[nb]) errorCount.ref(); + if (sentinel[nb].load()) errorCount.ref(); lockCount.ref(); mutex[nb].unlock(); } - nb = (nb * 15 + i * 47 + lockCount * 31) % threadCount; + nb = (nb * 15 + i * 47 + lockCount.load() * 31) % threadCount; if (mutex[nb].tryLock(2)) { - if (sentinel[nb]) errorCount.ref(); + if (sentinel[nb].load()) errorCount.ref(); if (sentinel[nb].fetchAndAddRelaxed(53)) errorCount.ref(); if (!sentinel[nb].testAndSetRelaxed(53, 0)) errorCount.ref(); - if (sentinel[nb]) errorCount.ref(); + if (sentinel[nb].load()) errorCount.ref(); lockCount.ref(); mutex[nb].unlock(); } diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp index 5d29b9c67e..c9cadadd77 100644 --- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp @@ -4541,17 +4541,16 @@ void tst_QString::nanAndInf() QVERIFY(ok); QVERIFY(d == -INFINITY); - long l; - l = QString("INF").toLong(&ok); + QString("INF").toLong(&ok); QVERIFY(!ok); - l = QString("INF").toLong(&ok, 36); + QString("INF").toLong(&ok, 36); QVERIFY(ok); - l = QString("INF0").toLong(&ok, 36); + QString("INF0").toLong(&ok, 36); QVERIFY(ok); - l = QString("0INF0").toLong(&ok, 36); + QString("0INF0").toLong(&ok, 36); QVERIFY(ok); } |