Benchmark cleanup.

28 files changed, 198 insertions, 23 deletions

diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index 08bf0ed..2979ffc 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
@@ -41,3 +41,4 @@ SUBDIRS = containers-associative \
 	qthreadstorage
 
 contains(QT_CONFIG, opengl): SUBDIRS += opengl
+contains(QT_CONFIG, declarative): SUBDIRS += declarative
diff --git a/tests/benchmarks/declarative/binding/idproperty.txt b/tests/benchmarks/declarative/binding/data/idproperty.txt
index 71e3c4e..71e3c4e 100644
--- a/tests/benchmarks/declarative/binding/idproperty.txt
+++ b/tests/benchmarks/declarative/binding/data/idproperty.txt
diff --git a/tests/benchmarks/declarative/binding/localproperty.txt b/tests/benchmarks/declarative/binding/data/localproperty.txt
index c7ca0ef..c7ca0ef 100644
--- a/tests/benchmarks/declarative/binding/localproperty.txt
+++ b/tests/benchmarks/declarative/binding/data/localproperty.txt
diff --git a/tests/benchmarks/declarative/binding/objectproperty.txt b/tests/benchmarks/declarative/binding/data/objectproperty.txt
index 63fa74d..63fa74d 100644
--- a/tests/benchmarks/declarative/binding/objectproperty.txt
+++ b/tests/benchmarks/declarative/binding/data/objectproperty.txt
diff --git a/tests/benchmarks/declarative/binding/tst_binding.cpp b/tests/benchmarks/declarative/binding/tst_binding.cpp
index 02312e6..7b4875f 100644
--- a/tests/benchmarks/declarative/binding/tst_binding.cpp
+++ b/tests/benchmarks/declarative/binding/tst_binding.cpp
@@ -102,8 +102,8 @@ void tst_binding::objectproperty_data()
     QTest::addColumn<QString>("file");
     QTest::addColumn<QString>("binding");
 
-    QTest::newRow("object.value") << "objectproperty.txt" << "object.value";
-    QTest::newRow("object.value + 10") << "objectproperty.txt" << "object.value + 10";
+    QTest::newRow("object.value") << "data/objectproperty.txt" << "object.value";
+    QTest::newRow("object.value + 10") << "data/objectproperty.txt" << "object.value + 10";
 }
 
 void tst_binding::objectproperty()
@@ -131,13 +131,13 @@ void tst_binding::basicproperty_data()
     QTest::addColumn<QString>("file");
     QTest::addColumn<QString>("binding");
 
-    QTest::newRow("value") << "localproperty.txt" << "value";
-    QTest::newRow("value + 10") << "localproperty.txt" << "value + 10";
-    QTest::newRow("value + value + 10") << "localproperty.txt" << "value + value + 10";
+    QTest::newRow("value") << "data/localproperty.txt" << "value";
+    QTest::newRow("value + 10") << "data/localproperty.txt" << "value + 10";
+    QTest::newRow("value + value + 10") << "data/localproperty.txt" << "value + value + 10";
 
-    QTest::newRow("MyObject.value") << "idproperty.txt" << "MyObject.value";
-    QTest::newRow("MyObject.value + 10") << "idproperty.txt" << "MyObject.value + 10";
-    QTest::newRow("MyObject.value + MyObject.value + 10") << "idproperty.txt" << "MyObject.value + MyObject.value + 10";
+    QTest::newRow("MyObject.value") << "data/idproperty.txt" << "MyObject.value";
+    QTest::newRow("MyObject.value + 10") << "data/idproperty.txt" << "MyObject.value + 10";
+    QTest::newRow("MyObject.value + MyObject.value + 10") << "data/idproperty.txt" << "MyObject.value + MyObject.value + 10";
 }
 
 void tst_binding::basicproperty()
diff --git a/tests/benchmarks/declarative/declarative.pro b/tests/benchmarks/declarative/declarative.pro
new file mode 100644
index 0000000..2f85265
--- /dev/null
+++ b/tests/benchmarks/declarative/declarative.pro
@@ -0,0 +1,12 @@
+TEMPLATE = subdirs
+SUBDIRS += \
+           binding \
+           creation \
+           pointers \
+           qmlcomponent \
+           qmlgraphicsimage \
+           qmlmetaproperty \
+           qmlpainting \
+           script \
+           text
+#           qmltime
diff --git a/tests/benchmarks/declarative/qmlcomponent/myqmlobject.txt b/tests/benchmarks/declarative/qmlcomponent/data/myqmlobject.qml
index 9c3f7f8..9c3f7f8 100644
--- a/tests/benchmarks/declarative/qmlcomponent/myqmlobject.txt
+++ b/tests/benchmarks/declarative/qmlcomponent/data/myqmlobject.qml
diff --git a/tests/benchmarks/declarative/qmlcomponent/myqmlobject_binding.txt b/tests/benchmarks/declarative/qmlcomponent/data/myqmlobject_binding.qml
index e6cc4cf..e6cc4cf 100644
--- a/tests/benchmarks/declarative/qmlcomponent/myqmlobject_binding.txt
+++ b/tests/benchmarks/declarative/qmlcomponent/data/myqmlobject_binding.qml
diff --git a/tests/benchmarks/declarative/qmlcomponent/object.txt b/tests/benchmarks/declarative/qmlcomponent/data/object.qml
index 0d2d49b..0d2d49b 100644
--- a/tests/benchmarks/declarative/qmlcomponent/object.txt
+++ b/tests/benchmarks/declarative/qmlcomponent/data/object.qml
diff --git a/tests/benchmarks/declarative/qmlcomponent/object_id.txt b/tests/benchmarks/declarative/qmlcomponent/data/object_id.qml
index 69114af..69114af 100644
--- a/tests/benchmarks/declarative/qmlcomponent/object_id.txt
+++ b/tests/benchmarks/declarative/qmlcomponent/data/object_id.qml
diff --git a/tests/benchmarks/declarative/qmlcomponent/samegame/BoomBlock.qml b/tests/benchmarks/declarative/qmlcomponent/data/samegame/BoomBlock.qml
index 723e62a..723e62a 100644
--- a/tests/benchmarks/declarative/qmlcomponent/samegame/BoomBlock.qml
+++ b/tests/benchmarks/declarative/qmlcomponent/data/samegame/BoomBlock.qml
diff --git a/tests/benchmarks/declarative/qmlcomponent/samegame/pics/blueStar.png b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/blueStar.png
index ff9588f..ff9588f 100644
--- a/tests/benchmarks/declarative/qmlcomponent/samegame/pics/blueStar.png
+++ b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/blueStar.png
diff --git a/tests/benchmarks/declarative/qmlcomponent/samegame/pics/blueStone.png b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/blueStone.png
index bf342e0..bf342e0 100644
--- a/tests/benchmarks/declarative/qmlcomponent/samegame/pics/blueStone.png
+++ b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/blueStone.png
diff --git a/tests/benchmarks/declarative/qmlcomponent/samegame/pics/greenStar.png b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/greenStar.png
index cd06854..cd06854 100644
--- a/tests/benchmarks/declarative/qmlcomponent/samegame/pics/greenStar.png
+++ b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/greenStar.png
diff --git a/tests/benchmarks/declarative/qmlcomponent/samegame/pics/greenStone.png b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/greenStone.png
index 5ac14a5..5ac14a5 100644
--- a/tests/benchmarks/declarative/qmlcomponent/samegame/pics/greenStone.png
+++ b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/greenStone.png
diff --git a/tests/benchmarks/declarative/qmlcomponent/samegame/pics/redStar.png b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/redStar.png
index 0a4dffe..0a4dffe 100644
--- a/tests/benchmarks/declarative/qmlcomponent/samegame/pics/redStar.png
+++ b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/redStar.png
diff --git a/tests/benchmarks/declarative/qmlcomponent/samegame/pics/redStone.png b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/redStone.png
index b099f60..b099f60 100644
--- a/tests/benchmarks/declarative/qmlcomponent/samegame/pics/redStone.png
+++ b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/redStone.png
diff --git a/tests/benchmarks/declarative/qmlcomponent/samegame/pics/yellowStone.png b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/yellowStone.png
index c56124a..c56124a 100644
--- a/tests/benchmarks/declarative/qmlcomponent/samegame/pics/yellowStone.png
+++ b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/yellowStone.png
diff --git a/tests/benchmarks/declarative/qmlcomponent/synthesized_properties.2.txt b/tests/benchmarks/declarative/qmlcomponent/data/synthesized_properties.2.qml
index 27c5646..27c5646 100644
--- a/tests/benchmarks/declarative/qmlcomponent/synthesized_properties.2.txt
+++ b/tests/benchmarks/declarative/qmlcomponent/data/synthesized_properties.2.qml
diff --git a/tests/benchmarks/declarative/qmlcomponent/synthesized_properties.txt b/tests/benchmarks/declarative/qmlcomponent/data/synthesized_properties.qml
index d08f35b..d08f35b 100644
--- a/tests/benchmarks/declarative/qmlcomponent/synthesized_properties.txt
+++ b/tests/benchmarks/declarative/qmlcomponent/data/synthesized_properties.qml
diff --git a/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp b/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp
index 50cfc93..f5a4540 100644
--- a/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp
+++ b/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp
@@ -23,7 +23,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** version 1.1, included in the file LGPL_EXCEPTION.qml in this package.
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
@@ -89,13 +89,13 @@ void tst_qmlcomponent::creation_data()
 {
     QTest::addColumn<QString>("file");
 
-    QTest::newRow("Object") << "object.txt";
-    QTest::newRow("Object - Id") << "object_id.txt";
-    QTest::newRow("MyQmlObject") << "myqmlobject.txt";
-    QTest::newRow("MyQmlObject: basic binding") << "myqmlobject_binding.txt";
-    QTest::newRow("Synthesized properties") << "synthesized_properties.txt";
-    QTest::newRow("Synthesized properties.2") << "synthesized_properties.2.txt";
-    QTest::newRow("SameGame - BoomBlock") << "samegame/BoomBlock.qml";
+    QTest::newRow("Object") << "data/object.qml";
+    QTest::newRow("Object - Id") << "data/object_id.qml";
+    QTest::newRow("MyQmlObject") << "data/myqmlobject.qml";
+    QTest::newRow("MyQmlObject: basic binding") << "data/myqmlobject_binding.qml";
+    QTest::newRow("Synthesized properties") << "data/synthesized_properties.qml";
+    QTest::newRow("Synthesized properties.2") << "data/synthesized_properties.2.qml";
+    QTest::newRow("SameGame - BoomBlock") << "data/samegame/BoomBlock.qml";
 }
 
 void tst_qmlcomponent::creation()
diff --git a/tests/benchmarks/declarative/qmlgraphicsimage/image.png b/tests/benchmarks/declarative/qmlgraphicsimage/image.png
index e94a94d..623d362 100644
--- a/tests/benchmarks/declarative/qmlgraphicsimage/image.png
+++ b/tests/benchmarks/declarative/qmlgraphicsimage/image.png
diff --git a/tests/benchmarks/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp b/tests/benchmarks/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
index bfd1c75..f6a6432 100644
--- a/tests/benchmarks/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
+++ b/tests/benchmarks/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
@@ -59,11 +59,6 @@ private:
     QmlEngine engine;
 };
 
-inline QUrl TEST_FILE(const QString &filename)
-{
-    return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
-}
-
 void tst_qmlgraphicsimage::qmlgraphicsimage()
 {
     int x = 0;
diff --git a/tests/benchmarks/declarative/qmlmetaproperty/object.txt b/tests/benchmarks/declarative/qmlmetaproperty/data/object.qml
index 11b95e1..11b95e1 100644
--- a/tests/benchmarks/declarative/qmlmetaproperty/object.txt
+++ b/tests/benchmarks/declarative/qmlmetaproperty/data/object.qml
diff --git a/tests/benchmarks/declarative/qmlmetaproperty/synthesized_object.txt b/tests/benchmarks/declarative/qmlmetaproperty/data/synthesized_object.qml
index a923a0a..a923a0a 100644
--- a/tests/benchmarks/declarative/qmlmetaproperty/synthesized_object.txt
+++ b/tests/benchmarks/declarative/qmlmetaproperty/data/synthesized_object.qml
diff --git a/tests/benchmarks/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp b/tests/benchmarks/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
index 3a3dc7a..8d0e549 100644
--- a/tests/benchmarks/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
+++ b/tests/benchmarks/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
@@ -89,8 +89,8 @@ void tst_qmlmetaproperty::lookup_data()
 {
     QTest::addColumn<QString>("file");
 
-    QTest::newRow("Simple Object") << "object.txt";
-    QTest::newRow("Synthesized Object") << "synthesized_object.txt";
+    QTest::newRow("Simple Object") << "data/object.qml";
+    QTest::newRow("Synthesized Object") << "data/synthesized_object.qml";
 }
 
 void tst_qmlmetaproperty::lookup()
diff --git a/tests/benchmarks/declarative/signalemission/signalemission.pro b/tests/benchmarks/declarative/signalemission/signalemission.pro
new file mode 100644
index 0000000..0119aff
--- /dev/null
+++ b/tests/benchmarks/declarative/signalemission/signalemission.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+TEMPLATE = app
+TARGET = tst_signalemission
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_signalemission.cpp
+
diff --git a/tests/benchmarks/declarative/signalemission/tst_signalemission.cpp b/tests/benchmarks/declarative/signalemission/tst_signalemission.cpp
new file mode 100644
index 0000000..8327638
--- /dev/null
+++ b/tests/benchmarks/declarative/signalemission/tst_signalemission.cpp
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QObject>
+#include <QDebug>
+
+class LotsOfSignals : public QObject
+{
+    Q_OBJECT
+public:
+    LotsOfSignals() {}
+
+signals:
+    void extraSignal1();
+    void extraSignal2();
+    void extraSignal3();
+    void extraSignal4();
+    void extraSignal5();
+    void extraSignal6();
+    void extraSignal7();
+    void extraSignal8();
+    void extraSignal9();
+    void extraSignal10();
+    void extraSignal12();
+    void extraSignal13();
+    void extraSignal14();
+    void extraSignal15();
+    void extraSignal16();
+    void extraSignal17();
+    void extraSignal18();
+    void extraSignal19();
+    void extraSignal20();
+    void extraSignal21();
+    void extraSignal22();
+    void extraSignal23();
+    void extraSignal24();
+    void extraSignal25();
+    void extraSignal26();
+    void extraSignal27();
+    void extraSignal28();
+    void extraSignal29();
+    void extraSignal30();
+    void extraSignal31();
+    void extraSignal32();
+    void extraSignal33();
+    void extraSignal34();
+    void extraSignal35();
+    void extraSignal36();
+    void extraSignal37();
+    void extraSignal38();
+    void extraSignal39();
+    void extraSignal40();
+    void extraSignal41();
+    void extraSignal42();
+    void extraSignal43();
+    void extraSignal44();
+    void extraSignal45();
+    void extraSignal46();
+    void extraSignal47();
+    void extraSignal48();
+    void extraSignal49();
+    void extraSignal50();
+    void extraSignal51();
+    void extraSignal52();
+    void extraSignal53();
+    void extraSignal54();
+    void extraSignal55();
+    void extraSignal56();
+    void extraSignal57();
+    void extraSignal58();
+    void extraSignal59();
+    void extraSignal60();
+    void extraSignal61();
+    void extraSignal62();
+    void extraSignal63();
+    void extraSignal64();
+    void extraSignal65();
+    void extraSignal66();
+    void extraSignal67();
+    void extraSignal68();
+    void extraSignal69();
+    void extraSignal70();
+};
+
+class tst_signalemission : public QObject
+{
+    Q_OBJECT
+public:
+    tst_signalemission() {}
+
+private slots:
+    void unconnected_data();
+    void unconnected();
+};
+
+void tst_signalemission::unconnected_data()
+{
+    QTest::addColumn<int>("signal_index");
+    QTest::newRow("9") << 9;
+    QTest::newRow("32") << 32;
+    QTest::newRow("33") << 33;
+    QTest::newRow("64") << 64;
+    QTest::newRow("65") << 65;
+    QTest::newRow("70") << 70;
+}
+
+void tst_signalemission::unconnected()
+{
+    LotsOfSignals *obj = new LotsOfSignals;
+    QFETCH(int, signal_index);
+    QVERIFY(obj->metaObject()->methodCount() == 73);
+    void *v;
+    QBENCHMARK {
+        //+1 because QObject has one slot
+        QMetaObject::metacall(obj, QMetaObject::InvokeMetaMethod, signal_index+1, &v);
+    }
+    delete obj;
+}
+
+QTEST_MAIN(tst_signalemission)
+#include "tst_signalemission.moc"