From 7d21abfca39d2dcf98e3a81b1b7d8c73bd274cd1 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 27 Aug 2012 23:22:15 +0200 Subject: Move QFutureSynchronizer back to QtCore This class, too, belongs with QFuture. Change-Id: I41a532ca66c156f1631e4b22ffc1a5879c854488 Reviewed-by: Thiago Macieira --- tests/auto/concurrent/concurrent.pro | 1 - .../qfuturesynchronizer/qfuturesynchronizer.pro | 5 - .../tst_qfuturesynchronizer.cpp | 158 --------------------- .../qfuturesynchronizer/qfuturesynchronizer.pro | 5 + .../tst_qfuturesynchronizer.cpp | 158 +++++++++++++++++++++ tests/auto/corelib/thread/thread.pro | 1 + 6 files changed, 164 insertions(+), 164 deletions(-) delete mode 100644 tests/auto/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro delete mode 100644 tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp create mode 100644 tests/auto/corelib/thread/qfuturesynchronizer/qfuturesynchronizer.pro create mode 100644 tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp (limited to 'tests/auto') diff --git a/tests/auto/concurrent/concurrent.pro b/tests/auto/concurrent/concurrent.pro index 14aff5d493..20bad24fc1 100644 --- a/tests/auto/concurrent/concurrent.pro +++ b/tests/auto/concurrent/concurrent.pro @@ -1,6 +1,5 @@ TEMPLATE=subdirs SUBDIRS=\ - qfuturesynchronizer \ qtconcurrentfilter \ qtconcurrentiteratekernel \ qtconcurrentmap \ diff --git a/tests/auto/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro b/tests/auto/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro deleted file mode 100644 index a828213ade..0000000000 --- a/tests/auto/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase parallel_test -TARGET = tst_qfuturesynchronizer -QT = core testlib concurrent -SOURCES = tst_qfuturesynchronizer.cpp -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp b/tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp deleted file mode 100644 index 5d643a47f1..0000000000 --- a/tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp +++ /dev/null @@ -1,158 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -#include -#include - -class tst_QFutureSynchronizer : public QObject -{ - Q_OBJECT - - -private Q_SLOTS: - void construction(); - void addFuture(); - void cancelOnWait(); - void clearFutures(); - void futures(); - void setFuture(); - void waitForFinished(); -}; - - -void tst_QFutureSynchronizer::construction() -{ - - QFuture future; - QFutureSynchronizer synchronizer; - QFutureSynchronizer synchronizerWithFuture(future); - - QCOMPARE(synchronizer.futures().size(), 0); - QCOMPARE(synchronizerWithFuture.futures().size(), 1); -} - -void tst_QFutureSynchronizer::addFuture() -{ - QFutureSynchronizer synchronizer; - - synchronizer.addFuture(QFuture()); - QFuture future; - synchronizer.addFuture(future); - synchronizer.addFuture(future); - - QCOMPARE(synchronizer.futures().size(), 3); -} - -void tst_QFutureSynchronizer::cancelOnWait() -{ - QFutureSynchronizer synchronizer; - QVERIFY(!synchronizer.cancelOnWait()); - synchronizer.setCancelOnWait(true); - QVERIFY(synchronizer.cancelOnWait()); - synchronizer.setCancelOnWait(false); - QVERIFY(!synchronizer.cancelOnWait()); - synchronizer.setCancelOnWait(true); - QVERIFY(synchronizer.cancelOnWait()); -} - -void tst_QFutureSynchronizer::clearFutures() -{ - QFutureSynchronizer synchronizer; - synchronizer.clearFutures(); - QVERIFY(synchronizer.futures().isEmpty()); - - synchronizer.addFuture(QFuture()); - QFuture future; - synchronizer.addFuture(future); - synchronizer.addFuture(future); - synchronizer.clearFutures(); - QVERIFY(synchronizer.futures().isEmpty()); -} - -void tst_QFutureSynchronizer::futures() -{ - QFutureSynchronizer synchronizer; - - QList > futures; - for (int i=0; i<100; i++) { - QFuture future; - futures.append(future); - synchronizer.addFuture(future); - } - - QCOMPARE(futures, synchronizer.futures()); -} - -void tst_QFutureSynchronizer::setFuture() -{ - QFutureSynchronizer synchronizer; - - for (int i=0; i<100; i++) { - synchronizer.addFuture(QFuture()); - } - QCOMPARE(synchronizer.futures().size(), 100); - - QFuture future; - synchronizer.setFuture(future); - QCOMPARE(synchronizer.futures().size(), 1); - QCOMPARE(synchronizer.futures().first(), future); -} - -void tst_QFutureSynchronizer::waitForFinished() -{ - QFutureSynchronizer synchronizer; - - for (int i=0; i<100; i++) { - synchronizer.addFuture(QFuture()); - } - synchronizer.waitForFinished(); - const QList > futures = synchronizer.futures(); - - for (int i=0; i<100; i++) { - QVERIFY(futures.at(i).isFinished()); - } -} - -QTEST_MAIN(tst_QFutureSynchronizer) - -#include "tst_qfuturesynchronizer.moc" diff --git a/tests/auto/corelib/thread/qfuturesynchronizer/qfuturesynchronizer.pro b/tests/auto/corelib/thread/qfuturesynchronizer/qfuturesynchronizer.pro new file mode 100644 index 0000000000..a828213ade --- /dev/null +++ b/tests/auto/corelib/thread/qfuturesynchronizer/qfuturesynchronizer.pro @@ -0,0 +1,5 @@ +CONFIG += testcase parallel_test +TARGET = tst_qfuturesynchronizer +QT = core testlib concurrent +SOURCES = tst_qfuturesynchronizer.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp b/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp new file mode 100644 index 0000000000..6b48c96a57 --- /dev/null +++ b/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp @@ -0,0 +1,158 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +#include +#include + +class tst_QFutureSynchronizer : public QObject +{ + Q_OBJECT + + +private Q_SLOTS: + void construction(); + void addFuture(); + void cancelOnWait(); + void clearFutures(); + void futures(); + void setFuture(); + void waitForFinished(); +}; + + +void tst_QFutureSynchronizer::construction() +{ + + QFuture future; + QFutureSynchronizer synchronizer; + QFutureSynchronizer synchronizerWithFuture(future); + + QCOMPARE(synchronizer.futures().size(), 0); + QCOMPARE(synchronizerWithFuture.futures().size(), 1); +} + +void tst_QFutureSynchronizer::addFuture() +{ + QFutureSynchronizer synchronizer; + + synchronizer.addFuture(QFuture()); + QFuture future; + synchronizer.addFuture(future); + synchronizer.addFuture(future); + + QCOMPARE(synchronizer.futures().size(), 3); +} + +void tst_QFutureSynchronizer::cancelOnWait() +{ + QFutureSynchronizer synchronizer; + QVERIFY(!synchronizer.cancelOnWait()); + synchronizer.setCancelOnWait(true); + QVERIFY(synchronizer.cancelOnWait()); + synchronizer.setCancelOnWait(false); + QVERIFY(!synchronizer.cancelOnWait()); + synchronizer.setCancelOnWait(true); + QVERIFY(synchronizer.cancelOnWait()); +} + +void tst_QFutureSynchronizer::clearFutures() +{ + QFutureSynchronizer synchronizer; + synchronizer.clearFutures(); + QVERIFY(synchronizer.futures().isEmpty()); + + synchronizer.addFuture(QFuture()); + QFuture future; + synchronizer.addFuture(future); + synchronizer.addFuture(future); + synchronizer.clearFutures(); + QVERIFY(synchronizer.futures().isEmpty()); +} + +void tst_QFutureSynchronizer::futures() +{ + QFutureSynchronizer synchronizer; + + QList > futures; + for (int i=0; i<100; i++) { + QFuture future; + futures.append(future); + synchronizer.addFuture(future); + } + + QCOMPARE(futures, synchronizer.futures()); +} + +void tst_QFutureSynchronizer::setFuture() +{ + QFutureSynchronizer synchronizer; + + for (int i=0; i<100; i++) { + synchronizer.addFuture(QFuture()); + } + QCOMPARE(synchronizer.futures().size(), 100); + + QFuture future; + synchronizer.setFuture(future); + QCOMPARE(synchronizer.futures().size(), 1); + QCOMPARE(synchronizer.futures().first(), future); +} + +void tst_QFutureSynchronizer::waitForFinished() +{ + QFutureSynchronizer synchronizer; + + for (int i=0; i<100; i++) { + synchronizer.addFuture(QFuture()); + } + synchronizer.waitForFinished(); + const QList > futures = synchronizer.futures(); + + for (int i=0; i<100; i++) { + QVERIFY(futures.at(i).isFinished()); + } +} + +QTEST_MAIN(tst_QFutureSynchronizer) + +#include "tst_qfuturesynchronizer.moc" diff --git a/tests/auto/corelib/thread/thread.pro b/tests/auto/corelib/thread/thread.pro index ee64aeaa3f..f529bd8941 100644 --- a/tests/auto/corelib/thread/thread.pro +++ b/tests/auto/corelib/thread/thread.pro @@ -4,6 +4,7 @@ SUBDIRS=\ qatomicpointer \ qresultstore \ qfuture \ + qfuturesynchronizer \ qfuturewatcher \ qmutex \ qmutexlocker \ -- cgit v1.2.3