diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2009-09-23 01:00:38 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2009-09-23 01:00:38 (GMT) |
commit | 4594ccff8ee55a5bbc640f764e0767da885a3c9f (patch) | |
tree | 353d2f94919a2c59ad06110effb46eb8a962baac /tests | |
parent | 1c011c7f70791e0a4a38bd9f8bb1988cd604305c (diff) | |
parent | 30379e098ef31a8a1f670bdeab212ed419e80b5b (diff) | |
download | Qt-4594ccff8ee55a5bbc640f764e0767da885a3c9f.zip Qt-4594ccff8ee55a5bbc640f764e0767da885a3c9f.tar.gz Qt-4594ccff8ee55a5bbc640f764e0767da885a3c9f.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests')
16 files changed, 71 insertions, 52 deletions
diff --git a/tests/auto/declarative/anchors/tst_anchors.cpp b/tests/auto/declarative/anchors/tst_anchors.cpp index 98ede65..a8b119c 100644 --- a/tests/auto/declarative/anchors/tst_anchors.cpp +++ b/tests/auto/declarative/anchors/tst_anchors.cpp @@ -1,7 +1,7 @@ #include <qtest.h> #include <QtDeclarative/qmlengine.h> #include <QtDeclarative/qmlcomponent.h> -#include <QtDeclarative/qfxview.h> +#include <QtDeclarative/qmlview.h> #include <QtDeclarative/qfxrect.h> class tst_anchors : public QObject @@ -43,7 +43,7 @@ T *tst_anchors::findItem(QFxItem *parent, const QString &objectName) void tst_anchors::basicAnchors() { - QFxView *view = new QFxView; + QmlView *view = new QmlView; view->setUrl(QUrl("file://" SRCDIR "/data/anchors.qml")); view->execute(); @@ -93,7 +93,7 @@ void tst_anchors::basicAnchors() void tst_anchors::loops() { { - QFxView *view = new QFxView; + QmlView *view = new QmlView; view->setUrl(QUrl("file://" SRCDIR "/data/loop1.qml")); @@ -105,7 +105,7 @@ void tst_anchors::loops() } { - QFxView *view = new QFxView; + QmlView *view = new QmlView; view->setUrl(QUrl("file://" SRCDIR "/data/loop2.qml")); @@ -120,7 +120,7 @@ void tst_anchors::loops() void tst_anchors::illegalSets() { { - QFxView *view = new QFxView; + QmlView *view = new QmlView; view->setUrl(QUrl("file://" SRCDIR "/data/illegal1.qml")); @@ -132,7 +132,7 @@ void tst_anchors::illegalSets() } { - QFxView *view = new QFxView; + QmlView *view = new QmlView; view->setUrl(QUrl("file://" SRCDIR "/data/illegal2.qml")); @@ -144,7 +144,7 @@ void tst_anchors::illegalSets() } { - QFxView *view = new QFxView; + QmlView *view = new QmlView; view->setUrl(QUrl("file://" SRCDIR "/data/illegal3.qml")); diff --git a/tests/auto/declarative/animations/tst_animations.cpp b/tests/auto/declarative/animations/tst_animations.cpp index 8e1abc6..f627527 100644 --- a/tests/auto/declarative/animations/tst_animations.cpp +++ b/tests/auto/declarative/animations/tst_animations.cpp @@ -1,7 +1,7 @@ #include <qtest.h> #include <QtDeclarative/qmlengine.h> #include <QtDeclarative/qmlcomponent.h> -#include <QtDeclarative/qfxview.h> +#include <QtDeclarative/qmlview.h> #include <QtDeclarative/qfxrect.h> #include <QtDeclarative/QmlNumberAnimation> @@ -97,7 +97,7 @@ void tst_animations::badTypes() { //don't crash { - QFxView *view = new QFxView; + QmlView *view = new QmlView; view->setUrl(QUrl("file://" SRCDIR "/data/badtype1.qml")); view->execute(); diff --git a/tests/auto/declarative/layouts/tst_layouts.cpp b/tests/auto/declarative/layouts/tst_layouts.cpp index 3416b2e..d1e6aab 100644 --- a/tests/auto/declarative/layouts/tst_layouts.cpp +++ b/tests/auto/declarative/layouts/tst_layouts.cpp @@ -1,6 +1,6 @@ #include <QtTest/QtTest> #include <qlistmodelinterface.h> -#include <qfxview.h> +#include <qmlview.h> #include <qfxrect.h> #include <qmlexpression.h> @@ -19,7 +19,7 @@ private slots: void test_grid_spacing(); private: - QFxView *createView(const QString &filename); + QmlView *createView(const QString &filename); }; tst_QFxLayouts::tst_QFxLayouts() @@ -28,7 +28,7 @@ tst_QFxLayouts::tst_QFxLayouts() void tst_QFxLayouts::test_horizontal() { - QFxView *canvas = createView(SRCDIR "/data/horizontal.qml"); + QmlView *canvas = createView(SRCDIR "/data/horizontal.qml"); canvas->execute(); qApp->processEvents(); @@ -52,7 +52,7 @@ void tst_QFxLayouts::test_horizontal() void tst_QFxLayouts::test_horizontal_spacing() { - QFxView *canvas = createView(SRCDIR "/data/horizontal-spacing.qml"); + QmlView *canvas = createView(SRCDIR "/data/horizontal-spacing.qml"); canvas->execute(); qApp->processEvents(); @@ -76,7 +76,7 @@ void tst_QFxLayouts::test_horizontal_spacing() void tst_QFxLayouts::test_vertical() { - QFxView *canvas = createView(SRCDIR "/data/vertical.qml"); + QmlView *canvas = createView(SRCDIR "/data/vertical.qml"); canvas->execute(); qApp->processEvents(); @@ -100,7 +100,7 @@ void tst_QFxLayouts::test_vertical() void tst_QFxLayouts::test_vertical_spacing() { - QFxView *canvas = createView(SRCDIR "/data/vertical-spacing.qml"); + QmlView *canvas = createView(SRCDIR "/data/vertical-spacing.qml"); canvas->execute(); qApp->processEvents(); @@ -124,7 +124,7 @@ void tst_QFxLayouts::test_vertical_spacing() void tst_QFxLayouts::test_grid() { - QFxView *canvas = createView("data/grid.qml"); + QmlView *canvas = createView("data/grid.qml"); canvas->execute(); qApp->processEvents(); @@ -154,7 +154,7 @@ void tst_QFxLayouts::test_grid() void tst_QFxLayouts::test_grid_spacing() { - QFxView *canvas = createView("data/grid-spacing.qml"); + QmlView *canvas = createView("data/grid-spacing.qml"); canvas->execute(); qApp->processEvents(); @@ -182,9 +182,9 @@ void tst_QFxLayouts::test_grid_spacing() QCOMPARE(five->y(), 54.0); } -QFxView *tst_QFxLayouts::createView(const QString &filename) +QmlView *tst_QFxLayouts::createView(const QString &filename) { - QFxView *canvas = new QFxView(0); + QmlView *canvas = new QmlView(0); QFile file(filename); file.open(QFile::ReadOnly); diff --git a/tests/auto/declarative/listview/tst_listview.cpp b/tests/auto/declarative/listview/tst_listview.cpp index ebc3053..19d324d 100644 --- a/tests/auto/declarative/listview/tst_listview.cpp +++ b/tests/auto/declarative/listview/tst_listview.cpp @@ -1,6 +1,6 @@ #include <QtTest/QtTest> #include <qlistmodelinterface.h> -#include <qfxview.h> +#include <qmlview.h> #include <qfxlistview.h> #include <qfxtext.h> #include <qmlcontext.h> @@ -31,7 +31,7 @@ private: template <class T> void changed(); template <class T> void inserted(); template <class T> void removed(); - QFxView *createView(const QString &filename); + QmlView *createView(const QString &filename); template<typename T> T *findItem(QFxItem *parent, const QString &id, int index=0); }; @@ -169,7 +169,7 @@ tst_QFxListView::tst_QFxListView() template <class T> void tst_QFxListView::items() { - QFxView *canvas = createView(SRCDIR "/data/listview.qml"); + QmlView *canvas = createView(SRCDIR "/data/listview.qml"); T model; model.addItem("Fred", "12345"); @@ -205,7 +205,7 @@ void tst_QFxListView::items() template <class T> void tst_QFxListView::changed() { - QFxView *canvas = createView(SRCDIR "/data/listview.qml"); + QmlView *canvas = createView(SRCDIR "/data/listview.qml"); T model; model.addItem("Fred", "12345"); @@ -238,7 +238,7 @@ void tst_QFxListView::changed() template <class T> void tst_QFxListView::inserted() { - QFxView *canvas = createView(SRCDIR "/data/listview.qml"); + QmlView *canvas = createView(SRCDIR "/data/listview.qml"); T model; model.addItem("Fred", "12345"); @@ -305,7 +305,7 @@ void tst_QFxListView::inserted() template <class T> void tst_QFxListView::removed() { - QFxView *canvas = createView(SRCDIR "/data/listview.qml"); + QmlView *canvas = createView(SRCDIR "/data/listview.qml"); T model; for (int i = 0; i < 30; i++) @@ -438,9 +438,9 @@ void tst_QFxListView::qAbstractItemModel_removed() removed<TestModel2>(); } -QFxView *tst_QFxListView::createView(const QString &filename) +QmlView *tst_QFxListView::createView(const QString &filename) { - QFxView *canvas = new QFxView(0); + QmlView *canvas = new QmlView(0); canvas->setFixedSize(240,320); QFile file(filename); diff --git a/tests/auto/declarative/pathview/tst_pathview.cpp b/tests/auto/declarative/pathview/tst_pathview.cpp index 2933323..e2da191 100644 --- a/tests/auto/declarative/pathview/tst_pathview.cpp +++ b/tests/auto/declarative/pathview/tst_pathview.cpp @@ -1,6 +1,6 @@ #include <QtTest/QtTest> #include <qlistmodelinterface.h> -#include <qfxview.h> +#include <qmlview.h> #include <qfxpathview.h> #include <qfxtext.h> #include <qfxrect.h> @@ -19,7 +19,7 @@ private slots: void limitedItems(); private: - QFxView *createView(const QString &filename); + QmlView *createView(const QString &filename); template<typename T> T *findItem(QFxItem *parent, const QString &id, int index=0); }; @@ -101,7 +101,7 @@ tst_QFxPathView::tst_QFxPathView() void tst_QFxPathView::items() { - QFxView *canvas = createView(SRCDIR "/data/pathview.qml"); + QmlView *canvas = createView(SRCDIR "/data/pathview.qml"); TestModel model; model.addItem("Fred", "12345"); @@ -133,7 +133,7 @@ void tst_QFxPathView::items() void tst_QFxPathView::pathMoved() { - QFxView *canvas = createView(SRCDIR "/data/pathview.qml"); + QmlView *canvas = createView(SRCDIR "/data/pathview.qml"); TestModel model; model.addItem("Ben", "12345"); @@ -176,7 +176,7 @@ void tst_QFxPathView::pathMoved() void tst_QFxPathView::limitedItems() { - QFxView *canvas = createView(SRCDIR "/data/pathview.qml"); + QmlView *canvas = createView(SRCDIR "/data/pathview.qml"); TestModel model; for(int i=0; i<100; i++) @@ -213,9 +213,9 @@ void tst_QFxPathView::limitedItems() QVERIFY(testItem != 0); } -QFxView *tst_QFxPathView::createView(const QString &filename) +QmlView *tst_QFxPathView::createView(const QString &filename) { - QFxView *canvas = new QFxView(0); + QmlView *canvas = new QmlView(0); canvas->setFixedSize(240,320); QFile file(filename); diff --git a/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp b/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp index c4fc506..ffbb09b 100644 --- a/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp +++ b/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp @@ -424,10 +424,10 @@ void tst_qfxtextedit::selection() QVERIFY(textEditObject->selectedText().size() == 10); } -#include <QFxView> +#include <QmlView> void tst_qfxtextedit::cursorDelegate() { - QFxView* view = new QFxView(0); + QmlView* view = new QmlView(0); view->show(); view->setUrl(QUrl("data/cursorTest.qml")); view->execute(); diff --git a/tests/auto/declarative/qfxtextinput/tst_qfxtextinput.cpp b/tests/auto/declarative/qfxtextinput/tst_qfxtextinput.cpp index c883aa3..13a301d 100644 --- a/tests/auto/declarative/qfxtextinput/tst_qfxtextinput.cpp +++ b/tests/auto/declarative/qfxtextinput/tst_qfxtextinput.cpp @@ -2,7 +2,7 @@ #include "../../../shared/util.h" #include <QtDeclarative/qmlengine.h> #include <QFile> -#include <QtDeclarative/qfxview.h> +#include <QtDeclarative/qmlview.h> #include <QFxTextInput> #include <QDebug> @@ -28,8 +28,8 @@ private slots: void navigation(); private: - void simulateKey(QFxView *, int key); - QFxView *createView(const QString &filename); + void simulateKey(QmlView *, int key); + QmlView *createView(const QString &filename); QmlEngine engine; QStringList standard; @@ -268,7 +268,7 @@ void tst_qfxtextinput::selection() void tst_qfxtextinput::maxLength() { - QFxView *canvas = createView(SRCDIR "/data/navigation.qml"); + QmlView *canvas = createView(SRCDIR "/data/navigation.qml"); canvas->execute(); canvas->show(); @@ -282,7 +282,7 @@ void tst_qfxtextinput::maxLength() void tst_qfxtextinput::masks() { - QFxView *canvas = createView(SRCDIR "/data/navigation.qml"); + QmlView *canvas = createView(SRCDIR "/data/navigation.qml"); canvas->execute(); canvas->show(); @@ -296,7 +296,7 @@ void tst_qfxtextinput::masks() void tst_qfxtextinput::validators() { - QFxView *canvas = createView(SRCDIR "/data/navigation.qml"); + QmlView *canvas = createView(SRCDIR "/data/navigation.qml"); canvas->execute(); canvas->show(); @@ -314,7 +314,7 @@ the extent of the text, then they should ignore the keys. */ void tst_qfxtextinput::navigation() { - QFxView *canvas = createView(SRCDIR "/data/navigation.qml"); + QmlView *canvas = createView(SRCDIR "/data/navigation.qml"); canvas->execute(); canvas->show(); @@ -339,7 +339,7 @@ void tst_qfxtextinput::cursorDelegate() //TODO:Get the QFxTextInput test passing first } -void tst_qfxtextinput::simulateKey(QFxView *view, int key) +void tst_qfxtextinput::simulateKey(QmlView *view, int key) { QKeyEvent press(QKeyEvent::KeyPress, key, 0); QKeyEvent release(QKeyEvent::KeyRelease, key, 0); @@ -348,9 +348,9 @@ void tst_qfxtextinput::simulateKey(QFxView *view, int key) QApplication::sendEvent(view, &release); } -QFxView *tst_qfxtextinput::createView(const QString &filename) +QmlView *tst_qfxtextinput::createView(const QString &filename) { - QFxView *canvas = new QFxView(0); + QmlView *canvas = new QmlView(0); QFile file(filename); file.open(QFile::ReadOnly); diff --git a/tests/auto/declarative/qmlparser/assignSignal.qml b/tests/auto/declarative/qmlparser/assignSignal.qml index 153b403..3abc04d 100644 --- a/tests/auto/declarative/qmlparser/assignSignal.qml +++ b/tests/auto/declarative/qmlparser/assignSignal.qml @@ -1,4 +1,5 @@ import Test 1.0 MyQmlObject { onBasicSignal: basicSlot() + onBasicParameterizedSignal: basicSlot(parameter) } diff --git a/tests/auto/declarative/qmlparser/importVersionMissingBuiltIn.errors.txt b/tests/auto/declarative/qmlparser/importVersionMissingBuiltIn.errors.txt new file mode 100644 index 0000000..2235cbc --- /dev/null +++ b/tests/auto/declarative/qmlparser/importVersionMissingBuiltIn.errors.txt @@ -0,0 +1 @@ +SHOULD GIVE AN ERROR ABOUT MISSING VERSION diff --git a/tests/auto/declarative/qmlparser/importVersionMissingBuiltIn.qml b/tests/auto/declarative/qmlparser/importVersionMissingBuiltIn.qml new file mode 100644 index 0000000..23ed566 --- /dev/null +++ b/tests/auto/declarative/qmlparser/importVersionMissingBuiltIn.qml @@ -0,0 +1,7 @@ +import Test as S + +S.MyQmlObject { + property real x; + property real y; +} + diff --git a/tests/auto/declarative/qmlparser/importVersionMissingInstalled.errors.txt b/tests/auto/declarative/qmlparser/importVersionMissingInstalled.errors.txt new file mode 100644 index 0000000..2235cbc --- /dev/null +++ b/tests/auto/declarative/qmlparser/importVersionMissingInstalled.errors.txt @@ -0,0 +1 @@ +SHOULD GIVE AN ERROR ABOUT MISSING VERSION diff --git a/tests/auto/declarative/qmlparser/importVersionMissingInstalled.qml b/tests/auto/declarative/qmlparser/importVersionMissingInstalled.qml new file mode 100644 index 0000000..97ec222 --- /dev/null +++ b/tests/auto/declarative/qmlparser/importVersionMissingInstalled.qml @@ -0,0 +1,3 @@ +import com.nokia.installedtest as T + +T.InstalledTest {} diff --git a/tests/auto/declarative/qmlparser/testtypes.h b/tests/auto/declarative/qmlparser/testtypes.h index e3e9aae..f6f966f 100644 --- a/tests/auto/declarative/qmlparser/testtypes.h +++ b/tests/auto/declarative/qmlparser/testtypes.h @@ -97,9 +97,11 @@ public: void setCustomType(const MyCustomVariantType &v) { m_custom = v; } public slots: void basicSlot() { qWarning("MyQmlObject::basicSlot"); } + void basicSlot(int v) { qWarning("MyQmlObject::basicSlot(%d)", v); } signals: void basicSignal(); + void basicParameterizedSignal(int parameter); private: friend class tst_qmlparser; diff --git a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp b/tests/auto/declarative/qmlparser/tst_qmlparser.cpp index b8bd0e7..c2f1e1a 100644 --- a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp +++ b/tests/auto/declarative/qmlparser/tst_qmlparser.cpp @@ -160,6 +160,8 @@ void tst_qmlparser::errors_data() QTest::newRow("finalOverride") << "finalOverride.qml" << "finalOverride.errors.txt" << false; QTest::newRow("importNamespaceConflict") << "importNamespaceConflict.qml" << "importNamespaceConflict.errors.txt" << false; + QTest::newRow("importVersionMissing (builtin)") << "importVersionMissingBuiltIn.qml" << "importVersionMissingBuiltIn.errors.txt" << false; + QTest::newRow("importVersionMissing (installed)") << "importVersionMissingInstalled.qml" << "importVersionMissingInstalled.errors.txt" << false; QTest::newRow("customParserIdNotAllowed") << "customParserIdNotAllowed.qml" << "customParserIdNotAllowed.errors.txt" << false; } @@ -374,6 +376,8 @@ void tst_qmlparser::assignSignal() QVERIFY(object != 0); QTest::ignoreMessage(QtWarningMsg, "MyQmlObject::basicSlot"); emit object->basicSignal(); + QTest::ignoreMessage(QtWarningMsg, "MyQmlObject::basicSlot(9)"); + emit object->basicParameterizedSignal(9); } // Tests the creation and assignment of dynamic properties diff --git a/tests/auto/declarative/repeater/tst_repeater.cpp b/tests/auto/declarative/repeater/tst_repeater.cpp index 08f9154..5fce70e 100644 --- a/tests/auto/declarative/repeater/tst_repeater.cpp +++ b/tests/auto/declarative/repeater/tst_repeater.cpp @@ -1,6 +1,6 @@ #include <QtTest/QtTest> #include <qlistmodelinterface.h> -#include <qfxview.h> +#include <qmlview.h> #include <qfxrepeater.h> #include <qfxtext.h> #include <qmlcontext.h> @@ -15,7 +15,7 @@ private slots: void stringList(); private: - QFxView *createView(const QString &filename); + QmlView *createView(const QString &filename); template<typename T> T *findItem(QObject *parent, const QString &id); }; @@ -26,7 +26,7 @@ tst_QFxRepeater::tst_QFxRepeater() void tst_QFxRepeater::stringList() { - QFxView *canvas = createView(SRCDIR "/data/repeater.qml"); + QmlView *canvas = createView(SRCDIR "/data/repeater.qml"); QStringList data; data << "One"; @@ -58,9 +58,9 @@ void tst_QFxRepeater::stringList() } -QFxView *tst_QFxRepeater::createView(const QString &filename) +QmlView *tst_QFxRepeater::createView(const QString &filename) { - QFxView *canvas = new QFxView(0); + QmlView *canvas = new QmlView(0); canvas->setFixedSize(240,320); QFile file(filename); diff --git a/tests/auto/declarative/visual/tst_visual.cpp b/tests/auto/declarative/visual/tst_visual.cpp index f540e62..10823e8 100644 --- a/tests/auto/declarative/visual/tst_visual.cpp +++ b/tests/auto/declarative/visual/tst_visual.cpp @@ -1,5 +1,5 @@ #include <qtest.h> -#include <QFxView> +#include <QmlView> #include <QApplication> #include <QFxTestView> #include <QFile> |