Standardise layout and naming in corelib benchmarks

Make file names match CMake's test names (and those follow dir-name)
and class names follow tst_ClassName pattern when testing
ClassName. Purge comments about the qmake configs the CMakeLists.txt
are generated from.  Purge empty constructors and init/cleanup methods
of classes.  Fix petty coding style violations.

Add qdir/tree/, qurl, qbench and qset benchmarks to their parent directories'
lists of subdirs. Fix unused return error from qurl benchmark.

Change-Id: Ifc15a3a46e71cf82ad0637753517e0df34049763
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

2 files changed, 20 insertions, 28 deletions

diff --git a/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt b/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt
index 3b787dc8e8..66ec60effc 100644
--- a/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt
+++ b/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt
@@ -1,15 +1,10 @@
-# Generated from quuid.pro.
-
 #####################################################################
 ## tst_bench_quuid Binary:
 #####################################################################
 
 qt_internal_add_benchmark(tst_bench_quuid
     SOURCES
-        tst_quuid.cpp
+        tst_bench_quuid.cpp
     PUBLIC_LIBRARIES
         Qt::Test
 )
-
-#### Keys ignored in scope 1:.:.:quuid.pro:<TRUE>:
-# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp b/tests/benchmarks/corelib/plugin/quuid/tst_bench_quuid.cpp
index 0bc0a7de93..2db1563568 100644
--- a/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp
+++ b/tests/benchmarks/corelib/plugin/quuid/tst_bench_quuid.cpp
@@ -30,14 +30,10 @@
 #include <QtCore/QUuid>
 #include <QTest>
 
-class tst_bench_QUuid : public QObject
+class tst_QUuid : public QObject
 {
     Q_OBJECT
 
-public:
-    tst_bench_QUuid()
-    { }
-
 private slots:
     void createUuid();
     void fromChar();
@@ -56,21 +52,21 @@ private slots:
     void operatorMore();
 };
 
-void tst_bench_QUuid::createUuid()
+void tst_QUuid::createUuid()
 {
     QBENCHMARK {
         QUuid::createUuid();
     }
 }
 
-void tst_bench_QUuid::fromChar()
+void tst_QUuid::fromChar()
 {
     QBENCHMARK {
         QUuid uuid("{67C8770B-44F1-410A-AB9A-F9B5446F13EE}");
     }
 }
 
-void tst_bench_QUuid::toString()
+void tst_QUuid::toString()
 {
     QUuid uuid = QUuid::createUuid();
     QBENCHMARK {
@@ -78,7 +74,7 @@ void tst_bench_QUuid::toString()
     }
 }
 
-void tst_bench_QUuid::fromString()
+void tst_QUuid::fromString()
 {
     QString string = "{67C8770B-44F1-410A-AB9A-F9B5446F13EE}";
     QBENCHMARK {
@@ -86,7 +82,7 @@ void tst_bench_QUuid::fromString()
     }
 }
 
-void tst_bench_QUuid::toByteArray()
+void tst_QUuid::toByteArray()
 {
     QUuid uuid = QUuid::createUuid();
     QBENCHMARK {
@@ -94,7 +90,7 @@ void tst_bench_QUuid::toByteArray()
     }
 }
 
-void tst_bench_QUuid::fromByteArray()
+void tst_QUuid::fromByteArray()
 {
     QByteArray string = "{67C8770B-44F1-410A-AB9A-F9B5446F13EE}";
     QBENCHMARK {
@@ -102,7 +98,7 @@ void tst_bench_QUuid::fromByteArray()
     }
 }
 
-void tst_bench_QUuid::toRfc4122()
+void tst_QUuid::toRfc4122()
 {
     QUuid uuid = QUuid::createUuid();
     QBENCHMARK {
@@ -110,7 +106,7 @@ void tst_bench_QUuid::toRfc4122()
     }
 }
 
-void tst_bench_QUuid::fromRfc4122()
+void tst_QUuid::fromRfc4122()
 {
     QByteArray string = QByteArray::fromHex("67C8770B44F1410AAB9AF9B5446F13EE");
     QBENCHMARK {
@@ -119,7 +115,7 @@ void tst_bench_QUuid::fromRfc4122()
     }
 }
 
-void tst_bench_QUuid::createUuidV3()
+void tst_QUuid::createUuidV3()
 {
     QUuid ns = QUuid::createUuid();
     QByteArray name = QByteArray("Test");
@@ -129,7 +125,7 @@ void tst_bench_QUuid::createUuidV3()
     }
 }
 
-void tst_bench_QUuid::createUuidV5()
+void tst_QUuid::createUuidV5()
 {
     QUuid ns = QUuid::createUuid();
     QByteArray name = QByteArray("Test");
@@ -139,7 +135,7 @@ void tst_bench_QUuid::createUuidV5()
     }
 }
 
-void tst_bench_QUuid::toDataStream()
+void tst_QUuid::toDataStream()
 {
     QUuid uuid = QUuid::createUuid();
     QByteArray ar;
@@ -151,7 +147,7 @@ void tst_bench_QUuid::toDataStream()
     }
 }
 
-void tst_bench_QUuid::fromDataStream()
+void tst_QUuid::fromDataStream()
 {
     QUuid uuid1, uuid2;
     uuid1 = QUuid::createUuid();
@@ -168,7 +164,7 @@ void tst_bench_QUuid::fromDataStream()
     }
 }
 
-void tst_bench_QUuid::isNull()
+void tst_QUuid::isNull()
 {
     QUuid uuid = QUuid();
     QBENCHMARK {
@@ -176,7 +172,7 @@ void tst_bench_QUuid::isNull()
     }
 }
 
-void tst_bench_QUuid::operatorLess()
+void tst_QUuid::operatorLess()
 {
     QUuid uuid1, uuid2;
     uuid1 = QUuid::createUuid();
@@ -186,7 +182,7 @@ void tst_bench_QUuid::operatorLess()
     }
 }
 
-void tst_bench_QUuid::operatorMore()
+void tst_QUuid::operatorMore()
 {
     QUuid uuid1, uuid2;
     uuid1 = QUuid::createUuid();
@@ -196,5 +192,6 @@ void tst_bench_QUuid::operatorMore()
     }
 }
 
-QTEST_MAIN(tst_bench_QUuid);
-#include "tst_quuid.moc"
+QTEST_MAIN(tst_QUuid)
+
+#include "tst_bench_quuid.moc"