summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/concurrent/concurrent.pro1
-rw-r--r--tests/auto/concurrent/qfuture/tst_qfuture.cpp58
-rw-r--r--tests/auto/corelib/thread/qresultstore/qresultstore.pro (renamed from tests/auto/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro)4
-rw-r--r--tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp (renamed from tests/auto/concurrent/qtconcurrentresultstore/tst_qtconcurrentresultstore.cpp)6
-rw-r--r--tests/auto/corelib/thread/thread.pro1
5 files changed, 34 insertions, 36 deletions
diff --git a/tests/auto/concurrent/concurrent.pro b/tests/auto/concurrent/concurrent.pro
index 15368aef64..c87ae9e673 100644
--- a/tests/auto/concurrent/concurrent.pro
+++ b/tests/auto/concurrent/concurrent.pro
@@ -6,7 +6,6 @@ SUBDIRS=\
qtconcurrentfilter \
qtconcurrentiteratekernel \
qtconcurrentmap \
- qtconcurrentresultstore \
qtconcurrentrun \
qtconcurrentthreadengine
diff --git a/tests/auto/concurrent/qfuture/tst_qfuture.cpp b/tests/auto/concurrent/qfuture/tst_qfuture.cpp
index aea35e80b2..ebf545f128 100644
--- a/tests/auto/concurrent/qfuture/tst_qfuture.cpp
+++ b/tests/auto/concurrent/qfuture/tst_qfuture.cpp
@@ -46,12 +46,10 @@
#include <QtTest/QtTest>
#include <qfuture.h>
#include <qfuturewatcher.h>
-#include <qtconcurrentresultstore.h>
-#include <qtconcurrentexception.h>
+#include <qresultstore.h>
+#include <qexception.h>
#include <private/qfutureinterface_p.h>
-using namespace QtConcurrent;
-
// COM interface macro.
#if defined(Q_OS_WIN) && defined(interface)
# undef interface
@@ -91,7 +89,7 @@ void tst_QFuture::resultStore()
int int2 = 2;
{
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
QVERIFY(store.begin() == store.end());
QVERIFY(store.resultAt(0) == store.end());
QVERIFY(store.resultAt(1) == store.end());
@@ -99,10 +97,10 @@ void tst_QFuture::resultStore()
{
- ResultStoreBase store;
+ QtPrivate::ResultStoreBase store;
store.addResult(-1, &int0); // note to self: adding a pointer to the stack here is ok since
store.addResult(1, &int1); // ResultStoreBase does not take ownership, only ResultStore<> does.
- ResultIteratorBase it = store.begin();
+ QtPrivate::ResultIteratorBase it = store.begin();
QCOMPARE(it.resultIndex(), 0);
QVERIFY(it == store.begin());
QVERIFY(it != store.end());
@@ -121,10 +119,10 @@ void tst_QFuture::resultStore()
QVector<int> vec1 = QVector<int>() << 4 << 5;
{
- ResultStoreBase store;
+ QtPrivate::ResultStoreBase store;
store.addResults(-1, &vec0, 2, 2);
store.addResults(-1, &vec1, 2, 2);
- ResultIteratorBase it = store.begin();
+ QtPrivate::ResultIteratorBase it = store.begin();
QCOMPARE(it.resultIndex(), 0);
QVERIFY(it == store.begin());
QVERIFY(it != store.end());
@@ -144,12 +142,12 @@ void tst_QFuture::resultStore()
QVERIFY(it == store.end());
}
{
- ResultStoreBase store;
+ QtPrivate::ResultStoreBase store;
store.addResult(-1, &int0);
store.addResults(-1, &vec1, 2, 2);
store.addResult(-1, &int1);
- ResultIteratorBase it = store.begin();
+ QtPrivate::ResultIteratorBase it = store.begin();
QCOMPARE(it.resultIndex(), 0);
QVERIFY(it == store.begin());
QVERIFY(it != store.end());
@@ -175,12 +173,12 @@ void tst_QFuture::resultStore()
QCOMPARE(store.resultAt(4), store.end());
}
{
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.addResult(-1, &int0);
store.addResults(-1, &vec0);
store.addResult(-1, &int1);
- ResultIteratorBase it = store.begin();
+ QtPrivate::ResultIteratorBase it = store.begin();
QCOMPARE(it.resultIndex(), 0);
QVERIFY(it == store.begin());
QVERIFY(it != store.end());
@@ -205,7 +203,7 @@ void tst_QFuture::resultStore()
QCOMPARE(store.resultAt(3).value(), int1);
}
{
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.addResult(-1, &int0);
store.addResults(-1, &vec0);
store.addResult(200, &int1);
@@ -217,7 +215,7 @@ void tst_QFuture::resultStore()
}
{
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.addResult(1, &int1);
store.addResult(0, &int0);
store.addResult(-1, &int2);
@@ -228,7 +226,7 @@ void tst_QFuture::resultStore()
}
{
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
QCOMPARE(store.contains(0), false);
QCOMPARE(store.contains(1), false);
QCOMPARE(store.contains(INT_MAX), false);
@@ -236,7 +234,7 @@ void tst_QFuture::resultStore()
{
// Test filter mode, where "gaps" in the result array aren't allowed.
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.setFilterMode(true);
store.addResult(0, &int0);
@@ -270,7 +268,7 @@ void tst_QFuture::resultStore()
{
// test canceled results
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.setFilterMode(true);
store.addResult(0, &int0);
@@ -307,7 +305,7 @@ void tst_QFuture::resultStore()
{
// test addResult return value
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.setFilterMode(true);
store.addResult(0, &int0);
@@ -353,7 +351,7 @@ void tst_QFuture::resultStore()
{
// test resultCount in non-filtered mode. It should always be possible
// to iterate through the results 0 to resultCount.
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.addResult(0, &int0);
QCOMPARE(store.count(), 1);
@@ -367,7 +365,7 @@ void tst_QFuture::resultStore()
}
{
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.addResult(2, &int0);
QCOMPARE(store.count(), 0);
@@ -379,7 +377,7 @@ void tst_QFuture::resultStore()
}
{
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.addResults(2, &vec1);
QCOMPARE(store.count(), 0);
@@ -391,7 +389,7 @@ void tst_QFuture::resultStore()
}
{
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.addResults(2, &vec1);
QCOMPARE(store.count(), 0);
@@ -399,7 +397,7 @@ void tst_QFuture::resultStore()
QCOMPARE(store.count(), 4);
}
{
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.addResults(3, &vec1);
QCOMPARE(store.count(), 0);
@@ -411,7 +409,7 @@ void tst_QFuture::resultStore()
}
{
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.setFilterMode(true);
store.addResults(3, &vec1);
QCOMPARE(store.count(), 0);
@@ -424,7 +422,7 @@ void tst_QFuture::resultStore()
}
{
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.setFilterMode(true);
store.addResults(3, &vec1);
QCOMPARE(store.count(), 0);
@@ -434,7 +432,7 @@ void tst_QFuture::resultStore()
}
{
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.setFilterMode(true);
store.addResults(3, &vec1);
QCOMPARE(store.count(), 0);
@@ -447,7 +445,7 @@ void tst_QFuture::resultStore()
}
{
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.addResult(1, &int0);
store.addResult(3, &int0);
store.addResults(6, &vec0);
@@ -462,7 +460,7 @@ void tst_QFuture::resultStore()
}
{
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.setFilterMode(true);
store.addResult(1, &int0);
store.addResult(3, &int0);
@@ -490,7 +488,7 @@ void tst_QFuture::resultStore()
QCOMPARE(store.contains(7), false);
}
{
- ResultStore<int> store;
+ QtPrivate::ResultStore<int> store;
store.setFilterMode(true);
store.addCanceledResult(0);
QCOMPARE(store.contains(0), false);
diff --git a/tests/auto/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro b/tests/auto/corelib/thread/qresultstore/qresultstore.pro
index 02fed4e04c..5e9e83c503 100644
--- a/tests/auto/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro
+++ b/tests/auto/corelib/thread/qresultstore/qresultstore.pro
@@ -1,6 +1,6 @@
CONFIG += testcase parallel_test
-TARGET = tst_qtconcurrentresultstore
+TARGET = tst_qresultstore
QT = core-private testlib concurrent
-SOURCES = tst_qtconcurrentresultstore.cpp
+SOURCES = tst_qresultstore.cpp
DEFINES += QT_STRICT_ITERATORS
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/concurrent/qtconcurrentresultstore/tst_qtconcurrentresultstore.cpp b/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp
index cf833ba4f8..a28be46dda 100644
--- a/tests/auto/concurrent/qtconcurrentresultstore/tst_qtconcurrentresultstore.cpp
+++ b/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp
@@ -41,9 +41,9 @@
#include <QtTest/QtTest>
-#include <qtconcurrentresultstore.h>
+#include <qresultstore.h>
-using namespace QtConcurrent;
+using namespace QtPrivate;
class tst_QtConcurrentResultStore : public QObject
{
@@ -487,4 +487,4 @@ void tst_QtConcurrentResultStore::count()
}
QTEST_MAIN(tst_QtConcurrentResultStore)
-#include "tst_qtconcurrentresultstore.moc"
+#include "tst_qresultstore.moc"
diff --git a/tests/auto/corelib/thread/thread.pro b/tests/auto/corelib/thread/thread.pro
index 12a284c7c7..8f063ee746 100644
--- a/tests/auto/corelib/thread/thread.pro
+++ b/tests/auto/corelib/thread/thread.pro
@@ -2,6 +2,7 @@ TEMPLATE=subdirs
SUBDIRS=\
qatomicint \
qatomicpointer \
+ qresultstore \
qmutex \
qmutexlocker \
qreadlocker \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 07:04:01 +0000