From bf55d2b1659290753641ee862f814ab8781cfa94 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Sat, 17 Oct 2015 17:34:31 +0200
Subject: Add Universal style

https://dev.windows.com/design

Change-Id: I1d8c633ae246724649a6ed71b300a56ba9572405
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
---
 tests/benchmarks/creationtime/tst_creationtime.cpp | 17 +++++++++++++++++
 tests/benchmarks/objectcount/tst_objectcount.cpp   | 15 +++++++++++++++
 2 files changed, 32 insertions(+)

(limited to 'tests/benchmarks')

diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp
index 3eccc654..7ce6947b 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 universal();
+    void universal_data();
+
     void calendar();
     void calendar_data();
 
@@ -93,6 +96,20 @@ void tst_CreationTime::controls_data()
     addTestRows(QQC2_IMPORT_PATH "/controls");
 }
 
+void tst_CreationTime::universal()
+{
+    QFETCH(QUrl, url);
+    QQmlComponent component(&engine);
+    component.loadUrl(url);
+    doBenchmark(&component);
+}
+
+void tst_CreationTime::universal_data()
+{
+    QTest::addColumn<QUrl>("url");
+    addTestRows(QQC2_IMPORT_PATH "/controls/universal");
+}
+
 void tst_CreationTime::calendar()
 {
     QFETCH(QUrl, url);
diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp
index 641d78d1..f2998708 100644
--- a/tests/benchmarks/objectcount/tst_objectcount.cpp
+++ b/tests/benchmarks/objectcount/tst_objectcount.cpp
@@ -69,6 +69,9 @@ private slots:
     void controls();
     void controls_data();
 
+    void universal();
+    void universal_data();
+
 private:
     QQmlEngine engine;
 };
@@ -216,6 +219,18 @@ void tst_ObjectCount::controls_data()
     addTestRows(QQC2_IMPORT_PATH "/controls");
 }
 
+void tst_ObjectCount::universal()
+{
+    QFETCH(QUrl, url);
+    doBenchmark(&engine, url);
+}
+
+void tst_ObjectCount::universal_data()
+{
+    QTest::addColumn<QUrl>("url");
+    addTestRows(QQC2_IMPORT_PATH "/controls/universal");
+}
+
 QTEST_MAIN(tst_ObjectCount)
 
 #include "tst_objectcount.moc"
-- 
cgit v1.2.3