From b898b8c2317cd2c7349a60eba0c9bfea395e614c Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 9 Apr 2015 16:27:44 +0200 Subject: Rename benchmarks Just to make it clear what they actually do. These project names are also visible in Qt Creator when choosing the run-target... Change-Id: I95dd54fd1b6cb3369ab19dbaccbd92d104ea5250 Reviewed-by: J-P Nurmi --- tests/benchmarks/benchmarks.pro | 4 +- tests/benchmarks/creation/creation.pro | 9 - tests/benchmarks/creation/tst_creation.cpp | 158 -------------- tests/benchmarks/creationtime/creationtime.pro | 9 + tests/benchmarks/creationtime/tst_creationtime.cpp | 158 ++++++++++++++ tests/benchmarks/objectcount/objectcount.pro | 9 + tests/benchmarks/objectcount/tst_objectcount.cpp | 231 +++++++++++++++++++++ tests/benchmarks/objects/objects.pro | 9 - tests/benchmarks/objects/tst_objects.cpp | 231 --------------------- 9 files changed, 409 insertions(+), 409 deletions(-) delete mode 100644 tests/benchmarks/creation/creation.pro delete mode 100644 tests/benchmarks/creation/tst_creation.cpp create mode 100644 tests/benchmarks/creationtime/creationtime.pro create mode 100644 tests/benchmarks/creationtime/tst_creationtime.cpp create mode 100644 tests/benchmarks/objectcount/objectcount.pro create mode 100644 tests/benchmarks/objectcount/tst_objectcount.cpp delete mode 100644 tests/benchmarks/objects/objects.pro delete mode 100644 tests/benchmarks/objects/tst_objects.cpp (limited to 'tests') diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro index 5b06760b..7c4ca224 100644 --- a/tests/benchmarks/benchmarks.pro +++ b/tests/benchmarks/benchmarks.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs SUBDIRS += \ - creation \ - objects + creationtime \ + objectcount diff --git a/tests/benchmarks/creation/creation.pro b/tests/benchmarks/creation/creation.pro deleted file mode 100644 index 5750cb9f..00000000 --- a/tests/benchmarks/creation/creation.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = app -TARGET = tst_creation - -QT += qml testlib -CONFIG += testcase -osx:CONFIG -= app_bundle - -SOURCES += \ - tst_creation.cpp diff --git a/tests/benchmarks/creation/tst_creation.cpp b/tests/benchmarks/creation/tst_creation.cpp deleted file mode 100644 index 0f542ab9..00000000 --- a/tests/benchmarks/creation/tst_creation.cpp +++ /dev/null @@ -1,158 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -//#define QT_QUICK_CONTROLS_V1 - -class tst_Creation : public QObject -{ - Q_OBJECT - -private slots: - void initTestCase(); - - void testControls(); - void testControls_data(); - - void testCalendar(); - void testCalendar_data(); - -private: - QQmlEngine engine; -}; - -void tst_Creation::initTestCase() -{ - engine.clearComponentCache(); -} - -void tst_Creation::testControls() -{ - QFETCH(QByteArray, control); - - QQmlComponent component(&engine); -#ifdef QT_QUICK_CONTROLS_V1 - component.setData("import QtQuick.Controls 1.3;" + control + "{}", QUrl()); -#else - component.setData("import QtQuick.Controls 2.0;" + control + "{}", QUrl()); -#endif - - QObjectList objects; - QBENCHMARK { - QObject *object = component.create(); - if (!object) - qFatal("%s", qPrintable(component.errorString())); - objects += object; - } - qDeleteAll(objects); - engine.clearComponentCache(); -} - -void tst_Creation::testControls_data() -{ - QTest::addColumn("control"); - - QTest::newRow("ApplicationWindow") << QByteArray("ApplicationWindow"); - QTest::newRow("BusyIndicator") << QByteArray("BusyIndicator"); - QTest::newRow("Button") << QByteArray("Button"); - QTest::newRow("CheckBox") << QByteArray("CheckBox"); -#ifndef QT_QUICK_CONTROLS_V1 - QTest::newRow("Frame") << QByteArray("Frame"); -#endif - QTest::newRow("GroupBox") << QByteArray("GroupBox"); - QTest::newRow("Label") << QByteArray("Label"); - QTest::newRow("ProgressBar") << QByteArray("ProgressBar"); - QTest::newRow("RadioButton") << QByteArray("RadioButton"); -#ifdef QT_QUICK_CONTROLS_V1 - QTest::newRow("ScrollView") << QByteArray("ScrollView"); -#else - QTest::newRow("ScrollBar") << QByteArray("ScrollBar"); - QTest::newRow("ScrollIndicator") << QByteArray("ScrollIndicator"); -#endif - QTest::newRow("Slider") << QByteArray("Slider"); - QTest::newRow("Switch") << QByteArray("Switch"); -#ifndef QT_QUICK_CONTROLS_V1 - QTest::newRow("TabBar") << QByteArray("TabBar"); - QTest::newRow("TabButton") << QByteArray("TabButton"); -#endif - QTest::newRow("TabView") << QByteArray("TabView"); - QTest::newRow("TextArea") << QByteArray("TextArea"); - QTest::newRow("TextField") << QByteArray("TextField"); - QTest::newRow("ToolBar") << QByteArray("ToolBar"); - QTest::newRow("ToolButton") << QByteArray("ToolButton"); -} - -void tst_Creation::testCalendar() -{ - QFETCH(QByteArray, control); - - QQmlComponent component(&engine); -#ifdef QT_QUICK_CONTROLS_V1 - component.setData("import QtQuick.Controls 1.3;" + control + "{}", QUrl()); -#else - component.setData("import QtQuick.Calendar 2.0;" + control + "{}", QUrl()); -#endif - - QObjectList objects; - QBENCHMARK { - QObject *object = component.create(); - if (!object) - qFatal("%s", qPrintable(component.errorString())); - objects += object; - } - qDeleteAll(objects); - engine.clearComponentCache(); -} - -void tst_Creation::testCalendar_data() -{ - QTest::addColumn("control"); - -#ifdef QT_QUICK_CONTROLS_V1 - QTest::newRow("Calendar") << QByteArray("Calendar"); -#else - QTest::newRow("CalendarModel") << QByteArray("CalendarModel"); - QTest::newRow("CalendarView") << QByteArray("CalendarView"); - QTest::newRow("DayOfWeekRow") << QByteArray("DayOfWeekRow"); - QTest::newRow("WeekNumberColumn") << QByteArray("WeekNumberColumn"); -#endif -} - -QTEST_MAIN(tst_Creation) - -#include "tst_creation.moc" diff --git a/tests/benchmarks/creationtime/creationtime.pro b/tests/benchmarks/creationtime/creationtime.pro new file mode 100644 index 00000000..050e29aa --- /dev/null +++ b/tests/benchmarks/creationtime/creationtime.pro @@ -0,0 +1,9 @@ +TEMPLATE = app +TARGET = tst_creationtime + +QT += qml testlib +CONFIG += testcase +osx:CONFIG -= app_bundle + +SOURCES += \ + tst_creationtime.cpp diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp new file mode 100644 index 00000000..a6b19d6c --- /dev/null +++ b/tests/benchmarks/creationtime/tst_creationtime.cpp @@ -0,0 +1,158 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +//#define QT_QUICK_CONTROLS_V1 + +class tst_CreationTime : public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + + void testControls(); + void testControls_data(); + + void testCalendar(); + void testCalendar_data(); + +private: + QQmlEngine engine; +}; + +void tst_CreationTime::initTestCase() +{ + engine.clearComponentCache(); +} + +void tst_CreationTime::testControls() +{ + QFETCH(QByteArray, control); + + QQmlComponent component(&engine); +#ifdef QT_QUICK_CONTROLS_V1 + component.setData("import QtQuick.Controls 1.3;" + control + "{}", QUrl()); +#else + component.setData("import QtQuick.Controls 2.0;" + control + "{}", QUrl()); +#endif + + QObjectList objects; + QBENCHMARK { + QObject *object = component.create(); + if (!object) + qFatal("%s", qPrintable(component.errorString())); + objects += object; + } + qDeleteAll(objects); + engine.clearComponentCache(); +} + +void tst_CreationTime::testControls_data() +{ + QTest::addColumn("control"); + + QTest::newRow("ApplicationWindow") << QByteArray("ApplicationWindow"); + QTest::newRow("BusyIndicator") << QByteArray("BusyIndicator"); + QTest::newRow("Button") << QByteArray("Button"); + QTest::newRow("CheckBox") << QByteArray("CheckBox"); +#ifndef QT_QUICK_CONTROLS_V1 + QTest::newRow("Frame") << QByteArray("Frame"); +#endif + QTest::newRow("GroupBox") << QByteArray("GroupBox"); + QTest::newRow("Label") << QByteArray("Label"); + QTest::newRow("ProgressBar") << QByteArray("ProgressBar"); + QTest::newRow("RadioButton") << QByteArray("RadioButton"); +#ifdef QT_QUICK_CONTROLS_V1 + QTest::newRow("ScrollView") << QByteArray("ScrollView"); +#else + QTest::newRow("ScrollBar") << QByteArray("ScrollBar"); + QTest::newRow("ScrollIndicator") << QByteArray("ScrollIndicator"); +#endif + QTest::newRow("Slider") << QByteArray("Slider"); + QTest::newRow("Switch") << QByteArray("Switch"); +#ifndef QT_QUICK_CONTROLS_V1 + QTest::newRow("TabBar") << QByteArray("TabBar"); + QTest::newRow("TabButton") << QByteArray("TabButton"); +#endif + QTest::newRow("TabView") << QByteArray("TabView"); + QTest::newRow("TextArea") << QByteArray("TextArea"); + QTest::newRow("TextField") << QByteArray("TextField"); + QTest::newRow("ToolBar") << QByteArray("ToolBar"); + QTest::newRow("ToolButton") << QByteArray("ToolButton"); +} + +void tst_CreationTime::testCalendar() +{ + QFETCH(QByteArray, control); + + QQmlComponent component(&engine); +#ifdef QT_QUICK_CONTROLS_V1 + component.setData("import QtQuick.Controls 1.3;" + control + "{}", QUrl()); +#else + component.setData("import QtQuick.Calendar 2.0;" + control + "{}", QUrl()); +#endif + + QObjectList objects; + QBENCHMARK { + QObject *object = component.create(); + if (!object) + qFatal("%s", qPrintable(component.errorString())); + objects += object; + } + qDeleteAll(objects); + engine.clearComponentCache(); +} + +void tst_CreationTime::testCalendar_data() +{ + QTest::addColumn("control"); + +#ifdef QT_QUICK_CONTROLS_V1 + QTest::newRow("Calendar") << QByteArray("Calendar"); +#else + QTest::newRow("CalendarModel") << QByteArray("CalendarModel"); + QTest::newRow("CalendarView") << QByteArray("CalendarView"); + QTest::newRow("DayOfWeekRow") << QByteArray("DayOfWeekRow"); + QTest::newRow("WeekNumberColumn") << QByteArray("WeekNumberColumn"); +#endif +} + +QTEST_MAIN(tst_CreationTime) + +#include "tst_creationtime.moc" diff --git a/tests/benchmarks/objectcount/objectcount.pro b/tests/benchmarks/objectcount/objectcount.pro new file mode 100644 index 00000000..f54d72d6 --- /dev/null +++ b/tests/benchmarks/objectcount/objectcount.pro @@ -0,0 +1,9 @@ +TEMPLATE = app +TARGET = tst_objectcount + +QT += quick testlib core-private +CONFIG += testcase +osx:CONFIG -= app_bundle + +SOURCES += \ + tst_objectcount.cpp diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp new file mode 100644 index 00000000..d8493730 --- /dev/null +++ b/tests/benchmarks/objectcount/tst_objectcount.cpp @@ -0,0 +1,231 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include + +Q_GLOBAL_STATIC(QObjectList, qt_qobjects) + +extern "C" Q_DECL_EXPORT void qt_addQObject(QObject *object) +{ + qt_qobjects->append(object); +} + +extern "C" Q_DECL_EXPORT void qt_removeQObject(QObject *object) +{ + qt_qobjects->removeAll(object); +} + +class tst_ObjectCount : public QObject +{ + Q_OBJECT + +private slots: + void init(); + void cleanup(); + + void testCount(); + void testCount_data(); + +private: + QQmlEngine engine; +}; + +void tst_ObjectCount::init() +{ + qtHookData[QHooks::AddQObject] = reinterpret_cast(&qt_addQObject); + qtHookData[QHooks::RemoveQObject] = reinterpret_cast(&qt_removeQObject); + + // warmup + QQmlComponent component(&engine); + component.setData("import QtQuick 2.0; Item { Accessible.role: Accessible.Button }", QUrl()); + delete component.create(); +} + +void tst_ObjectCount::cleanup() +{ + qtHookData[QHooks::AddQObject] = 0; + qtHookData[QHooks::RemoveQObject] = 0; +} + +void tst_ObjectCount::testCount() +{ + QFETCH(QByteArray, v1); + QFETCH(QByteArray, v2); + + qt_qobjects->clear(); + + if (!v1.isEmpty()) { + QQmlComponent component(&engine); + component.setData(v1, QUrl()); + QScopedPointer object(component.create()); + QVERIFY2(object.data(), qPrintable(component.errorString())); + + QList items; + foreach (QObject *object, *qt_qobjects()) { + QQuickItem *item = qobject_cast(object); + if (item) + items += item; + } + + qInfo() << "V1: QQuickItems:" << items.count() << "(total of QObjects:" << qt_qobjects->count() << ")"; + } + + qt_qobjects->clear(); + + if (!v2.isEmpty()) { + QQmlComponent component(&engine); + component.setData(v2, QUrl()); + QScopedPointer object(component.create()); + QVERIFY2(object.data(), qPrintable(component.errorString())); + + QList items; + foreach (QObject *object, *qt_qobjects()) { + QQuickItem *item = qobject_cast(object); + if (item) + items += item; + } + + qInfo() << "V2: QQuickItems:" << items.count() << "(total of QObjects:" << qt_qobjects->count() << ")"; + } +} + +void tst_ObjectCount::testCount_data() +{ + QTest::addColumn("v1"); + QTest::addColumn("v2"); + + QTest::newRow("ApplicationWindow") + << QByteArray("import QtQuick.Controls 1.3; ApplicationWindow { }") + << QByteArray("import QtQuick.Controls 2.0; ApplicationWindow { }"); + + QTest::newRow("BusyIndicator") + << QByteArray("import QtQuick.Controls 1.3; BusyIndicator { }") + << QByteArray("import QtQuick.Controls 2.0; BusyIndicator { }"); + + QTest::newRow("Button") + << QByteArray("import QtQuick.Controls 1.3; Button { }") + << QByteArray("import QtQuick.Controls 2.0; Button { }"); + + QTest::newRow("CheckBox") + << QByteArray("import QtQuick.Controls 1.3; CheckBox { }") + << QByteArray("import QtQuick.Controls 2.0; CheckBox { }"); + + QTest::newRow("Frame") + << QByteArray() + << QByteArray("import QtQuick.Controls 2.0; Frame { }"); + + QTest::newRow("GroupBox") + << QByteArray("import QtQuick.Controls 1.3; GroupBox { }") + << QByteArray("import QtQuick.Controls 2.0; GroupBox { }"); + + QTest::newRow("Label") + << QByteArray("import QtQuick.Controls 1.3; Label { }") + << QByteArray("import QtQuick.Controls 2.0; Label { }"); + + QTest::newRow("PageIndicator") + << QByteArray() + << QByteArray("import QtQuick.Controls 2.0; PageIndicator { }"); + + QTest::newRow("ProgressBar") + << QByteArray("import QtQuick.Controls 1.3; ProgressBar { }") + << QByteArray("import QtQuick.Controls 2.0; ProgressBar { }"); + + QTest::newRow("RadioButton") + << QByteArray("import QtQuick.Controls 1.3; RadioButton { }") + << QByteArray("import QtQuick.Controls 2.0; RadioButton { }"); + + QTest::newRow("ScrollView") + << QByteArray("import QtQuick.Controls 1.3; ScrollView { }") + << QByteArray(); + + QTest::newRow("ScrollIndicator") + << QByteArray() + << QByteArray("import QtQuick.Controls 2.0; ScrollIndicator { }"); + + QTest::newRow("ScrollBar") + << QByteArray() + << QByteArray("import QtQuick.Controls 2.0; ScrollBar { }"); + + QTest::newRow("Slider") + << QByteArray("import QtQuick.Controls 1.3; Slider { }") + << QByteArray("import QtQuick.Controls 2.0; Slider { }"); + + QTest::newRow("StackView") + << QByteArray("import QtQuick.Controls 1.3; StackView { }") + << QByteArray("import QtQuick.Controls 2.0; StackView { }"); + + QTest::newRow("Switch") + << QByteArray("import QtQuick.Controls 1.3; Switch { }") + << QByteArray("import QtQuick.Controls 2.0; Switch { }"); + + QTest::newRow("TabBar") + << QByteArray() + << QByteArray("import QtQuick.Controls 2.0; TabBar { }"); + + QTest::newRow("TabButton") + << QByteArray() + << QByteArray("import QtQuick.Controls 2.0; TabButton { }"); + + QTest::newRow("TabView") + << QByteArray("import QtQuick.Controls 1.3; TabView { }") + << QByteArray("import QtQuick.Controls 2.0; TabView { }"); + + QTest::newRow("TextArea") + << QByteArray("import QtQuick.Controls 1.3; TextArea { }") + << QByteArray("import QtQuick.Controls 2.0; TextArea { }"); + + QTest::newRow("TextField") + << QByteArray("import QtQuick.Controls 1.3; TextField { }") + << QByteArray("import QtQuick.Controls 2.0; TextField { }"); + + QTest::newRow("ToggleButton") + << QByteArray() + << QByteArray("import QtQuick.Controls 2.0; ToggleButton { }"); + + QTest::newRow("ToolBar") + << QByteArray("import QtQuick.Controls 1.3; ToolBar { }") + << QByteArray("import QtQuick.Controls 2.0; ToolBar { }"); + + QTest::newRow("ToolButton") + << QByteArray("import QtQuick.Controls 1.3; ToolButton { }") + << QByteArray("import QtQuick.Controls 2.0; ToolButton { }"); +} + +QTEST_MAIN(tst_ObjectCount) + +#include "tst_objectcount.moc" diff --git a/tests/benchmarks/objects/objects.pro b/tests/benchmarks/objects/objects.pro deleted file mode 100644 index 21429271..00000000 --- a/tests/benchmarks/objects/objects.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = app -TARGET = tst_objects - -QT += quick testlib core-private -CONFIG += testcase -osx:CONFIG -= app_bundle - -SOURCES += \ - tst_objects.cpp diff --git a/tests/benchmarks/objects/tst_objects.cpp b/tests/benchmarks/objects/tst_objects.cpp deleted file mode 100644 index 96f97bd9..00000000 --- a/tests/benchmarks/objects/tst_objects.cpp +++ /dev/null @@ -1,231 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include - -Q_GLOBAL_STATIC(QObjectList, qt_qobjects) - -extern "C" Q_DECL_EXPORT void qt_addQObject(QObject *object) -{ - qt_qobjects->append(object); -} - -extern "C" Q_DECL_EXPORT void qt_removeQObject(QObject *object) -{ - qt_qobjects->removeAll(object); -} - -class tst_Objects : public QObject -{ - Q_OBJECT - -private slots: - void init(); - void cleanup(); - - void testCount(); - void testCount_data(); - -private: - QQmlEngine engine; -}; - -void tst_Objects::init() -{ - qtHookData[QHooks::AddQObject] = reinterpret_cast(&qt_addQObject); - qtHookData[QHooks::RemoveQObject] = reinterpret_cast(&qt_removeQObject); - - // warmup - QQmlComponent component(&engine); - component.setData("import QtQuick 2.0; Item { Accessible.role: Accessible.Button }", QUrl()); - delete component.create(); -} - -void tst_Objects::cleanup() -{ - qtHookData[QHooks::AddQObject] = 0; - qtHookData[QHooks::RemoveQObject] = 0; -} - -void tst_Objects::testCount() -{ - QFETCH(QByteArray, v1); - QFETCH(QByteArray, v2); - - qt_qobjects->clear(); - - if (!v1.isEmpty()) { - QQmlComponent component(&engine); - component.setData(v1, QUrl()); - QScopedPointer object(component.create()); - QVERIFY2(object.data(), qPrintable(component.errorString())); - - QList items; - foreach (QObject *object, *qt_qobjects()) { - QQuickItem *item = qobject_cast(object); - if (item) - items += item; - } - - qInfo() << "V1: QQuickItems:" << items.count() << "(total of QObjects:" << qt_qobjects->count() << ")"; - } - - qt_qobjects->clear(); - - if (!v2.isEmpty()) { - QQmlComponent component(&engine); - component.setData(v2, QUrl()); - QScopedPointer object(component.create()); - QVERIFY2(object.data(), qPrintable(component.errorString())); - - QList items; - foreach (QObject *object, *qt_qobjects()) { - QQuickItem *item = qobject_cast(object); - if (item) - items += item; - } - - qInfo() << "V2: QQuickItems:" << items.count() << "(total of QObjects:" << qt_qobjects->count() << ")"; - } -} - -void tst_Objects::testCount_data() -{ - QTest::addColumn("v1"); - QTest::addColumn("v2"); - - QTest::newRow("ApplicationWindow") - << QByteArray("import QtQuick.Controls 1.3; ApplicationWindow { }") - << QByteArray("import QtQuick.Controls 2.0; ApplicationWindow { }"); - - QTest::newRow("BusyIndicator") - << QByteArray("import QtQuick.Controls 1.3; BusyIndicator { }") - << QByteArray("import QtQuick.Controls 2.0; BusyIndicator { }"); - - QTest::newRow("Button") - << QByteArray("import QtQuick.Controls 1.3; Button { }") - << QByteArray("import QtQuick.Controls 2.0; Button { }"); - - QTest::newRow("CheckBox") - << QByteArray("import QtQuick.Controls 1.3; CheckBox { }") - << QByteArray("import QtQuick.Controls 2.0; CheckBox { }"); - - QTest::newRow("Frame") - << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; Frame { }"); - - QTest::newRow("GroupBox") - << QByteArray("import QtQuick.Controls 1.3; GroupBox { }") - << QByteArray("import QtQuick.Controls 2.0; GroupBox { }"); - - QTest::newRow("Label") - << QByteArray("import QtQuick.Controls 1.3; Label { }") - << QByteArray("import QtQuick.Controls 2.0; Label { }"); - - QTest::newRow("PageIndicator") - << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; PageIndicator { }"); - - QTest::newRow("ProgressBar") - << QByteArray("import QtQuick.Controls 1.3; ProgressBar { }") - << QByteArray("import QtQuick.Controls 2.0; ProgressBar { }"); - - QTest::newRow("RadioButton") - << QByteArray("import QtQuick.Controls 1.3; RadioButton { }") - << QByteArray("import QtQuick.Controls 2.0; RadioButton { }"); - - QTest::newRow("ScrollView") - << QByteArray("import QtQuick.Controls 1.3; ScrollView { }") - << QByteArray(); - - QTest::newRow("ScrollIndicator") - << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; ScrollIndicator { }"); - - QTest::newRow("ScrollBar") - << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; ScrollBar { }"); - - QTest::newRow("Slider") - << QByteArray("import QtQuick.Controls 1.3; Slider { }") - << QByteArray("import QtQuick.Controls 2.0; Slider { }"); - - QTest::newRow("StackView") - << QByteArray("import QtQuick.Controls 1.3; StackView { }") - << QByteArray("import QtQuick.Controls 2.0; StackView { }"); - - QTest::newRow("Switch") - << QByteArray("import QtQuick.Controls 1.3; Switch { }") - << QByteArray("import QtQuick.Controls 2.0; Switch { }"); - - QTest::newRow("TabBar") - << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; TabBar { }"); - - QTest::newRow("TabButton") - << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; TabButton { }"); - - QTest::newRow("TabView") - << QByteArray("import QtQuick.Controls 1.3; TabView { }") - << QByteArray("import QtQuick.Controls 2.0; TabView { }"); - - QTest::newRow("TextArea") - << QByteArray("import QtQuick.Controls 1.3; TextArea { }") - << QByteArray("import QtQuick.Controls 2.0; TextArea { }"); - - QTest::newRow("TextField") - << QByteArray("import QtQuick.Controls 1.3; TextField { }") - << QByteArray("import QtQuick.Controls 2.0; TextField { }"); - - QTest::newRow("ToggleButton") - << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; ToggleButton { }"); - - QTest::newRow("ToolBar") - << QByteArray("import QtQuick.Controls 1.3; ToolBar { }") - << QByteArray("import QtQuick.Controls 2.0; ToolBar { }"); - - QTest::newRow("ToolButton") - << QByteArray("import QtQuick.Controls 1.3; ToolButton { }") - << QByteArray("import QtQuick.Controls 2.0; ToolButton { }"); -} - -QTEST_MAIN(tst_Objects) - -#include "tst_objects.moc" -- cgit v1.2.3