From 9004a2412ba1f9976c2c61f01223dff852208c42 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 18 Aug 2021 11:48:29 +0200 Subject: 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 Reviewed-by: Thiago Macieira --- .../benchmarks/corelib/plugin/quuid/CMakeLists.txt | 7 +- .../corelib/plugin/quuid/tst_bench_quuid.cpp | 197 ++++++++++++++++++++ .../benchmarks/corelib/plugin/quuid/tst_quuid.cpp | 200 --------------------- 3 files changed, 198 insertions(+), 206 deletions(-) create mode 100644 tests/benchmarks/corelib/plugin/quuid/tst_bench_quuid.cpp delete mode 100644 tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp (limited to 'tests/benchmarks/corelib/plugin') 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:: -# TEMPLATE = "app" diff --git a/tests/benchmarks/corelib/plugin/quuid/tst_bench_quuid.cpp b/tests/benchmarks/corelib/plugin/quuid/tst_bench_quuid.cpp new file mode 100644 index 0000000000..2db1563568 --- /dev/null +++ b/tests/benchmarks/corelib/plugin/quuid/tst_bench_quuid.cpp @@ -0,0 +1,197 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include + +class tst_QUuid : public QObject +{ + Q_OBJECT + +private slots: + void createUuid(); + void fromChar(); + void toString(); + void fromString(); + void toByteArray(); + void fromByteArray(); + void toRfc4122(); + void fromRfc4122(); + void createUuidV3(); + void createUuidV5(); + void toDataStream(); + void fromDataStream(); + void isNull(); + void operatorLess(); + void operatorMore(); +}; + +void tst_QUuid::createUuid() +{ + QBENCHMARK { + QUuid::createUuid(); + } +} + +void tst_QUuid::fromChar() +{ + QBENCHMARK { + QUuid uuid("{67C8770B-44F1-410A-AB9A-F9B5446F13EE}"); + } +} + +void tst_QUuid::toString() +{ + QUuid uuid = QUuid::createUuid(); + QBENCHMARK { + uuid.toString(); + } +} + +void tst_QUuid::fromString() +{ + QString string = "{67C8770B-44F1-410A-AB9A-F9B5446F13EE}"; + QBENCHMARK { + QUuid uuid(string); + } +} + +void tst_QUuid::toByteArray() +{ + QUuid uuid = QUuid::createUuid(); + QBENCHMARK { + uuid.toByteArray(); + } +} + +void tst_QUuid::fromByteArray() +{ + QByteArray string = "{67C8770B-44F1-410A-AB9A-F9B5446F13EE}"; + QBENCHMARK { + QUuid uuid(string); + } +} + +void tst_QUuid::toRfc4122() +{ + QUuid uuid = QUuid::createUuid(); + QBENCHMARK { + uuid.toRfc4122(); + } +} + +void tst_QUuid::fromRfc4122() +{ + QByteArray string = QByteArray::fromHex("67C8770B44F1410AAB9AF9B5446F13EE"); + QBENCHMARK { + QUuid uuid = QUuid::fromRfc4122(string); + Q_UNUSED(uuid) + } +} + +void tst_QUuid::createUuidV3() +{ + QUuid ns = QUuid::createUuid(); + QByteArray name = QByteArray("Test"); + QBENCHMARK { + QUuid uuid = QUuid::createUuidV3(ns, name); + Q_UNUSED(uuid) + } +} + +void tst_QUuid::createUuidV5() +{ + QUuid ns = QUuid::createUuid(); + QByteArray name = QByteArray("Test"); + QBENCHMARK { + QUuid uuid = QUuid::createUuidV5(ns, name); + Q_UNUSED(uuid) + } +} + +void tst_QUuid::toDataStream() +{ + QUuid uuid = QUuid::createUuid(); + QByteArray ar; + { + QDataStream out(&ar,QIODevice::WriteOnly); + QBENCHMARK { + out << uuid; + } + } +} + +void tst_QUuid::fromDataStream() +{ + QUuid uuid1, uuid2; + uuid1 = QUuid::createUuid(); + QByteArray ar; + { + QDataStream out(&ar,QIODevice::WriteOnly); + out << uuid1; + } + { + QDataStream in(&ar,QIODevice::ReadOnly); + QBENCHMARK { + in >> uuid2; + } + } +} + +void tst_QUuid::isNull() +{ + QUuid uuid = QUuid(); + QBENCHMARK { + uuid.isNull(); + } +} + +void tst_QUuid::operatorLess() +{ + QUuid uuid1, uuid2; + uuid1 = QUuid::createUuid(); + uuid2 = QUuid::createUuid(); + QBENCHMARK { + uuid1 < uuid2; + } +} + +void tst_QUuid::operatorMore() +{ + QUuid uuid1, uuid2; + uuid1 = QUuid::createUuid(); + uuid2 = QUuid::createUuid(); + QBENCHMARK { + uuid1 > uuid2; + } +} + +QTEST_MAIN(tst_QUuid) + +#include "tst_bench_quuid.moc" diff --git a/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp b/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp deleted file mode 100644 index 0bc0a7de93..0000000000 --- a/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp +++ /dev/null @@ -1,200 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include - -class tst_bench_QUuid : public QObject -{ - Q_OBJECT - -public: - tst_bench_QUuid() - { } - -private slots: - void createUuid(); - void fromChar(); - void toString(); - void fromString(); - void toByteArray(); - void fromByteArray(); - void toRfc4122(); - void fromRfc4122(); - void createUuidV3(); - void createUuidV5(); - void toDataStream(); - void fromDataStream(); - void isNull(); - void operatorLess(); - void operatorMore(); -}; - -void tst_bench_QUuid::createUuid() -{ - QBENCHMARK { - QUuid::createUuid(); - } -} - -void tst_bench_QUuid::fromChar() -{ - QBENCHMARK { - QUuid uuid("{67C8770B-44F1-410A-AB9A-F9B5446F13EE}"); - } -} - -void tst_bench_QUuid::toString() -{ - QUuid uuid = QUuid::createUuid(); - QBENCHMARK { - uuid.toString(); - } -} - -void tst_bench_QUuid::fromString() -{ - QString string = "{67C8770B-44F1-410A-AB9A-F9B5446F13EE}"; - QBENCHMARK { - QUuid uuid(string); - } -} - -void tst_bench_QUuid::toByteArray() -{ - QUuid uuid = QUuid::createUuid(); - QBENCHMARK { - uuid.toByteArray(); - } -} - -void tst_bench_QUuid::fromByteArray() -{ - QByteArray string = "{67C8770B-44F1-410A-AB9A-F9B5446F13EE}"; - QBENCHMARK { - QUuid uuid(string); - } -} - -void tst_bench_QUuid::toRfc4122() -{ - QUuid uuid = QUuid::createUuid(); - QBENCHMARK { - uuid.toRfc4122(); - } -} - -void tst_bench_QUuid::fromRfc4122() -{ - QByteArray string = QByteArray::fromHex("67C8770B44F1410AAB9AF9B5446F13EE"); - QBENCHMARK { - QUuid uuid = QUuid::fromRfc4122(string); - Q_UNUSED(uuid) - } -} - -void tst_bench_QUuid::createUuidV3() -{ - QUuid ns = QUuid::createUuid(); - QByteArray name = QByteArray("Test"); - QBENCHMARK { - QUuid uuid = QUuid::createUuidV3(ns, name); - Q_UNUSED(uuid) - } -} - -void tst_bench_QUuid::createUuidV5() -{ - QUuid ns = QUuid::createUuid(); - QByteArray name = QByteArray("Test"); - QBENCHMARK { - QUuid uuid = QUuid::createUuidV5(ns, name); - Q_UNUSED(uuid) - } -} - -void tst_bench_QUuid::toDataStream() -{ - QUuid uuid = QUuid::createUuid(); - QByteArray ar; - { - QDataStream out(&ar,QIODevice::WriteOnly); - QBENCHMARK { - out << uuid; - } - } -} - -void tst_bench_QUuid::fromDataStream() -{ - QUuid uuid1, uuid2; - uuid1 = QUuid::createUuid(); - QByteArray ar; - { - QDataStream out(&ar,QIODevice::WriteOnly); - out << uuid1; - } - { - QDataStream in(&ar,QIODevice::ReadOnly); - QBENCHMARK { - in >> uuid2; - } - } -} - -void tst_bench_QUuid::isNull() -{ - QUuid uuid = QUuid(); - QBENCHMARK { - uuid.isNull(); - } -} - -void tst_bench_QUuid::operatorLess() -{ - QUuid uuid1, uuid2; - uuid1 = QUuid::createUuid(); - uuid2 = QUuid::createUuid(); - QBENCHMARK { - uuid1 < uuid2; - } -} - -void tst_bench_QUuid::operatorMore() -{ - QUuid uuid1, uuid2; - uuid1 = QUuid::createUuid(); - uuid2 = QUuid::createUuid(); - QBENCHMARK { - uuid1 > uuid2; - } -} - -QTEST_MAIN(tst_bench_QUuid); -#include "tst_quuid.moc" -- cgit v1.2.3