From 4997773a6ed0ea9908cd67ab0335d2ae177a6320 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Mon, 11 Sep 2017 11:05:05 +0200
Subject: Update benchmarks for the new styles

Fusion was missing from tst_creationtime, and Imagine was missing from
tst_objectcount. Furthermore, they were both missing from the list of
dependencies declared in data/dependencies.qml, which is necessary in
static builds and also expected to help with a random failure spotted
in the CI logs:

    QWARN  : tst_ObjectCount::qobjects(fusion/ApplicationWindow.qml) QQmlComponent: Component is not ready
    FAIL!  : tst_ObjectCount::qobjects(fusion/ApplicationWindow.qml) 'object.data()' returned FALSE.
             (file:///C:/Users/qt/work/install/qml/QtQuick/Controls.2/Fusion/ApplicationWindow.qml:40
              module "QtQuick.Controls.Fusion" version 2.3 is not installed)
    tst_objectcount.cpp(141) : failure location

Change-Id: Ibb85b3024f1bb9d1e2a9654aeba39adb378fdec6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 tests/benchmarks/creationtime/data/dependencies.qml |  2 ++
 tests/benchmarks/creationtime/tst_creationtime.cpp  | 15 +++++++++++++++
 tests/benchmarks/objectcount/data/dependencies.qml  |  2 ++
 tests/benchmarks/objectcount/tst_objectcount.cpp    |  1 +
 4 files changed, 20 insertions(+)

(limited to 'tests/benchmarks')

diff --git a/tests/benchmarks/creationtime/data/dependencies.qml b/tests/benchmarks/creationtime/data/dependencies.qml
index 6b6d951b..c284d94c 100644
--- a/tests/benchmarks/creationtime/data/dependencies.qml
+++ b/tests/benchmarks/creationtime/data/dependencies.qml
@@ -1,5 +1,7 @@
 import QtQuick 2.6
 import QtQuick.Controls 2.1
+import QtQuick.Controls.Fusion 2.3
+import QtQuick.Controls.Imagine 2.3
 import QtQuick.Controls.Material 2.1
 import QtQuick.Controls.Universal 2.1
 import Qt.labs.calendar 1.0
diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp
index 9539ee1b..c584b9a5 100644
--- a/tests/benchmarks/creationtime/tst_creationtime.cpp
+++ b/tests/benchmarks/creationtime/tst_creationtime.cpp
@@ -47,6 +47,9 @@ private slots:
     void controls();
     void controls_data();
 
+    void fusion();
+    void fusion_data();
+
     void imagine();
     void imagine_data();
 
@@ -131,6 +134,18 @@ void tst_CreationTime::controls_data()
     addTestRows(&engine, "controls", "QtQuick/Controls.2", QStringList() << "ApplicationWindow" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator");
 }
 
+void tst_CreationTime::fusion()
+{
+    QFETCH(QUrl, url);
+    doBenchmark(&engine, url);
+}
+
+void tst_CreationTime::fusion_data()
+{
+    QTest::addColumn<QUrl>("url");
+    addTestRows(&engine, "controls/fusion", "QtQuick/Controls.2/Fusion", QStringList() << "ApplicationWindow" << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator");
+}
+
 void tst_CreationTime::imagine()
 {
     QFETCH(QUrl, url);
diff --git a/tests/benchmarks/objectcount/data/dependencies.qml b/tests/benchmarks/objectcount/data/dependencies.qml
index 6b6d951b..c284d94c 100644
--- a/tests/benchmarks/objectcount/data/dependencies.qml
+++ b/tests/benchmarks/objectcount/data/dependencies.qml
@@ -1,5 +1,7 @@
 import QtQuick 2.6
 import QtQuick.Controls 2.1
+import QtQuick.Controls.Fusion 2.3
+import QtQuick.Controls.Imagine 2.3
 import QtQuick.Controls.Material 2.1
 import QtQuick.Controls.Universal 2.1
 import Qt.labs.calendar 1.0
diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp
index 38ef156e..748cc1c1 100644
--- a/tests/benchmarks/objectcount/tst_objectcount.cpp
+++ b/tests/benchmarks/objectcount/tst_objectcount.cpp
@@ -128,6 +128,7 @@ static void initTestRows(QQmlEngine *engine)
 {
     addTestRows(engine, "controls", "QtQuick/Controls.2", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator");
     addTestRows(engine, "controls/fusion", "QtQuick/Controls.2/Fusion", QStringList() << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator");
+    addTestRows(engine, "controls/imagine", "QtQuick/Controls.2/Imagine");
     addTestRows(engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate");
     addTestRows(engine, "controls/universal", "QtQuick/Controls.2/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator");
 }
-- 
cgit v1.2.3