diff -r 000000000000 -r 1918ee327afb tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp	Mon Jan 11 14:00:40 2010 +0000
@@ -0,0 +1,357 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QThread>
+#include "../qfuture/versioncheck.h"
+
+struct TestIterator
+{
+    TestIterator(int i)
+    :i(i) { }
+
+    int operator-(const TestIterator &other)
+    {
+        return i - other.i;
+    }
+
+    TestIterator& operator++()
+    {
+        ++i;
+        return *this;
+    }
+
+    bool operator!=(const TestIterator &other) const
+    {
+        return i != other.i;
+    }
+
+    int i;
+};
+
+#include <qiterator.h>
+#ifndef QT_NO_STL
+namespace std {
+template <>
+struct iterator_traits<TestIterator>
+{
+    typedef random_access_iterator_tag iterator_category;
+};
+
+int distance(TestIterator &a, TestIterator &b)
+{
+    return b - a;
+}
+
+}
+#endif
+
+
+#include <qtconcurrentiteratekernel.h>
+#include <QtTest/QtTest>
+
+#ifndef QT_NO_CONCURRENT_TEST
+
+using namespace QtConcurrent;
+
+class tst_iteratekernel: public QObject
+{
+    Q_OBJECT
+private slots:
+    // "for" iteration tests:
+    void instantiate();
+    void cancel();
+    void stresstest();
+    void noIterations();
+    void throttling();
+    void blockSize();
+    void multipleResults();
+#if 0
+    //"while" iterations tests:
+    void instantiateWhile();
+    void stresstestWhile();
+#endif
+};
+
+QAtomicInt iterations;
+class PrintFor : public IterateKernel<TestIterator, void>
+{
+public:
+    PrintFor(TestIterator begin, TestIterator end) : IterateKernel<TestIterator, void>(begin, end) {iterations = 0; }
+    bool runIterations(TestIterator/*beginIterator*/, int begin, int end, void *)
+    {
+        iterations.fetchAndAddRelaxed(end - begin);
+#ifdef PRINT
+        qDebug() << QThread::currentThread() << "iteration" << begin <<  "to" << end << "(exclusive)";
+#endif
+        return false;
+    }
+    bool runIteration(TestIterator it, int index , void *result)
+    { 
+        return runIterations(it, index, index + 1, result);
+    }
+
+};
+
+class SleepPrintFor : public IterateKernel<TestIterator, void>
+{
+public:
+    SleepPrintFor(TestIterator begin, TestIterator end) : IterateKernel<TestIterator, void>(begin, end) {iterations = 0; }
+    inline bool runIterations(TestIterator/*beginIterator*/, int begin, int end, void *)
+    {
+        QTest::qSleep(200);
+        iterations.fetchAndAddRelaxed(end - begin);
+#ifdef PRINT
+        qDebug() << QThread::currentThread() << "iteration" << begin <<  "to" << end << "(exclusive)";
+#endif
+        return false;
+    }
+    bool runIteration(TestIterator it, int index , void *result)
+    { 
+        return runIterations(it, index, index + 1, result);
+    }
+};
+
+
+void tst_iteratekernel::instantiate()
+{
+    startThreadEngine(new PrintFor(0, 40)).startBlocking();
+    QCOMPARE((int)iterations, 40);
+}
+
+void tst_iteratekernel::cancel()
+{
+    {
+        QFuture<void> f = startThreadEngine(new SleepPrintFor(0, 40)).startAsynchronously();
+        f.cancel();
+        f.waitForFinished();
+        QVERIFY(f.isCanceled());
+        QVERIFY(int(iterations) <= QThread::idealThreadCount()); // the threads might run one iteration each before they are canceled.
+    }
+}
+
+QAtomicInt counter;
+class CountFor : public IterateKernel<TestIterator, void>
+{
+public:
+    CountFor(TestIterator begin, TestIterator end) : IterateKernel<TestIterator, void>(begin, end) {iterations = 0; }
+    inline bool runIterations(TestIterator/*beginIterator*/, int begin, int end, void *)
+    {
+        counter.fetchAndAddRelaxed(end - begin);
+        return false;
+    }
+    bool runIteration(TestIterator it, int index , void *result)
+    { 
+        return runIterations(it, index, index + 1, result);
+    }
+};
+
+void tst_iteratekernel::stresstest()
+{
+    const int iterations = 1000;
+    const int times = 50;
+    for (int i = 0; i < times; ++i) {
+        counter = 0;
+        CountFor f(0, iterations);
+        f.startBlocking();
+        QCOMPARE((int)counter, iterations);
+    }
+}
+
+void tst_iteratekernel::noIterations()
+{
+    const int times = 20000;
+    for (int i = 0; i < times; ++i)
+        startThreadEngine(new IterateKernel<TestIterator, void>(0, 0)).startBlocking();
+}
+
+QSet<QThread *> threads;
+class ThrottleFor : public IterateKernel<TestIterator, void>
+{
+public:
+    // this class throttles between iterations 100 and 200,
+    // and then records how many threads that run between
+    // iterations 140 and 160.
+    ThrottleFor(TestIterator begin, TestIterator end) : IterateKernel<TestIterator, void>(begin, end) {iterations = 0; throttling = false; }
+    inline bool runIterations(TestIterator/*beginIterator*/, int begin, int end, void *)
+    {
+        if (200 >= begin && 200 < end) {
+            throttling = false;
+        }
+
+        iterations.fetchAndAddRelaxed(end - begin);
+
+        QThread *thread = QThread::currentThread();
+
+        if (begin > 140 && end < 160)
+            threads.insert(thread);
+
+        if (100 >= begin && 100 < end) {
+            throttling = true;
+        }
+        
+        QTest::qWait(1);
+
+        return false;
+    }
+    bool runIteration(TestIterator it, int index , void *result)
+    { 
+        return runIterations(it, index, index + 1, result);
+    }
+
+    bool shouldThrottleThread()
+    {
+       return (iterations > 100 && iterations < 200);
+    }
+    bool throttling;
+};
+
+void tst_iteratekernel::throttling()
+{
+    const int totalIterations = 400;
+    iterations = 0;
+
+    threads.clear();
+
+    ThrottleFor f(0, totalIterations);
+    f.startBlocking();
+
+    QCOMPARE((int)iterations, totalIterations);
+
+
+    QCOMPARE(threads.count(), 1);
+}
+
+
+int peakBlockSize = 0;
+class BlockSizeRecorder : public IterateKernel<TestIterator, void>
+{
+public:
+    BlockSizeRecorder(TestIterator begin, TestIterator end) : IterateKernel<TestIterator, void>(begin, end) { }
+    inline bool runIterations(TestIterator, int begin, int end, void *)
+    {
+        peakBlockSize = qMax(peakBlockSize, end - begin);
+        return false;
+    }
+};
+
+void tst_iteratekernel::blockSize()
+{
+#ifdef QT_NO_STL
+    QSKIP("Missing stl iterators prevent correct block size calculation", SkipAll);
+#endif
+    const int expectedMinimumBlockSize = 1024 / QThread::idealThreadCount();
+    BlockSizeRecorder(0, 10000).startBlocking();
+    if (peakBlockSize < expectedMinimumBlockSize)
+        qDebug() << "block size" << peakBlockSize;
+    QVERIFY(peakBlockSize >= expectedMinimumBlockSize);
+}
+
+class MultipleResultsFor : public IterateKernel<TestIterator, int>
+{
+public:
+    MultipleResultsFor(TestIterator begin, TestIterator end) : IterateKernel<TestIterator, int>(begin, end) { }
+    inline bool runIterations(TestIterator, int begin, int end, int *results)
+    {
+        for (int i = begin; i < end; ++i)
+            results[i - begin] = i;
+        return true;
+    }
+};
+
+
+void tst_iteratekernel::multipleResults()
+{
+#ifdef QT_NO_STL
+    QSKIP("Missing stl iterators prevent correct summation", SkipAll);
+#endif
+    QFuture<int> f = startThreadEngine(new MultipleResultsFor(0, 10)).startAsynchronously();
+    QCOMPARE(f.results().count() , 10);
+    QCOMPARE(f.resultAt(0), 0);
+    QCOMPARE(f.resultAt(5), 5);
+    QCOMPARE(f.resultAt(9), 9);
+    f.waitForFinished();
+}
+
+#if 0
+class PrintWhile : public IterateKernel<TestIterator, void>
+{
+public:
+    PrintWhile() : IterateKernel<TestIterator, void>(0, 10, WhileIteration) { }
+    bool runIteration(TestIterator it, TestIterator, void *)
+    {
+        return false;
+    }
+};
+
+void tst_iteratekernel::instantiateWhile()
+{
+    PrintWhile w;
+    w.startBlocking();
+}
+
+QAtomicInt iterationCount;
+class StressWhile : public IterateKernel<TestIterator, void>
+{
+public:
+    StressWhile(TestIterator iterations) : IterateKernel<TestIterator, void>(0, iterations, WhileIteration) { }
+    bool runIteration(TestIterator it, TestIterator index, void *)
+    {
+        if (it == index) // should match.
+            ::iterationCount.ref();
+        return false;
+    }
+};
+
+void tst_iteratekernel::stresstestWhile()
+{
+    int iterations = 100000;
+    StressWhile w(iterations);
+    w.startBlocking();
+    QCOMPARE(int(iterationCount), iterations);
+}
+#endif
+
+QTEST_MAIN(tst_iteratekernel)
+
+#include "tst_qtconcurrentiteratekernel.moc"
+
+#else
+QTEST_NOOP_MAIN
+#endif