summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtconcurrentrun
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2010-03-22 00:28:27 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2010-03-22 00:28:27 (GMT)
commit91ebcc413f0650ab235b93689776d4457bdbc80e (patch)
treedb4846ab6cf828b4f237e08b96b7615b14d1342e /tests/auto/qtconcurrentrun
parent7a7dbde042b380f3005deb1c1e72e876eaa57d4c (diff)
downloadQt-91ebcc413f0650ab235b93689776d4457bdbc80e.zip
Qt-91ebcc413f0650ab235b93689776d4457bdbc80e.tar.gz
Qt-91ebcc413f0650ab235b93689776d4457bdbc80e.tar.bz2
Fixed inconsistent test naming.
TARGET and test class name should always match.
Diffstat (limited to 'tests/auto/qtconcurrentrun')
-rw-r--r--tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp
index b9ab6d3..8fdc50c 100644
--- a/tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp
+++ b/tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp
@@ -49,7 +49,7 @@
using namespace QtConcurrent;
-class TestRunFunction: public QObject
+class tst_QtConcurrentRun: public QObject
{
Q_OBJECT
private slots:
@@ -73,7 +73,7 @@ private slots:
#endif
-QTEST_MAIN(TestRunFunction)
+QTEST_MAIN(tst_QtConcurrentRun)
void light()
{
@@ -91,7 +91,7 @@ void heavy()
}
-void TestRunFunction::runLightFunction()
+void tst_QtConcurrentRun::runLightFunction()
{
qDebug("starting function");
QFuture<void> future = run(F(light));
@@ -100,7 +100,7 @@ void TestRunFunction::runLightFunction()
qDebug("done");
}
-void TestRunFunction::runHeavyFunction()
+void tst_QtConcurrentRun::runHeavyFunction()
{
qDebug("starting function");
QFuture<void> future = run(F(heavy));
@@ -141,7 +141,7 @@ public:
int operator()(int in) const { return in; }
};
-void TestRunFunction::returnValue()
+void tst_QtConcurrentRun::returnValue()
{
QFuture<int> f;
@@ -217,7 +217,7 @@ struct TestConstClass
void fooInt(int) const { };
};
-void TestRunFunction::functionObject()
+void tst_QtConcurrentRun::functionObject()
{
QFuture<void> f;
TestClass c;
@@ -235,7 +235,7 @@ void TestRunFunction::functionObject()
}
-void TestRunFunction::memberFunctions()
+void tst_QtConcurrentRun::memberFunctions()
{
TestClass c;
@@ -278,7 +278,7 @@ void stringIntFunction(QString)
}
-void TestRunFunction::implicitConvertibleTypes()
+void tst_QtConcurrentRun::implicitConvertibleTypes()
{
double d;
run(F(doubleFunction), d).waitForFinished();
@@ -294,7 +294,7 @@ void TestRunFunction::implicitConvertibleTypes()
void fn() { }
-void TestRunFunction::runWaitLoop()
+void tst_QtConcurrentRun::runWaitLoop()
{
for (int i = 0; i < 1000; ++i)
run(fn).waitForFinished();
@@ -324,7 +324,7 @@ int recursiveResult(int level)
return 1;
}
-void TestRunFunction::recursive()
+void tst_QtConcurrentRun::recursive()
{
int levels = 15;
@@ -375,7 +375,7 @@ int fn2(double, int *)
}
#if 0
-void TestRunFunction::createFunctor()
+void tst_QtConcurrentRun::createFunctor()
{
e = 0;
::QtConcurrent::createFunctor(vfn0)();