diff options
Diffstat (limited to 'tests')
60 files changed, 891 insertions, 891 deletions
diff --git a/tests/auto/declarative/layouts/tst_layouts.cpp b/tests/auto/declarative/layouts/tst_layouts.cpp index b580336..942125f 100644 --- a/tests/auto/declarative/layouts/tst_layouts.cpp +++ b/tests/auto/declarative/layouts/tst_layouts.cpp @@ -45,11 +45,11 @@ #include <qdeclarativeexpression.h> #include <QStyle> -class tst_QmlGraphicsLayouts : public QObject +class tst_QDeclarativeLayouts : public QObject { Q_OBJECT public: - tst_QmlGraphicsLayouts(); + tst_QDeclarativeLayouts(); private slots: void test_qml();//GraphicsLayout set up in Qml @@ -59,11 +59,11 @@ private: QDeclarativeView *createView(const QString &filename); }; -tst_QmlGraphicsLayouts::tst_QmlGraphicsLayouts() +tst_QDeclarativeLayouts::tst_QDeclarativeLayouts() { } -void tst_QmlGraphicsLayouts::test_qml() +void tst_QDeclarativeLayouts::test_qml() { QDeclarativeView *canvas = createView(SRCDIR "/data/layouts.qml"); @@ -128,12 +128,12 @@ void tst_QmlGraphicsLayouts::test_qml() delete canvas; } -void tst_QmlGraphicsLayouts::test_cpp() +void tst_QDeclarativeLayouts::test_cpp() { //TODO: Waiting on QT-2407 to write this test } -QDeclarativeView *tst_QmlGraphicsLayouts::createView(const QString &filename) +QDeclarativeView *tst_QDeclarativeLayouts::createView(const QString &filename) { QDeclarativeView *canvas = new QDeclarativeView(0); canvas->setSource(QUrl::fromLocalFile(filename)); @@ -142,6 +142,6 @@ QDeclarativeView *tst_QmlGraphicsLayouts::createView(const QString &filename) } -QTEST_MAIN(tst_QmlGraphicsLayouts) +QTEST_MAIN(tst_QDeclarativeLayouts) #include "tst_layouts.moc" diff --git a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp index ccc0ec7..9d8ba6c 100644 --- a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp +++ b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp @@ -51,11 +51,11 @@ Q_DECLARE_METATYPE(QDeclarativeAnchors::UsedAnchor) Q_DECLARE_METATYPE(QDeclarativeAnchorLine::AnchorLine) -class tst_qmlgraphicsanchors : public QObject +class tst_qdeclarativeanchors : public QObject { Q_OBJECT public: - tst_qmlgraphicsanchors() {} + tst_qdeclarativeanchors() {} template<typename T> T *findItem(QGraphicsObject *parent, const QString &id); @@ -80,7 +80,7 @@ private slots: Find an item with the specified id. */ template<typename T> -T *tst_qmlgraphicsanchors::findItem(QGraphicsObject *parent, const QString &objectName) +T *tst_qdeclarativeanchors::findItem(QGraphicsObject *parent, const QString &objectName) { const QMetaObject &mo = T::staticMetaObject; QList<QGraphicsItem *> children = parent->childItems(); @@ -99,7 +99,7 @@ T *tst_qmlgraphicsanchors::findItem(QGraphicsObject *parent, const QString &obje return 0; } -void tst_qmlgraphicsanchors::basicAnchors() +void tst_qdeclarativeanchors::basicAnchors() { QDeclarativeView *view = new QDeclarativeView; view->setSource(QUrl::fromLocalFile(SRCDIR "/data/anchors.qml")); @@ -167,7 +167,7 @@ void tst_qmlgraphicsanchors::basicAnchors() } // mostly testing that we don't crash -void tst_qmlgraphicsanchors::loops() +void tst_qdeclarativeanchors::loops() { { QUrl source(QUrl::fromLocalFile(SRCDIR "/data/loop1.qml")); @@ -198,7 +198,7 @@ void tst_qmlgraphicsanchors::loops() } } -void tst_qmlgraphicsanchors::illegalSets() +void tst_qdeclarativeanchors::illegalSets() { QFETCH(QString, qml); QFETCH(QString, warning); @@ -215,7 +215,7 @@ void tst_qmlgraphicsanchors::illegalSets() delete o; } -void tst_qmlgraphicsanchors::illegalSets_data() +void tst_qdeclarativeanchors::illegalSets_data() { QTest::addColumn<QString>("qml"); QTest::addColumn<QString>("warning"); @@ -273,7 +273,7 @@ void tst_qmlgraphicsanchors::illegalSets_data() << "QML Rectangle (file::2:45) Cannot anchor to an item that isn't a parent or sibling."; } -void tst_qmlgraphicsanchors::reset() +void tst_qdeclarativeanchors::reset() { QFETCH(QString, side); QFETCH(QDeclarativeAnchorLine::AnchorLine, anchorLine); @@ -300,7 +300,7 @@ void tst_qmlgraphicsanchors::reset() delete baseItem; } -void tst_qmlgraphicsanchors::reset_data() +void tst_qdeclarativeanchors::reset_data() { QTest::addColumn<QString>("side"); QTest::addColumn<QDeclarativeAnchorLine::AnchorLine>("anchorLine"); @@ -316,7 +316,7 @@ void tst_qmlgraphicsanchors::reset_data() QTest::newRow("baseline") << "baseline" << QDeclarativeAnchorLine::Baseline << QDeclarativeAnchors::HasBaselineAnchor; } -void tst_qmlgraphicsanchors::resetConvenience() +void tst_qdeclarativeanchors::resetConvenience() { QDeclarativeItem *baseItem = new QDeclarativeItem; QDeclarativeItem *item = new QDeclarativeItem; @@ -337,7 +337,7 @@ void tst_qmlgraphicsanchors::resetConvenience() delete baseItem; } -void tst_qmlgraphicsanchors::nullItem() +void tst_qdeclarativeanchors::nullItem() { QFETCH(QString, side); @@ -353,7 +353,7 @@ void tst_qmlgraphicsanchors::nullItem() delete item; } -void tst_qmlgraphicsanchors::nullItem_data() +void tst_qdeclarativeanchors::nullItem_data() { QTest::addColumn<QString>("side"); @@ -367,7 +367,7 @@ void tst_qmlgraphicsanchors::nullItem_data() QTest::newRow("baseline") << "baseline"; } -void tst_qmlgraphicsanchors::crash1() +void tst_qdeclarativeanchors::crash1() { QUrl source(QUrl::fromLocalFile(SRCDIR "/data/crash1.qml")); @@ -381,7 +381,7 @@ void tst_qmlgraphicsanchors::crash1() delete view; } -void tst_qmlgraphicsanchors::fill() +void tst_qdeclarativeanchors::fill() { QDeclarativeView *view = new QDeclarativeView(QUrl::fromLocalFile(SRCDIR "/data/fill.qml")); @@ -404,7 +404,7 @@ void tst_qmlgraphicsanchors::fill() delete view; } -void tst_qmlgraphicsanchors::centerIn() +void tst_qdeclarativeanchors::centerIn() { QDeclarativeView *view = new QDeclarativeView(QUrl::fromLocalFile(SRCDIR "/data/centerin.qml")); @@ -421,7 +421,7 @@ void tst_qmlgraphicsanchors::centerIn() delete view; } -void tst_qmlgraphicsanchors::margins() +void tst_qdeclarativeanchors::margins() { QDeclarativeView *view = new QDeclarativeView(QUrl::fromLocalFile(SRCDIR "/data/margins.qml")); @@ -443,6 +443,6 @@ void tst_qmlgraphicsanchors::margins() delete view; } -QTEST_MAIN(tst_qmlgraphicsanchors) +QTEST_MAIN(tst_qdeclarativeanchors) #include "tst_qdeclarativeanchors.moc" diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp index cb56813..31efc64 100644 --- a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp +++ b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp @@ -58,11 +58,11 @@ } while (false) -class tst_qmlgraphicsanimatedimage : public QObject +class tst_qdeclarativeanimatedimage : public QObject { Q_OBJECT public: - tst_qmlgraphicsanimatedimage() {} + tst_qdeclarativeanimatedimage() {} private slots: void play(); @@ -75,7 +75,7 @@ private slots: void invalidSource(); }; -void tst_qmlgraphicsanimatedimage::play() +void tst_qdeclarativeanimatedimage::play() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickman.qml")); @@ -86,7 +86,7 @@ void tst_qmlgraphicsanimatedimage::play() delete anim; } -void tst_qmlgraphicsanimatedimage::pause() +void tst_qdeclarativeanimatedimage::pause() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanpause.qml")); @@ -98,7 +98,7 @@ void tst_qmlgraphicsanimatedimage::pause() delete anim; } -void tst_qmlgraphicsanimatedimage::stopped() +void tst_qdeclarativeanimatedimage::stopped() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanstopped.qml")); @@ -110,7 +110,7 @@ void tst_qmlgraphicsanimatedimage::stopped() delete anim; } -void tst_qmlgraphicsanimatedimage::setFrame() +void tst_qdeclarativeanimatedimage::setFrame() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanpause.qml")); @@ -122,7 +122,7 @@ void tst_qmlgraphicsanimatedimage::setFrame() delete anim; } -void tst_qmlgraphicsanimatedimage::frameCount() +void tst_qdeclarativeanimatedimage::frameCount() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/colors.qml")); @@ -134,7 +134,7 @@ void tst_qmlgraphicsanimatedimage::frameCount() delete anim; } -void tst_qmlgraphicsanimatedimage::remote() +void tst_qdeclarativeanimatedimage::remote() { QFETCH(QString, fileName); QFETCH(bool, paused); @@ -159,7 +159,7 @@ void tst_qmlgraphicsanimatedimage::remote() delete anim; } -void tst_qmlgraphicsanimatedimage::remote_data() +void tst_qdeclarativeanimatedimage::remote_data() { QTest::addColumn<QString>("fileName"); QTest::addColumn<bool>("paused"); @@ -168,7 +168,7 @@ void tst_qmlgraphicsanimatedimage::remote_data() QTest::newRow("paused") << "stickmanpause.qml" << true; } -void tst_qmlgraphicsanimatedimage::invalidSource() +void tst_qdeclarativeanimatedimage::invalidSource() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine); @@ -186,6 +186,6 @@ void tst_qmlgraphicsanimatedimage::invalidSource() QCOMPARE(anim->frameCount(), 0); } -QTEST_MAIN(tst_qmlgraphicsanimatedimage) +QTEST_MAIN(tst_qdeclarativeanimatedimage) #include "tst_qdeclarativeanimatedimage.moc" diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp index 9894fe0..53c63b5 100644 --- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp +++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp @@ -47,11 +47,11 @@ #include <QVariantAnimation> #include <QEasingCurve> -class tst_qmlanimations : public QObject +class tst_qdeclarativeanimations : public QObject { Q_OBJECT public: - tst_qmlanimations() {} + tst_qdeclarativeanimations() {} private slots: void initTestCase() { QDeclarativeEngine engine; } // ensure types are registered @@ -84,7 +84,7 @@ private slots: QCOMPARE(lhs, rhs); \ } while (false) -void tst_qmlanimations::simpleProperty() +void tst_qdeclarativeanimations::simpleProperty() { QDeclarativeRectangle rect; QDeclarativePropertyAnimation animation; @@ -109,7 +109,7 @@ void tst_qmlanimations::simpleProperty() QCOMPARE(rect.pos(), QPointF(100,100)); } -void tst_qmlanimations::simpleNumber() +void tst_qdeclarativeanimations::simpleNumber() { QDeclarativeRectangle rect; QDeclarativeNumberAnimation animation; @@ -134,7 +134,7 @@ void tst_qmlanimations::simpleNumber() QCOMPARE(rect.x(), qreal(100)); } -void tst_qmlanimations::simpleColor() +void tst_qdeclarativeanimations::simpleColor() { QDeclarativeRectangle rect; QDeclarativeColorAnimation animation; @@ -168,7 +168,7 @@ void tst_qmlanimations::simpleColor() QCOMPARE(rect.color(), QColor::fromRgbF(0.498039, 0, 0.498039, 1)); } -void tst_qmlanimations::alwaysRunToEnd() +void tst_qdeclarativeanimations::alwaysRunToEnd() { QDeclarativeRectangle rect; QDeclarativePropertyAnimation animation; @@ -188,7 +188,7 @@ void tst_qmlanimations::alwaysRunToEnd() QTIMED_COMPARE(rect.x(), qreal(200)); } -void tst_qmlanimations::complete() +void tst_qdeclarativeanimations::complete() { QDeclarativeRectangle rect; QDeclarativePropertyAnimation animation; @@ -209,7 +209,7 @@ void tst_qmlanimations::complete() QCOMPARE(rect.x(), qreal(200)); } -void tst_qmlanimations::resume() +void tst_qdeclarativeanimations::resume() { QDeclarativeRectangle rect; QDeclarativePropertyAnimation animation; @@ -236,7 +236,7 @@ void tst_qmlanimations::resume() QVERIFY(rect.x() > x); } -void tst_qmlanimations::dotProperty() +void tst_qdeclarativeanimations::dotProperty() { QDeclarativeRectangle rect; QDeclarativeNumberAnimation animation; @@ -255,7 +255,7 @@ void tst_qmlanimations::dotProperty() QCOMPARE(rect.border()->width(), 5); } -void tst_qmlanimations::badTypes() +void tst_qdeclarativeanimations::badTypes() { //don't crash { @@ -304,7 +304,7 @@ void tst_qmlanimations::badTypes() } } -void tst_qmlanimations::badProperties() +void tst_qdeclarativeanimations::badProperties() { //make sure we get a runtime error { @@ -329,7 +329,7 @@ void tst_qmlanimations::badProperties() //test animating mixed types with property animation in a transition //for example, int + real; color + real; etc -void tst_qmlanimations::mixedTypes() +void tst_qdeclarativeanimations::mixedTypes() { //assumes border.width stays a real -- not real robust { @@ -365,7 +365,7 @@ void tst_qmlanimations::mixedTypes() } } -void tst_qmlanimations::properties() +void tst_qdeclarativeanimations::properties() { const int waitDuration = 300; { @@ -431,7 +431,7 @@ void tst_qmlanimations::properties() } } -void tst_qmlanimations::propertiesTransition() +void tst_qdeclarativeanimations::propertiesTransition() { const int waitDuration = 300; { @@ -518,7 +518,7 @@ void tst_qmlanimations::propertiesTransition() }*/ } -void tst_qmlanimations::invalidDuration() +void tst_qdeclarativeanimations::invalidDuration() { QDeclarativePropertyAnimation *animation = new QDeclarativePropertyAnimation; QTest::ignoreMessage(QtWarningMsg, "QML PropertyAnimation (unknown location) Cannot set a duration of < 0"); @@ -531,7 +531,7 @@ void tst_qmlanimations::invalidDuration() QCOMPARE(pauseAnimation->duration(), 250); } -void tst_qmlanimations::attached() +void tst_qdeclarativeanimations::attached() { QDeclarativeEngine engine; @@ -542,7 +542,7 @@ void tst_qmlanimations::attached() QVERIFY(rect); } -void tst_qmlanimations::propertyValueSourceDefaultStart() +void tst_qdeclarativeanimations::propertyValueSourceDefaultStart() { { QDeclarativeEngine engine; @@ -585,7 +585,7 @@ void tst_qmlanimations::propertyValueSourceDefaultStart() } -void tst_qmlanimations::dontStart() +void tst_qdeclarativeanimations::dontStart() { { QDeclarativeEngine engine; @@ -616,7 +616,7 @@ void tst_qmlanimations::dontStart() } } -void tst_qmlanimations::easingProperties() +void tst_qdeclarativeanimations::easingProperties() { { QDeclarativeEngine engine; @@ -667,6 +667,6 @@ void tst_qmlanimations::easingProperties() } } -QTEST_MAIN(tst_qmlanimations) +QTEST_MAIN(tst_qdeclarativeanimations) #include "tst_qdeclarativeanimations.moc" diff --git a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp index a177247..f87330d 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp +++ b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp @@ -46,11 +46,11 @@ #include <private/qdeclarativebehavior_p.h> #include <private/qdeclarativeanimation_p.h> -class tst_qmlbehaviors : public QObject +class tst_qdeclarativebehaviors : public QObject { Q_OBJECT public: - tst_qmlbehaviors() {} + tst_qdeclarativebehaviors() {} private slots: void simpleBehavior(); @@ -70,7 +70,7 @@ private slots: void dontStart(); }; -void tst_qmlbehaviors::simpleBehavior() +void tst_qdeclarativebehaviors::simpleBehavior() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/simple.qml")); @@ -84,7 +84,7 @@ void tst_qmlbehaviors::simpleBehavior() QVERIFY(x > 0 && x < 200); //i.e. the behavior has been triggered } -void tst_qmlbehaviors::scriptTriggered() +void tst_qdeclarativebehaviors::scriptTriggered() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/scripttrigger.qml")); @@ -97,7 +97,7 @@ void tst_qmlbehaviors::scriptTriggered() QVERIFY(x > 0 && x < 200); //i.e. the behavior has been triggered } -void tst_qmlbehaviors::cppTriggered() +void tst_qdeclarativebehaviors::cppTriggered() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/cpptrigger.qml")); @@ -113,7 +113,7 @@ void tst_qmlbehaviors::cppTriggered() QVERIFY(x > 0 && x < 200); //i.e. the behavior has been triggered } -void tst_qmlbehaviors::loop() +void tst_qdeclarativebehaviors::loop() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/loop.qml")); @@ -124,7 +124,7 @@ void tst_qmlbehaviors::loop() rect->setState("moved"); } -void tst_qmlbehaviors::colorBehavior() +void tst_qdeclarativebehaviors::colorBehavior() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/color.qml")); @@ -137,7 +137,7 @@ void tst_qmlbehaviors::colorBehavior() QVERIFY(color != QColor("red") && color != QColor("green")); //i.e. the behavior has been triggered } -void tst_qmlbehaviors::parentBehavior() +void tst_qdeclarativebehaviors::parentBehavior() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/parent.qml")); @@ -154,7 +154,7 @@ void tst_qmlbehaviors::parentBehavior() QVERIFY(parent == newParent); } -void tst_qmlbehaviors::replaceBinding() +void tst_qdeclarativebehaviors::replaceBinding() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/binding.qml")); @@ -188,7 +188,7 @@ void tst_qmlbehaviors::replaceBinding() QCOMPARE(innerRect->x(), (qreal)20); } -void tst_qmlbehaviors::group() +void tst_qdeclarativebehaviors::group() { { QDeclarativeEngine engine; @@ -215,7 +215,7 @@ void tst_qmlbehaviors::group() } } -void tst_qmlbehaviors::emptyBehavior() +void tst_qdeclarativebehaviors::emptyBehavior() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/empty.qml")); @@ -227,7 +227,7 @@ void tst_qmlbehaviors::emptyBehavior() QCOMPARE(x, qreal(200)); //should change immediately } -void tst_qmlbehaviors::explicitSelection() +void tst_qdeclarativebehaviors::explicitSelection() { { QDeclarativeEngine engine; @@ -242,7 +242,7 @@ void tst_qmlbehaviors::explicitSelection() } } -void tst_qmlbehaviors::nonSelectingBehavior() +void tst_qdeclarativebehaviors::nonSelectingBehavior() { { QDeclarativeEngine engine; @@ -256,7 +256,7 @@ void tst_qmlbehaviors::nonSelectingBehavior() } } -void tst_qmlbehaviors::reassignedAnimation() +void tst_qdeclarativebehaviors::reassignedAnimation() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/reassignedAnimation.qml")); @@ -268,7 +268,7 @@ void tst_qmlbehaviors::reassignedAnimation() rect->findChild<QDeclarativeBehavior*>("MyBehavior"))->animation())->duration(), 200); } -void tst_qmlbehaviors::disabled() +void tst_qdeclarativebehaviors::disabled() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/disabled.qml")); @@ -281,7 +281,7 @@ void tst_qmlbehaviors::disabled() QCOMPARE(x, qreal(200)); //should change immediately } -void tst_qmlbehaviors::dontStart() +void tst_qdeclarativebehaviors::dontStart() { QDeclarativeEngine engine; @@ -296,6 +296,6 @@ void tst_qmlbehaviors::dontStart() QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped); } -QTEST_MAIN(tst_qmlbehaviors) +QTEST_MAIN(tst_qdeclarativebehaviors) #include "tst_qdeclarativebehaviors.moc" diff --git a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp index 36d8483..826df4f 100644 --- a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp +++ b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp @@ -45,12 +45,12 @@ #include <private/qdeclarativerectangle_p.h> #include "../../../shared/util.h" -class tst_qmlbinding : public QObject +class tst_qdeclarativebinding : public QObject { Q_OBJECT public: - tst_qmlbinding(); + tst_qdeclarativebinding(); private slots: void binding(); @@ -60,11 +60,11 @@ private: QDeclarativeEngine engine; }; -tst_qmlbinding::tst_qmlbinding() +tst_qdeclarativebinding::tst_qdeclarativebinding() { } -void tst_qmlbinding::binding() +void tst_qdeclarativebinding::binding() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-binding.qml")); @@ -86,7 +86,7 @@ void tst_qmlbinding::binding() delete rect; } -void tst_qmlbinding::whenAfterValue() +void tst_qdeclarativebinding::whenAfterValue() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-binding2.qml")); @@ -102,6 +102,6 @@ void tst_qmlbinding::whenAfterValue() delete rect; } -QTEST_MAIN(tst_qmlbinding) +QTEST_MAIN(tst_qdeclarativebinding) #include "tst_qdeclarativebinding.moc" diff --git a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp index b220f00..b2ef16b 100644 --- a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp +++ b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp @@ -68,12 +68,12 @@ } while (false) -class tst_qmlgraphicsborderimage : public QObject +class tst_qdeclarativeborderimage : public QObject { Q_OBJECT public: - tst_qmlgraphicsborderimage(); + tst_qdeclarativeborderimage(); private slots: void noSource(); @@ -93,11 +93,11 @@ private: QDeclarativeEngine engine; }; -tst_qmlgraphicsborderimage::tst_qmlgraphicsborderimage() +tst_qdeclarativeborderimage::tst_qdeclarativeborderimage() { } -void tst_qmlgraphicsborderimage::noSource() +void tst_qdeclarativeborderimage::noSource() { QString componentStr = "import Qt 4.6\nBorderImage { source: \"\" }"; QDeclarativeComponent component(&engine); @@ -113,7 +113,7 @@ void tst_qmlgraphicsborderimage::noSource() delete obj; } -void tst_qmlgraphicsborderimage::imageSource_data() +void tst_qdeclarativeborderimage::imageSource_data() { QTest::addColumn<QString>("source"); QTest::addColumn<bool>("remote"); @@ -127,7 +127,7 @@ void tst_qmlgraphicsborderimage::imageSource_data() << "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" "; } -void tst_qmlgraphicsborderimage::imageSource() +void tst_qdeclarativeborderimage::imageSource() { QFETCH(QString, source); QFETCH(bool, remote); @@ -168,7 +168,7 @@ void tst_qmlgraphicsborderimage::imageSource() delete server; } -void tst_qmlgraphicsborderimage::clearSource() +void tst_qdeclarativeborderimage::clearSource() { QString componentStr = "import Qt 4.6\nBorderImage { source: srcImage }"; QDeclarativeContext *ctxt = engine.rootContext(); @@ -188,7 +188,7 @@ void tst_qmlgraphicsborderimage::clearSource() QCOMPARE(obj->height(), 0.); } -void tst_qmlgraphicsborderimage::resized() +void tst_qdeclarativeborderimage::resized() { QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() + "\"; width: 300; height: 300 }"; QDeclarativeComponent component(&engine); @@ -203,7 +203,7 @@ void tst_qmlgraphicsborderimage::resized() delete obj; } -void tst_qmlgraphicsborderimage::smooth() +void tst_qdeclarativeborderimage::smooth() { QString componentStr = "import Qt 4.6\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; smooth: true; width: 300; height: 300 }"; QDeclarativeComponent component(&engine); @@ -219,7 +219,7 @@ void tst_qmlgraphicsborderimage::smooth() delete obj; } -void tst_qmlgraphicsborderimage::tileModes() +void tst_qdeclarativeborderimage::tileModes() { { QString componentStr = "import Qt 4.6\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; width: 100; height: 300; horizontalTileMode: BorderImage.Repeat; verticalTileMode: BorderImage.Repeat }"; @@ -249,7 +249,7 @@ void tst_qmlgraphicsborderimage::tileModes() } } -void tst_qmlgraphicsborderimage::sciSource() +void tst_qdeclarativeborderimage::sciSource() { QFETCH(QString, source); QFETCH(bool, valid); @@ -291,7 +291,7 @@ void tst_qmlgraphicsborderimage::sciSource() delete server; } -void tst_qmlgraphicsborderimage::sciSource_data() +void tst_qdeclarativeborderimage::sciSource_data() { QTest::addColumn<QString>("source"); QTest::addColumn<bool>("valid"); @@ -302,7 +302,7 @@ void tst_qmlgraphicsborderimage::sciSource_data() QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.sci" << false; } -void tst_qmlgraphicsborderimage::invalidSciFile() +void tst_qdeclarativeborderimage::invalidSciFile() { QTest::ignoreMessage(QtWarningMsg, "Unknown tile rule specified. Using Stretch "); // for "Roun" QTest::ignoreMessage(QtWarningMsg, "Unknown tile rule specified. Using Stretch "); // for "Repea" @@ -321,7 +321,7 @@ void tst_qmlgraphicsborderimage::invalidSciFile() delete obj; } -void tst_qmlgraphicsborderimage::pendingRemoteRequest() +void tst_qdeclarativeborderimage::pendingRemoteRequest() { QFETCH(QString, source); @@ -338,7 +338,7 @@ void tst_qmlgraphicsborderimage::pendingRemoteRequest() QTest::qWait(50); } -void tst_qmlgraphicsborderimage::pendingRemoteRequest_data() +void tst_qdeclarativeborderimage::pendingRemoteRequest_data() { QTest::addColumn<QString>("source"); @@ -346,6 +346,6 @@ void tst_qmlgraphicsborderimage::pendingRemoteRequest_data() QTest::newRow("sci file") << "http://no-such-qt-server-like-this/none.sci"; } -QTEST_MAIN(tst_qmlgraphicsborderimage) +QTEST_MAIN(tst_qdeclarativeborderimage) #include "tst_qdeclarativeborderimage.moc" diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp index 5e3de5e..adf343f 100644 --- a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp +++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp @@ -46,12 +46,12 @@ #include "../../../shared/util.h" #include <QtDeclarative/qdeclarativescriptstring.h> -class tst_qmlconnection : public QObject +class tst_qdeclarativeconnection : public QObject { Q_OBJECT public: - tst_qmlconnection(); + tst_qdeclarativeconnection(); private slots: void defaultValues(); @@ -63,11 +63,11 @@ private: QDeclarativeEngine engine; }; -tst_qmlconnection::tst_qmlconnection() +tst_qdeclarativeconnection::tst_qdeclarativeconnection() { } -void tst_qmlconnection::defaultValues() +void tst_qdeclarativeconnection::defaultValues() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection3.qml")); @@ -81,7 +81,7 @@ void tst_qmlconnection::defaultValues() delete item; } -void tst_qmlconnection::properties() +void tst_qdeclarativeconnection::properties() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection2.qml")); @@ -97,7 +97,7 @@ void tst_qmlconnection::properties() delete item; } -void tst_qmlconnection::connection() +void tst_qdeclarativeconnection::connection() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection.qml")); @@ -114,7 +114,7 @@ void tst_qmlconnection::connection() delete item; } -void tst_qmlconnection::trimming() +void tst_qdeclarativeconnection::trimming() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/trimming.qml")); @@ -134,6 +134,6 @@ void tst_qmlconnection::trimming() delete item; } -QTEST_MAIN(tst_qmlconnection) +QTEST_MAIN(tst_qdeclarativeconnection) #include "tst_qdeclarativeconnection.moc" diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp index c1d6bdb..5f03989 100644 --- a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp +++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp @@ -46,11 +46,11 @@ #include <QDeclarativeComponent> #include <QDeclarativeExpression> -class tst_qmlcontext : public QObject +class tst_qdeclarativecontext : public QObject { Q_OBJECT public: - tst_qmlcontext() {} + tst_qdeclarativecontext() {} private slots: void baseUrl(); @@ -65,7 +65,7 @@ private: QDeclarativeEngine engine; }; -void tst_qmlcontext::baseUrl() +void tst_qdeclarativecontext::baseUrl() { QDeclarativeContext ctxt(&engine); @@ -76,7 +76,7 @@ void tst_qmlcontext::baseUrl() QCOMPARE(ctxt.baseUrl(), QUrl("http://www.nokia.com/")); } -void tst_qmlcontext::resolvedUrl() +void tst_qdeclarativecontext::resolvedUrl() { // Relative to the component { @@ -123,7 +123,7 @@ void tst_qmlcontext::resolvedUrl() } } -void tst_qmlcontext::engineMethod() +void tst_qdeclarativecontext::engineMethod() { QDeclarativeEngine *engine = new QDeclarativeEngine; @@ -145,7 +145,7 @@ void tst_qmlcontext::engineMethod() QCOMPARE(ctxt4.engine(), engine); } -void tst_qmlcontext::parentContext() +void tst_qdeclarativecontext::parentContext() { QDeclarativeEngine *engine = new QDeclarativeEngine; @@ -253,7 +253,7 @@ private: delete obj; \ } -void tst_qmlcontext::setContextProperty() +void tst_qdeclarativecontext::setContextProperty() { QDeclarativeContext ctxt(&engine); QDeclarativeContext ctxt2(&ctxt); @@ -366,7 +366,7 @@ void tst_qmlcontext::setContextProperty() } } -void tst_qmlcontext::addDefaultObject() +void tst_qdeclarativecontext::addDefaultObject() { QDeclarativeContext ctxt(&engine); @@ -412,7 +412,7 @@ void tst_qmlcontext::addDefaultObject() } } -void tst_qmlcontext::destruction() +void tst_qdeclarativecontext::destruction() { QDeclarativeContext *ctxt = new QDeclarativeContext(&engine); @@ -429,6 +429,6 @@ void tst_qmlcontext::destruction() QCOMPARE(ctxt, expr.context()); } -QTEST_MAIN(tst_qmlcontext) +QTEST_MAIN(tst_qdeclarativecontext) #include "tst_qdeclarativecontext.moc" diff --git a/tests/auto/declarative/qdeclarativedatetimeformatter/tst_qdeclarativedatetimeformatter.cpp b/tests/auto/declarative/qdeclarativedatetimeformatter/tst_qdeclarativedatetimeformatter.cpp index 5970cc2..69d7900 100644 --- a/tests/auto/declarative/qdeclarativedatetimeformatter/tst_qdeclarativedatetimeformatter.cpp +++ b/tests/auto/declarative/qdeclarativedatetimeformatter/tst_qdeclarativedatetimeformatter.cpp @@ -44,11 +44,11 @@ #include <private/qdeclarativedatetimeformatter_p.h> #include <QDebug> -class tst_qmldatetimeformatter : public QObject +class tst_qdeclarativedatetimeformatter : public QObject { Q_OBJECT public: - tst_qmldatetimeformatter() {} + tst_qdeclarativedatetimeformatter() {} private slots: void date(); @@ -56,7 +56,7 @@ private slots: void dateTime(); }; -void tst_qmldatetimeformatter::date() +void tst_qdeclarativedatetimeformatter::date() { QDeclarativeEngine engine; QDeclarativeComponent formatterComponent(&engine); @@ -86,7 +86,7 @@ void tst_qmldatetimeformatter::date() delete formatter; } -void tst_qmldatetimeformatter::time() +void tst_qdeclarativedatetimeformatter::time() { QDeclarativeEngine engine; QDeclarativeComponent formatterComponent(&engine); @@ -119,7 +119,7 @@ void tst_qmldatetimeformatter::time() delete formatter; } -void tst_qmldatetimeformatter::dateTime() +void tst_qdeclarativedatetimeformatter::dateTime() { QDeclarativeEngine engine; QDeclarativeComponent formatterComponent(&engine); @@ -145,6 +145,6 @@ void tst_qmldatetimeformatter::dateTime() delete formatter; } -QTEST_MAIN(tst_qmldatetimeformatter) +QTEST_MAIN(tst_qdeclarativedatetimeformatter) #include "tst_qdeclarativedatetimeformatter.moc" diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp index b23bddc..1c8cbbc 100644 --- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp +++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp @@ -64,12 +64,12 @@ Q_DECLARE_METATYPE(QDeclarativeDebugWatch::State) -class tst_QmlDebug : public QObject +class tst_QDeclarativeDebug : public QObject { Q_OBJECT public: - tst_QmlDebug(QDeclarativeDebugTestData *data) + tst_QDeclarativeDebug(QDeclarativeDebugTestData *data) { m_conn = data->conn; m_engine = data->engine; @@ -109,14 +109,14 @@ private slots: void queryExpressionResult(); void queryExpressionResult_data(); - void tst_QmlDebugFileReference(); - void tst_QmlDebugEngineReference(); - void tst_QmlDebugObjectReference(); - void tst_QmlDebugContextReference(); - void tst_QmlDebugPropertyReference(); + void tst_QDeclarativeDebugFileReference(); + void tst_QDeclarativeDebugEngineReference(); + void tst_QDeclarativeDebugObjectReference(); + void tst_QDeclarativeDebugContextReference(); + void tst_QDeclarativeDebugPropertyReference(); }; -QDeclarativeDebugObjectReference tst_QmlDebug::findRootObject() +QDeclarativeDebugObjectReference tst_QDeclarativeDebug::findRootObject() { QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this); waitForQuery(q_engines); @@ -140,7 +140,7 @@ QDeclarativeDebugObjectReference tst_QmlDebug::findRootObject() return result; } -QDeclarativeDebugPropertyReference tst_QmlDebug::findProperty(const QList<QDeclarativeDebugPropertyReference> &props, const QString &name) const +QDeclarativeDebugPropertyReference tst_QDeclarativeDebug::findProperty(const QList<QDeclarativeDebugPropertyReference> &props, const QString &name) const { foreach(const QDeclarativeDebugPropertyReference &p, props) { if (p.name() == name) @@ -149,7 +149,7 @@ QDeclarativeDebugPropertyReference tst_QmlDebug::findProperty(const QList<QDecla return QDeclarativeDebugPropertyReference(); } -void tst_QmlDebug::waitForQuery(QDeclarativeDebugQuery *query) +void tst_QDeclarativeDebug::waitForQuery(QDeclarativeDebugQuery *query) { QVERIFY(query); QCOMPARE(query->parent(), this); @@ -158,7 +158,7 @@ void tst_QmlDebug::waitForQuery(QDeclarativeDebugQuery *query) QFAIL("query timed out"); } -void tst_QmlDebug::recursiveObjectTest(QObject *o, const QDeclarativeDebugObjectReference &oref, bool recursive) const +void tst_QDeclarativeDebug::recursiveObjectTest(QObject *o, const QDeclarativeDebugObjectReference &oref, bool recursive) const { const QMetaObject *meta = o->metaObject(); @@ -226,7 +226,7 @@ void tst_QmlDebug::recursiveObjectTest(QObject *o, const QDeclarativeDebugObject } } -void tst_QmlDebug::recursiveCompareObjects(const QDeclarativeDebugObjectReference &a, const QDeclarativeDebugObjectReference &b) const +void tst_QDeclarativeDebug::recursiveCompareObjects(const QDeclarativeDebugObjectReference &a, const QDeclarativeDebugObjectReference &b) const { QCOMPARE(a.debugId(), b.debugId()); QCOMPARE(a.className(), b.className()); @@ -250,7 +250,7 @@ void tst_QmlDebug::recursiveCompareObjects(const QDeclarativeDebugObjectReferenc recursiveCompareObjects(a.children()[i], b.children()[i]); } -void tst_QmlDebug::recursiveCompareContexts(const QDeclarativeDebugContextReference &a, const QDeclarativeDebugContextReference &b) const +void tst_QDeclarativeDebug::recursiveCompareContexts(const QDeclarativeDebugContextReference &a, const QDeclarativeDebugContextReference &b) const { QCOMPARE(a.debugId(), b.debugId()); QCOMPARE(a.name(), b.name()); @@ -264,7 +264,7 @@ void tst_QmlDebug::recursiveCompareContexts(const QDeclarativeDebugContextRefere recursiveCompareContexts(a.contexts()[i], b.contexts()[i]); } -void tst_QmlDebug::compareProperties(const QDeclarativeDebugPropertyReference &a, const QDeclarativeDebugPropertyReference &b) const +void tst_QDeclarativeDebug::compareProperties(const QDeclarativeDebugPropertyReference &a, const QDeclarativeDebugPropertyReference &b) const { QCOMPARE(a.objectDebugId(), b.objectDebugId()); QCOMPARE(a.name(), b.name()); @@ -274,14 +274,14 @@ void tst_QmlDebug::compareProperties(const QDeclarativeDebugPropertyReference &a QCOMPARE(a.hasNotifySignal(), b.hasNotifySignal()); } -void tst_QmlDebug::initTestCase() +void tst_QDeclarativeDebug::initTestCase() { m_dbg = new QDeclarativeEngineDebug(m_conn, this); qRegisterMetaType<QDeclarativeDebugWatch::State>(); } -void tst_QmlDebug::watch_property() +void tst_QDeclarativeDebug::watch_property() { QDeclarativeDebugObjectReference obj = findRootObject(); QDeclarativeDebugPropertyReference prop = findProperty(obj.properties(), "width"); @@ -326,7 +326,7 @@ void tst_QmlDebug::watch_property() QCOMPARE(spy.at(0).at(1).value<QVariant>(), qVariantFromValue(origWidth*2)); } -void tst_QmlDebug::watch_object() +void tst_QDeclarativeDebug::watch_object() { QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this); waitForQuery(q_engines); @@ -399,7 +399,7 @@ void tst_QmlDebug::watch_object() QCOMPARE(newHeight, origHeight * 2); } -void tst_QmlDebug::watch_expression() +void tst_QDeclarativeDebug::watch_expression() { QFETCH(QString, expr); QFETCH(int, increment); @@ -462,7 +462,7 @@ void tst_QmlDebug::watch_expression() } } -void tst_QmlDebug::watch_expression_data() +void tst_QDeclarativeDebug::watch_expression_data() { QTest::addColumn<QString>("expr"); QTest::addColumn<int>("increment"); @@ -472,21 +472,21 @@ void tst_QmlDebug::watch_expression_data() QTest::newRow("width+10") << "width + 10" << 10 << 5; } -void tst_QmlDebug::watch_context() +void tst_QDeclarativeDebug::watch_context() { QDeclarativeDebugContextReference c; QTest::ignoreMessage(QtWarningMsg, "QDeclarativeEngineDebug::addWatch(): Not implemented"); QVERIFY(!m_dbg->addWatch(c, QString(), this)); } -void tst_QmlDebug::watch_file() +void tst_QDeclarativeDebug::watch_file() { QDeclarativeDebugFileReference f; QTest::ignoreMessage(QtWarningMsg, "QDeclarativeEngineDebug::addWatch(): Not implemented"); QVERIFY(!m_dbg->addWatch(f, this)); } -void tst_QmlDebug::queryAvailableEngines() +void tst_QDeclarativeDebug::queryAvailableEngines() { QDeclarativeDebugEnginesQuery *q_engines; @@ -515,7 +515,7 @@ void tst_QmlDebug::queryAvailableEngines() delete q_engines; } -void tst_QmlDebug::queryRootContexts() +void tst_QDeclarativeDebug::queryRootContexts() { QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this); waitForQuery(q_engines); @@ -549,13 +549,13 @@ void tst_QmlDebug::queryRootContexts() QCOMPARE(context.contexts().count(), 1); QVERIFY(context.contexts()[0].debugId() >= 0); - QCOMPARE(context.contexts()[0].name(), QString("tst_QmlDebug_childContext")); + QCOMPARE(context.contexts()[0].name(), QString("tst_QDeclarativeDebug_childContext")); delete q_engines; delete q_context; } -void tst_QmlDebug::queryObject() +void tst_QDeclarativeDebug::queryObject() { QFETCH(bool, recursive); @@ -621,7 +621,7 @@ void tst_QmlDebug::queryObject() } } -void tst_QmlDebug::queryObject_data() +void tst_QDeclarativeDebug::queryObject_data() { QTest::addColumn<bool>("recursive"); @@ -629,7 +629,7 @@ void tst_QmlDebug::queryObject_data() QTest::newRow("recursive") << true; } -void tst_QmlDebug::queryExpressionResult() +void tst_QDeclarativeDebug::queryExpressionResult() { QFETCH(QString, expr); QFETCH(QVariant, result); @@ -663,7 +663,7 @@ void tst_QmlDebug::queryExpressionResult() delete q_expr; } -void tst_QmlDebug::queryExpressionResult_data() +void tst_QDeclarativeDebug::queryExpressionResult_data() { QTest::addColumn<QString>("expr"); QTest::addColumn<QVariant>("result"); @@ -673,7 +673,7 @@ void tst_QmlDebug::queryExpressionResult_data() QTest::newRow("bad expr") << "aeaef" << qVariantFromValue(QString("<undefined>")); } -void tst_QmlDebug::tst_QmlDebugFileReference() +void tst_QDeclarativeDebug::tst_QDeclarativeDebugFileReference() { QDeclarativeDebugFileReference ref; QVERIFY(ref.url().isEmpty()); @@ -697,7 +697,7 @@ void tst_QmlDebug::tst_QmlDebugFileReference() } } -void tst_QmlDebug::tst_QmlDebugEngineReference() +void tst_QDeclarativeDebug::tst_QDeclarativeDebugEngineReference() { QDeclarativeDebugEngineReference ref; QCOMPARE(ref.debugId(), -1); @@ -721,7 +721,7 @@ void tst_QmlDebug::tst_QmlDebugEngineReference() } } -void tst_QmlDebug::tst_QmlDebugObjectReference() +void tst_QDeclarativeDebug::tst_QDeclarativeDebugObjectReference() { QDeclarativeDebugObjectReference ref; QCOMPARE(ref.debugId(), -1); @@ -754,7 +754,7 @@ void tst_QmlDebug::tst_QmlDebugObjectReference() recursiveCompareObjects(r, ref); } -void tst_QmlDebug::tst_QmlDebugContextReference() +void tst_QDeclarativeDebug::tst_QDeclarativeDebugContextReference() { QDeclarativeDebugContextReference ref; QCOMPARE(ref.debugId(), -1); @@ -779,7 +779,7 @@ void tst_QmlDebug::tst_QmlDebugContextReference() recursiveCompareContexts(r, ref); } -void tst_QmlDebug::tst_QmlDebugPropertyReference() +void tst_QDeclarativeDebug::tst_QDeclarativeDebugPropertyReference() { QDeclarativeDebugObjectReference rootObject = findRootObject(); QDeclarativeDebugObjectQuery *query = m_dbg->queryObject(rootObject, this); @@ -803,14 +803,14 @@ void tst_QmlDebug::tst_QmlDebugPropertyReference() } -class tst_QmlDebug_Factory : public QDeclarativeTestFactory +class tst_QDeclarativeDebug_Factory : public QDeclarativeTestFactory { public: QObject *createTest(QDeclarativeDebugTestData *data) { - tst_QmlDebug *test = new tst_QmlDebug(data); + tst_QDeclarativeDebug *test = new tst_QDeclarativeDebug(data); QDeclarativeContext *c = new QDeclarativeContext(data->engine->rootContext(), test); - c->setObjectName("tst_QmlDebug_childContext"); + c->setObjectName("tst_QDeclarativeDebug_childContext"); return test; } }; @@ -832,10 +832,10 @@ int main(int argc, char *argv[]) // add second component to test multiple root contexts qml << "import Qt 4.6\n" "Item {}"; - tst_QmlDebug_Factory factory; + tst_QDeclarativeDebug_Factory factory; return QDeclarativeDebugTest::runTests(&factory, qml); } -//QTEST_MAIN(tst_QmlDebug) +//QTEST_MAIN(tst_QDeclarativeDebug) #include "tst_qdeclarativedebug.moc" diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp index 7e68ae8..d3679a7 100644 --- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp +++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp @@ -54,12 +54,12 @@ #include "../shared/debugutil_p.h" -class tst_QmlDebugClient : public QObject +class tst_QDeclarativeDebugClient : public QObject { Q_OBJECT public: - tst_QmlDebugClient(QDeclarativeDebugTestData *data) + tst_QDeclarativeDebugClient(QDeclarativeDebugTestData *data) { m_conn = data->conn; } @@ -74,24 +74,24 @@ private slots: void sendMessage(); }; -void tst_QmlDebugClient::name() +void tst_QDeclarativeDebugClient::name() { - QString name = "tst_QmlDebugClient::name()"; + QString name = "tst_QDeclarativeDebugClient::name()"; QDeclarativeDebugClient client(name, m_conn); QCOMPARE(client.name(), name); } -void tst_QmlDebugClient::isEnabled() +void tst_QDeclarativeDebugClient::isEnabled() { - QDeclarativeDebugClient client("tst_QmlDebugClient::isEnabled()", m_conn); + QDeclarativeDebugClient client("tst_QDeclarativeDebugClient::isEnabled()", m_conn); QCOMPARE(client.isEnabled(), false); } -void tst_QmlDebugClient::setEnabled() +void tst_QDeclarativeDebugClient::setEnabled() { - QDeclarativeDebugTestService service("tst_QmlDebugClient::setEnabled()"); - QDeclarativeDebugTestClient client("tst_QmlDebugClient::setEnabled()", m_conn); + QDeclarativeDebugTestService service("tst_QDeclarativeDebugClient::setEnabled()"); + QDeclarativeDebugTestClient client("tst_QDeclarativeDebugClient::setEnabled()", m_conn); QCOMPARE(service.isEnabled(), false); @@ -106,28 +106,28 @@ void tst_QmlDebugClient::setEnabled() QCOMPARE(service.isEnabled(), false); } -void tst_QmlDebugClient::isConnected() +void tst_QDeclarativeDebugClient::isConnected() { - QDeclarativeDebugClient client1("tst_QmlDebugClient::isConnected() A", m_conn); + QDeclarativeDebugClient client1("tst_QDeclarativeDebugClient::isConnected() A", m_conn); QCOMPARE(client1.isConnected(), true); QDeclarativeDebugConnection conn; - QDeclarativeDebugClient client2("tst_QmlDebugClient::isConnected() B", &conn); + QDeclarativeDebugClient client2("tst_QDeclarativeDebugClient::isConnected() B", &conn); QCOMPARE(client2.isConnected(), false); - QDeclarativeDebugClient client3("tst_QmlDebugClient::isConnected() C", 0); + QDeclarativeDebugClient client3("tst_QDeclarativeDebugClient::isConnected() C", 0); QCOMPARE(client3.isConnected(), false); // duplicate plugin name - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugClient: Conflicting plugin name \"tst_QmlDebugClient::isConnected() A\" "); - QDeclarativeDebugClient client4("tst_QmlDebugClient::isConnected() A", m_conn); + QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugClient: Conflicting plugin name \"tst_QDeclarativeDebugClient::isConnected() A\" "); + QDeclarativeDebugClient client4("tst_QDeclarativeDebugClient::isConnected() A", m_conn); QCOMPARE(client4.isConnected(), false); } -void tst_QmlDebugClient::sendMessage() +void tst_QDeclarativeDebugClient::sendMessage() { - QDeclarativeDebugTestService service("tst_QmlDebugClient::sendMessage()"); - QDeclarativeDebugTestClient client("tst_QmlDebugClient::sendMessage()", m_conn); + QDeclarativeDebugTestService service("tst_QDeclarativeDebugClient::sendMessage()"); + QDeclarativeDebugTestClient client("tst_QDeclarativeDebugClient::sendMessage()", m_conn); QByteArray msg = "hello!"; @@ -137,10 +137,10 @@ void tst_QmlDebugClient::sendMessage() } -class tst_QmlDebugClient_Factory : public QDeclarativeTestFactory +class tst_QDeclarativeDebugClient_Factory : public QDeclarativeTestFactory { public: - QObject *createTest(QDeclarativeDebugTestData *data) { return new tst_QmlDebugClient(data); } + QObject *createTest(QDeclarativeDebugTestData *data) { return new tst_QDeclarativeDebugClient(data); } }; @@ -150,7 +150,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - tst_QmlDebugClient_Factory factory; + tst_QDeclarativeDebugClient_Factory factory; return QDeclarativeDebugTest::runTests(&factory); } diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp index 69def9a..c8fc001 100644 --- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp +++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp @@ -54,12 +54,12 @@ #include "../shared/debugutil_p.h" -class tst_QmlDebugService : public QObject +class tst_QDeclarativeDebugService : public QObject { Q_OBJECT public: - tst_QmlDebugService(QDeclarativeDebugTestData *data) + tst_QDeclarativeDebugService(QDeclarativeDebugTestData *data) { m_conn = data->conn; } @@ -76,33 +76,33 @@ private slots: void objectToString(); }; -void tst_QmlDebugService::name() +void tst_QDeclarativeDebugService::name() { - QString name = "tst_QmlDebugService::name()"; + QString name = "tst_QDeclarativeDebugService::name()"; QDeclarativeDebugService service(name); QCOMPARE(service.name(), name); } -void tst_QmlDebugService::isEnabled() +void tst_QDeclarativeDebugService::isEnabled() { - QDeclarativeDebugTestService service("tst_QmlDebugService::isEnabled()", m_conn); + QDeclarativeDebugTestService service("tst_QDeclarativeDebugService::isEnabled()", m_conn); QCOMPARE(service.isEnabled(), false); - QDeclarativeDebugTestClient client("tst_QmlDebugService::isEnabled()", m_conn); + QDeclarativeDebugTestClient client("tst_QDeclarativeDebugService::isEnabled()", m_conn); client.setEnabled(true); QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged())); QCOMPARE(service.isEnabled(), true); - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugService: Conflicting plugin name \"tst_QmlDebugService::isEnabled()\" "); - QDeclarativeDebugService duplicate("tst_QmlDebugService::isEnabled()", m_conn); + QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugService: Conflicting plugin name \"tst_QDeclarativeDebugService::isEnabled()\" "); + QDeclarativeDebugService duplicate("tst_QDeclarativeDebugService::isEnabled()", m_conn); QCOMPARE(duplicate.isEnabled(), false); } -void tst_QmlDebugService::enabledChanged() +void tst_QDeclarativeDebugService::enabledChanged() { - QDeclarativeDebugTestService service("tst_QmlDebugService::enabledChanged()"); - QDeclarativeDebugTestClient client("tst_QmlDebugService::enabledChanged()", m_conn); + QDeclarativeDebugTestService service("tst_QDeclarativeDebugService::enabledChanged()"); + QDeclarativeDebugTestClient client("tst_QDeclarativeDebugService::enabledChanged()", m_conn); QCOMPARE(service.enabled, false); @@ -111,10 +111,10 @@ void tst_QmlDebugService::enabledChanged() QCOMPARE(service.enabled, true); } -void tst_QmlDebugService::sendMessage() +void tst_QDeclarativeDebugService::sendMessage() { - QDeclarativeDebugTestService service("tst_QmlDebugService::sendMessage()"); - QDeclarativeDebugTestClient client("tst_QmlDebugService::sendMessage()", m_conn); + QDeclarativeDebugTestService service("tst_QDeclarativeDebugService::sendMessage()"); + QDeclarativeDebugTestClient client("tst_QDeclarativeDebugService::sendMessage()", m_conn); QByteArray msg = "hello!"; @@ -123,7 +123,7 @@ void tst_QmlDebugService::sendMessage() QCOMPARE(resp, msg); } -void tst_QmlDebugService::idForObject() +void tst_QDeclarativeDebugService::idForObject() { QCOMPARE(QDeclarativeDebugService::idForObject(0), -1); @@ -145,7 +145,7 @@ void tst_QmlDebugService::idForObject() delete objB; } -void tst_QmlDebugService::objectForId() +void tst_QDeclarativeDebugService::objectForId() { QCOMPARE(QDeclarativeDebugService::objectForId(-1), static_cast<QObject*>(0)); QCOMPARE(QDeclarativeDebugService::objectForId(1), static_cast<QObject*>(0)); @@ -158,7 +158,7 @@ void tst_QmlDebugService::objectForId() QCOMPARE(QDeclarativeDebugService::objectForId(id), static_cast<QObject*>(0)); } -void tst_QmlDebugService::objectToString() +void tst_QDeclarativeDebugService::objectToString() { QCOMPARE(QDeclarativeDebugService::objectToString(0), QString("NULL")); @@ -171,10 +171,10 @@ void tst_QmlDebugService::objectToString() } -class tst_QmlDebugService_Factory : public QDeclarativeTestFactory +class tst_QDeclarativeDebugService_Factory : public QDeclarativeTestFactory { public: - QObject *createTest(QDeclarativeDebugTestData *data) { return new tst_QmlDebugService(data); } + QObject *createTest(QDeclarativeDebugTestData *data) { return new tst_QDeclarativeDebugService(data); } }; // This does not use QTEST_MAIN because the test has to be created and run @@ -183,7 +183,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - tst_QmlDebugService_Factory factory; + tst_QDeclarativeDebugService_Factory factory; return QDeclarativeDebugTest::runTests(&factory); } diff --git a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp index a92a240..9543280 100644 --- a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp +++ b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp @@ -46,11 +46,11 @@ #include <QtCore/QDebug> #include <QtCore/QFile> -class tst_qmldom : public QObject +class tst_qdeclarativedom : public QObject { Q_OBJECT public: - tst_qmldom() {} + tst_qdeclarativedom() {} private slots: void loadSimple(); @@ -79,7 +79,7 @@ private: }; -void tst_qmldom::loadSimple() +void tst_qdeclarativedom::loadSimple() { QByteArray qml = "import Qt 4.6\n" "Item {}"; @@ -98,7 +98,7 @@ void tst_qmldom::loadSimple() } // Test regular properties -void tst_qmldom::loadProperties() +void tst_qdeclarativedom::loadProperties() { QByteArray qml = "import Qt 4.6\n" "Item { id : item; x : 300; visible : true }"; @@ -131,7 +131,7 @@ void tst_qmldom::loadProperties() } // Test grouped properties -void tst_qmldom::loadGroupedProperties() +void tst_qdeclarativedom::loadGroupedProperties() { { QByteArray qml = "import Qt 4.6\n" @@ -226,7 +226,7 @@ void tst_qmldom::loadGroupedProperties() } -void tst_qmldom::loadChildObject() +void tst_qdeclarativedom::loadChildObject() { QByteArray qml = "import Qt 4.6\n" "Item { Item {} }"; @@ -250,7 +250,7 @@ void tst_qmldom::loadChildObject() QVERIFY(childItem.objectType() == "Qt/Item"); } -void tst_qmldom::loadComposite() +void tst_qdeclarativedom::loadComposite() { QFile file(SRCDIR "/data/top.qml"); QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); @@ -271,7 +271,7 @@ void tst_qmldom::loadComposite() QVERIFY(heightProperty.value().isLiteral()); } -void tst_qmldom::testValueSource() +void tst_qdeclarativedom::testValueSource() { QByteArray qml = "import Qt 4.6\n" "Rectangle { height: SpringFollow { spring: 1.4; damping: .15; source: Math.min(Math.max(-130, value*2.2 - 130), 133); }}"; @@ -303,7 +303,7 @@ void tst_qmldom::testValueSource() QVERIFY(sourceValue.toBinding().binding() == "Math.min(Math.max(-130, value*2.2 - 130), 133)"); } -void tst_qmldom::testValueInterceptor() +void tst_qdeclarativedom::testValueInterceptor() { QByteArray qml = "import Qt 4.6\n" "Rectangle { height: Behavior { NumberAnimation { duration: 100 } } }"; @@ -330,7 +330,7 @@ void tst_qmldom::testValueInterceptor() } // Test QDeclarativeDomDocument::imports() -void tst_qmldom::loadImports() +void tst_qdeclarativedom::loadImports() { QByteArray qml = "import Qt 4.6\n" "import importlib.sublib 4.7\n" @@ -378,7 +378,7 @@ void tst_qmldom::loadImports() } // Test loading a file with errors -void tst_qmldom::loadErrors() +void tst_qdeclarativedom::loadErrors() { QByteArray qml = "import Qt 4.6\n" "Item {\n" @@ -398,7 +398,7 @@ void tst_qmldom::loadErrors() } // Test loading a file with syntax errors -void tst_qmldom::loadSyntaxErrors() +void tst_qdeclarativedom::loadSyntaxErrors() { QByteArray qml = "import Qt 4.6\n" "asdf"; @@ -416,7 +416,7 @@ void tst_qmldom::loadSyntaxErrors() } // Test attempting to load a file with remote references -void tst_qmldom::loadRemoteErrors() +void tst_qdeclarativedom::loadRemoteErrors() { QByteArray qml = "import Qt 4.6\n" "Item {\n" @@ -437,7 +437,7 @@ void tst_qmldom::loadRemoteErrors() } // Test dynamic property declarations -void tst_qmldom::loadDynamicProperty() +void tst_qdeclarativedom::loadDynamicProperty() { { QByteArray qml = "import Qt 4.6\n" @@ -530,7 +530,7 @@ void tst_qmldom::loadDynamicProperty() } // Test inline components -void tst_qmldom::loadComponent() +void tst_qdeclarativedom::loadComponent() { // Explicit component { @@ -620,7 +620,7 @@ void tst_qmldom::loadComponent() } // Test QDeclarativeDomObject::dynamicProperty() method -void tst_qmldom::object_dynamicProperty() +void tst_qdeclarativedom::object_dynamicProperty() { // Invalid object { @@ -674,7 +674,7 @@ void tst_qmldom::object_dynamicProperty() } // Test QDeclarativeObject::property() method -void tst_qmldom::object_property() +void tst_qdeclarativedom::object_property() { // Invalid object { @@ -776,7 +776,7 @@ void tst_qmldom::object_property() } // Tests the QDeclarativeDomObject::url() method -void tst_qmldom::object_url() +void tst_qdeclarativedom::object_url() { // Invalid object { @@ -815,7 +815,7 @@ void tst_qmldom::object_url() } // Test copy constructors and operators -void tst_qmldom::copy() +void tst_qdeclarativedom::copy() { QByteArray qml = "import Qt 4.6\n" "MyItem {\n" @@ -1190,7 +1190,7 @@ void tst_qmldom::copy() } // Tests the position/length of various elements -void tst_qmldom::position() +void tst_qdeclarativedom::position() { QByteArray qml = "import Qt 4.6\n" /*14*/ "Item {\n" @@ -1308,6 +1308,6 @@ void tst_qmldom::position() qWarning("QDeclarativeListValue position test required"); } -QTEST_MAIN(tst_qmldom) +QTEST_MAIN(tst_qdeclarativedom) #include "tst_qdeclarativedom.moc" diff --git a/tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp b/tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp index 60c74ef..036eec0 100644 --- a/tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp +++ b/tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp @@ -45,11 +45,11 @@ #include <private/qdeclarativevaluetype_p.h> #include "../../../shared/util.h" -class tst_qmleasefollow : public QObject +class tst_qdeclarativeeasefollow : public QObject { Q_OBJECT public: - tst_qmleasefollow(); + tst_qdeclarativeeasefollow(); private slots: void defaultValues(); @@ -60,11 +60,11 @@ private: QDeclarativeEngine engine; }; -tst_qmleasefollow::tst_qmleasefollow() +tst_qdeclarativeeasefollow::tst_qdeclarativeeasefollow() { } -void tst_qmleasefollow::defaultValues() +void tst_qdeclarativeeasefollow::defaultValues() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow1.qml")); @@ -82,7 +82,7 @@ void tst_qmleasefollow::defaultValues() delete obj; } -void tst_qmleasefollow::values() +void tst_qdeclarativeeasefollow::values() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow2.qml")); @@ -100,7 +100,7 @@ void tst_qmleasefollow::values() delete obj; } -void tst_qmleasefollow::disabled() +void tst_qdeclarativeeasefollow::disabled() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow3.qml")); @@ -117,6 +117,6 @@ void tst_qmleasefollow::disabled() delete obj; } -QTEST_MAIN(tst_qmleasefollow) +QTEST_MAIN(tst_qdeclarativeeasefollow) #include "tst_qdeclarativeeasefollow.moc" diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h index 779e4e4..8fbd071 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h +++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h @@ -142,7 +142,7 @@ public slots: void setString(const QString &s) { m_string = s; } private: - friend class tst_qmlecmascript; + friend class tst_qdeclarativeecmascript; bool m_methodCalled; bool m_methodIntCalled; diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index bbdb5cd..60c380c 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -69,11 +69,11 @@ inline QUrl TEST_FILE(const char *filename) return TEST_FILE(QLatin1String(filename)); } -class tst_qmlecmascript : public QObject +class tst_qdeclarativeecmascript : public QObject { Q_OBJECT public: - tst_qmlecmascript() {} + tst_qdeclarativeecmascript() {} private slots: void initTestCase(); @@ -130,9 +130,9 @@ private: QDeclarativeEngine engine; }; -void tst_qmlecmascript::initTestCase() { registerTypes(); } +void tst_qdeclarativeecmascript::initTestCase() { registerTypes(); } -void tst_qmlecmascript::assignBasicTypes() +void tst_qdeclarativeecmascript::assignBasicTypes() { { QDeclarativeComponent component(&engine, TEST_FILE("assignBasicTypes.qml")); @@ -192,7 +192,7 @@ void tst_qmlecmascript::assignBasicTypes() } } -void tst_qmlecmascript::idShortcutInvalidates() +void tst_qdeclarativeecmascript::idShortcutInvalidates() { { QDeclarativeComponent component(&engine, TEST_FILE("idShortcutInvalidates.qml")); @@ -213,7 +213,7 @@ void tst_qmlecmascript::idShortcutInvalidates() } } -void tst_qmlecmascript::boolPropertiesEvaluateAsBool() +void tst_qdeclarativeecmascript::boolPropertiesEvaluateAsBool() { { QDeclarativeComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.1.qml")); @@ -229,7 +229,7 @@ void tst_qmlecmascript::boolPropertiesEvaluateAsBool() } } -void tst_qmlecmascript::signalAssignment() +void tst_qdeclarativeecmascript::signalAssignment() { { QDeclarativeComponent component(&engine, TEST_FILE("signalAssignment.1.qml")); @@ -250,7 +250,7 @@ void tst_qmlecmascript::signalAssignment() } } -void tst_qmlecmascript::methods() +void tst_qdeclarativeecmascript::methods() { { QDeclarativeComponent component(&engine, TEST_FILE("methods.1.qml")); @@ -298,7 +298,7 @@ void tst_qmlecmascript::methods() } } -void tst_qmlecmascript::bindingLoop() +void tst_qdeclarativeecmascript::bindingLoop() { QDeclarativeComponent component(&engine, TEST_FILE("bindingLoop.qml")); QString warning = "QML MyQmlObject (" + component.url().toString() + ":9:9) Binding loop detected for property \"stringProperty\""; @@ -307,7 +307,7 @@ void tst_qmlecmascript::bindingLoop() QVERIFY(object != 0); } -void tst_qmlecmascript::basicExpressions_data() +void tst_qdeclarativeecmascript::basicExpressions_data() { QTest::addColumn<QString>("expression"); QTest::addColumn<QVariant>("result"); @@ -334,7 +334,7 @@ void tst_qmlecmascript::basicExpressions_data() QTest::newRow("Context property override default object property") << "millipedeLegs" << QVariant(100) << true; } -void tst_qmlecmascript::basicExpressions() +void tst_qdeclarativeecmascript::basicExpressions() { QFETCH(QString, expression); QFETCH(QVariant, result); @@ -368,7 +368,7 @@ void tst_qmlecmascript::basicExpressions() QCOMPARE(expr.value(), result); } -void tst_qmlecmascript::arrayExpressions() +void tst_qdeclarativeecmascript::arrayExpressions() { QObject obj1; QObject obj2; @@ -391,7 +391,7 @@ void tst_qmlecmascript::arrayExpressions() } // Tests that modifying a context property will reevaluate expressions -void tst_qmlecmascript::contextPropertiesTriggerReeval() +void tst_qdeclarativeecmascript::contextPropertiesTriggerReeval() { QDeclarativeContext context(engine.rootContext()); MyQmlObject object1; @@ -453,7 +453,7 @@ void tst_qmlecmascript::contextPropertiesTriggerReeval() } -void tst_qmlecmascript::objectPropertiesTriggerReeval() +void tst_qdeclarativeecmascript::objectPropertiesTriggerReeval() { QDeclarativeContext context(engine.rootContext()); MyQmlObject object1; @@ -507,7 +507,7 @@ void tst_qmlecmascript::objectPropertiesTriggerReeval() } } -void tst_qmlecmascript::deferredProperties() +void tst_qdeclarativeecmascript::deferredProperties() { QDeclarativeComponent component(&engine, TEST_FILE("deferredProperties.qml")); MyDeferredObject *object = @@ -527,7 +527,7 @@ void tst_qmlecmascript::deferredProperties() QCOMPARE(qmlObject->value(), 19); } -void tst_qmlecmascript::extensionObjects() +void tst_qdeclarativeecmascript::extensionObjects() { QDeclarativeComponent component(&engine, TEST_FILE("extensionObjects.qml")); MyExtendedObject *object = @@ -542,7 +542,7 @@ void tst_qmlecmascript::extensionObjects() QCOMPARE(object->baseProperty(), 92); } -void tst_qmlecmascript::attachedProperties() +void tst_qdeclarativeecmascript::attachedProperties() { QDeclarativeComponent component(&engine, TEST_FILE("attachedProperty.qml")); QObject *object = component.create(); @@ -555,7 +555,7 @@ void tst_qmlecmascript::attachedProperties() // ### Need to test attached property assignment } -void tst_qmlecmascript::enums() +void tst_qdeclarativeecmascript::enums() { // Existant enums { @@ -590,7 +590,7 @@ void tst_qmlecmascript::enums() } } -void tst_qmlecmascript::valueTypeFunctions() +void tst_qdeclarativeecmascript::valueTypeFunctions() { QDeclarativeComponent component(&engine, TEST_FILE("valueTypeFunctions.qml")); MyTypeObject *obj = qobject_cast<MyTypeObject*>(component.create()); @@ -603,7 +603,7 @@ void tst_qmlecmascript::valueTypeFunctions() Tests that writing a constant to a property with a binding on it disables the binding. */ -void tst_qmlecmascript::constantsOverrideBindings() +void tst_qdeclarativeecmascript::constantsOverrideBindings() { // From ECMAScript { @@ -659,7 +659,7 @@ void tst_qmlecmascript::constantsOverrideBindings() Tests that assigning a binding to a property that already has a binding causes the original binding to be disabled. */ -void tst_qmlecmascript::outerBindingOverridesInnerBinding() +void tst_qdeclarativeecmascript::outerBindingOverridesInnerBinding() { QDeclarativeComponent component(&engine, TEST_FILE("outerBindingOverridesInnerBinding.qml")); @@ -686,7 +686,7 @@ Access a non-existent attached object. Tests for a regression where this used to crash. */ -void tst_qmlecmascript::nonExistantAttachedObject() +void tst_qdeclarativeecmascript::nonExistantAttachedObject() { QDeclarativeComponent component(&engine, TEST_FILE("nonExistantAttachedObject.qml")); @@ -697,7 +697,7 @@ void tst_qmlecmascript::nonExistantAttachedObject() QVERIFY(object != 0); } -void tst_qmlecmascript::scope() +void tst_qdeclarativeecmascript::scope() { { QDeclarativeComponent component(&engine, TEST_FILE("scope.qml")); @@ -734,7 +734,7 @@ void tst_qmlecmascript::scope() Tests that "any" type passes through a synthesized signal parameter. This is essentially a test of QDeclarativeMetaType::copy() */ -void tst_qmlecmascript::signalParameterTypes() +void tst_qdeclarativeecmascript::signalParameterTypes() { QDeclarativeComponent component(&engine, TEST_FILE("signalParameterTypes.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); @@ -751,7 +751,7 @@ void tst_qmlecmascript::signalParameterTypes() /* Test that two JS objects for the same QObject compare as equal. */ -void tst_qmlecmascript::objectsCompareAsEqual() +void tst_qdeclarativeecmascript::objectsCompareAsEqual() { QDeclarativeComponent component(&engine, TEST_FILE("objectsCompareAsEqual.qml")); QObject *object = component.create(); @@ -769,7 +769,7 @@ Confirm bindings and alias properties can coexist. Tests for a regression where the binding would not reevaluate. */ -void tst_qmlecmascript::aliasPropertyAndBinding() +void tst_qdeclarativeecmascript::aliasPropertyAndBinding() { QDeclarativeComponent component(&engine, TEST_FILE("aliasPropertyAndBinding.qml")); QObject *object = component.create(); @@ -787,7 +787,7 @@ void tst_qmlecmascript::aliasPropertyAndBinding() /* Tests that only methods of Script {} blocks are exposed. */ -void tst_qmlecmascript::scriptAccess() +void tst_qdeclarativeecmascript::scriptAccess() { QDeclarativeComponent component(&engine, TEST_FILE("scriptAccess.qml")); @@ -802,7 +802,7 @@ void tst_qmlecmascript::scriptAccess() QCOMPARE(object->property("test3").toInt(), 0); } -void tst_qmlecmascript::dynamicCreation_data() +void tst_qdeclarativeecmascript::dynamicCreation_data() { QTest::addColumn<QString>("method"); QTest::addColumn<QString>("createdName"); @@ -816,7 +816,7 @@ void tst_qmlecmascript::dynamicCreation_data() Test using createQmlObject to dynamically generate an item Also using createComponent is tested. */ -void tst_qmlecmascript::dynamicCreation() +void tst_qdeclarativeecmascript::dynamicCreation() { QFETCH(QString, method); QFETCH(QString, createdName); @@ -834,7 +834,7 @@ void tst_qmlecmascript::dynamicCreation() /* Tests the destroy function */ -void tst_qmlecmascript::dynamicDestruction() +void tst_qdeclarativeecmascript::dynamicDestruction() { QDeclarativeComponent component(&engine, TEST_FILE("dynamicDeletion.qml")); QDeclarativeGuard<MyQmlObject> object = qobject_cast<MyQmlObject*>(component.create()); @@ -868,7 +868,7 @@ void tst_qmlecmascript::dynamicDestruction() /* tests that id.toString() works */ -void tst_qmlecmascript::objectToString() +void tst_qdeclarativeecmascript::objectToString() { QDeclarativeComponent component(&engine, TEST_FILE("declarativeToString.qml")); MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create()); @@ -883,7 +883,7 @@ Tests bindings that indirectly cause their own deletion work. This test is best run under valgrind to ensure no invalid memory access occur. */ -void tst_qmlecmascript::selfDeletingBinding() +void tst_qdeclarativeecmascript::selfDeletingBinding() { { QDeclarativeComponent component(&engine, TEST_FILE("selfDeletingBinding.qml")); @@ -907,7 +907,7 @@ This test a regression where this used to crash. The issue was specificially for extended objects that did not include a synthesized meta object (so non-root and no synthesiszed properties). */ -void tst_qmlecmascript::extendedObjectPropertyLookup() +void tst_qdeclarativeecmascript::extendedObjectPropertyLookup() { QDeclarativeComponent component(&engine, TEST_FILE("extendedObjectPropertyLookup.qml")); QObject *object = component.create(); @@ -917,7 +917,7 @@ void tst_qmlecmascript::extendedObjectPropertyLookup() /* Test file/lineNumbers for binding/Script errors. */ -void tst_qmlecmascript::scriptErrors() +void tst_qdeclarativeecmascript::scriptErrors() { QDeclarativeComponent component(&engine, TEST_FILE("scriptErrors.qml")); QString url = component.url().toString(); @@ -953,7 +953,7 @@ void tst_qmlecmascript::scriptErrors() Test bindings still work when the reeval is triggered from within a signal script. */ -void tst_qmlecmascript::signalTriggeredBindings() +void tst_qdeclarativeecmascript::signalTriggeredBindings() { QDeclarativeComponent component(&engine, TEST_FILE("signalTriggeredBindings.qml")); MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create()); @@ -979,7 +979,7 @@ void tst_qmlecmascript::signalTriggeredBindings() /* Test that list properties can be iterated from ECMAScript */ -void tst_qmlecmascript::listProperties() +void tst_qdeclarativeecmascript::listProperties() { QDeclarativeComponent component(&engine, TEST_FILE("listProperties.qml")); MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create()); @@ -991,7 +991,7 @@ void tst_qmlecmascript::listProperties() QCOMPARE(object->property("test4").toBool(), true); } -void tst_qmlecmascript::exceptionClearsOnReeval() +void tst_qdeclarativeecmascript::exceptionClearsOnReeval() { QDeclarativeComponent component(&engine, TEST_FILE("exceptionClearsOnReeval.qml")); QString url = component.url().toString(); @@ -1012,7 +1012,7 @@ void tst_qmlecmascript::exceptionClearsOnReeval() QCOMPARE(object->property("test").toBool(), true); } -void tst_qmlecmascript::exceptionSlotProducesWarning() +void tst_qdeclarativeecmascript::exceptionSlotProducesWarning() { QDeclarativeComponent component(&engine, TEST_FILE("exceptionProducesWarning.qml")); QString url = component.url().toString(); @@ -1024,7 +1024,7 @@ void tst_qmlecmascript::exceptionSlotProducesWarning() QVERIFY(object != 0); } -void tst_qmlecmascript::exceptionBindingProducesWarning() +void tst_qdeclarativeecmascript::exceptionBindingProducesWarning() { QDeclarativeComponent component(&engine, TEST_FILE("exceptionProducesWarning2.qml")); QString url = component.url().toString(); @@ -1043,7 +1043,7 @@ static void transientErrorsMsgHandler(QtMsgType, const char *) } // Check that transient binding errors are not displayed -void tst_qmlecmascript::transientErrors() +void tst_qdeclarativeecmascript::transientErrors() { QDeclarativeComponent component(&engine, TEST_FILE("transientErrors.qml")); @@ -1059,7 +1059,7 @@ void tst_qmlecmascript::transientErrors() } // Check that errors during shutdown are minimized -void tst_qmlecmascript::shutdownErrors() +void tst_qdeclarativeecmascript::shutdownErrors() { QDeclarativeComponent component(&engine, TEST_FILE("shutdownErrors.qml")); QObject *object = component.create(); @@ -1075,7 +1075,7 @@ void tst_qmlecmascript::shutdownErrors() } // Check that Script::source property works as expected -void tst_qmlecmascript::externalScript() +void tst_qdeclarativeecmascript::externalScript() { { QDeclarativeComponent component(&engine, TEST_FILE("externalScript.1.qml")); @@ -1121,7 +1121,7 @@ void tst_qmlecmascript::externalScript() } } -void tst_qmlecmascript::compositePropertyType() +void tst_qdeclarativeecmascript::compositePropertyType() { QDeclarativeComponent component(&engine, TEST_FILE("compositePropertyType.qml")); QTest::ignoreMessage(QtDebugMsg, "hello world"); @@ -1130,7 +1130,7 @@ void tst_qmlecmascript::compositePropertyType() } // QTBUG-5759 -void tst_qmlecmascript::jsObject() +void tst_qdeclarativeecmascript::jsObject() { QDeclarativeComponent component(&engine, TEST_FILE("jsObject.qml")); QObject *object = component.create(); @@ -1141,7 +1141,7 @@ void tst_qmlecmascript::jsObject() delete object; } -void tst_qmlecmascript::undefinedResetsProperty() +void tst_qdeclarativeecmascript::undefinedResetsProperty() { { QDeclarativeComponent component(&engine, TEST_FILE("undefinedResetsProperty.qml")); @@ -1176,7 +1176,7 @@ void tst_qmlecmascript::undefinedResetsProperty() } // QTBUG-6781 -void tst_qmlecmascript::bug1() +void tst_qdeclarativeecmascript::bug1() { QDeclarativeComponent component(&engine, TEST_FILE("bug.1.qml")); QObject *object = component.create(); @@ -1195,7 +1195,7 @@ void tst_qmlecmascript::bug1() delete object; } -void tst_qmlecmascript::callQtInvokables() +void tst_qdeclarativeecmascript::callQtInvokables() { MyInvokableObject o; @@ -1598,7 +1598,7 @@ void tst_qmlecmascript::callQtInvokables() } // QTBUG-5675 -void tst_qmlecmascript::listToVariant() +void tst_qdeclarativeecmascript::listToVariant() { QDeclarativeComponent component(&engine, TEST_FILE("listToVariant.qml")); @@ -1618,7 +1618,7 @@ void tst_qmlecmascript::listToVariant() } // QTBUG-7957 -void tst_qmlecmascript::multiEngineObject() +void tst_qdeclarativeecmascript::multiEngineObject() { MyQmlObject obj; obj.setStringProperty("Howdy planet"); @@ -1642,7 +1642,7 @@ void tst_qmlecmascript::multiEngineObject() } // Test that references to QObjects are cleanup when the object is destroyed -void tst_qmlecmascript::deletedObject() +void tst_qdeclarativeecmascript::deletedObject() { QDeclarativeComponent component(&engine, TEST_FILE("deletedObject.qml")); @@ -1657,6 +1657,6 @@ void tst_qmlecmascript::deletedObject() delete object; } -QTEST_MAIN(tst_qmlecmascript) +QTEST_MAIN(tst_qdeclarativeecmascript) #include "tst_qdeclarativeecmascript.moc" diff --git a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp index ca48bd2..5dc5f19 100644 --- a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp +++ b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp @@ -50,11 +50,11 @@ #include <QDeclarativeComponent> #include <QDeclarativeNetworkAccessManagerFactory> -class tst_qmlengine : public QObject +class tst_qdeclarativeengine : public QObject { Q_OBJECT public: - tst_qmlengine() {} + tst_qdeclarativeengine() {} private slots: void rootContext(); @@ -65,7 +65,7 @@ private slots: void clearComponentCache(); }; -void tst_qmlengine::rootContext() +void tst_qdeclarativeengine::rootContext() { QDeclarativeEngine engine; @@ -88,7 +88,7 @@ public: QNetworkAccessManager *manager; }; -void tst_qmlengine::networkAccessManager() +void tst_qdeclarativeengine::networkAccessManager() { QDeclarativeEngine *engine = new QDeclarativeEngine; @@ -105,7 +105,7 @@ void tst_qmlengine::networkAccessManager() delete engine; } -void tst_qmlengine::baseUrl() +void tst_qdeclarativeengine::baseUrl() { QDeclarativeEngine engine; @@ -129,7 +129,7 @@ void tst_qmlengine::baseUrl() QCOMPARE(engine.rootContext()->resolvedUrl(QUrl("main.qml")), cwd.resolved(QUrl("main.qml"))); } -void tst_qmlengine::contextForObject() +void tst_qdeclarativeengine::contextForObject() { QDeclarativeEngine *engine = new QDeclarativeEngine; @@ -162,11 +162,11 @@ void tst_qmlengine::contextForObject() QVERIFY(QDeclarativeEngine::contextForObject(&object) == 0); } -void tst_qmlengine::offlineStoragePath() +void tst_qdeclarativeengine::offlineStoragePath() { // Without these set, QDesktopServices::storageLocation returns // strings with extra "//" at the end. We set them to ignore this problem. - qApp->setApplicationName("tst_qmlengine"); + qApp->setApplicationName("tst_qdeclarativeengine"); qApp->setOrganizationName("Nokia"); qApp->setOrganizationDomain("nokia.com"); @@ -184,7 +184,7 @@ void tst_qmlengine::offlineStoragePath() QCOMPARE(engine.offlineStoragePath(), QDir::homePath()); } -void tst_qmlengine::clearComponentCache() +void tst_qdeclarativeengine::clearComponentCache() { QDeclarativeEngine engine; @@ -235,6 +235,6 @@ void tst_qmlengine::clearComponentCache() } } -QTEST_MAIN(tst_qmlengine) +QTEST_MAIN(tst_qdeclarativeengine) #include "tst_qdeclarativeengine.moc" diff --git a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp index 2df11d3..ba1ebae 100644 --- a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp +++ b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp @@ -43,7 +43,7 @@ #include <QDeclarativeError> #include <QDebug> -class tst_qmlerror : public QObject +class tst_qdeclarativeerror : public QObject { Q_OBJECT private slots: @@ -57,7 +57,7 @@ private slots: void debug(); }; -void tst_qmlerror::url() +void tst_qdeclarativeerror::url() { QDeclarativeError error; @@ -77,7 +77,7 @@ void tst_qmlerror::url() QCOMPARE(error2.url(), QUrl("http://www.nokia.com/main.qml")); } -void tst_qmlerror::description() +void tst_qdeclarativeerror::description() { QDeclarativeError error; @@ -97,7 +97,7 @@ void tst_qmlerror::description() QCOMPARE(error2.description(), QString("An Error")); } -void tst_qmlerror::line() +void tst_qdeclarativeerror::line() { QDeclarativeError error; @@ -117,7 +117,7 @@ void tst_qmlerror::line() QCOMPARE(error2.line(), 102); } -void tst_qmlerror::column() +void tst_qdeclarativeerror::column() { QDeclarativeError error; @@ -137,7 +137,7 @@ void tst_qmlerror::column() QCOMPARE(error2.column(), 16); } -void tst_qmlerror::toString() +void tst_qdeclarativeerror::toString() { { QDeclarativeError error; @@ -159,7 +159,7 @@ void tst_qmlerror::toString() } } -void tst_qmlerror::copy() +void tst_qdeclarativeerror::copy() { QDeclarativeError error; error.setUrl(QUrl("http://www.nokia.com/main.qml")); @@ -193,7 +193,7 @@ void tst_qmlerror::copy() } -void tst_qmlerror::debug() +void tst_qdeclarativeerror::debug() { { QDeclarativeError error; @@ -237,6 +237,6 @@ void tst_qmlerror::debug() -QTEST_MAIN(tst_qmlerror) +QTEST_MAIN(tst_qdeclarativeerror) #include "tst_qdeclarativeerror.moc" diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp index 9e5238e..1c98c50 100644 --- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp +++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp @@ -46,11 +46,11 @@ #include <private/qdeclarativevaluetype_p.h> #include <math.h> -class tst_qmlgraphicsflickable : public QObject +class tst_qdeclarativeflickable : public QObject { Q_OBJECT public: - tst_qmlgraphicsflickable(); + tst_qdeclarativeflickable(); private slots: void create(); @@ -66,11 +66,11 @@ private: QDeclarativeEngine engine; }; -tst_qmlgraphicsflickable::tst_qmlgraphicsflickable() +tst_qdeclarativeflickable::tst_qdeclarativeflickable() { } -void tst_qmlgraphicsflickable::create() +void tst_qdeclarativeflickable::create() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable01.qml")); @@ -96,7 +96,7 @@ void tst_qmlgraphicsflickable::create() delete obj; } -void tst_qmlgraphicsflickable::horizontalViewportSize() +void tst_qdeclarativeflickable::horizontalViewportSize() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable02.qml")); @@ -113,7 +113,7 @@ void tst_qmlgraphicsflickable::horizontalViewportSize() delete obj; } -void tst_qmlgraphicsflickable::verticalViewportSize() +void tst_qdeclarativeflickable::verticalViewportSize() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable03.qml")); @@ -130,7 +130,7 @@ void tst_qmlgraphicsflickable::verticalViewportSize() delete obj; } -void tst_qmlgraphicsflickable::properties() +void tst_qdeclarativeflickable::properties() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable04.qml")); @@ -145,7 +145,7 @@ void tst_qmlgraphicsflickable::properties() delete obj; } -void tst_qmlgraphicsflickable::overShoot() +void tst_qdeclarativeflickable::overShoot() { QDeclarativeComponent component(&engine); component.setData("import Qt 4.6; Flickable { overShoot: false; }", QUrl::fromLocalFile("")); @@ -168,7 +168,7 @@ void tst_qmlgraphicsflickable::overShoot() QCOMPARE(spy.count(),2); } -void tst_qmlgraphicsflickable::maximumFlickVelocity() +void tst_qdeclarativeflickable::maximumFlickVelocity() { QDeclarativeComponent component(&engine); component.setData("import Qt 4.6; Flickable { maximumFlickVelocity: 1.0; }", QUrl::fromLocalFile("")); @@ -185,7 +185,7 @@ void tst_qmlgraphicsflickable::maximumFlickVelocity() QCOMPARE(spy.count(),1); } -void tst_qmlgraphicsflickable::flickDeceleration() +void tst_qdeclarativeflickable::flickDeceleration() { QDeclarativeComponent component(&engine); component.setData("import Qt 4.6; Flickable { flickDeceleration: 1.0; }", QUrl::fromLocalFile("")); @@ -202,7 +202,7 @@ void tst_qmlgraphicsflickable::flickDeceleration() QCOMPARE(spy.count(),1); } -void tst_qmlgraphicsflickable::pressDelay() +void tst_qdeclarativeflickable::pressDelay() { QDeclarativeComponent component(&engine); component.setData("import Qt 4.6; Flickable { pressDelay: 100; }", QUrl::fromLocalFile("")); @@ -219,6 +219,6 @@ void tst_qmlgraphicsflickable::pressDelay() QCOMPARE(spy.count(),1); } -QTEST_MAIN(tst_qmlgraphicsflickable) +QTEST_MAIN(tst_qdeclarativeflickable) #include "tst_qdeclarativeflickable.moc" diff --git a/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp b/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp index f29ed18..ed37c43 100644 --- a/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp +++ b/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp @@ -47,11 +47,11 @@ #include <private/qdeclarativerectangle_p.h> #include <math.h> -class tst_qmlgraphicsflipable : public QObject +class tst_qdeclarativeflipable : public QObject { Q_OBJECT public: - tst_qmlgraphicsflipable(); + tst_qdeclarativeflipable(); private slots: void create(); @@ -62,11 +62,11 @@ private: QDeclarativeEngine engine; }; -tst_qmlgraphicsflipable::tst_qmlgraphicsflipable() +tst_qdeclarativeflipable::tst_qdeclarativeflipable() { } -void tst_qmlgraphicsflipable::create() +void tst_qdeclarativeflipable::create() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml")); @@ -76,7 +76,7 @@ void tst_qmlgraphicsflipable::create() delete obj; } -void tst_qmlgraphicsflipable::checkFrontAndBack() +void tst_qdeclarativeflipable::checkFrontAndBack() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml")); @@ -88,7 +88,7 @@ void tst_qmlgraphicsflipable::checkFrontAndBack() delete obj; } -void tst_qmlgraphicsflipable::setFrontAndBack() +void tst_qdeclarativeflipable::setFrontAndBack() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml")); @@ -108,6 +108,6 @@ void tst_qmlgraphicsflipable::setFrontAndBack() delete obj; } -QTEST_MAIN(tst_qmlgraphicsflipable) +QTEST_MAIN(tst_qdeclarativeflipable) #include "tst_qdeclarativeflipable.moc" diff --git a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp index 5a1259d..a9762df 100644 --- a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp +++ b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp @@ -44,12 +44,12 @@ #include <private/qdeclarativefontloader_p.h> #include "../../../shared/util.h" -class tst_qmlfontloader : public QObject +class tst_qdeclarativefontloader : public QObject { Q_OBJECT public: - tst_qmlfontloader(); + tst_qdeclarativefontloader(); private slots: void noFont(); @@ -65,11 +65,11 @@ private: QDeclarativeEngine engine; }; -tst_qmlfontloader::tst_qmlfontloader() +tst_qdeclarativefontloader::tst_qdeclarativefontloader() { } -void tst_qmlfontloader::noFont() +void tst_qdeclarativefontloader::noFont() { QString componentStr = "import Qt 4.6\nFontLoader { }"; QDeclarativeComponent component(&engine); @@ -84,7 +84,7 @@ void tst_qmlfontloader::noFont() delete fontObject; } -void tst_qmlfontloader::namedFont() +void tst_qdeclarativefontloader::namedFont() { QString componentStr = "import Qt 4.6\nFontLoader { name: \"Helvetica\" }"; QDeclarativeComponent component(&engine); @@ -97,7 +97,7 @@ void tst_qmlfontloader::namedFont() QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready); } -void tst_qmlfontloader::localFont() +void tst_qdeclarativefontloader::localFont() { QString componentStr = "import Qt 4.6\nFontLoader { source: \"" SRCDIR "/data/tarzeau_ocr_a.ttf\" }"; QDeclarativeComponent component(&engine); @@ -110,7 +110,7 @@ void tst_qmlfontloader::localFont() QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready); } -void tst_qmlfontloader::failLocalFont() +void tst_qdeclarativefontloader::failLocalFont() { QString componentStr = "import Qt 4.6\nFontLoader { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/dummy.ttf").toString() + "\" }"; QTest::ignoreMessage(QtWarningMsg, QString("Cannot load font: QUrl( \"" + QUrl::fromLocalFile(SRCDIR "/data/dummy.ttf").toString() + "\" ) ").toUtf8().constData()); @@ -124,7 +124,7 @@ void tst_qmlfontloader::failLocalFont() QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Error); } -void tst_qmlfontloader::webFont() +void tst_qdeclarativefontloader::webFont() { QString componentStr = "import Qt 4.6\nFontLoader { source: \"http://www.princexml.com/fonts/steffmann/Starburst.ttf\" }"; QDeclarativeComponent component(&engine); @@ -137,7 +137,7 @@ void tst_qmlfontloader::webFont() QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready); } -void tst_qmlfontloader::failWebFont() +void tst_qdeclarativefontloader::failWebFont() { QString componentStr = "import Qt 4.6\nFontLoader { source: \"http://wrong.address.com/Starburst.ttf\" }"; QTest::ignoreMessage(QtWarningMsg, "Cannot load font: QUrl( \"http://wrong.address.com/Starburst.ttf\" ) "); @@ -151,6 +151,6 @@ void tst_qmlfontloader::failWebFont() QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Error); } -QTEST_MAIN(tst_qmlfontloader) +QTEST_MAIN(tst_qdeclarativefontloader) #include "tst_qdeclarativefontloader.moc" diff --git a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp index 0deb43d..9a7f517 100644 --- a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp +++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp @@ -49,11 +49,11 @@ #include <qdeclarativecontext.h> #include <qdeclarativeexpression.h> -class tst_QmlGraphicsGridView : public QObject +class tst_QDeclarativeGridView : public QObject { Q_OBJECT public: - tst_QmlGraphicsGridView(); + tst_QDeclarativeGridView(); private slots: void items(); @@ -136,11 +136,11 @@ private: QList<QPair<QString,QString> > list; }; -tst_QmlGraphicsGridView::tst_QmlGraphicsGridView() +tst_QDeclarativeGridView::tst_QDeclarativeGridView() { } -void tst_QmlGraphicsGridView::items() +void tst_QDeclarativeGridView::items() { QDeclarativeView *canvas = createView(); @@ -188,7 +188,7 @@ void tst_QmlGraphicsGridView::items() delete canvas; } -void tst_QmlGraphicsGridView::changed() +void tst_QDeclarativeGridView::changed() { QDeclarativeView *canvas = createView(); @@ -225,7 +225,7 @@ void tst_QmlGraphicsGridView::changed() delete canvas; } -void tst_QmlGraphicsGridView::inserted() +void tst_QDeclarativeGridView::inserted() { QDeclarativeView *canvas = createView(); @@ -307,7 +307,7 @@ void tst_QmlGraphicsGridView::inserted() delete canvas; } -void tst_QmlGraphicsGridView::removed() +void tst_QDeclarativeGridView::removed() { QDeclarativeView *canvas = createView(); @@ -467,7 +467,7 @@ void tst_QmlGraphicsGridView::removed() delete canvas; } -void tst_QmlGraphicsGridView::moved() +void tst_QDeclarativeGridView::moved() { QDeclarativeView *canvas = createView(); @@ -565,7 +565,7 @@ void tst_QmlGraphicsGridView::moved() delete canvas; } -void tst_QmlGraphicsGridView::currentIndex() +void tst_QDeclarativeGridView::currentIndex() { TestModel model; for (int i = 0; i < 30; i++) @@ -687,7 +687,7 @@ void tst_QmlGraphicsGridView::currentIndex() delete canvas; } -void tst_QmlGraphicsGridView::changeFlow() +void tst_QDeclarativeGridView::changeFlow() { QDeclarativeView *canvas = createView(); @@ -746,7 +746,7 @@ void tst_QmlGraphicsGridView::changeFlow() delete canvas; } -void tst_QmlGraphicsGridView::defaultValues() +void tst_QDeclarativeGridView::defaultValues() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/gridview3.qml")); @@ -769,7 +769,7 @@ void tst_QmlGraphicsGridView::defaultValues() delete obj; } -void tst_QmlGraphicsGridView::properties() +void tst_QDeclarativeGridView::properties() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/gridview2.qml")); @@ -792,7 +792,7 @@ void tst_QmlGraphicsGridView::properties() delete obj; } -void tst_QmlGraphicsGridView::positionViewAtIndex() +void tst_QDeclarativeGridView::positionViewAtIndex() { QDeclarativeView *canvas = createView(); @@ -882,7 +882,7 @@ void tst_QmlGraphicsGridView::positionViewAtIndex() delete canvas; } -QDeclarativeView *tst_QmlGraphicsGridView::createView() +QDeclarativeView *tst_QDeclarativeGridView::createView() { QDeclarativeView *canvas = new QDeclarativeView(0); canvas->setFixedSize(240,320); @@ -895,7 +895,7 @@ QDeclarativeView *tst_QmlGraphicsGridView::createView() item must also evaluate the {index} expression equal to index */ template<typename T> -T *tst_QmlGraphicsGridView::findItem(QGraphicsObject *parent, const QString &objectName, int index) +T *tst_QDeclarativeGridView::findItem(QGraphicsObject *parent, const QString &objectName, int index) { const QMetaObject &mo = T::staticMetaObject; //qDebug() << parent->childItems().count() << "children"; @@ -925,7 +925,7 @@ T *tst_QmlGraphicsGridView::findItem(QGraphicsObject *parent, const QString &obj } template<typename T> -QList<T*> tst_QmlGraphicsGridView::findItems(QGraphicsObject *parent, const QString &objectName) +QList<T*> tst_QDeclarativeGridView::findItems(QGraphicsObject *parent, const QString &objectName) { QList<T*> items; const QMetaObject &mo = T::staticMetaObject; @@ -945,7 +945,7 @@ QList<T*> tst_QmlGraphicsGridView::findItems(QGraphicsObject *parent, const QStr return items; } -void tst_QmlGraphicsGridView::dumpTree(QDeclarativeItem *parent, int depth) +void tst_QDeclarativeGridView::dumpTree(QDeclarativeItem *parent, int depth) { static QString padding(" "); for (int i = 0; i < parent->childItems().count(); ++i) { @@ -959,6 +959,6 @@ void tst_QmlGraphicsGridView::dumpTree(QDeclarativeItem *parent, int depth) } -QTEST_MAIN(tst_QmlGraphicsGridView) +QTEST_MAIN(tst_QDeclarativeGridView) #include "tst_qdeclarativegridview.moc" diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp index 097e5fc..f38fca9 100644 --- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp +++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp @@ -67,12 +67,12 @@ } while (false) -class tst_qmlgraphicsimage : public QObject +class tst_qdeclarativeimage : public QObject { Q_OBJECT public: - tst_qmlgraphicsimage(); + tst_qdeclarativeimage(); private slots: void noSource(); @@ -87,11 +87,11 @@ private: QDeclarativeEngine engine; }; -tst_qmlgraphicsimage::tst_qmlgraphicsimage() +tst_qdeclarativeimage::tst_qdeclarativeimage() { } -void tst_qmlgraphicsimage::noSource() +void tst_qdeclarativeimage::noSource() { QString componentStr = "import Qt 4.6\nImage { source: \"\" }"; QDeclarativeComponent component(&engine); @@ -108,7 +108,7 @@ void tst_qmlgraphicsimage::noSource() delete obj; } -void tst_qmlgraphicsimage::imageSource_data() +void tst_qdeclarativeimage::imageSource_data() { QTest::addColumn<QString>("source"); QTest::addColumn<bool>("remote"); @@ -122,7 +122,7 @@ void tst_qmlgraphicsimage::imageSource_data() << "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" "; } -void tst_qmlgraphicsimage::imageSource() +void tst_qdeclarativeimage::imageSource() { QFETCH(QString, source); QFETCH(bool, remote); @@ -161,7 +161,7 @@ void tst_qmlgraphicsimage::imageSource() delete obj; } -void tst_qmlgraphicsimage::clearSource() +void tst_qdeclarativeimage::clearSource() { QString componentStr = "import Qt 4.6\nImage { source: srcImage }"; QDeclarativeContext *ctxt = engine.rootContext(); @@ -183,7 +183,7 @@ void tst_qmlgraphicsimage::clearSource() QCOMPARE(obj->progress(), 0.0); } -void tst_qmlgraphicsimage::resized() +void tst_qdeclarativeimage::resized() { QString componentStr = "import Qt 4.6\nImage { source: \"" SRCDIR "/data/colors.png\"; width: 300; height: 300 }"; QDeclarativeComponent component(&engine); @@ -197,7 +197,7 @@ void tst_qmlgraphicsimage::resized() delete obj; } -void tst_qmlgraphicsimage::smooth() +void tst_qdeclarativeimage::smooth() { QString componentStr = "import Qt 4.6\nImage { source: \"" SRCDIR "/data/colors.png\"; smooth: true; width: 300; height: 300 }"; QDeclarativeComponent component(&engine); @@ -212,7 +212,7 @@ void tst_qmlgraphicsimage::smooth() delete obj; } -void tst_qmlgraphicsimage::pixmap() +void tst_qdeclarativeimage::pixmap() { QString componentStr = "import Qt 4.6\nImage { pixmap: testPixmap }"; @@ -242,6 +242,6 @@ void tst_qmlgraphicsimage::pixmap() delete obj; } -QTEST_MAIN(tst_qmlgraphicsimage) +QTEST_MAIN(tst_qdeclarativeimage) #include "tst_qdeclarativeimage.moc" diff --git a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp index 704899d..c5bdfc8 100644 --- a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp +++ b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp @@ -56,11 +56,11 @@ } while (false) -class tst_qmlimageprovider : public QObject +class tst_qdeclarativeimageprovider : public QObject { Q_OBJECT public: - tst_qmlimageprovider() + tst_qdeclarativeimageprovider() { } @@ -83,7 +83,7 @@ public: } }; -void tst_qmlimageprovider::imageSource_data() +void tst_qdeclarativeimageprovider::imageSource_data() { QTest::addColumn<QString>("source"); QTest::addColumn<QString>("error"); @@ -95,7 +95,7 @@ void tst_qmlimageprovider::imageSource_data() << "\"Failed to get image from provider: image://bogus/exists.png\" "; } -void tst_qmlimageprovider::imageSource() +void tst_qdeclarativeimageprovider::imageSource() { QFETCH(QString, source); QFETCH(QString, error); @@ -129,7 +129,7 @@ void tst_qmlimageprovider::imageSource() delete obj; } -void tst_qmlimageprovider::removeProvider() +void tst_qdeclarativeimageprovider::removeProvider() { engine.addImageProvider("test2", new TestProvider); QVERIFY(engine.imageProvider("test2") != 0); @@ -161,6 +161,6 @@ void tst_qmlimageprovider::removeProvider() } -QTEST_MAIN(tst_qmlimageprovider) +QTEST_MAIN(tst_qdeclarativeimageprovider) #include "tst_qdeclarativeimageprovider.moc" diff --git a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp index dc3e816..aa3f03b 100644 --- a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp +++ b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp @@ -46,11 +46,11 @@ #include <QDeclarativeContext> #include <qdeclarativeinfo.h> -class tst_qmlinfo : public QObject +class tst_qdeclarativeinfo : public QObject { Q_OBJECT public: - tst_qmlinfo() {} + tst_qdeclarativeinfo() {} private slots: void qmlObject(); @@ -68,7 +68,7 @@ inline QUrl TEST_FILE(const QString &filename) return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename); } -void tst_qmlinfo::qmlObject() +void tst_qdeclarativeinfo::qmlObject() { QDeclarativeComponent component(&engine, TEST_FILE("qmlObject.qml")); @@ -87,7 +87,7 @@ void tst_qmlinfo::qmlObject() qmlInfo(nested) << "Second Test Message"; } -void tst_qmlinfo::nestedQmlObject() +void tst_qdeclarativeinfo::nestedQmlObject() { QDeclarativeComponent component(&engine, TEST_FILE("nestedQmlObject.qml")); @@ -108,7 +108,7 @@ void tst_qmlinfo::nestedQmlObject() qmlInfo(nested2) << "Inner Object"; } -void tst_qmlinfo::nonQmlObject() +void tst_qdeclarativeinfo::nonQmlObject() { QObject object; QTest::ignoreMessage(QtWarningMsg, "QML QtObject (unknown location) Test Message"); @@ -119,13 +119,13 @@ void tst_qmlinfo::nonQmlObject() qmlInfo(&pbObject) << "Test Message"; } -void tst_qmlinfo::nullObject() +void tst_qdeclarativeinfo::nullObject() { QTest::ignoreMessage(QtWarningMsg, "QML (unknown location) Null Object Test Message"); qmlInfo(0) << "Null Object Test Message"; } -void tst_qmlinfo::nonQmlContextedObject() +void tst_qdeclarativeinfo::nonQmlContextedObject() { QObject object; QDeclarativeContext context(&engine); @@ -134,6 +134,6 @@ void tst_qmlinfo::nonQmlContextedObject() qmlInfo(&object) << "Test Message"; } -QTEST_MAIN(tst_qmlinfo) +QTEST_MAIN(tst_qdeclarativeinfo) #include "tst_qdeclarativeinfo.moc" diff --git a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp index 71495f3..636c5e3 100644 --- a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp +++ b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp @@ -42,11 +42,11 @@ #include <qtest.h> #include <private/qdeclarativecompiler_p.h> -class tst_qmlinstruction : public QObject +class tst_qdeclarativeinstruction : public QObject { Q_OBJECT public: - tst_qmlinstruction() {} + tst_qdeclarativeinstruction() {} private slots: void dump(); @@ -58,7 +58,7 @@ static void msgHandler(QtMsgType, const char *msg) messages << QLatin1String(msg); } -void tst_qmlinstruction::dump() +void tst_qdeclarativeinstruction::dump() { QDeclarativeCompiledData *data = new QDeclarativeCompiledData(0); { @@ -580,6 +580,6 @@ void tst_qmlinstruction::dump() data->release(); } -QTEST_MAIN(tst_qmlinstruction) +QTEST_MAIN(tst_qdeclarativeinstruction) #include "tst_qdeclarativeinstruction.moc" diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp index 9feabdb..36dcf1f 100644 --- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp +++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp @@ -46,12 +46,12 @@ #include <QtDeclarative/qdeclarativeview.h> #include <QtDeclarative/qdeclarativeitem.h> -class tst_QmlGraphicsItem : public QObject +class tst_QDeclarativeItem : public QObject { Q_OBJECT public: - tst_QmlGraphicsItem(); + tst_QDeclarativeItem(); private slots: void keys(); @@ -103,11 +103,11 @@ private: }; -tst_QmlGraphicsItem::tst_QmlGraphicsItem() +tst_QDeclarativeItem::tst_QDeclarativeItem() { } -void tst_QmlGraphicsItem::keys() +void tst_QDeclarativeItem::keys() { QDeclarativeView *canvas = new QDeclarativeView(0); canvas->setFixedSize(240,320); @@ -187,7 +187,7 @@ void tst_QmlGraphicsItem::keys() delete testObject; } -void tst_QmlGraphicsItem::keyNavigation() +void tst_QDeclarativeItem::keyNavigation() { QDeclarativeView *canvas = new QDeclarativeView(0); canvas->setFixedSize(240,320); @@ -242,7 +242,7 @@ void tst_QmlGraphicsItem::keyNavigation() QVERIFY(item->hasFocus()); } -void tst_QmlGraphicsItem::smooth() +void tst_QDeclarativeItem::smooth() { QDeclarativeComponent component(&engine); component.setData("import Qt 4.6; Item { smooth: false; }", QUrl::fromLocalFile("")); @@ -265,7 +265,7 @@ void tst_QmlGraphicsItem::smooth() QCOMPARE(spy.count(),2); } -void tst_QmlGraphicsItem::clip() +void tst_QDeclarativeItem::clip() { QDeclarativeComponent component(&engine); component.setData("import Qt 4.6\nItem { clip: false\n }", QUrl::fromLocalFile("")); @@ -289,7 +289,7 @@ void tst_QmlGraphicsItem::clip() } template<typename T> -T *tst_QmlGraphicsItem::findItem(QGraphicsObject *parent, const QString &objectName) +T *tst_QDeclarativeItem::findItem(QGraphicsObject *parent, const QString &objectName) { if (!parent) return 0; @@ -313,6 +313,6 @@ T *tst_QmlGraphicsItem::findItem(QGraphicsObject *parent, const QString &objectN -QTEST_MAIN(tst_QmlGraphicsItem) +QTEST_MAIN(tst_QDeclarativeItem) #include "tst_qdeclarativeitem.moc" diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h index 21f3e70..2c06416 100644 --- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h +++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h @@ -146,7 +146,7 @@ signals: void basicParameterizedSignal(int parameter); private: - friend class tst_qmllanguage; + friend class tst_qdeclarativelanguage; int m_value; MyInterface *m_interface; MyQmlObject *m_qmlobject; diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp index cb59f47..d6b5f0c 100644 --- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp +++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp @@ -56,11 +56,11 @@ involve evaluating ECMAScript expressions and bindings. Evaluation of expressions and bindings is covered in qmlecmascript */ -class tst_qmllanguage : public QObject +class tst_qdeclarativelanguage : public QObject { Q_OBJECT public: - tst_qmllanguage() { + tst_qdeclarativelanguage() { QDeclarativeMetaType::registerCustomStringConverter(qMetaTypeId<MyCustomVariantType>(), myCustomVariantTypeConverter); QFileInfo fileInfo(__FILE__); engine.addImportPath(fileInfo.absoluteDir().filePath(QLatin1String("data/lib"))); @@ -180,12 +180,12 @@ inline QUrl TEST_FILE(const char *filename) return TEST_FILE(QLatin1String(filename)); } -void tst_qmllanguage::cleanupTestCase() +void tst_qdeclarativelanguage::cleanupTestCase() { QVERIFY(QFile::remove(TEST_FILE(QString::fromUtf8("I18nType\303\201\303\242\303\243\303\244\303\245.qml")).toLocalFile())); } -void tst_qmllanguage::errors_data() +void tst_qdeclarativelanguage::errors_data() { QTest::addColumn<QString>("file"); QTest::addColumn<QString>("errorFile"); @@ -306,7 +306,7 @@ void tst_qmllanguage::errors_data() } -void tst_qmllanguage::errors() +void tst_qdeclarativelanguage::errors() { QFETCH(QString, file); QFETCH(QString, errorFile); @@ -325,7 +325,7 @@ void tst_qmllanguage::errors() VERIFY_ERRORS(errorFile.toLatin1().constData()); } -void tst_qmllanguage::simpleObject() +void tst_qdeclarativelanguage::simpleObject() { QDeclarativeComponent component(&engine, TEST_FILE("simpleObject.qml")); VERIFY_ERRORS(0); @@ -333,7 +333,7 @@ void tst_qmllanguage::simpleObject() QVERIFY(object != 0); } -void tst_qmllanguage::simpleContainer() +void tst_qdeclarativelanguage::simpleContainer() { QDeclarativeComponent component(&engine, TEST_FILE("simpleContainer.qml")); VERIFY_ERRORS(0); @@ -342,7 +342,7 @@ void tst_qmllanguage::simpleContainer() QCOMPARE(container->getChildren()->count(),2); } -void tst_qmllanguage::interfaceProperty() +void tst_qdeclarativelanguage::interfaceProperty() { QDeclarativeComponent component(&engine, TEST_FILE("interfaceProperty.qml")); VERIFY_ERRORS(0); @@ -352,7 +352,7 @@ void tst_qmllanguage::interfaceProperty() QVERIFY(object->interface()->id == 913); } -void tst_qmllanguage::interfaceQList() +void tst_qdeclarativelanguage::interfaceQList() { QDeclarativeComponent component(&engine, TEST_FILE("interfaceQList.qml")); VERIFY_ERRORS(0); @@ -363,7 +363,7 @@ void tst_qmllanguage::interfaceQList() QVERIFY(container->getQListInterfaces()->at(ii)->id == 913); } -void tst_qmllanguage::assignObjectToSignal() +void tst_qdeclarativelanguage::assignObjectToSignal() { QDeclarativeComponent component(&engine, TEST_FILE("assignObjectToSignal.qml")); VERIFY_ERRORS(0); @@ -373,7 +373,7 @@ void tst_qmllanguage::assignObjectToSignal() emit object->basicSignal(); } -void tst_qmllanguage::assignObjectToVariant() +void tst_qdeclarativelanguage::assignObjectToVariant() { QDeclarativeComponent component(&engine, TEST_FILE("assignObjectToVariant.qml")); VERIFY_ERRORS(0); @@ -383,7 +383,7 @@ void tst_qmllanguage::assignObjectToVariant() QVERIFY(v.userType() == qMetaTypeId<QObject *>()); } -void tst_qmllanguage::assignLiteralSignalProperty() +void tst_qdeclarativelanguage::assignLiteralSignalProperty() { QDeclarativeComponent component(&engine, TEST_FILE("assignLiteralSignalProperty.qml")); VERIFY_ERRORS(0); @@ -393,7 +393,7 @@ void tst_qmllanguage::assignLiteralSignalProperty() } // Test is an external component can be loaded and assigned (to a qlist) -void tst_qmllanguage::assignQmlComponent() +void tst_qdeclarativelanguage::assignQmlComponent() { QDeclarativeComponent component(&engine, TEST_FILE("assignQmlComponent.qml")); VERIFY_ERRORS(0); @@ -406,7 +406,7 @@ void tst_qmllanguage::assignQmlComponent() } // Test literal assignment to all the basic types -void tst_qmllanguage::assignBasicTypes() +void tst_qdeclarativelanguage::assignBasicTypes() { QDeclarativeComponent component(&engine, TEST_FILE("assignBasicTypes.qml")); VERIFY_ERRORS(0); @@ -441,7 +441,7 @@ void tst_qmllanguage::assignBasicTypes() } // Test edge case type assignments -void tst_qmllanguage::assignTypeExtremes() +void tst_qdeclarativelanguage::assignTypeExtremes() { QDeclarativeComponent component(&engine, TEST_FILE("assignTypeExtremes.qml")); VERIFY_ERRORS(0); @@ -452,7 +452,7 @@ void tst_qmllanguage::assignTypeExtremes() } // Test that a composite type can assign to a property of its base type -void tst_qmllanguage::assignCompositeToType() +void tst_qdeclarativelanguage::assignCompositeToType() { QDeclarativeComponent component(&engine, TEST_FILE("assignCompositeToType.qml")); VERIFY_ERRORS(0); @@ -461,7 +461,7 @@ void tst_qmllanguage::assignCompositeToType() } // Tests that custom parser types can be instantiated -void tst_qmllanguage::customParserTypes() +void tst_qdeclarativelanguage::customParserTypes() { QDeclarativeComponent component(&engine, TEST_FILE("customParserTypes.qml")); VERIFY_ERRORS(0); @@ -471,7 +471,7 @@ void tst_qmllanguage::customParserTypes() } // Tests that the root item can be a custom component -void tst_qmllanguage::rootAsQmlComponent() +void tst_qdeclarativelanguage::rootAsQmlComponent() { QDeclarativeComponent component(&engine, TEST_FILE("rootAsQmlComponent.qml")); VERIFY_ERRORS(0); @@ -482,7 +482,7 @@ void tst_qmllanguage::rootAsQmlComponent() } // Tests that components can be specified inline -void tst_qmllanguage::inlineQmlComponents() +void tst_qdeclarativelanguage::inlineQmlComponents() { QDeclarativeComponent component(&engine, TEST_FILE("inlineQmlComponents.qml")); VERIFY_ERRORS(0); @@ -497,7 +497,7 @@ void tst_qmllanguage::inlineQmlComponents() } // Tests that types that have an id property have it set -void tst_qmllanguage::idProperty() +void tst_qdeclarativelanguage::idProperty() { QDeclarativeComponent component(&engine, TEST_FILE("idProperty.qml")); VERIFY_ERRORS(0); @@ -512,7 +512,7 @@ void tst_qmllanguage::idProperty() } // Tests that signals can be assigned to -void tst_qmllanguage::assignSignal() +void tst_qdeclarativelanguage::assignSignal() { QDeclarativeComponent component(&engine, TEST_FILE("assignSignal.qml")); VERIFY_ERRORS(0); @@ -525,7 +525,7 @@ void tst_qmllanguage::assignSignal() } // Tests the creation and assignment of dynamic properties -void tst_qmllanguage::dynamicProperties() +void tst_qdeclarativelanguage::dynamicProperties() { QDeclarativeComponent component(&engine, TEST_FILE("dynamicProperties.qml")); VERIFY_ERRORS(0); @@ -544,7 +544,7 @@ void tst_qmllanguage::dynamicProperties() } // Test that nested types can use dynamic properties -void tst_qmllanguage::dynamicPropertiesNested() +void tst_qdeclarativelanguage::dynamicPropertiesNested() { QDeclarativeComponent component(&engine, TEST_FILE("dynamicPropertiesNested.qml")); VERIFY_ERRORS(0); @@ -560,7 +560,7 @@ void tst_qmllanguage::dynamicPropertiesNested() } // Tests the creation and assignment to dynamic list properties -void tst_qmllanguage::listProperties() +void tst_qdeclarativelanguage::listProperties() { QDeclarativeComponent component(&engine, TEST_FILE("listProperties.qml")); VERIFY_ERRORS(0); @@ -572,7 +572,7 @@ void tst_qmllanguage::listProperties() // Tests the creation and assignment of dynamic object properties // ### Not complete -void tst_qmllanguage::dynamicObjectProperties() +void tst_qdeclarativelanguage::dynamicObjectProperties() { QDeclarativeComponent component(&engine, TEST_FILE("dynamicObjectProperties.qml")); VERIFY_ERRORS(0); @@ -584,7 +584,7 @@ void tst_qmllanguage::dynamicObjectProperties() } // Tests the declaration of dynamic signals and slots -void tst_qmllanguage::dynamicSignalsAndSlots() +void tst_qdeclarativelanguage::dynamicSignalsAndSlots() { QTest::ignoreMessage(QtDebugMsg, "1921"); @@ -602,7 +602,7 @@ void tst_qmllanguage::dynamicSignalsAndSlots() QCOMPARE(object->property("test").toInt(), 10); } -void tst_qmllanguage::simpleBindings() +void tst_qdeclarativelanguage::simpleBindings() { QDeclarativeComponent component(&engine, TEST_FILE("simpleBindings.qml")); VERIFY_ERRORS(0); @@ -615,7 +615,7 @@ void tst_qmllanguage::simpleBindings() QCOMPARE(object->property("objectProperty"), QVariant::fromValue(object)); } -void tst_qmllanguage::autoComponentCreation() +void tst_qdeclarativelanguage::autoComponentCreation() { QDeclarativeComponent component(&engine, TEST_FILE("autoComponentCreation.qml")); VERIFY_ERRORS(0); @@ -627,7 +627,7 @@ void tst_qmllanguage::autoComponentCreation() QCOMPARE(child->realProperty(), qreal(9)); } -void tst_qmllanguage::propertyValueSource() +void tst_qdeclarativelanguage::propertyValueSource() { { QDeclarativeComponent component(&engine, TEST_FILE("propertyValueSource.qml")); @@ -672,7 +672,7 @@ void tst_qmllanguage::propertyValueSource() } } -void tst_qmllanguage::attachedProperties() +void tst_qdeclarativelanguage::attachedProperties() { QDeclarativeComponent component(&engine, TEST_FILE("attachedProperties.qml")); VERIFY_ERRORS(0); @@ -685,7 +685,7 @@ void tst_qmllanguage::attachedProperties() } // Tests non-static object properties -void tst_qmllanguage::dynamicObjects() +void tst_qdeclarativelanguage::dynamicObjects() { QDeclarativeComponent component(&engine, TEST_FILE("dynamicObject.1.qml")); VERIFY_ERRORS(0); @@ -694,7 +694,7 @@ void tst_qmllanguage::dynamicObjects() } // Tests the registration of custom variant string converters -void tst_qmllanguage::customVariantTypes() +void tst_qdeclarativelanguage::customVariantTypes() { QDeclarativeComponent component(&engine, TEST_FILE("customVariantTypes.qml")); VERIFY_ERRORS(0); @@ -703,7 +703,7 @@ void tst_qmllanguage::customVariantTypes() QCOMPARE(object->customType().a, 10); } -void tst_qmllanguage::valueTypes() +void tst_qdeclarativelanguage::valueTypes() { QDeclarativeComponent component(&engine, TEST_FILE("valueTypes.qml")); VERIFY_ERRORS(0); @@ -739,7 +739,7 @@ void tst_qmllanguage::valueTypes() #endif } -void tst_qmllanguage::cppnamespace() +void tst_qdeclarativelanguage::cppnamespace() { { QDeclarativeComponent component(&engine, TEST_FILE("cppnamespace.qml")); @@ -758,7 +758,7 @@ void tst_qmllanguage::cppnamespace() } } -void tst_qmllanguage::aliasProperties() +void tst_qdeclarativelanguage::aliasProperties() { // Simple "int" alias { @@ -923,7 +923,7 @@ void tst_qmllanguage::aliasProperties() } // Test that the root element in a composite type can be a Component -void tst_qmllanguage::componentCompositeType() +void tst_qdeclarativelanguage::componentCompositeType() { QDeclarativeComponent component(&engine, TEST_FILE("componentCompositeType.qml")); VERIFY_ERRORS(0); @@ -943,7 +943,7 @@ public: TestType2(QObject *p=0) : QObject(p) {} }; -void tst_qmllanguage::i18n_data() +void tst_qdeclarativelanguage::i18n_data() { QTest::addColumn<QString>("file"); QTest::addColumn<QString>("stringProperty"); @@ -955,7 +955,7 @@ void tst_qmllanguage::i18n_data() QTest::newRow("i18nNameSpace") << "i18nNameSpace.qml" << QString::fromUtf8("Test \303\241\303\242\303\243\303\244\303\245: 40"); } -void tst_qmllanguage::i18n() +void tst_qdeclarativelanguage::i18n() { QFETCH(QString, file); QFETCH(QString, stringProperty); @@ -969,7 +969,7 @@ void tst_qmllanguage::i18n() } // Check that the Component::onCompleted attached property works -void tst_qmllanguage::onCompleted() +void tst_qdeclarativelanguage::onCompleted() { QDeclarativeComponent component(&engine, TEST_FILE("onCompleted.qml")); VERIFY_ERRORS(0); @@ -981,7 +981,7 @@ void tst_qmllanguage::onCompleted() } // Check that assignments to QDeclarativeScriptString properties work -void tst_qmllanguage::scriptString() +void tst_qdeclarativelanguage::scriptString() { QDeclarativeComponent component(&engine, TEST_FILE("scriptString.qml")); VERIFY_ERRORS(0); @@ -1000,7 +1000,7 @@ void tst_qmllanguage::scriptString() // Check that default property assignments are correctly spliced into explicit // property assignments -void tst_qmllanguage::defaultPropertyListOrder() +void tst_qdeclarativelanguage::defaultPropertyListOrder() { QDeclarativeComponent component(&engine, TEST_FILE("defaultPropertyListOrder.qml")); VERIFY_ERRORS(0); @@ -1017,7 +1017,7 @@ void tst_qmllanguage::defaultPropertyListOrder() QCOMPARE(container->getChildren()->at(5)->property("index"), QVariant(5)); } -void tst_qmllanguage::declaredPropertyValues() +void tst_qdeclarativelanguage::declaredPropertyValues() { QDeclarativeComponent component(&engine, TEST_FILE("declaredPropertyValues.qml")); QEXPECT_FAIL("", "QTBUG-7860", Abort); @@ -1025,7 +1025,7 @@ void tst_qmllanguage::declaredPropertyValues() } // Check that first child of qml is of given type. Empty type insists on error. -void tst_qmllanguage::testType(const QString& qml, const QString& type) +void tst_qdeclarativelanguage::testType(const QString& qml, const QString& type) { QDeclarativeComponent component(&engine); component.setData(qml.toUtf8(), TEST_FILE("empty.qml")); // just a file for relative local imports @@ -1047,7 +1047,7 @@ QML_DECLARE_TYPE(TestType2) // Import tests (QT-558) -void tst_qmllanguage::importsBuiltin_data() +void tst_qdeclarativelanguage::importsBuiltin_data() { // QT-610 @@ -1136,14 +1136,14 @@ void tst_qmllanguage::importsBuiltin_data() << "TestType2"; } -void tst_qmllanguage::importsBuiltin() +void tst_qdeclarativelanguage::importsBuiltin() { QFETCH(QString, qml); QFETCH(QString, type); testType(qml,type); } -void tst_qmllanguage::importsLocal_data() +void tst_qdeclarativelanguage::importsLocal_data() { QTest::addColumn<QString>("qml"); QTest::addColumn<QString>("type"); @@ -1183,14 +1183,14 @@ void tst_qmllanguage::importsLocal_data() << "TestType"; } -void tst_qmllanguage::importsLocal() +void tst_qdeclarativelanguage::importsLocal() { QFETCH(QString, qml); QFETCH(QString, type); testType(qml,type); } -void tst_qmllanguage::importsRemote_data() +void tst_qdeclarativelanguage::importsRemote_data() { QTest::addColumn<QString>("qml"); QTest::addColumn<QString>("type"); @@ -1204,7 +1204,7 @@ void tst_qmllanguage::importsRemote_data() #include "testhttpserver.h" -void tst_qmllanguage::importsRemote() +void tst_qdeclarativelanguage::importsRemote() { QFETCH(QString, qml); QFETCH(QString, type); @@ -1215,7 +1215,7 @@ void tst_qmllanguage::importsRemote() testType(qml,type); } -void tst_qmllanguage::importsInstalled_data() +void tst_qdeclarativelanguage::importsInstalled_data() { // QT-610 @@ -1253,7 +1253,7 @@ void tst_qmllanguage::importsInstalled_data() << ""; } -void tst_qmllanguage::importsInstalled() +void tst_qdeclarativelanguage::importsInstalled() { QFETCH(QString, qml); QFETCH(QString, type); @@ -1261,7 +1261,7 @@ void tst_qmllanguage::importsInstalled() } -void tst_qmllanguage::importsOrder_data() +void tst_qdeclarativelanguage::importsOrder_data() { QTest::addColumn<QString>("qml"); QTest::addColumn<QString>("type"); @@ -1312,14 +1312,14 @@ void tst_qmllanguage::importsOrder_data() << "QDeclarativeImage"; } -void tst_qmllanguage::importsOrder() +void tst_qdeclarativelanguage::importsOrder() { QFETCH(QString, qml); QFETCH(QString, type); testType(qml,type); } -void tst_qmllanguage::qmlAttachedPropertiesObjectMethod() +void tst_qdeclarativelanguage::qmlAttachedPropertiesObjectMethod() { QObject object; @@ -1347,19 +1347,19 @@ void tst_qmllanguage::qmlAttachedPropertiesObjectMethod() } } -void tst_qmllanguage::crash1() +void tst_qdeclarativelanguage::crash1() { QDeclarativeComponent component(&engine); component.setData("import Qt 4.6\nComponent {}", QUrl()); } -void tst_qmllanguage::crash2() +void tst_qdeclarativelanguage::crash2() { QDeclarativeComponent component(&engine, TEST_FILE("crash2.qml")); } -void tst_qmllanguage::initTestCase() +void tst_qdeclarativelanguage::initTestCase() { registerTypes(); @@ -1381,6 +1381,6 @@ void tst_qmllanguage::initTestCase() out.write(in.readAll()); } -QTEST_MAIN(tst_qmllanguage) +QTEST_MAIN(tst_qdeclarativelanguage) #include "tst_qdeclarativelanguage.moc" diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp index 390ebe0..a1e6d6b 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp +++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp @@ -44,11 +44,11 @@ #include <QDeclarativeComponent> #include <QDebug> -class tst_QmlListModel : public QObject +class tst_QDeclarativeListModel : public QObject { Q_OBJECT public: - tst_QmlListModel() {} + tst_QDeclarativeListModel() {} private slots: void static_types(); @@ -62,7 +62,7 @@ private slots: void error(); }; -void tst_QmlListModel::static_i18n() +void tst_QDeclarativeListModel::static_i18n() { QString expect = QString::fromUtf8("na\303\257ve"); QString componentStr = "import Qt 4.6\nListModel { ListElement { prop1: \""+expect+"\" } }"; @@ -76,7 +76,7 @@ void tst_QmlListModel::static_i18n() delete obj; } -void tst_QmlListModel::static_nestedElements() +void tst_QDeclarativeListModel::static_nestedElements() { QFETCH(int, elementCount); @@ -110,7 +110,7 @@ void tst_QmlListModel::static_nestedElements() delete obj; } -void tst_QmlListModel::static_nestedElements_data() +void tst_QDeclarativeListModel::static_nestedElements_data() { QTest::addColumn<int>("elementCount"); @@ -120,7 +120,7 @@ void tst_QmlListModel::static_nestedElements_data() QTest::newRow("many items") << 5; } -void tst_QmlListModel::dynamic_data() +void tst_QDeclarativeListModel::dynamic_data() { QTest::addColumn<QString>("script"); QTest::addColumn<int>("result"); @@ -205,7 +205,7 @@ void tst_QmlListModel::dynamic_data() QTest::newRow("listprop2a") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]});get(0).bars.append({'a':4});get(0).bars.get(3).a}" << 4 << ""; } -void tst_QmlListModel::dynamic() +void tst_QDeclarativeListModel::dynamic() { QFETCH(QString, script); QFETCH(int, result); @@ -225,7 +225,7 @@ void tst_QmlListModel::dynamic() QCOMPARE(actual,result); } -void tst_QmlListModel::static_types_data() +void tst_QDeclarativeListModel::static_types_data() { QTest::addColumn<QString>("qml"); QTest::addColumn<QVariant>("value"); @@ -255,7 +255,7 @@ void tst_QmlListModel::static_types_data() << QVariant("QTBUG-5974:ListElement: constant script support for property value"); } -void tst_QmlListModel::static_types() +void tst_QDeclarativeListModel::static_types() { QFETCH(QString, qml); QFETCH(QVariant, value); @@ -286,7 +286,7 @@ void tst_QmlListModel::static_types() delete obj; } -void tst_QmlListModel::error_data() +void tst_QDeclarativeListModel::error_data() { QTest::addColumn<QString>("qml"); QTest::addColumn<QString>("error"); @@ -320,7 +320,7 @@ void tst_QmlListModel::error_data() << "QTBUG-6082 ListElement should not allow child objects"; } -void tst_QmlListModel::error() +void tst_QDeclarativeListModel::error() { QFETCH(QString, qml); QFETCH(QString, error); @@ -341,6 +341,6 @@ void tst_QmlListModel::error() } } -QTEST_MAIN(tst_QmlListModel) +QTEST_MAIN(tst_QDeclarativeListModel) #include "tst_qdeclarativelistmodel.moc" diff --git a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp index 9eafc7c..03d641d 100644 --- a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp +++ b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp @@ -60,11 +60,11 @@ inline QUrl TEST_FILE(const char *filename) return TEST_FILE(QLatin1String(filename)); } -class tst_qmllistreference : public QObject +class tst_qdeclarativelistreference : public QObject { Q_OBJECT public: - tst_qmllistreference() {} + tst_qdeclarativelistreference() {} private slots: void initTestCase(); @@ -103,12 +103,12 @@ public: }; QML_DECLARE_TYPE(TestType); -void tst_qmllistreference::initTestCase() +void tst_qdeclarativelistreference::initTestCase() { QML_REGISTER_NOCREATE_TYPE(TestType); } -void tst_qmllistreference::qmllistreference() +void tst_qdeclarativelistreference::qmllistreference() { TestType tt; @@ -120,7 +120,7 @@ void tst_qmllistreference::qmllistreference() QCOMPARE(r.count(), 1); } -void tst_qmllistreference::qmllistreference_invalid() +void tst_qdeclarativelistreference::qmllistreference_invalid() { TestType tt; @@ -170,7 +170,7 @@ void tst_qmllistreference::qmllistreference_invalid() } } -void tst_qmllistreference::isValid() +void tst_qdeclarativelistreference::isValid() { TestType *tt = new TestType; @@ -192,7 +192,7 @@ void tst_qmllistreference::isValid() } } -void tst_qmllistreference::object() +void tst_qdeclarativelistreference::object() { TestType *tt = new TestType; @@ -214,7 +214,7 @@ void tst_qmllistreference::object() } } -void tst_qmllistreference::listElementType() +void tst_qdeclarativelistreference::listElementType() { TestType *tt = new TestType; @@ -236,7 +236,7 @@ void tst_qmllistreference::listElementType() } } -void tst_qmllistreference::canAppend() +void tst_qdeclarativelistreference::canAppend() { TestType *tt = new TestType; @@ -265,7 +265,7 @@ void tst_qmllistreference::canAppend() } } -void tst_qmllistreference::canAt() +void tst_qdeclarativelistreference::canAt() { TestType *tt = new TestType; @@ -294,7 +294,7 @@ void tst_qmllistreference::canAt() } } -void tst_qmllistreference::canClear() +void tst_qdeclarativelistreference::canClear() { TestType *tt = new TestType; @@ -323,7 +323,7 @@ void tst_qmllistreference::canClear() } } -void tst_qmllistreference::canCount() +void tst_qdeclarativelistreference::canCount() { TestType *tt = new TestType; @@ -352,7 +352,7 @@ void tst_qmllistreference::canCount() } } -void tst_qmllistreference::append() +void tst_qdeclarativelistreference::append() { TestType *tt = new TestType; QObject object; @@ -391,7 +391,7 @@ void tst_qmllistreference::append() } } -void tst_qmllistreference::at() +void tst_qdeclarativelistreference::at() { TestType *tt = new TestType; tt->data.append(tt); @@ -426,7 +426,7 @@ void tst_qmllistreference::at() } } -void tst_qmllistreference::clear() +void tst_qdeclarativelistreference::clear() { TestType *tt = new TestType; tt->data.append(tt); @@ -459,7 +459,7 @@ void tst_qmllistreference::clear() } } -void tst_qmllistreference::count() +void tst_qdeclarativelistreference::count() { TestType *tt = new TestType; tt->data.append(tt); @@ -494,7 +494,7 @@ void tst_qmllistreference::count() } } -void tst_qmllistreference::copy() +void tst_qdeclarativelistreference::copy() { TestType tt; tt.data.append(&tt); @@ -522,7 +522,7 @@ void tst_qmllistreference::copy() QVERIFY(r3.count() == 2); } -void tst_qmllistreference::qmlmetaproperty() +void tst_qdeclarativelistreference::qmlmetaproperty() { TestType tt; tt.data.append(&tt); @@ -537,7 +537,7 @@ void tst_qmllistreference::qmlmetaproperty() QVERIFY(ref.listElementType() == &TestType::staticMetaObject); } -void tst_qmllistreference::engineTypes() +void tst_qdeclarativelistreference::engineTypes() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine, TEST_FILE("engineTypes.qml")); @@ -560,7 +560,7 @@ void tst_qmllistreference::engineTypes() delete o; } -void tst_qmllistreference::variantToList() +void tst_qdeclarativelistreference::variantToList() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine, TEST_FILE("variantToList.qml")); @@ -574,6 +574,6 @@ void tst_qmllistreference::variantToList() delete o; } -QTEST_MAIN(tst_qmllistreference) +QTEST_MAIN(tst_qdeclarativelistreference) #include "tst_qdeclarativelistreference.moc" diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp index 2b6e7f0..daa40d1 100644 --- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp +++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp @@ -47,11 +47,11 @@ #include <qdeclarativecontext.h> #include <qdeclarativeexpression.h> -class tst_QmlGraphicsListView : public QObject +class tst_QDeclarativeListView : public QObject { Q_OBJECT public: - tst_QmlGraphicsListView(); + tst_QDeclarativeListView(); private slots: // Test both QListModelInterface and QAbstractItemModel model types @@ -293,12 +293,12 @@ private: QList<QPair<QString,QString> > list; }; -tst_QmlGraphicsListView::tst_QmlGraphicsListView() +tst_QDeclarativeListView::tst_QDeclarativeListView() { } template <class T> -void tst_QmlGraphicsListView::items() +void tst_QDeclarativeListView::items() { QDeclarativeView *canvas = createView(); @@ -378,7 +378,7 @@ void tst_QmlGraphicsListView::items() } template <class T> -void tst_QmlGraphicsListView::changed() +void tst_QDeclarativeListView::changed() { QDeclarativeView *canvas = createView(); @@ -414,7 +414,7 @@ void tst_QmlGraphicsListView::changed() } template <class T> -void tst_QmlGraphicsListView::inserted() +void tst_QDeclarativeListView::inserted() { QDeclarativeView *canvas = createView(); @@ -507,7 +507,7 @@ void tst_QmlGraphicsListView::inserted() } template <class T> -void tst_QmlGraphicsListView::removed(bool animated) +void tst_QDeclarativeListView::removed(bool animated) { QDeclarativeView *canvas = createView(); @@ -650,7 +650,7 @@ void tst_QmlGraphicsListView::removed(bool animated) } template <class T> -void tst_QmlGraphicsListView::clear() +void tst_QDeclarativeListView::clear() { QDeclarativeView *canvas = createView(); @@ -687,7 +687,7 @@ void tst_QmlGraphicsListView::clear() template <class T> -void tst_QmlGraphicsListView::moved() +void tst_QDeclarativeListView::moved() { QDeclarativeView *canvas = createView(); @@ -783,7 +783,7 @@ void tst_QmlGraphicsListView::moved() delete canvas; } -void tst_QmlGraphicsListView::enforceRange() +void tst_QDeclarativeListView::enforceRange() { QDeclarativeView *canvas = createView(); @@ -828,7 +828,7 @@ void tst_QmlGraphicsListView::enforceRange() delete canvas; } -void tst_QmlGraphicsListView::spacing() +void tst_QDeclarativeListView::spacing() { QDeclarativeView *canvas = createView(); @@ -886,7 +886,7 @@ void tst_QmlGraphicsListView::spacing() delete canvas; } -void tst_QmlGraphicsListView::sections() +void tst_QDeclarativeListView::sections() { QDeclarativeView *canvas = createView(); @@ -959,7 +959,7 @@ void tst_QmlGraphicsListView::sections() delete canvas; } -void tst_QmlGraphicsListView::currentIndex() +void tst_QDeclarativeListView::currentIndex() { TestModel model; for (int i = 0; i < 30; i++) @@ -1052,7 +1052,7 @@ void tst_QmlGraphicsListView::currentIndex() delete canvas; } -void tst_QmlGraphicsListView::itemList() +void tst_QDeclarativeListView::itemList() { QDeclarativeView *canvas = createView(); @@ -1093,7 +1093,7 @@ void tst_QmlGraphicsListView::itemList() delete canvas; } -void tst_QmlGraphicsListView::cacheBuffer() +void tst_QDeclarativeListView::cacheBuffer() { QDeclarativeView *canvas = createView(); @@ -1145,7 +1145,7 @@ void tst_QmlGraphicsListView::cacheBuffer() delete canvas; } -void tst_QmlGraphicsListView::positionViewAtIndex() +void tst_QDeclarativeListView::positionViewAtIndex() { QDeclarativeView *canvas = createView(); @@ -1232,69 +1232,69 @@ void tst_QmlGraphicsListView::positionViewAtIndex() delete canvas; } -void tst_QmlGraphicsListView::qListModelInterface_items() +void tst_QDeclarativeListView::qListModelInterface_items() { items<TestModel>(); } -void tst_QmlGraphicsListView::qAbstractItemModel_items() +void tst_QDeclarativeListView::qAbstractItemModel_items() { items<TestModel2>(); } -void tst_QmlGraphicsListView::qListModelInterface_changed() +void tst_QDeclarativeListView::qListModelInterface_changed() { changed<TestModel>(); } -void tst_QmlGraphicsListView::qAbstractItemModel_changed() +void tst_QDeclarativeListView::qAbstractItemModel_changed() { changed<TestModel2>(); } -void tst_QmlGraphicsListView::qListModelInterface_inserted() +void tst_QDeclarativeListView::qListModelInterface_inserted() { inserted<TestModel>(); } -void tst_QmlGraphicsListView::qAbstractItemModel_inserted() +void tst_QDeclarativeListView::qAbstractItemModel_inserted() { inserted<TestModel2>(); } -void tst_QmlGraphicsListView::qListModelInterface_removed() +void tst_QDeclarativeListView::qListModelInterface_removed() { removed<TestModel>(false); removed<TestModel>(true); } -void tst_QmlGraphicsListView::qAbstractItemModel_removed() +void tst_QDeclarativeListView::qAbstractItemModel_removed() { removed<TestModel2>(false); removed<TestModel2>(true); } -void tst_QmlGraphicsListView::qListModelInterface_moved() +void tst_QDeclarativeListView::qListModelInterface_moved() { moved<TestModel>(); } -void tst_QmlGraphicsListView::qAbstractItemModel_moved() +void tst_QDeclarativeListView::qAbstractItemModel_moved() { moved<TestModel2>(); } -void tst_QmlGraphicsListView::qListModelInterface_clear() +void tst_QDeclarativeListView::qListModelInterface_clear() { clear<TestModel>(); } -void tst_QmlGraphicsListView::qAbstractItemModel_clear() +void tst_QDeclarativeListView::qAbstractItemModel_clear() { clear<TestModel2>(); } -QDeclarativeView *tst_QmlGraphicsListView::createView() +QDeclarativeView *tst_QDeclarativeListView::createView() { QDeclarativeView *canvas = new QDeclarativeView(0); canvas->setFixedSize(240,320); @@ -1307,7 +1307,7 @@ QDeclarativeView *tst_QmlGraphicsListView::createView() item must also evaluate the {index} expression equal to index */ template<typename T> -T *tst_QmlGraphicsListView::findItem(QGraphicsObject *parent, const QString &objectName, int index) +T *tst_QDeclarativeListView::findItem(QGraphicsObject *parent, const QString &objectName, int index) { const QMetaObject &mo = T::staticMetaObject; //qDebug() << parent->childItems().count() << "children"; @@ -1334,7 +1334,7 @@ T *tst_QmlGraphicsListView::findItem(QGraphicsObject *parent, const QString &obj } template<typename T> -QList<T*> tst_QmlGraphicsListView::findItems(QGraphicsObject *parent, const QString &objectName) +QList<T*> tst_QDeclarativeListView::findItems(QGraphicsObject *parent, const QString &objectName) { QList<T*> items; const QMetaObject &mo = T::staticMetaObject; @@ -1352,7 +1352,7 @@ QList<T*> tst_QmlGraphicsListView::findItems(QGraphicsObject *parent, const QStr return items; } -void tst_QmlGraphicsListView::dumpTree(QDeclarativeItem *parent, int depth) +void tst_QDeclarativeListView::dumpTree(QDeclarativeItem *parent, int depth) { static QString padding(" "); for (int i = 0; i < parent->childItems().count(); ++i) { @@ -1365,6 +1365,6 @@ void tst_QmlGraphicsListView::dumpTree(QDeclarativeItem *parent, int depth) } -QTEST_MAIN(tst_QmlGraphicsListView) +QTEST_MAIN(tst_QDeclarativeListView) #include "tst_qdeclarativelistview.moc" diff --git a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp index 235487c..61b2800 100644 --- a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp +++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp @@ -64,12 +64,12 @@ inline QUrl TEST_FILE(const QString &filename) QVERIFY((expr)); \ } while (false) -class tst_QmlGraphicsLoader : public QObject +class tst_QDeclarativeLoader : public QObject { Q_OBJECT public: - tst_QmlGraphicsLoader(); + tst_QDeclarativeLoader(); private slots: void url(); @@ -93,11 +93,11 @@ private: }; -tst_QmlGraphicsLoader::tst_QmlGraphicsLoader() +tst_QDeclarativeLoader::tst_QDeclarativeLoader() { } -void tst_QmlGraphicsLoader::url() +void tst_QDeclarativeLoader::url() { QDeclarativeComponent component(&engine); component.setData(QByteArray("import Qt 4.6\nLoader { source: \"Rect120x60.qml\" }"), TEST_FILE("")); @@ -112,7 +112,7 @@ void tst_QmlGraphicsLoader::url() delete loader; } -void tst_QmlGraphicsLoader::component() +void tst_QDeclarativeLoader::component() { QDeclarativeComponent component(&engine, TEST_FILE("/SetSourceComponent.qml")); QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create()); @@ -128,7 +128,7 @@ void tst_QmlGraphicsLoader::component() delete loader; } -void tst_QmlGraphicsLoader::invalidUrl() +void tst_QDeclarativeLoader::invalidUrl() { QTest::ignoreMessage(QtWarningMsg, QString("(:-1: File error for URL " + QUrl::fromLocalFile(SRCDIR "/data/IDontExist.qml").toString() + ") ").toUtf8().constData()); @@ -144,7 +144,7 @@ void tst_QmlGraphicsLoader::invalidUrl() delete loader; } -void tst_QmlGraphicsLoader::clear() +void tst_QDeclarativeLoader::clear() { { QDeclarativeComponent component(&engine); @@ -192,7 +192,7 @@ void tst_QmlGraphicsLoader::clear() } } -void tst_QmlGraphicsLoader::urlToComponent() +void tst_QDeclarativeLoader::urlToComponent() { QDeclarativeComponent component(&engine); component.setData(QByteArray("import Qt 4.6\n" @@ -215,7 +215,7 @@ void tst_QmlGraphicsLoader::urlToComponent() delete loader; } -void tst_QmlGraphicsLoader::componentToUrl() +void tst_QDeclarativeLoader::componentToUrl() { QDeclarativeComponent component(&engine, TEST_FILE("/SetSourceComponent.qml")); QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create()); @@ -237,7 +237,7 @@ void tst_QmlGraphicsLoader::componentToUrl() delete loader; } -void tst_QmlGraphicsLoader::sizeLoaderToItem() +void tst_QDeclarativeLoader::sizeLoaderToItem() { QDeclarativeComponent component(&engine, TEST_FILE("/SizeToItem.qml")); QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create()); @@ -269,7 +269,7 @@ void tst_QmlGraphicsLoader::sizeLoaderToItem() QCOMPARE(spy.count(),1); } -void tst_QmlGraphicsLoader::sizeItemToLoader() +void tst_QDeclarativeLoader::sizeItemToLoader() { QDeclarativeComponent component(&engine, TEST_FILE("/SizeToLoader.qml")); QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create()); @@ -297,7 +297,7 @@ void tst_QmlGraphicsLoader::sizeItemToLoader() QCOMPARE(loader->height(), 45.0); } -void tst_QmlGraphicsLoader::noResize() +void tst_QDeclarativeLoader::noResize() { QDeclarativeComponent component(&engine, TEST_FILE("/NoResize.qml")); QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create()); @@ -311,7 +311,7 @@ void tst_QmlGraphicsLoader::noResize() QCOMPARE(rect->height(), 60.0); } -void tst_QmlGraphicsLoader::sizeLoaderToGraphicsWidget() +void tst_QDeclarativeLoader::sizeLoaderToGraphicsWidget() { QDeclarativeComponent component(&engine, TEST_FILE("/SizeLoaderToGraphicsWidget.qml")); QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create()); @@ -338,7 +338,7 @@ void tst_QmlGraphicsLoader::sizeLoaderToGraphicsWidget() QCOMPARE(widget->size().height(), 30.0); } -void tst_QmlGraphicsLoader::sizeGraphicsWidgetToLoader() +void tst_QDeclarativeLoader::sizeGraphicsWidgetToLoader() { QDeclarativeComponent component(&engine, TEST_FILE("/SizeGraphicsWidgetToLoader.qml")); QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create()); @@ -368,7 +368,7 @@ void tst_QmlGraphicsLoader::sizeGraphicsWidgetToLoader() QCOMPARE(loader->height(), 45.0); } -void tst_QmlGraphicsLoader::noResizeGraphicsWidget() +void tst_QDeclarativeLoader::noResizeGraphicsWidget() { QDeclarativeComponent component(&engine, TEST_FILE("/NoResizeGraphicsWidget.qml")); QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create()); @@ -385,7 +385,7 @@ void tst_QmlGraphicsLoader::noResizeGraphicsWidget() QCOMPARE(widget->size().height(), 250.0); } -void tst_QmlGraphicsLoader::networkRequestUrl() +void tst_QDeclarativeLoader::networkRequestUrl() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); @@ -406,7 +406,7 @@ void tst_QmlGraphicsLoader::networkRequestUrl() } /* XXX Component waits until all dependencies are loaded. Is this actually possible? -void tst_QmlGraphicsLoader::networkComponent() +void tst_QDeclarativeLoader::networkComponent() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); @@ -437,7 +437,7 @@ void tst_QmlGraphicsLoader::networkComponent() } */ -void tst_QmlGraphicsLoader::failNetworkRequest() +void tst_QDeclarativeLoader::failNetworkRequest() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); @@ -459,6 +459,6 @@ void tst_QmlGraphicsLoader::failNetworkRequest() delete loader; } -QTEST_MAIN(tst_QmlGraphicsLoader) +QTEST_MAIN(tst_QDeclarativeLoader) #include "tst_qdeclarativeloader.moc" diff --git a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp index 0271c64..e19bea0 100644 --- a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp +++ b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp @@ -89,11 +89,11 @@ private: QML_DECLARE_TYPE(MyContainer); QML_DECLARE_TYPEINFO(MyContainer, QML_HAS_ATTACHED_PROPERTIES) -class tst_qmlmetaproperty : public QObject +class tst_qdeclarativemetaproperty : public QObject { Q_OBJECT public: - tst_qmlmetaproperty() {} + tst_qdeclarativemetaproperty() {} private slots: void initTestCase(); @@ -125,7 +125,7 @@ private: QDeclarativeEngine engine; }; -void tst_qmlmetaproperty::qmlmetaproperty() +void tst_qdeclarativemetaproperty::qmlmetaproperty() { QDeclarativeMetaProperty prop; @@ -209,7 +209,7 @@ private: QML_DECLARE_TYPE(PropertyObject); -void tst_qmlmetaproperty::qmlmetaproperty_object() +void tst_qdeclarativemetaproperty::qmlmetaproperty_object() { QObject object; // Has no default property PropertyObject dobject; // Has default property @@ -310,7 +310,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object() } } -void tst_qmlmetaproperty::qmlmetaproperty_object_string() +void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string() { QObject object; PropertyObject dobject; @@ -459,7 +459,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string() } } -void tst_qmlmetaproperty::qmlmetaproperty_object_context() +void tst_qdeclarativemetaproperty::qmlmetaproperty_object_context() { QObject object; // Has no default property PropertyObject dobject; // Has default property @@ -560,7 +560,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_context() } } -void tst_qmlmetaproperty::qmlmetaproperty_object_string_context() +void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context() { QObject object; PropertyObject dobject; @@ -709,7 +709,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string_context() } } -void tst_qmlmetaproperty::name() +void tst_qdeclarativemetaproperty::name() { { QDeclarativeMetaProperty p; @@ -770,7 +770,7 @@ void tst_qmlmetaproperty::name() } } -void tst_qmlmetaproperty::read() +void tst_qdeclarativemetaproperty::read() { // Invalid { @@ -872,7 +872,7 @@ void tst_qmlmetaproperty::read() } } -void tst_qmlmetaproperty::write() +void tst_qdeclarativemetaproperty::write() { // Invalid { @@ -994,7 +994,7 @@ void tst_qmlmetaproperty::write() } } -void tst_qmlmetaproperty::reset() +void tst_qdeclarativemetaproperty::reset() { // Invalid { @@ -1067,7 +1067,7 @@ void tst_qmlmetaproperty::reset() } } -void tst_qmlmetaproperty::writeObjectToList() +void tst_qdeclarativemetaproperty::writeObjectToList() { QDeclarativeComponent containerComponent(&engine); containerComponent.setData("import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl()); @@ -1084,7 +1084,7 @@ void tst_qmlmetaproperty::writeObjectToList() } Q_DECLARE_METATYPE(QList<QObject *>); -void tst_qmlmetaproperty::writeListToList() +void tst_qdeclarativemetaproperty::writeListToList() { QDeclarativeComponent containerComponent(&engine); containerComponent.setData("import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl()); @@ -1106,7 +1106,7 @@ void tst_qmlmetaproperty::writeListToList() QCOMPARE(container->children()->size(), 1);*/ } -void tst_qmlmetaproperty::crashOnValueProperty() +void tst_qdeclarativemetaproperty::crashOnValueProperty() { QDeclarativeEngine *engine = new QDeclarativeEngine; QDeclarativeComponent component(engine); @@ -1130,7 +1130,7 @@ void tst_qmlmetaproperty::crashOnValueProperty() QCOMPARE(p.read(), QVariant(20)); } -void tst_qmlmetaproperty::copy() +void tst_qdeclarativemetaproperty::copy() { PropertyObject object; @@ -1172,7 +1172,7 @@ void tst_qmlmetaproperty::copy() QCOMPARE(p2.propertyType(), (int)QVariant::Int); } -void tst_qmlmetaproperty::initTestCase() +void tst_qdeclarativemetaproperty::initTestCase() { QML_REGISTER_TYPE(Test,1,0,MyQmlObject,MyQmlObject); QML_REGISTER_TYPE(Test,1,0,PropertyObject,PropertyObject); @@ -1180,6 +1180,6 @@ void tst_qmlmetaproperty::initTestCase() } -QTEST_MAIN(tst_qmlmetaproperty) +QTEST_MAIN(tst_qdeclarativemetaproperty) #include "tst_qdeclarativemetaproperty.moc" diff --git a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp index e7372d3..ca16214 100644 --- a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp +++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp @@ -53,11 +53,11 @@ #include <QQuaternion> #include <qdeclarative.h> -class tst_qmlmetatype : public QObject +class tst_qdeclarativemetatype : public QObject { Q_OBJECT public: - tst_qmlmetatype() {} + tst_qdeclarativemetatype() {} private slots: void initTestCase(); @@ -129,7 +129,7 @@ QML_DECLARE_TYPE(ValueInterceptorTestType); QVERIFY(v == (value)); \ } -void tst_qmlmetatype::initTestCase() +void tst_qdeclarativemetatype::initTestCase() { QML_REGISTER_TYPE(Test, 1, 0, TestType, TestType); QML_REGISTER_TYPE(Test, 1, 0, ParserStatusTestType, ParserStatusTestType); @@ -137,7 +137,7 @@ void tst_qmlmetatype::initTestCase() QML_REGISTER_TYPE(Test, 1, 0, ValueInterceptorTestType, ValueInterceptorTestType); } -void tst_qmlmetatype::copy() +void tst_qdeclarativemetatype::copy() { QVERIFY(QDeclarativeMetaType::copy(QMetaType::Void, 0, 0)); @@ -286,7 +286,7 @@ void tst_qmlmetatype::copy() } } -void tst_qmlmetatype::qmlParserStatusCast() +void tst_qdeclarativemetatype::qmlParserStatusCast() { QVERIFY(QDeclarativeMetaType::qmlType(QVariant::Int) == 0); QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>()) != 0); @@ -306,7 +306,7 @@ void tst_qmlmetatype::qmlParserStatusCast() QCOMPARE(status, &t); } -void tst_qmlmetatype::qmlPropertyValueSourceCast() +void tst_qdeclarativemetatype::qmlPropertyValueSourceCast() { QVERIFY(QDeclarativeMetaType::qmlType(QVariant::Int) == 0); QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>()) != 0); @@ -326,7 +326,7 @@ void tst_qmlmetatype::qmlPropertyValueSourceCast() QCOMPARE(source, &t); } -void tst_qmlmetatype::qmlPropertyValueInterceptorCast() +void tst_qdeclarativemetatype::qmlPropertyValueInterceptorCast() { QVERIFY(QDeclarativeMetaType::qmlType(QVariant::Int) == 0); QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>()) != 0); @@ -346,7 +346,7 @@ void tst_qmlmetatype::qmlPropertyValueInterceptorCast() QCOMPARE(interceptor, &t); } -void tst_qmlmetatype::isList() +void tst_qdeclarativemetatype::isList() { QCOMPARE(QDeclarativeMetaType::isList(QVariant::Invalid), false); QCOMPARE(QDeclarativeMetaType::isList(QVariant::Int), false); @@ -356,7 +356,7 @@ void tst_qmlmetatype::isList() QCOMPARE(QDeclarativeMetaType::isList(qMetaTypeId<QDeclarativeListProperty<TestType> >()), true); } -void tst_qmlmetatype::defaultObject() +void tst_qdeclarativemetatype::defaultObject() { QVERIFY(QDeclarativeMetaType::defaultProperty(&QObject::staticMetaObject).name() == 0); QVERIFY(QDeclarativeMetaType::defaultProperty(&ParserStatusTestType::staticMetaObject).name() == 0); @@ -372,6 +372,6 @@ void tst_qmlmetatype::defaultObject() QCOMPARE(QString(QDeclarativeMetaType::defaultProperty(&t).name()), QString("foo")); } -QTEST_MAIN(tst_qmlmetatype) +QTEST_MAIN(tst_qdeclarativemetatype) #include "tst_qdeclarativemetatype.moc" diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp index 64c7499..f3caa7f 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp @@ -44,11 +44,11 @@ #include <QtDeclarative/qdeclarativecomponent.h> #include <QDebug> -class tst_qmlmoduleplugin : public QObject +class tst_qdeclarativemoduleplugin : public QObject { Q_OBJECT public: - tst_qmlmoduleplugin() { + tst_qdeclarativemoduleplugin() { QCoreApplication::addLibraryPath(QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("plugin")); qDebug() << QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("plugin"); } @@ -100,7 +100,7 @@ inline QUrl TEST_FILE(const QString &filename) } -void tst_qmlmoduleplugin::importsPlugin() +void tst_qdeclarativemoduleplugin::importsPlugin() { QDeclarativeEngine engine; QTest::ignoreMessage(QtWarningMsg, "plugin created"); @@ -112,6 +112,6 @@ void tst_qmlmoduleplugin::importsPlugin() QCOMPARE(object->property("value").toInt(),123); } -QTEST_MAIN(tst_qmlmoduleplugin) +QTEST_MAIN(tst_qdeclarativemoduleplugin) #include "tst_qdeclarativemoduleplugin.moc" diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp index 42a1e69..769cf32 100644 --- a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp +++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp @@ -44,7 +44,7 @@ #include <private/qdeclarativemousearea_p.h> #include <QtDeclarative/qdeclarativeview.h> -class tst_QmlGraphicsMouseArea: public QObject +class tst_QDeclarativeMouseArea: public QObject { Q_OBJECT private slots: @@ -53,7 +53,7 @@ private: QDeclarativeView *createView(const QString &filename); }; -void tst_QmlGraphicsMouseArea::dragProperties() +void tst_QDeclarativeMouseArea::dragProperties() { QDeclarativeView *canvas = createView(SRCDIR "/data/dragproperties.qml"); canvas->show(); @@ -123,7 +123,7 @@ void tst_QmlGraphicsMouseArea::dragProperties() QCOMPARE(ymaxSpy.count(),1); } -QDeclarativeView *tst_QmlGraphicsMouseArea::createView(const QString &filename) +QDeclarativeView *tst_QDeclarativeMouseArea::createView(const QString &filename) { QDeclarativeView *canvas = new QDeclarativeView(0); canvas->setFixedSize(240,320); @@ -133,6 +133,6 @@ QDeclarativeView *tst_QmlGraphicsMouseArea::createView(const QString &filename) return canvas; } -QTEST_MAIN(tst_QmlGraphicsMouseArea) +QTEST_MAIN(tst_QDeclarativeMouseArea) #include "tst_qdeclarativemousearea.moc" diff --git a/tests/auto/declarative/qdeclarativenumberformatter/tst_qdeclarativenumberformatter.cpp b/tests/auto/declarative/qdeclarativenumberformatter/tst_qdeclarativenumberformatter.cpp index 77ad442..26ff3d5 100644 --- a/tests/auto/declarative/qdeclarativenumberformatter/tst_qdeclarativenumberformatter.cpp +++ b/tests/auto/declarative/qdeclarativenumberformatter/tst_qdeclarativenumberformatter.cpp @@ -45,11 +45,11 @@ #include <private/qnumberformat_p.h> #include <private/qdeclarativenumberformatter_p.h> -class tst_qmlnumberformatter : public QObject +class tst_qdeclarativenumberformatter : public QObject { Q_OBJECT public: - tst_qmlnumberformatter(); + tst_qdeclarativenumberformatter(); void init() {} void initTestCase() {} @@ -67,7 +67,7 @@ private: QStringList texts; }; -tst_qmlnumberformatter::tst_qmlnumberformatter() +tst_qdeclarativenumberformatter::tst_qdeclarativenumberformatter() { strings << "100.0" << "12345" @@ -177,7 +177,7 @@ tst_qmlnumberformatter::tst_qmlnumberformatter() << "texts.size()" << texts.size(); } -void tst_qmlnumberformatter::text_data() +void tst_qdeclarativenumberformatter::text_data() { QTest::addColumn<QString>("string"); QTest::addColumn<QString>("format"); @@ -194,7 +194,7 @@ void tst_qmlnumberformatter::text_data() } -void tst_qmlnumberformatter::text() +void tst_qdeclarativenumberformatter::text() { QFETCH(QString, string); QFETCH(QString, format); @@ -217,6 +217,6 @@ void tst_qmlnumberformatter::text() delete formatter; } -QTEST_MAIN(tst_qmlnumberformatter) +QTEST_MAIN(tst_qdeclarativenumberformatter) #include "tst_qdeclarativenumberformatter.moc" diff --git a/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp b/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp index 328a480..6090a07 100644 --- a/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp +++ b/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp @@ -43,11 +43,11 @@ #include <qdeclarativeview.h> #include <private/qdeclarativeparticles_p.h> -class tst_QmlGraphicsParticles : public QObject +class tst_QDeclarativeParticles : public QObject { Q_OBJECT public: - tst_QmlGraphicsParticles(); + tst_QDeclarativeParticles(); private slots: void properties(); @@ -59,11 +59,11 @@ private: }; -tst_QmlGraphicsParticles::tst_QmlGraphicsParticles() +tst_QDeclarativeParticles::tst_QDeclarativeParticles() { } -void tst_QmlGraphicsParticles::properties() +void tst_QDeclarativeParticles::properties() { QDeclarativeView *canvas = createView(SRCDIR "/data/particles.qml"); QVERIFY(canvas->rootObject()); @@ -101,7 +101,7 @@ void tst_QmlGraphicsParticles::properties() QCOMPARE(particles->emissionRate(), 12); } -void tst_QmlGraphicsParticles::motionGravity() +void tst_QDeclarativeParticles::motionGravity() { QDeclarativeView *canvas = createView(SRCDIR "/data/particlemotion.qml"); QVERIFY(canvas->rootObject()); @@ -140,7 +140,7 @@ void tst_QmlGraphicsParticles::motionGravity() QCOMPARE(accelerationSpy.count(), 1); } -void tst_QmlGraphicsParticles::motionWander() +void tst_QDeclarativeParticles::motionWander() { QDeclarativeView *canvas = createView(SRCDIR "/data/particlemotion.qml"); QVERIFY(canvas->rootObject()); @@ -186,7 +186,7 @@ void tst_QmlGraphicsParticles::motionWander() QCOMPARE(paceSpy.count(), 1); } -void tst_QmlGraphicsParticles::runs() +void tst_QDeclarativeParticles::runs() { QDeclarativeView *canvas = createView(SRCDIR "/data/particles.qml"); QVERIFY(canvas->rootObject()); @@ -195,7 +195,7 @@ void tst_QmlGraphicsParticles::runs() QTest::qWait(1000);//Run for one second. Test passes if it doesn't crash. } -QDeclarativeView *tst_QmlGraphicsParticles::createView(const QString &filename) +QDeclarativeView *tst_QDeclarativeParticles::createView(const QString &filename) { QDeclarativeView *canvas = new QDeclarativeView(0); canvas->setFixedSize(240,320); @@ -204,6 +204,6 @@ QDeclarativeView *tst_QmlGraphicsParticles::createView(const QString &filename) return canvas; } -QTEST_MAIN(tst_QmlGraphicsParticles) +QTEST_MAIN(tst_QDeclarativeParticles) #include "tst_qdeclarativeparticles.moc" diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp index 6873757..09f0f79 100644 --- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp +++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp @@ -53,11 +53,11 @@ #include <private/qdeclarativevaluetype_p.h> #include "../../../shared/util.h" -class tst_QmlGraphicsPathView : public QObject +class tst_QDeclarativePathView : public QObject { Q_OBJECT public: - tst_QmlGraphicsPathView(); + tst_QDeclarativePathView(); private slots: void initValues(); @@ -167,11 +167,11 @@ private: }; -tst_QmlGraphicsPathView::tst_QmlGraphicsPathView() +tst_QDeclarativePathView::tst_QDeclarativePathView() { } -void tst_QmlGraphicsPathView::initValues() +void tst_QDeclarativePathView::initValues() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview1.qml")); @@ -189,7 +189,7 @@ void tst_QmlGraphicsPathView::initValues() QCOMPARE(obj->pathItemCount(), -1); } -void tst_QmlGraphicsPathView::items() +void tst_QDeclarativePathView::items() { QDeclarativeView *canvas = createView(); @@ -221,7 +221,7 @@ void tst_QmlGraphicsPathView::items() delete canvas; } -void tst_QmlGraphicsPathView::pathview2() +void tst_QDeclarativePathView::pathview2() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview2.qml")); @@ -239,7 +239,7 @@ void tst_QmlGraphicsPathView::pathview2() QCOMPARE(obj->pathItemCount(), 10); } -void tst_QmlGraphicsPathView::pathview3() +void tst_QDeclarativePathView::pathview3() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview3.qml")); @@ -257,7 +257,7 @@ void tst_QmlGraphicsPathView::pathview3() QCOMPARE(obj->pathItemCount(), 4); } -void tst_QmlGraphicsPathView::path() +void tst_QDeclarativePathView::path() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/path.qml")); @@ -302,7 +302,7 @@ void tst_QmlGraphicsPathView::path() QCOMPARE(cubic->control2Y(), 90.); } -void tst_QmlGraphicsPathView::dataModel() +void tst_QDeclarativePathView::dataModel() { QDeclarativeView *canvas = createView(); @@ -382,7 +382,7 @@ void tst_QmlGraphicsPathView::dataModel() delete canvas; } -void tst_QmlGraphicsPathView::pathMoved() +void tst_QDeclarativePathView::pathMoved() { QDeclarativeView *canvas = createView(); @@ -425,7 +425,7 @@ void tst_QmlGraphicsPathView::pathMoved() delete canvas; } -QDeclarativeView *tst_QmlGraphicsPathView::createView() +QDeclarativeView *tst_QDeclarativePathView::createView() { QDeclarativeView *canvas = new QDeclarativeView(0); canvas->setFixedSize(240,320); @@ -438,7 +438,7 @@ QDeclarativeView *tst_QmlGraphicsPathView::createView() item must also evaluate the {index} expression equal to index */ template<typename T> -T *tst_QmlGraphicsPathView::findItem(QGraphicsObject *parent, const QString &objectName, int index) +T *tst_QDeclarativePathView::findItem(QGraphicsObject *parent, const QString &objectName, int index) { const QMetaObject &mo = T::staticMetaObject; //qDebug() << parent->childItems().count() << "children"; @@ -465,7 +465,7 @@ T *tst_QmlGraphicsPathView::findItem(QGraphicsObject *parent, const QString &obj } template<typename T> -QList<T*> tst_QmlGraphicsPathView::findItems(QGraphicsObject *parent, const QString &objectName) +QList<T*> tst_QDeclarativePathView::findItems(QGraphicsObject *parent, const QString &objectName) { QList<T*> items; const QMetaObject &mo = T::staticMetaObject; @@ -483,6 +483,6 @@ QList<T*> tst_QmlGraphicsPathView::findItems(QGraphicsObject *parent, const QStr return items; } -QTEST_MAIN(tst_QmlGraphicsPathView) +QTEST_MAIN(tst_QDeclarativePathView) #include "tst_qdeclarativepathview.moc" diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp index ccf41c6..223f54f 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp +++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp @@ -47,11 +47,11 @@ // These don't let normal people run tests! //#include "../network-settings.h" -class tst_qmlpixmapcache : public QObject +class tst_qdeclarativepixmapcache : public QObject { Q_OBJECT public: - tst_qmlpixmapcache() : + tst_qdeclarativepixmapcache() : thisfile(QUrl::fromLocalFile(__FILE__)) { } @@ -97,7 +97,7 @@ static const bool localfile_optimized = true; static const bool localfile_optimized = false; #endif -void tst_qmlpixmapcache::single_data() +void tst_qdeclarativepixmapcache::single_data() { // Note, since QDeclarativePixmapCache is shared, tests affect each other! // so use different files fore all test functions. @@ -114,7 +114,7 @@ void tst_qmlpixmapcache::single_data() QTest::newRow("remote") << QUrl("http://qt.nokia.com/thereisnologo.png") << false << false << true; } -void tst_qmlpixmapcache::single() +void tst_qdeclarativepixmapcache::single() { QFETCH(QUrl, target); QFETCH(bool, incache); @@ -163,7 +163,7 @@ void tst_qmlpixmapcache::single() QCOMPARE(QDeclarativePixmapCache::pendingRequests(), 0); } -void tst_qmlpixmapcache::parallel_data() +void tst_qdeclarativepixmapcache::parallel_data() { // Note, since QDeclarativePixmapCache is shared, tests affect each other! // so use different files fore all test functions. @@ -215,7 +215,7 @@ void tst_qmlpixmapcache::parallel_data() ; } -void tst_qmlpixmapcache::parallel() +void tst_qdeclarativepixmapcache::parallel() { QFETCH(QUrl, target1); QFETCH(QUrl, target2); @@ -277,6 +277,6 @@ void tst_qmlpixmapcache::parallel() QCOMPARE(QDeclarativePixmapCache::pendingRequests(), 0); } -QTEST_MAIN(tst_qmlpixmapcache) +QTEST_MAIN(tst_qdeclarativepixmapcache) #include "tst_qdeclarativepixmapcache.moc" diff --git a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp index a8de83b..3a8a892 100644 --- a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp +++ b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp @@ -47,11 +47,11 @@ #include <qdeclarativeexpression.h> #include "../../../shared/util.h" -class tst_QmlGraphicsPositioners : public QObject +class tst_QDeclarativePositioners : public QObject { Q_OBJECT public: - tst_QmlGraphicsPositioners(); + tst_QDeclarativePositioners(); private slots: void test_horizontal(); @@ -69,11 +69,11 @@ private: QDeclarativeView *createView(const QString &filename); }; -tst_QmlGraphicsPositioners::tst_QmlGraphicsPositioners() +tst_QDeclarativePositioners::tst_QDeclarativePositioners() { } -void tst_QmlGraphicsPositioners::test_horizontal() +void tst_QDeclarativePositioners::test_horizontal() { QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal.qml"); @@ -94,7 +94,7 @@ void tst_QmlGraphicsPositioners::test_horizontal() QCOMPARE(three->y(), 0.0); } -void tst_QmlGraphicsPositioners::test_horizontal_spacing() +void tst_QDeclarativePositioners::test_horizontal_spacing() { QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal-spacing.qml"); @@ -115,7 +115,7 @@ void tst_QmlGraphicsPositioners::test_horizontal_spacing() QCOMPARE(three->y(), 0.0); } -void tst_QmlGraphicsPositioners::test_horizontal_animated() +void tst_QDeclarativePositioners::test_horizontal_animated() { QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal-animated.qml"); @@ -155,7 +155,7 @@ void tst_QmlGraphicsPositioners::test_horizontal_animated() QTRY_COMPARE(three->x(), 100.0); } -void tst_QmlGraphicsPositioners::test_vertical() +void tst_QDeclarativePositioners::test_vertical() { QDeclarativeView *canvas = createView(SRCDIR "/data/vertical.qml"); @@ -176,7 +176,7 @@ void tst_QmlGraphicsPositioners::test_vertical() QCOMPARE(three->y(), 60.0); } -void tst_QmlGraphicsPositioners::test_vertical_spacing() +void tst_QDeclarativePositioners::test_vertical_spacing() { QDeclarativeView *canvas = createView(SRCDIR "/data/vertical-spacing.qml"); @@ -197,7 +197,7 @@ void tst_QmlGraphicsPositioners::test_vertical_spacing() QCOMPARE(three->y(), 80.0); } -void tst_QmlGraphicsPositioners::test_vertical_animated() +void tst_QDeclarativePositioners::test_vertical_animated() { QDeclarativeView *canvas = createView(SRCDIR "/data/vertical-animated.qml"); @@ -237,7 +237,7 @@ void tst_QmlGraphicsPositioners::test_vertical_animated() } -void tst_QmlGraphicsPositioners::test_grid() +void tst_QDeclarativePositioners::test_grid() { QDeclarativeView *canvas = createView(SRCDIR "/data/grid.qml"); @@ -264,7 +264,7 @@ void tst_QmlGraphicsPositioners::test_grid() QCOMPARE(five->y(), 50.0); } -void tst_QmlGraphicsPositioners::test_grid_spacing() +void tst_QDeclarativePositioners::test_grid_spacing() { QDeclarativeView *canvas = createView(SRCDIR "/data/grid-spacing.qml"); @@ -291,7 +291,7 @@ void tst_QmlGraphicsPositioners::test_grid_spacing() QCOMPARE(five->y(), 54.0); } -void tst_QmlGraphicsPositioners::test_grid_animated() +void tst_QDeclarativePositioners::test_grid_animated() { QDeclarativeView *canvas = createView(SRCDIR "/data/grid-animated.qml"); @@ -363,7 +363,7 @@ void tst_QmlGraphicsPositioners::test_grid_animated() QTRY_COMPARE(five->y(), 50.0); } -void tst_QmlGraphicsPositioners::test_propertychanges() +void tst_QDeclarativePositioners::test_propertychanges() { QDeclarativeView *canvas = createView("data/propertychanges.qml"); @@ -419,7 +419,7 @@ void tst_QmlGraphicsPositioners::test_propertychanges() QCOMPARE(rowsSpy.count(),2); } -void tst_QmlGraphicsPositioners::test_repeater() +void tst_QDeclarativePositioners::test_repeater() { QDeclarativeView *canvas = createView(SRCDIR "/data/repeater.qml"); @@ -440,7 +440,7 @@ void tst_QmlGraphicsPositioners::test_repeater() QCOMPARE(three->y(), 0.0); } -QDeclarativeView *tst_QmlGraphicsPositioners::createView(const QString &filename) +QDeclarativeView *tst_QDeclarativePositioners::createView(const QString &filename) { QDeclarativeView *canvas = new QDeclarativeView(0); @@ -450,6 +450,6 @@ QDeclarativeView *tst_QmlGraphicsPositioners::createView(const QString &filename } -QTEST_MAIN(tst_QmlGraphicsPositioners) +QTEST_MAIN(tst_QDeclarativePositioners) #include "tst_qdeclarativepositioners.moc" diff --git a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp index 1a65bd9..22c5581 100644 --- a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp +++ b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp @@ -46,11 +46,11 @@ #include <private/qdeclarativetext_p.h> #include <QSignalSpy> -class tst_QmlPropertyMap : public QObject +class tst_QDeclarativePropertyMap : public QObject { Q_OBJECT public: - tst_QmlPropertyMap() {} + tst_QDeclarativePropertyMap() {} private slots: void insert(); @@ -61,7 +61,7 @@ private slots: void count(); }; -void tst_QmlPropertyMap::insert() +void tst_QDeclarativePropertyMap::insert() { QDeclarativePropertyMap map; map.insert(QLatin1String("key1"),100); @@ -76,7 +76,7 @@ void tst_QmlPropertyMap::insert() QCOMPARE(map.value(QLatin1String("key1")), QVariant("Hello World")); } -void tst_QmlPropertyMap::operatorInsert() +void tst_QDeclarativePropertyMap::operatorInsert() { QDeclarativePropertyMap map; map[QLatin1String("key1")] = 100; @@ -90,7 +90,7 @@ void tst_QmlPropertyMap::operatorInsert() QCOMPARE(map.value(QLatin1String("key1")), QVariant("Hello World")); } -void tst_QmlPropertyMap::operatorValue() +void tst_QDeclarativePropertyMap::operatorValue() { QDeclarativePropertyMap map; map.insert(QLatin1String("key1"),100); @@ -106,7 +106,7 @@ void tst_QmlPropertyMap::operatorValue() QCOMPARE(constMap[QLatin1String("key2")], constMap.value(QLatin1String("key2"))); } -void tst_QmlPropertyMap::clear() +void tst_QDeclarativePropertyMap::clear() { QDeclarativePropertyMap map; map.insert(QLatin1String("key1"),100); @@ -120,7 +120,7 @@ void tst_QmlPropertyMap::clear() QCOMPARE(map.value(QLatin1String("key1")), QVariant()); } -void tst_QmlPropertyMap::changed() +void tst_QDeclarativePropertyMap::changed() { QDeclarativePropertyMap map; QSignalSpy spy(&map, SIGNAL(valueChanged(const QString&))); @@ -148,7 +148,7 @@ void tst_QmlPropertyMap::changed() QCOMPARE(map.value(QLatin1String("key1")), QVariant("Hello World")); } -void tst_QmlPropertyMap::count() +void tst_QDeclarativePropertyMap::count() { QDeclarativePropertyMap map; QCOMPARE(map.isEmpty(), true); @@ -166,6 +166,6 @@ void tst_QmlPropertyMap::count() QCOMPARE(map.size(), map.count()); } -QTEST_MAIN(tst_QmlPropertyMap) +QTEST_MAIN(tst_QDeclarativePropertyMap) #include "tst_qdeclarativepropertymap.moc" diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp index 9cbcaec..9ec6872 100644 --- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp +++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp @@ -49,11 +49,11 @@ #include <QCryptographicHash> #include <QDeclarativeItem> -class tst_qmlqt : public QObject +class tst_qdeclarativeqt : public QObject { Q_OBJECT public: - tst_qmlqt() {} + tst_qdeclarativeqt() {} private slots: void enums(); @@ -83,7 +83,7 @@ inline QUrl TEST_FILE(const QString &filename) return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename); } -void tst_qmlqt::enums() +void tst_qdeclarativeqt::enums() { QDeclarativeComponent component(&engine, TEST_FILE("enums.qml")); QObject *object = component.create(); @@ -97,7 +97,7 @@ void tst_qmlqt::enums() delete object; } -void tst_qmlqt::rgba() +void tst_qdeclarativeqt::rgba() { QDeclarativeComponent component(&engine, TEST_FILE("rgba.qml")); @@ -124,7 +124,7 @@ void tst_qmlqt::rgba() delete object; } -void tst_qmlqt::hsla() +void tst_qdeclarativeqt::hsla() { QDeclarativeComponent component(&engine, TEST_FILE("hsla.qml")); @@ -150,7 +150,7 @@ void tst_qmlqt::hsla() delete object; } -void tst_qmlqt::rect() +void tst_qdeclarativeqt::rect() { QDeclarativeComponent component(&engine, TEST_FILE("rect.qml")); QObject *object = component.create(); @@ -165,7 +165,7 @@ void tst_qmlqt::rect() delete object; } -void tst_qmlqt::point() +void tst_qdeclarativeqt::point() { QDeclarativeComponent component(&engine, TEST_FILE("point.qml")); QObject *object = component.create(); @@ -179,7 +179,7 @@ void tst_qmlqt::point() delete object; } -void tst_qmlqt::size() +void tst_qdeclarativeqt::size() { QDeclarativeComponent component(&engine, TEST_FILE("size.qml")); QObject *object = component.create(); @@ -194,7 +194,7 @@ void tst_qmlqt::size() delete object; } -void tst_qmlqt::vector() +void tst_qdeclarativeqt::vector() { QDeclarativeComponent component(&engine, TEST_FILE("vector.qml")); QObject *object = component.create(); @@ -208,7 +208,7 @@ void tst_qmlqt::vector() delete object; } -void tst_qmlqt::lighter() +void tst_qdeclarativeqt::lighter() { QDeclarativeComponent component(&engine, TEST_FILE("lighter.qml")); QObject *object = component.create(); @@ -224,7 +224,7 @@ void tst_qmlqt::lighter() delete object; } -void tst_qmlqt::darker() +void tst_qdeclarativeqt::darker() { QDeclarativeComponent component(&engine, TEST_FILE("darker.qml")); QObject *object = component.create(); @@ -240,7 +240,7 @@ void tst_qmlqt::darker() delete object; } -void tst_qmlqt::tint() +void tst_qdeclarativeqt::tint() { QDeclarativeComponent component(&engine, TEST_FILE("tint.qml")); @@ -262,7 +262,7 @@ void tst_qmlqt::tint() delete object; } -void tst_qmlqt::closestAngle() +void tst_qdeclarativeqt::closestAngle() { QDeclarativeComponent component(&engine, TEST_FILE("closestangle.qml")); QObject *object = component.create(); @@ -279,19 +279,19 @@ void tst_qmlqt::closestAngle() delete object; } -void tst_qmlqt::playSound() +void tst_qdeclarativeqt::playSound() { QEXPECT_FAIL("", "How do we test this?", Abort); QVERIFY(false); } -void tst_qmlqt::openUrlExternally() +void tst_qdeclarativeqt::openUrlExternally() { QEXPECT_FAIL("", "How do we test this?", Abort); QVERIFY(false); } -void tst_qmlqt::md5() +void tst_qdeclarativeqt::md5() { QDeclarativeComponent component(&engine, TEST_FILE("md5.qml")); QObject *object = component.create(); @@ -303,7 +303,7 @@ void tst_qmlqt::md5() delete object; } -void tst_qmlqt::createComponent() +void tst_qdeclarativeqt::createComponent() { QDeclarativeComponent component(&engine, TEST_FILE("createComponent.qml")); QObject *object = component.create(); @@ -319,7 +319,7 @@ void tst_qmlqt::createComponent() delete object; } -void tst_qmlqt::createQmlObject() +void tst_qdeclarativeqt::createQmlObject() { QDeclarativeComponent component(&engine, TEST_FILE("createQmlObject.qml")); @@ -354,7 +354,7 @@ void tst_qmlqt::createQmlObject() delete object; } -void tst_qmlqt::consoleLog() +void tst_qdeclarativeqt::consoleLog() { QTest::ignoreMessage(QtDebugMsg, "completed ok"); QTest::ignoreMessage(QtDebugMsg, "completed ok"); @@ -364,6 +364,6 @@ void tst_qmlqt::consoleLog() delete object; } -QTEST_MAIN(tst_qmlqt) +QTEST_MAIN(tst_qdeclarativeqt) #include "tst_qdeclarativeqt.moc" diff --git a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp index e442989..7a97e60 100644 --- a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp +++ b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp @@ -53,11 +53,11 @@ inline QUrl TEST_FILE(const QString &filename) return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename); } -class tst_QmlGraphicsRepeater : public QObject +class tst_QDeclarativeRepeater : public QObject { Q_OBJECT public: - tst_QmlGraphicsRepeater(); + tst_QDeclarativeRepeater(); private slots: void numberModel(); @@ -158,11 +158,11 @@ private: }; -tst_QmlGraphicsRepeater::tst_QmlGraphicsRepeater() +tst_QDeclarativeRepeater::tst_QDeclarativeRepeater() { } -void tst_QmlGraphicsRepeater::numberModel() +void tst_QDeclarativeRepeater::numberModel() { QDeclarativeView *canvas = createView(); @@ -184,7 +184,7 @@ void tst_QmlGraphicsRepeater::numberModel() delete canvas; } -void tst_QmlGraphicsRepeater::objectList() +void tst_QDeclarativeRepeater::objectList() { QDeclarativeView *canvas = createView(); @@ -211,7 +211,7 @@ The Repeater element creates children at its own position in its parent's stacking order. In this test we insert a repeater between two other Text elements to test this. */ -void tst_QmlGraphicsRepeater::stringList() +void tst_QDeclarativeRepeater::stringList() { QDeclarativeView *canvas = createView(); @@ -263,7 +263,7 @@ void tst_QmlGraphicsRepeater::stringList() delete canvas; } -void tst_QmlGraphicsRepeater::dataModel() +void tst_QDeclarativeRepeater::dataModel() { QDeclarativeView *canvas = createView(); QDeclarativeContext *ctxt = canvas->rootContext(); @@ -295,7 +295,7 @@ void tst_QmlGraphicsRepeater::dataModel() QCOMPARE(container->childItems().count(), 4); } -void tst_QmlGraphicsRepeater::itemModel() +void tst_QDeclarativeRepeater::itemModel() { QDeclarativeView *canvas = createView(); QDeclarativeContext *ctxt = canvas->rootContext(); @@ -326,7 +326,7 @@ void tst_QmlGraphicsRepeater::itemModel() delete canvas; } -void tst_QmlGraphicsRepeater::properties() +void tst_QDeclarativeRepeater::properties() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine, TEST_FILE("/properties.qml")); @@ -354,7 +354,7 @@ void tst_QmlGraphicsRepeater::properties() QCOMPARE(delegateSpy.count(),1); } -QDeclarativeView *tst_QmlGraphicsRepeater::createView() +QDeclarativeView *tst_QDeclarativeRepeater::createView() { QDeclarativeView *canvas = new QDeclarativeView(0); canvas->setFixedSize(240,320); @@ -363,7 +363,7 @@ QDeclarativeView *tst_QmlGraphicsRepeater::createView() } template<typename T> -T *tst_QmlGraphicsRepeater::findItem(QGraphicsObject *parent, const QString &objectName) +T *tst_QDeclarativeRepeater::findItem(QGraphicsObject *parent, const QString &objectName) { const QMetaObject &mo = T::staticMetaObject; if (mo.cast(parent) && (objectName.isEmpty() || parent->objectName() == objectName)) @@ -380,6 +380,6 @@ T *tst_QmlGraphicsRepeater::findItem(QGraphicsObject *parent, const QString &obj return 0; } -QTEST_MAIN(tst_QmlGraphicsRepeater) +QTEST_MAIN(tst_QDeclarativeRepeater) #include "tst_qdeclarativerepeater.moc" diff --git a/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp b/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp index 594b9a0..7a60e78 100644 --- a/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp +++ b/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp @@ -45,11 +45,11 @@ #include <private/qdeclarativevaluetype_p.h> #include "../../../shared/util.h" -class tst_qmlspringfollow : public QObject +class tst_qdeclarativespringfollow : public QObject { Q_OBJECT public: - tst_qmlspringfollow(); + tst_qdeclarativespringfollow(); private slots: void defaultValues(); @@ -60,11 +60,11 @@ private: QDeclarativeEngine engine; }; -tst_qmlspringfollow::tst_qmlspringfollow() +tst_qdeclarativespringfollow::tst_qdeclarativespringfollow() { } -void tst_qmlspringfollow::defaultValues() +void tst_qdeclarativespringfollow::defaultValues() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow1.qml")); @@ -86,7 +86,7 @@ void tst_qmlspringfollow::defaultValues() delete obj; } -void tst_qmlspringfollow::values() +void tst_qdeclarativespringfollow::values() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow2.qml")); @@ -109,7 +109,7 @@ void tst_qmlspringfollow::values() delete obj; } -void tst_qmlspringfollow::disabled() +void tst_qdeclarativespringfollow::disabled() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow3.qml")); @@ -132,6 +132,6 @@ void tst_qmlspringfollow::disabled() delete obj; } -QTEST_MAIN(tst_qmlspringfollow) +QTEST_MAIN(tst_qdeclarativespringfollow) #include "tst_qdeclarativespringfollow.moc" diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp index 1bc67e9..44fb51f 100644 --- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp +++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp @@ -46,11 +46,11 @@ #include <private/qdeclarativepropertychanges_p.h> #include <private/qdeclarativestategroup_p.h> -class tst_qmlstates : public QObject +class tst_qdeclarativestates : public QObject { Q_OBJECT public: - tst_qmlstates() {} + tst_qdeclarativestates() {} private: static QByteArray fullDataPath(const QString &path); @@ -83,12 +83,12 @@ private slots: void nonExistantProperty(); }; -QByteArray tst_qmlstates::fullDataPath(const QString &path) +QByteArray tst_qdeclarativestates::fullDataPath(const QString &path) { return QUrl::fromLocalFile(SRCDIR + path).toString().toUtf8(); } -void tst_qmlstates::basicChanges() +void tst_qdeclarativestates::basicChanges() { QDeclarativeEngine engine; @@ -158,7 +158,7 @@ void tst_qmlstates::basicChanges() } } -void tst_qmlstates::basicExtension() +void tst_qdeclarativestates::basicExtension() { QDeclarativeEngine engine; @@ -222,7 +222,7 @@ void tst_qmlstates::basicExtension() } } -void tst_qmlstates::basicBinding() +void tst_qdeclarativestates::basicBinding() { QDeclarativeEngine engine; @@ -347,12 +347,12 @@ Q_SIGNALS: QML_DECLARE_TYPE(MyRect) -void tst_qmlstates::initTestCase() +void tst_qdeclarativestates::initTestCase() { QML_REGISTER_TYPE(Qt.test, 1, 0, MyRectangle,MyRect); } -void tst_qmlstates::signalOverride() +void tst_qdeclarativestates::signalOverride() { QDeclarativeEngine engine; @@ -389,7 +389,7 @@ void tst_qmlstates::signalOverride() } } -void tst_qmlstates::signalOverrideCrash() +void tst_qdeclarativestates::signalOverrideCrash() { QDeclarativeEngine engine; @@ -401,7 +401,7 @@ void tst_qmlstates::signalOverrideCrash() rect->doSomething(); } -void tst_qmlstates::parentChange() +void tst_qdeclarativestates::parentChange() { QDeclarativeEngine engine; @@ -472,7 +472,7 @@ void tst_qmlstates::parentChange() } } -void tst_qmlstates::parentChangeErrors() +void tst_qdeclarativestates::parentChangeErrors() { QDeclarativeEngine engine; @@ -509,7 +509,7 @@ void tst_qmlstates::parentChangeErrors() } } -void tst_qmlstates::anchorChanges() +void tst_qdeclarativestates::anchorChanges() { QDeclarativeEngine engine; @@ -541,7 +541,7 @@ void tst_qmlstates::anchorChanges() delete rect; } -void tst_qmlstates::anchorChanges2() +void tst_qdeclarativestates::anchorChanges2() { QDeclarativeEngine engine; @@ -562,7 +562,7 @@ void tst_qmlstates::anchorChanges2() delete rect; } -void tst_qmlstates::anchorChanges3() +void tst_qdeclarativestates::anchorChanges3() { QDeclarativeEngine engine; @@ -612,7 +612,7 @@ void tst_qmlstates::anchorChanges3() delete rect; } -void tst_qmlstates::anchorChanges4() +void tst_qdeclarativestates::anchorChanges4() { QDeclarativeEngine engine; @@ -647,7 +647,7 @@ void tst_qmlstates::anchorChanges4() delete rect; } -void tst_qmlstates::anchorChanges5() +void tst_qdeclarativestates::anchorChanges5() { QDeclarativeEngine engine; @@ -682,7 +682,7 @@ void tst_qmlstates::anchorChanges5() delete rect; } -void tst_qmlstates::script() +void tst_qdeclarativestates::script() { QDeclarativeEngine engine; @@ -701,7 +701,7 @@ void tst_qmlstates::script() } } -void tst_qmlstates::restoreEntryValues() +void tst_qdeclarativestates::restoreEntryValues() { QDeclarativeEngine engine; @@ -718,7 +718,7 @@ void tst_qmlstates::restoreEntryValues() QCOMPARE(rect->color(),QColor("blue")); } -void tst_qmlstates::explicitChanges() +void tst_qdeclarativestates::explicitChanges() { QDeclarativeEngine engine; @@ -752,7 +752,7 @@ void tst_qmlstates::explicitChanges() QCOMPARE(rect->color(),QColor("yellow")); } -void tst_qmlstates::propertyErrors() +void tst_qdeclarativestates::propertyErrors() { QDeclarativeEngine engine; QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/propertyErrors.qml"); @@ -766,7 +766,7 @@ void tst_qmlstates::propertyErrors() rect->setState("blue"); } -void tst_qmlstates::incorrectRestoreBug() +void tst_qdeclarativestates::incorrectRestoreBug() { QDeclarativeEngine engine; @@ -792,7 +792,7 @@ void tst_qmlstates::incorrectRestoreBug() QCOMPARE(rect->color(),QColor("green")); } -void tst_qmlstates::autoStateAtStartupRestoreBug() +void tst_qdeclarativestates::autoStateAtStartupRestoreBug() { QDeclarativeEngine engine; @@ -809,7 +809,7 @@ void tst_qmlstates::autoStateAtStartupRestoreBug() delete obj; } -void tst_qmlstates::deletingChange() +void tst_qdeclarativestates::deletingChange() { QDeclarativeEngine engine; @@ -841,7 +841,7 @@ void tst_qmlstates::deletingChange() delete rect; } -void tst_qmlstates::deletingState() +void tst_qdeclarativestates::deletingState() { QDeclarativeEngine engine; @@ -872,7 +872,7 @@ void tst_qmlstates::deletingState() delete rect; } -void tst_qmlstates::tempState() +void tst_qdeclarativestates::tempState() { QDeclarativeEngine engine; @@ -886,7 +886,7 @@ void tst_qmlstates::tempState() QCOMPARE(rect->state(), QLatin1String("idle")); } -void tst_qmlstates::illegalTempState() +void tst_qdeclarativestates::illegalTempState() { QDeclarativeEngine engine; @@ -899,7 +899,7 @@ void tst_qmlstates::illegalTempState() QCOMPARE(rect->state(), QLatin1String("placed")); } -void tst_qmlstates::nonExistantProperty() +void tst_qdeclarativestates::nonExistantProperty() { QDeclarativeEngine engine; @@ -912,6 +912,6 @@ void tst_qmlstates::nonExistantProperty() QCOMPARE(rect->state(), QLatin1String("blue")); } -QTEST_MAIN(tst_qmlstates) +QTEST_MAIN(tst_qdeclarativestates) #include "tst_qdeclarativestates.moc" diff --git a/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp b/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp index 1968300..7b1293e 100644 --- a/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp +++ b/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp @@ -43,11 +43,11 @@ #include <QtGui/QTextLayout> #include <private/qdeclarativestyledtext_p.h> -class tst_qmlstyledtext : public QObject +class tst_qdeclarativestyledtext : public QObject { Q_OBJECT public: - tst_qmlstyledtext() + tst_qdeclarativestyledtext() { } @@ -58,7 +58,7 @@ private slots: // For malformed input all we test is that we get the expected text out. // -void tst_qmlstyledtext::textOutput_data() +void tst_qdeclarativestyledtext::textOutput_data() { QTest::addColumn<QString>("input"); QTest::addColumn<QString>("output"); @@ -79,7 +79,7 @@ void tst_qmlstyledtext::textOutput_data() QTest::newRow("empty") << "" << ""; } -void tst_qmlstyledtext::textOutput() +void tst_qdeclarativestyledtext::textOutput() { QFETCH(QString, input); QFETCH(QString, output); @@ -91,6 +91,6 @@ void tst_qmlstyledtext::textOutput() } -QTEST_MAIN(tst_qmlstyledtext) +QTEST_MAIN(tst_qdeclarativestyledtext) #include "tst_qdeclarativestyledtext.moc" diff --git a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp index 0f6383e..5c93952 100644 --- a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp +++ b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp @@ -47,12 +47,12 @@ #include <qpalette.h> #include "../../../shared/util.h" -class tst_qmlsystempalette : public QObject +class tst_qdeclarativesystempalette : public QObject { Q_OBJECT public: - tst_qmlsystempalette(); + tst_qdeclarativesystempalette(); private slots: void activePalette(); @@ -64,11 +64,11 @@ private: QDeclarativeEngine engine; }; -tst_qmlsystempalette::tst_qmlsystempalette() +tst_qdeclarativesystempalette::tst_qdeclarativesystempalette() { } -void tst_qmlsystempalette::activePalette() +void tst_qdeclarativesystempalette::activePalette() { QString componentStr = "import Qt 4.6\nSystemPalette { }"; QDeclarativeComponent component(&engine); @@ -97,7 +97,7 @@ void tst_qmlsystempalette::activePalette() delete object; } -void tst_qmlsystempalette::inactivePalette() +void tst_qdeclarativesystempalette::inactivePalette() { QString componentStr = "import Qt 4.6\nSystemPalette { colorGroup: SystemPalette.Inactive }"; QDeclarativeComponent component(&engine); @@ -127,7 +127,7 @@ void tst_qmlsystempalette::inactivePalette() delete object; } -void tst_qmlsystempalette::disabledPalette() +void tst_qdeclarativesystempalette::disabledPalette() { QString componentStr = "import Qt 4.6\nSystemPalette { colorGroup: SystemPalette.Disabled }"; QDeclarativeComponent component(&engine); @@ -157,7 +157,7 @@ void tst_qmlsystempalette::disabledPalette() delete object; } -void tst_qmlsystempalette::paletteChanged() +void tst_qdeclarativesystempalette::paletteChanged() { QString componentStr = "import Qt 4.6\nSystemPalette { }"; QDeclarativeComponent component(&engine); @@ -182,6 +182,6 @@ void tst_qmlsystempalette::paletteChanged() delete object; } -QTEST_MAIN(tst_qmlsystempalette) +QTEST_MAIN(tst_qdeclarativesystempalette) #include "tst_qdeclarativesystempalette.moc" diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp index 8026f1a..bbbbd83 100644 --- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp +++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp @@ -48,12 +48,12 @@ #include <QGraphicsSceneMouseEvent> #include <qmath.h> -class tst_qmlgraphicstext : public QObject +class tst_qdeclarativetext : public QObject { Q_OBJECT public: - tst_qmlgraphicstext(); + tst_qdeclarativetext(); private slots: void text(); @@ -99,7 +99,7 @@ private: QDeclarativeEngine engine; }; -tst_qmlgraphicstext::tst_qmlgraphicstext() +tst_qdeclarativetext::tst_qdeclarativetext() { standard << "the quick brown fox jumped over the lazy dog" << "the quick brown fox\n jumped over the lazy dog"; @@ -152,7 +152,7 @@ tst_qmlgraphicstext::tst_qmlgraphicstext() // } -void tst_qmlgraphicstext::text() +void tst_qdeclarativetext::text() { { QDeclarativeComponent textComponent(&engine); @@ -193,7 +193,7 @@ void tst_qmlgraphicstext::text() } } -void tst_qmlgraphicstext::width() +void tst_qdeclarativetext::width() { // uses Font metrics to find the width for standard and document to find the width for rich { @@ -245,7 +245,7 @@ void tst_qmlgraphicstext::width() } } -void tst_qmlgraphicstext::wrap() +void tst_qdeclarativetext::wrap() { int textHeight = 0; // for specified width and wrap set true @@ -290,7 +290,7 @@ void tst_qmlgraphicstext::wrap() } -void tst_qmlgraphicstext::elide() +void tst_qdeclarativetext::elide() { for (QDeclarativeText::TextElideMode m = QDeclarativeText::ElideLeft; m<=QDeclarativeText::ElideNone; m=QDeclarativeText::TextElideMode(int(m)+1)) { const char* elidename[]={"ElideLeft", "ElideRight", "ElideMiddle", "ElideNone"}; @@ -332,7 +332,7 @@ void tst_qmlgraphicstext::elide() } } -void tst_qmlgraphicstext::textFormat() +void tst_qdeclarativetext::textFormat() { { QDeclarativeComponent textComponent(&engine); @@ -353,7 +353,7 @@ void tst_qmlgraphicstext::textFormat() } //the alignment tests may be trivial o.oa -void tst_qmlgraphicstext::horizontalAlignment() +void tst_qdeclarativetext::horizontalAlignment() { //test one align each, and then test if two align fails. @@ -385,7 +385,7 @@ void tst_qmlgraphicstext::horizontalAlignment() } -void tst_qmlgraphicstext::verticalAlignment() +void tst_qdeclarativetext::verticalAlignment() { //test one align each, and then test if two align fails. @@ -419,7 +419,7 @@ void tst_qmlgraphicstext::verticalAlignment() } -void tst_qmlgraphicstext::font() +void tst_qdeclarativetext::font() { //test size, then bold, then italic, then family { @@ -485,7 +485,7 @@ void tst_qmlgraphicstext::font() } } -void tst_qmlgraphicstext::style() +void tst_qdeclarativetext::style() { //test style for (int i = 0; i < styles.size(); i++) @@ -500,7 +500,7 @@ void tst_qmlgraphicstext::style() } } -void tst_qmlgraphicstext::color() +void tst_qdeclarativetext::color() { //test style for (int i = 0; i < colorStrings.size(); i++) @@ -553,7 +553,7 @@ void tst_qmlgraphicstext::color() } } -void tst_qmlgraphicstext::smooth() +void tst_qdeclarativetext::smooth() { for (int i = 0; i < standard.size(); i++) { @@ -591,7 +591,7 @@ void tst_qmlgraphicstext::smooth() } } -void tst_qmlgraphicstext::weight() +void tst_qdeclarativetext::weight() { { QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }"; @@ -613,7 +613,7 @@ void tst_qmlgraphicstext::weight() } } -void tst_qmlgraphicstext::underline() +void tst_qdeclarativetext::underline() { { QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }"; @@ -635,7 +635,7 @@ void tst_qmlgraphicstext::underline() } } -void tst_qmlgraphicstext::overline() +void tst_qdeclarativetext::overline() { { QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }"; @@ -657,7 +657,7 @@ void tst_qmlgraphicstext::overline() } } -void tst_qmlgraphicstext::strikeout() +void tst_qdeclarativetext::strikeout() { { QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }"; @@ -679,7 +679,7 @@ void tst_qmlgraphicstext::strikeout() } } -void tst_qmlgraphicstext::capitalization() +void tst_qdeclarativetext::capitalization() { { QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }"; @@ -728,7 +728,7 @@ void tst_qmlgraphicstext::capitalization() } } -void tst_qmlgraphicstext::letterSpacing() +void tst_qdeclarativetext::letterSpacing() { { QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }"; @@ -759,7 +759,7 @@ void tst_qmlgraphicstext::letterSpacing() } } -void tst_qmlgraphicstext::wordSpacing() +void tst_qdeclarativetext::wordSpacing() { { QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }"; @@ -808,7 +808,7 @@ public slots: void linkClicked(QString l) { link = l; } }; -void tst_qmlgraphicstext::clickLink() +void tst_qdeclarativetext::clickLink() { { QString componentStr = "import Qt 4.6\nText { text: \"<a href=\\\"http://qt.nokia.com\\\">Hello world!</a>\" }"; @@ -839,6 +839,6 @@ void tst_qmlgraphicstext::clickLink() } } -QTEST_MAIN(tst_qmlgraphicstext) +QTEST_MAIN(tst_qdeclarativetext) #include "tst_qdeclarativetext.moc" diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index e08783f..b677fec 100644 --- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -54,12 +54,12 @@ #include <QStyle> #include <QInputContext> -class tst_qmlgraphicstextedit : public QObject +class tst_qdeclarativetextedit : public QObject { Q_OBJECT public: - tst_qmlgraphicstextedit(); + tst_qdeclarativetextedit(); private slots: void text(); @@ -102,7 +102,7 @@ private: QDeclarativeEngine engine; }; -tst_qmlgraphicstextedit::tst_qmlgraphicstextedit() +tst_qdeclarativetextedit::tst_qdeclarativetextedit() { standard << "the quick brown fox jumped over the lazy dog" << "the quick brown fox\n jumped over the lazy dog"; @@ -145,7 +145,7 @@ tst_qmlgraphicstextedit::tst_qmlgraphicstextedit() // } -void tst_qmlgraphicstextedit::text() +void tst_qdeclarativetextedit::text() { { QDeclarativeComponent texteditComponent(&engine); @@ -184,7 +184,7 @@ void tst_qmlgraphicstextedit::text() } } -void tst_qmlgraphicstextedit::width() +void tst_qdeclarativetextedit::width() { // uses Font metrics to find the width for standard and document to find the width for rich { @@ -230,7 +230,7 @@ void tst_qmlgraphicstextedit::width() } } -void tst_qmlgraphicstextedit::wrap() +void tst_qdeclarativetextedit::wrap() { // for specified width and wrap set true { @@ -266,7 +266,7 @@ void tst_qmlgraphicstextedit::wrap() } -void tst_qmlgraphicstextedit::textFormat() +void tst_qdeclarativetextedit::textFormat() { { QDeclarativeComponent textComponent(&engine); @@ -287,7 +287,7 @@ void tst_qmlgraphicstextedit::textFormat() } //the alignment tests may be trivial o.oa -void tst_qmlgraphicstextedit::hAlign() +void tst_qdeclarativetextedit::hAlign() { //test one align each, and then test if two align fails. @@ -321,7 +321,7 @@ void tst_qmlgraphicstextedit::hAlign() } -void tst_qmlgraphicstextedit::vAlign() +void tst_qdeclarativetextedit::vAlign() { //test one align each, and then test if two align fails. @@ -355,7 +355,7 @@ void tst_qmlgraphicstextedit::vAlign() } -void tst_qmlgraphicstextedit::font() +void tst_qdeclarativetextedit::font() { //test size, then bold, then italic, then family { @@ -415,7 +415,7 @@ void tst_qmlgraphicstextedit::font() } } -void tst_qmlgraphicstextedit::color() +void tst_qdeclarativetextedit::color() { //test normal for (int i = 0; i < colorStrings.size(); i++) @@ -466,7 +466,7 @@ void tst_qmlgraphicstextedit::color() } } -void tst_qmlgraphicstextedit::textMargin() +void tst_qdeclarativetextedit::textMargin() { for(qreal i=0; i<=10; i+=0.3){ QString componentStr = "import Qt 4.6\nTextEdit { textMargin: " + QString::number(i) + "; text: \"Hello World\" }"; @@ -478,7 +478,7 @@ void tst_qmlgraphicstextedit::textMargin() } } -void tst_qmlgraphicstextedit::persistentSelection() +void tst_qdeclarativetextedit::persistentSelection() { { QString componentStr = "import Qt 4.6\nTextEdit { persistentSelection: true; text: \"Hello World\" }"; @@ -499,7 +499,7 @@ void tst_qmlgraphicstextedit::persistentSelection() } } -void tst_qmlgraphicstextedit::focusOnPress() +void tst_qdeclarativetextedit::focusOnPress() { { QString componentStr = "import Qt 4.6\nTextEdit { focusOnPress: true; text: \"Hello World\" }"; @@ -520,7 +520,7 @@ void tst_qmlgraphicstextedit::focusOnPress() } } -void tst_qmlgraphicstextedit::selection() +void tst_qdeclarativetextedit::selection() { QString testStr = standard[0];//TODO: What should happen for multiline/rich text? QString componentStr = "import Qt 4.6\nTextEdit { text: \""+ testStr +"\"; }"; @@ -601,7 +601,7 @@ void tst_qmlgraphicstextedit::selection() QVERIFY(textEditObject->selectedText().size() == 10); } -void tst_qmlgraphicstextedit::inputMethodHints() +void tst_qdeclarativetextedit::inputMethodHints() { QDeclarativeView *canvas = createView(SRCDIR "/data/inputmethodhints.qml"); canvas->show(); @@ -615,7 +615,7 @@ void tst_qmlgraphicstextedit::inputMethodHints() QVERIFY(textEditObject->inputMethodHints() & Qt::ImhUppercaseOnly); } -void tst_qmlgraphicstextedit::cursorDelegate() +void tst_qdeclarativetextedit::cursorDelegate() { QDeclarativeView* view = createView(SRCDIR "/data/cursorTest.qml"); view->show(); @@ -641,7 +641,7 @@ void tst_qmlgraphicstextedit::cursorDelegate() QVERIFY(!textEditObject->findChild<QDeclarativeItem*>("cursorInstance")); } -void tst_qmlgraphicstextedit::delegateLoading() +void tst_qdeclarativetextedit::delegateLoading() { TestHTTPServer server(42332); server.serveDirectory(SRCDIR "/data/httpfail", TestHTTPServer::Disconnect); @@ -680,7 +680,7 @@ void tst_qmlgraphicstextedit::delegateLoading() TextEdit element should only handle left/right keys until the cursor reaches the extent of the text, then they should ignore the keys. */ -void tst_qmlgraphicstextedit::navigation() +void tst_qdeclarativetextedit::navigation() { QDeclarativeView *canvas = createView(SRCDIR "/data/navigation.qml"); canvas->show(); @@ -702,7 +702,7 @@ void tst_qmlgraphicstextedit::navigation() QVERIFY(input->hasFocus() == true); } -void tst_qmlgraphicstextedit::readOnly() +void tst_qdeclarativetextedit::readOnly() { QDeclarativeView *canvas = createView(SRCDIR "/data/readOnly.qml"); canvas->show(); @@ -724,7 +724,7 @@ void tst_qmlgraphicstextedit::readOnly() QCOMPARE(edit->text(), initial); } -void tst_qmlgraphicstextedit::simulateKey(QDeclarativeView *view, int key) +void tst_qdeclarativetextedit::simulateKey(QDeclarativeView *view, int key) { QKeyEvent press(QKeyEvent::KeyPress, key, 0); QKeyEvent release(QKeyEvent::KeyRelease, key, 0); @@ -733,7 +733,7 @@ void tst_qmlgraphicstextedit::simulateKey(QDeclarativeView *view, int key) QApplication::sendEvent(view, &release); } -QDeclarativeView *tst_qmlgraphicstextedit::createView(const QString &filename) +QDeclarativeView *tst_qdeclarativetextedit::createView(const QString &filename) { QDeclarativeView *canvas = new QDeclarativeView(0); @@ -763,7 +763,7 @@ public: bool softwareInputPanelEventReceived; }; -void tst_qmlgraphicstextedit::sendRequestSoftwareInputPanelEvent() +void tst_qdeclarativetextedit::sendRequestSoftwareInputPanelEvent() { QGraphicsScene scene; QGraphicsView view(&scene); @@ -786,6 +786,6 @@ void tst_qmlgraphicstextedit::sendRequestSoftwareInputPanelEvent() QApplication::processEvents(); QCOMPARE(ic.softwareInputPanelEventReceived, true); } -QTEST_MAIN(tst_qmlgraphicstextedit) +QTEST_MAIN(tst_qdeclarativetextedit) #include "tst_qdeclarativetextedit.moc" diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp index 5b98455..8b513e8 100644 --- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp +++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp @@ -48,12 +48,12 @@ #include <QStyle> #include <QInputContext> -class tst_qmlgraphicstextinput : public QObject +class tst_qdeclarativetextinput : public QObject { Q_OBJECT public: - tst_qmlgraphicstextinput(); + tst_qdeclarativetextinput(); private slots: void text(); @@ -82,7 +82,7 @@ private: QStringList colorStrings; }; -tst_qmlgraphicstextinput::tst_qmlgraphicstextinput() +tst_qdeclarativetextinput::tst_qdeclarativetextinput() { standard << "the quick brown fox jumped over the lazy dog" << "It's supercalifragisiticexpialidocious!" @@ -102,7 +102,7 @@ tst_qmlgraphicstextinput::tst_qmlgraphicstextinput() << "#2AC05F"; } -void tst_qmlgraphicstextinput::text() +void tst_qdeclarativetextinput::text() { { QDeclarativeComponent textinputComponent(&engine); @@ -126,7 +126,7 @@ void tst_qmlgraphicstextinput::text() } -void tst_qmlgraphicstextinput::width() +void tst_qdeclarativetextinput::width() { // uses Font metrics to find the width for standard { @@ -154,7 +154,7 @@ void tst_qmlgraphicstextinput::width() } } -void tst_qmlgraphicstextinput::font() +void tst_qdeclarativetextinput::font() { //test size, then bold, then italic, then family { @@ -214,7 +214,7 @@ void tst_qmlgraphicstextinput::font() } } -void tst_qmlgraphicstextinput::color() +void tst_qdeclarativetextinput::color() { //test color for (int i = 0; i < colorStrings.size(); i++) @@ -264,7 +264,7 @@ void tst_qmlgraphicstextinput::color() } } -void tst_qmlgraphicstextinput::selection() +void tst_qdeclarativetextinput::selection() { QString testStr = standard[0]; QString componentStr = "import Qt 4.6\nTextInput { text: \""+ testStr +"\"; }"; @@ -345,7 +345,7 @@ void tst_qmlgraphicstextinput::selection() QVERIFY(textinputObject->selectedText().size() == 10); } -void tst_qmlgraphicstextinput::maxLength() +void tst_qdeclarativetextinput::maxLength() { //QString componentStr = "import Qt 4.6\nTextInput { maximumLength: 10; }"; QDeclarativeView *canvas = createView(SRCDIR "/data/maxLength.qml"); @@ -372,7 +372,7 @@ void tst_qmlgraphicstextinput::maxLength() } } -void tst_qmlgraphicstextinput::masks() +void tst_qdeclarativetextinput::masks() { //Not a comprehensive test of the possible masks, that's done elsewhere (QLineEdit) //QString componentStr = "import Qt 4.6\nTextInput { inputMask: 'HHHHhhhh'; }"; @@ -394,7 +394,7 @@ void tst_qmlgraphicstextinput::masks() } } -void tst_qmlgraphicstextinput::validators() +void tst_qdeclarativetextinput::validators() { // Note that this test assumes that the validators are working properly // so you may need to run their tests first. All validators are checked @@ -487,7 +487,7 @@ void tst_qmlgraphicstextinput::validators() QCOMPARE(strInput->hasAcceptableInput(), true); } -void tst_qmlgraphicstextinput::inputMethodHints() +void tst_qdeclarativetextinput::inputMethodHints() { QDeclarativeView *canvas = createView(SRCDIR "/data/inputmethodhints.qml"); canvas->show(); @@ -506,7 +506,7 @@ TextInput element should only handle left/right keys until the cursor reaches the extent of the text, then they should ignore the keys. */ -void tst_qmlgraphicstextinput::navigation() +void tst_qdeclarativetextinput::navigation() { QDeclarativeView *canvas = createView(SRCDIR "/data/navigation.qml"); canvas->show(); @@ -538,7 +538,7 @@ void tst_qmlgraphicstextinput::navigation() QVERIFY(input->hasFocus() == true); } -void tst_qmlgraphicstextinput::cursorDelegate() +void tst_qdeclarativetextinput::cursorDelegate() { QDeclarativeView* view = createView(SRCDIR "/data/cursorTest.qml"); view->show(); @@ -565,7 +565,7 @@ void tst_qmlgraphicstextinput::cursorDelegate() QVERIFY(!textInputObject->findChild<QDeclarativeItem*>("cursorInstance")); } -void tst_qmlgraphicstextinput::readOnly() +void tst_qdeclarativetextinput::readOnly() { QDeclarativeView *canvas = createView(SRCDIR "/data/readOnly.qml"); canvas->show(); @@ -587,7 +587,7 @@ void tst_qmlgraphicstextinput::readOnly() QCOMPARE(input->text(), initial); } -void tst_qmlgraphicstextinput::simulateKey(QDeclarativeView *view, int key) +void tst_qdeclarativetextinput::simulateKey(QDeclarativeView *view, int key) { QKeyEvent press(QKeyEvent::KeyPress, key, 0); QKeyEvent release(QKeyEvent::KeyRelease, key, 0); @@ -596,7 +596,7 @@ void tst_qmlgraphicstextinput::simulateKey(QDeclarativeView *view, int key) QApplication::sendEvent(view, &release); } -QDeclarativeView *tst_qmlgraphicstextinput::createView(const QString &filename) +QDeclarativeView *tst_qdeclarativetextinput::createView(const QString &filename) { QDeclarativeView *canvas = new QDeclarativeView(0); @@ -627,7 +627,7 @@ public: bool softwareInputPanelEventReceived; }; -void tst_qmlgraphicstextinput::sendRequestSoftwareInputPanelEvent() +void tst_qdeclarativetextinput::sendRequestSoftwareInputPanelEvent() { QGraphicsScene scene; QGraphicsView view(&scene); @@ -651,6 +651,6 @@ void tst_qmlgraphicstextinput::sendRequestSoftwareInputPanelEvent() QCOMPARE(ic.softwareInputPanelEventReceived, true); } -QTEST_MAIN(tst_qmlgraphicstextinput) +QTEST_MAIN(tst_qdeclarativetextinput) #include "tst_qdeclarativetextinput.moc" diff --git a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp index 62c9e91..b120d5d 100644 --- a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp +++ b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp @@ -44,11 +44,11 @@ #include <private/qdeclarativetimer_p.h> #include <QDebug> -class tst_qmltimer : public QObject +class tst_qdeclarativetimer : public QObject { Q_OBJECT public: - tst_qmltimer(); + tst_qdeclarativetimer(); private slots: void notRepeating(); @@ -84,11 +84,11 @@ public slots: #define TIMEOUT_TIMEOUT 200 #endif -tst_qmltimer::tst_qmltimer() +tst_qdeclarativetimer::tst_qdeclarativetimer() { } -void tst_qmltimer::notRepeating() +void tst_qdeclarativetimer::notRepeating() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine); @@ -109,7 +109,7 @@ void tst_qmltimer::notRepeating() QVERIFY(timer->isRunning() == false); } -void tst_qmltimer::notRepeatingStart() +void tst_qdeclarativetimer::notRepeatingStart() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine); @@ -134,7 +134,7 @@ void tst_qmltimer::notRepeatingStart() delete timer; } -void tst_qmltimer::repeat() +void tst_qdeclarativetimer::repeat() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine); @@ -164,7 +164,7 @@ void tst_qmltimer::repeat() delete timer; } -void tst_qmltimer::triggeredOnStart() +void tst_qdeclarativetimer::triggeredOnStart() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine); @@ -187,7 +187,7 @@ void tst_qmltimer::triggeredOnStart() delete timer; } -void tst_qmltimer::triggeredOnStartRepeat() +void tst_qdeclarativetimer::triggeredOnStartRepeat() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine); @@ -210,7 +210,7 @@ void tst_qmltimer::triggeredOnStartRepeat() delete timer; } -void tst_qmltimer::noTriggerIfNotRunning() +void tst_qdeclarativetimer::noTriggerIfNotRunning() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine); @@ -229,7 +229,7 @@ void tst_qmltimer::noTriggerIfNotRunning() delete item; } -void tst_qmltimer::changeDuration() +void tst_qdeclarativetimer::changeDuration() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine); @@ -253,7 +253,7 @@ void tst_qmltimer::changeDuration() delete timer; } -void tst_qmltimer::restart() +void tst_qdeclarativetimer::restart() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine); @@ -280,6 +280,6 @@ void tst_qmltimer::restart() delete timer; } -QTEST_MAIN(tst_qmltimer) +QTEST_MAIN(tst_qdeclarativetimer) #include "tst_qdeclarativetimer.moc" diff --git a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp index e53ac91..69646b9 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp +++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp @@ -46,11 +46,11 @@ #include <private/qdeclarativevaluetype_p.h> #include "testtypes.h" -class tst_qmlvaluetypes : public QObject +class tst_qdeclarativevaluetypes : public QObject { Q_OBJECT public: - tst_qmlvaluetypes() {} + tst_qdeclarativevaluetypes() {} private slots: void initTestCase(); @@ -82,7 +82,7 @@ private: QDeclarativeEngine engine; }; -void tst_qmlvaluetypes::initTestCase() +void tst_qdeclarativevaluetypes::initTestCase() { registerTypes(); } @@ -92,7 +92,7 @@ inline QUrl TEST_FILE(const QString &filename) return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename); } -void tst_qmlvaluetypes::point() +void tst_qdeclarativevaluetypes::point() { { QDeclarativeComponent component(&engine, TEST_FILE("point_read.qml")); @@ -117,7 +117,7 @@ void tst_qmlvaluetypes::point() } } -void tst_qmlvaluetypes::pointf() +void tst_qdeclarativevaluetypes::pointf() { { QDeclarativeComponent component(&engine, TEST_FILE("pointf_read.qml")); @@ -142,7 +142,7 @@ void tst_qmlvaluetypes::pointf() } } -void tst_qmlvaluetypes::size() +void tst_qdeclarativevaluetypes::size() { { QDeclarativeComponent component(&engine, TEST_FILE("size_read.qml")); @@ -167,7 +167,7 @@ void tst_qmlvaluetypes::size() } } -void tst_qmlvaluetypes::sizef() +void tst_qdeclarativevaluetypes::sizef() { { QDeclarativeComponent component(&engine, TEST_FILE("sizef_read.qml")); @@ -192,7 +192,7 @@ void tst_qmlvaluetypes::sizef() } } -void tst_qmlvaluetypes::rect() +void tst_qdeclarativevaluetypes::rect() { { QDeclarativeComponent component(&engine, TEST_FILE("rect_read.qml")); @@ -219,7 +219,7 @@ void tst_qmlvaluetypes::rect() } } -void tst_qmlvaluetypes::rectf() +void tst_qdeclarativevaluetypes::rectf() { { QDeclarativeComponent component(&engine, TEST_FILE("rectf_read.qml")); @@ -246,7 +246,7 @@ void tst_qmlvaluetypes::rectf() } } -void tst_qmlvaluetypes::vector3d() +void tst_qdeclarativevaluetypes::vector3d() { { QDeclarativeComponent component(&engine, TEST_FILE("vector3d_read.qml")); @@ -272,7 +272,7 @@ void tst_qmlvaluetypes::vector3d() } } -void tst_qmlvaluetypes::font() +void tst_qdeclarativevaluetypes::font() { { QDeclarativeComponent component(&engine, TEST_FILE("font_read.qml")); @@ -345,7 +345,7 @@ void tst_qmlvaluetypes::font() } // Test bindings can write to value types -void tst_qmlvaluetypes::bindingAssignment() +void tst_qdeclarativevaluetypes::bindingAssignment() { QDeclarativeComponent component(&engine, TEST_FILE("bindingAssignment.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); @@ -361,7 +361,7 @@ void tst_qmlvaluetypes::bindingAssignment() } // Test bindings can read from value types -void tst_qmlvaluetypes::bindingRead() +void tst_qdeclarativevaluetypes::bindingRead() { QDeclarativeComponent component(&engine, TEST_FILE("bindingRead.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); @@ -377,7 +377,7 @@ void tst_qmlvaluetypes::bindingRead() } // Test static values can assign to value types -void tst_qmlvaluetypes::staticAssignment() +void tst_qdeclarativevaluetypes::staticAssignment() { QDeclarativeComponent component(&engine, TEST_FILE("staticAssignment.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); @@ -389,7 +389,7 @@ void tst_qmlvaluetypes::staticAssignment() } // Test scripts can read/write value types -void tst_qmlvaluetypes::scriptAccess() +void tst_qdeclarativevaluetypes::scriptAccess() { QDeclarativeComponent component(&engine, TEST_FILE("scriptAccess.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); @@ -403,7 +403,7 @@ void tst_qmlvaluetypes::scriptAccess() } // Test that assigning a constant from script removes any binding -void tst_qmlvaluetypes::autoBindingRemoval() +void tst_qdeclarativevaluetypes::autoBindingRemoval() { { QDeclarativeComponent component(&engine, TEST_FILE("autoBindingRemoval.qml")); @@ -474,7 +474,7 @@ void tst_qmlvaluetypes::autoBindingRemoval() } // Test that property value sources assign to value types -void tst_qmlvaluetypes::valueSources() +void tst_qdeclarativevaluetypes::valueSources() { QDeclarativeComponent component(&engine, TEST_FILE("valueSources.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); @@ -497,7 +497,7 @@ static void checkNoErrors(QDeclarativeComponent& component) } // Test that property value interceptors can be applied to value types -void tst_qmlvaluetypes::valueInterceptors() +void tst_qdeclarativevaluetypes::valueInterceptors() { QDeclarativeComponent component(&engine, TEST_FILE("valueInterceptors.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); @@ -515,7 +515,7 @@ void tst_qmlvaluetypes::valueInterceptors() } // Test that you can't assign a binding to the "root" value type, and a sub-property -void tst_qmlvaluetypes::bindingConflict() +void tst_qdeclarativevaluetypes::bindingConflict() { QDeclarativeComponent component(&engine, TEST_FILE("bindingConflict.qml")); QCOMPARE(component.isError(), true); @@ -532,7 +532,7 @@ void tst_qmlvaluetypes::bindingConflict() // Test that accessing a reference to a valuetype after the owning object is deleted // doesn't crash -void tst_qmlvaluetypes::deletedObject() +void tst_qdeclarativevaluetypes::deletedObject() { QDeclarativeComponent component(&engine, TEST_FILE("deletedObject.qml")); QTest::ignoreMessage(QtDebugMsg, "Test: 2"); @@ -550,7 +550,7 @@ void tst_qmlvaluetypes::deletedObject() } // Test that value types can be assigned to another value type property in a binding -void tst_qmlvaluetypes::bindingVariantCopy() +void tst_qdeclarativevaluetypes::bindingVariantCopy() { QDeclarativeComponent component(&engine, TEST_FILE("bindingVariantCopy.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); @@ -562,7 +562,7 @@ void tst_qmlvaluetypes::bindingVariantCopy() } // Test that value types can be assigned to another value type property in script -void tst_qmlvaluetypes::scriptVariantCopy() +void tst_qdeclarativevaluetypes::scriptVariantCopy() { QDeclarativeComponent component(&engine, TEST_FILE("scriptVariantCopy.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); @@ -579,7 +579,7 @@ void tst_qmlvaluetypes::scriptVariantCopy() // Test that the value type classes can be used manually -void tst_qmlvaluetypes::cppClasses() +void tst_qdeclarativevaluetypes::cppClasses() { CPP_TEST(QDeclarativePointValueType, QPoint(19, 33)); CPP_TEST(QDeclarativePointFValueType, QPointF(33.6, -23)); @@ -592,7 +592,7 @@ void tst_qmlvaluetypes::cppClasses() } -void tst_qmlvaluetypes::enums() +void tst_qdeclarativevaluetypes::enums() { { QDeclarativeComponent component(&engine, TEST_FILE("enums.1.qml")); @@ -611,6 +611,6 @@ void tst_qmlvaluetypes::enums() } } -QTEST_MAIN(tst_qmlvaluetypes) +QTEST_MAIN(tst_qdeclarativevaluetypes) #include "tst_qdeclarativevaluetypes.moc" diff --git a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp index aa5b8e3..2634825 100644 --- a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp +++ b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp @@ -53,11 +53,11 @@ #include <QtGui/qpainter.h> #include "testtypes.h" -class tst_qmlgraphicswebview : public QObject +class tst_qdeclarativewebview : public QObject { Q_OBJECT public: - tst_qmlgraphicswebview() {} + tst_qdeclarativewebview() {} private slots: void initTestCase(); @@ -81,13 +81,13 @@ private: QDeclarativeEngine engine; QString tmpDir() const { - static QString tmpd = QDir::tempPath()+"/tst_qmlgraphicswebview-" + static QString tmpd = QDir::tempPath()+"/tst_qdeclarativewebview-" + QDateTime::currentDateTime().toString(QLatin1String("yyyyMMddhhmmss")); return tmpd; } }; -void tst_qmlgraphicswebview::initTestCase() +void tst_qdeclarativewebview::initTestCase() { registerTypes(); } @@ -118,12 +118,12 @@ static void removeRecursive(const QString& dirname) QDir().rmdir(dirname); } -void tst_qmlgraphicswebview::cleanupTestCase() +void tst_qdeclarativewebview::cleanupTestCase() { removeRecursive(tmpDir()); } -void tst_qmlgraphicswebview::checkNoErrors(const QDeclarativeComponent& component) +void tst_qdeclarativewebview::checkNoErrors(const QDeclarativeComponent& component) { // Wait until the component is ready QTRY_VERIFY(component.isReady()); @@ -142,7 +142,7 @@ void tst_qmlgraphicswebview::checkNoErrors(const QDeclarativeComponent& componen QVERIFY(!component.isError()); } -void tst_qmlgraphicswebview::basicProperties() +void tst_qdeclarativewebview::basicProperties() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml")); checkNoErrors(component); @@ -177,7 +177,7 @@ void tst_qmlgraphicswebview::basicProperties() QTRY_COMPARE(wv->progress(), 1.0); } -void tst_qmlgraphicswebview::settings() +void tst_qdeclarativewebview::settings() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml")); checkNoErrors(component); @@ -242,7 +242,7 @@ void tst_qmlgraphicswebview::settings() } } -void tst_qmlgraphicswebview::historyNav() +void tst_qdeclarativewebview::historyNav() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml")); checkNoErrors(component); @@ -307,7 +307,7 @@ void tst_qmlgraphicswebview::historyNav() QVERIFY(!wv->stopAction()->isEnabled()); } -void tst_qmlgraphicswebview::multipleWindows() +void tst_qdeclarativewebview::multipleWindows() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/newwindows.qml")); checkNoErrors(component); @@ -320,7 +320,7 @@ void tst_qmlgraphicswebview::multipleWindows() QTRY_COMPARE(popup->x(), 150.0); } -void tst_qmlgraphicswebview::loadError() +void tst_qdeclarativewebview::loadError() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/loadError.qml")); checkNoErrors(component); @@ -339,7 +339,7 @@ void tst_qmlgraphicswebview::loadError() } } -void tst_qmlgraphicswebview::setHtml() +void tst_qdeclarativewebview::setHtml() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/sethtml.qml")); checkNoErrors(component); @@ -352,7 +352,7 @@ void tst_qmlgraphicswebview::setHtml() QCOMPARE(spy.count(),1); } -void tst_qmlgraphicswebview::elementAreaAt() +void tst_qdeclarativewebview::elementAreaAt() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/elements.qml")); checkNoErrors(component); @@ -367,7 +367,7 @@ void tst_qmlgraphicswebview::elementAreaAt() QCOMPARE(wv->elementAreaAt(130,30,400,400),QRect(0,0,310,100)); // Whole view } -void tst_qmlgraphicswebview::javaScript() +void tst_qdeclarativewebview::javaScript() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/javaScript.qml")); checkNoErrors(component); @@ -379,7 +379,7 @@ void tst_qmlgraphicswebview::javaScript() QCOMPARE(wv->evaluateJavaScript("window.myjsname.qmlprop").toString(), QString("qmlvalue")); } -void tst_qmlgraphicswebview::pixelCache() +void tst_qdeclarativewebview::pixelCache() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/pixelCache.qml")); checkNoErrors(component); @@ -406,7 +406,7 @@ void tst_qmlgraphicswebview::pixelCache() QCOMPARE(wv->pixelsPainted(), expected*3); // repainted } -void tst_qmlgraphicswebview::newWindowParent() +void tst_qdeclarativewebview::newWindowParent() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml")); checkNoErrors(component); @@ -434,7 +434,7 @@ void tst_qmlgraphicswebview::newWindowParent() QCOMPARE(newWindowParentSpy.count(),2); } -void tst_qmlgraphicswebview::newWindowComponent() +void tst_qdeclarativewebview::newWindowComponent() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml")); checkNoErrors(component); @@ -459,7 +459,7 @@ void tst_qmlgraphicswebview::newWindowComponent() QCOMPARE(newWindowComponentSpy.count(),2); } -void tst_qmlgraphicswebview::renderingEnabled() +void tst_qdeclarativewebview::renderingEnabled() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml")); checkNoErrors(component); @@ -483,7 +483,7 @@ void tst_qmlgraphicswebview::renderingEnabled() QCOMPARE(renderingEnabledSpy.count(),2); } -void tst_qmlgraphicswebview::pressGrabTime() +void tst_qdeclarativewebview::pressGrabTime() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml")); checkNoErrors(component); @@ -506,6 +506,6 @@ void tst_qmlgraphicswebview::pressGrabTime() QCOMPARE(pressGrabTimeSpy.count(),2); } -QTEST_MAIN(tst_qmlgraphicswebview) +QTEST_MAIN(tst_qdeclarativewebview) #include "tst_qdeclarativewebview.moc" diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp index c4ae90a..37d48fa 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp @@ -48,11 +48,11 @@ #define SERVER_PORT 14445 -class tst_qmlxmlhttprequest : public QObject +class tst_qdeclarativexmlhttprequest : public QObject { Q_OBJECT public: - tst_qmlxmlhttprequest() {} + tst_qdeclarativexmlhttprequest() {} private slots: void initTestCase() { @@ -123,7 +123,7 @@ inline QUrl TEST_FILE(const QString &filename) } // Test that the dom exception codes are correct -void tst_qmlxmlhttprequest::domExceptionCodes() +void tst_qdeclarativexmlhttprequest::domExceptionCodes() { QDeclarativeComponent component(&engine, TEST_FILE("domExceptionCodes.qml")); QObject *object = component.create(); @@ -160,7 +160,7 @@ void tst_qmlxmlhttprequest::domExceptionCodes() } while (false) -void tst_qmlxmlhttprequest::callbackException_data() +void tst_qdeclarativexmlhttprequest::callbackException_data() { QTest::addColumn<QString>("which"); QTest::addColumn<int>("line"); @@ -170,7 +170,7 @@ void tst_qmlxmlhttprequest::callbackException_data() QTest::newRow("on-done") << "4" << 15; } -void tst_qmlxmlhttprequest::callbackException() +void tst_qdeclarativexmlhttprequest::callbackException() { // Test exception reporting for exceptions thrown at various points. @@ -194,7 +194,7 @@ void tst_qmlxmlhttprequest::callbackException() // Test that the state value properties on the XMLHttpRequest constructor have the correct values. // ### WebKit does not do this, but it seems to fit the standard and QML better -void tst_qmlxmlhttprequest::staticStateValues() +void tst_qdeclarativexmlhttprequest::staticStateValues() { QDeclarativeComponent component(&engine, TEST_FILE("staticStateValues.qml")); QObject *object = component.create(); @@ -210,7 +210,7 @@ void tst_qmlxmlhttprequest::staticStateValues() } // Test that the state value properties on instances have the correct values. -void tst_qmlxmlhttprequest::instanceStateValues() +void tst_qdeclarativexmlhttprequest::instanceStateValues() { QDeclarativeComponent component(&engine, TEST_FILE("instanceStateValues.qml")); QObject *object = component.create(); @@ -226,7 +226,7 @@ void tst_qmlxmlhttprequest::instanceStateValues() } // Test calling constructor -void tst_qmlxmlhttprequest::constructor() +void tst_qdeclarativexmlhttprequest::constructor() { QDeclarativeComponent component(&engine, TEST_FILE("constructor.qml")); QObject *object = component.create(); @@ -239,7 +239,7 @@ void tst_qmlxmlhttprequest::constructor() } // Test that all the properties are set correctly before any request is sent -void tst_qmlxmlhttprequest::defaultState() +void tst_qdeclarativexmlhttprequest::defaultState() { QDeclarativeComponent component(&engine, TEST_FILE("defaultState.qml")); QObject *object = component.create(); @@ -255,7 +255,7 @@ void tst_qmlxmlhttprequest::defaultState() } // Test valid XMLHttpRequest.open() calls -void tst_qmlxmlhttprequest::open() +void tst_qdeclarativexmlhttprequest::open() { // Relative url { @@ -353,7 +353,7 @@ void tst_qmlxmlhttprequest::open() } // Test that calling XMLHttpRequest.open() with an invalid method raises an exception -void tst_qmlxmlhttprequest::open_invalid_method() +void tst_qdeclarativexmlhttprequest::open_invalid_method() { QDeclarativeComponent component(&engine, TEST_FILE("open_invalid_method.qml")); QObject *object = component.create(); @@ -365,7 +365,7 @@ void tst_qmlxmlhttprequest::open_invalid_method() } // Test that calling XMLHttpRequest.open() with sync raises an exception -void tst_qmlxmlhttprequest::open_sync() +void tst_qdeclarativexmlhttprequest::open_sync() { QDeclarativeComponent component(&engine, TEST_FILE("open_sync.qml")); QObject *object = component.create(); @@ -377,7 +377,7 @@ void tst_qmlxmlhttprequest::open_sync() } // Calling with incorrect arg count raises an exception -void tst_qmlxmlhttprequest::open_arg_count() +void tst_qdeclarativexmlhttprequest::open_arg_count() { { QDeclarativeComponent component(&engine, TEST_FILE("open_arg_count.1.qml")); @@ -401,7 +401,7 @@ void tst_qmlxmlhttprequest::open_arg_count() } // Test valid setRequestHeader() calls -void tst_qmlxmlhttprequest::setRequestHeader() +void tst_qdeclarativexmlhttprequest::setRequestHeader() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); @@ -421,7 +421,7 @@ void tst_qmlxmlhttprequest::setRequestHeader() } // Test setting headers before open() throws exception -void tst_qmlxmlhttprequest::setRequestHeader_unsent() +void tst_qdeclarativexmlhttprequest::setRequestHeader_unsent() { QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_unsent.qml")); QObject *object = component.create(); @@ -432,7 +432,7 @@ void tst_qmlxmlhttprequest::setRequestHeader_unsent() delete object; } -void tst_qmlxmlhttprequest::setRequestHeader_illegalName_data() +void tst_qdeclarativexmlhttprequest::setRequestHeader_illegalName_data() { QTest::addColumn<QString>("name"); @@ -461,7 +461,7 @@ void tst_qmlxmlhttprequest::setRequestHeader_illegalName_data() } // Tests that using illegal header names has no effect -void tst_qmlxmlhttprequest::setRequestHeader_illegalName() +void tst_qdeclarativexmlhttprequest::setRequestHeader_illegalName() { QFETCH(QString, name); @@ -491,7 +491,7 @@ void tst_qmlxmlhttprequest::setRequestHeader_illegalName() } // Test that attempting to set a header after a request is sent throws an exception -void tst_qmlxmlhttprequest::setRequestHeader_sent() +void tst_qdeclarativexmlhttprequest::setRequestHeader_sent() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); @@ -513,7 +513,7 @@ void tst_qmlxmlhttprequest::setRequestHeader_sent() } // Invalid arg count throws exception -void tst_qmlxmlhttprequest::setRequestHeader_args() +void tst_qdeclarativexmlhttprequest::setRequestHeader_args() { QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_args.qml")); QObject *object = component.create(); @@ -525,7 +525,7 @@ void tst_qmlxmlhttprequest::setRequestHeader_args() } // Test that calling send() in UNSENT state throws an exception -void tst_qmlxmlhttprequest::send_unsent() +void tst_qdeclarativexmlhttprequest::send_unsent() { QDeclarativeComponent component(&engine, TEST_FILE("send_unsent.qml")); QObject *object = component.create(); @@ -537,7 +537,7 @@ void tst_qmlxmlhttprequest::send_unsent() } // Test attempting to resend a sent request throws an exception -void tst_qmlxmlhttprequest::send_alreadySent() +void tst_qdeclarativexmlhttprequest::send_alreadySent() { QDeclarativeComponent component(&engine, TEST_FILE("send_alreadySent.qml")); QObject *object = component.create(); @@ -550,7 +550,7 @@ void tst_qmlxmlhttprequest::send_alreadySent() } // Test that send for a GET or HEAD ignores data -void tst_qmlxmlhttprequest::send_ignoreData() +void tst_qdeclarativexmlhttprequest::send_ignoreData() { { TestHTTPServer server(SERVER_PORT); @@ -592,7 +592,7 @@ void tst_qmlxmlhttprequest::send_ignoreData() } // Test that send()'ing data works -void tst_qmlxmlhttprequest::send_withdata() +void tst_qdeclarativexmlhttprequest::send_withdata() { // No content-type { @@ -729,7 +729,7 @@ void tst_qmlxmlhttprequest::send_withdata() } // Test abort() has no effect in unsent state -void tst_qmlxmlhttprequest::abort_unsent() +void tst_qdeclarativexmlhttprequest::abort_unsent() { QDeclarativeComponent component(&engine, TEST_FILE("abort_unsent.qml")); QObject *object = component.beginCreate(engine.rootContext()); @@ -750,7 +750,7 @@ void tst_qmlxmlhttprequest::abort_unsent() } // Test abort() cancels an open (but unsent) request -void tst_qmlxmlhttprequest::abort_opened() +void tst_qdeclarativexmlhttprequest::abort_opened() { QDeclarativeComponent component(&engine, TEST_FILE("abort_opened.qml")); QObject *object = component.beginCreate(engine.rootContext()); @@ -771,7 +771,7 @@ void tst_qmlxmlhttprequest::abort_opened() } // Test abort() aborts in progress send -void tst_qmlxmlhttprequest::abort() +void tst_qdeclarativexmlhttprequest::abort() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); @@ -795,7 +795,7 @@ void tst_qmlxmlhttprequest::abort() delete object; } -void tst_qmlxmlhttprequest::getResponseHeader() +void tst_qdeclarativexmlhttprequest::getResponseHeader() { QDeclarativeEngine engine; // Avoid cookie contamination @@ -835,7 +835,7 @@ void tst_qmlxmlhttprequest::getResponseHeader() } // Test getResponseHeader throws an exception in an invalid state -void tst_qmlxmlhttprequest::getResponseHeader_unsent() +void tst_qdeclarativexmlhttprequest::getResponseHeader_unsent() { QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader_unsent.qml")); QObject *object = component.create(); @@ -847,7 +847,7 @@ void tst_qmlxmlhttprequest::getResponseHeader_unsent() } // Test getResponseHeader throws an exception in an invalid state -void tst_qmlxmlhttprequest::getResponseHeader_sent() +void tst_qdeclarativexmlhttprequest::getResponseHeader_sent() { QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader_sent.qml")); QObject *object = component.create(); @@ -859,7 +859,7 @@ void tst_qmlxmlhttprequest::getResponseHeader_sent() } // Invalid arg count throws exception -void tst_qmlxmlhttprequest::getResponseHeader_args() +void tst_qdeclarativexmlhttprequest::getResponseHeader_args() { QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader_args.qml")); QObject *object = component.create(); @@ -870,7 +870,7 @@ void tst_qmlxmlhttprequest::getResponseHeader_args() delete object; } -void tst_qmlxmlhttprequest::getAllResponseHeaders() +void tst_qdeclarativexmlhttprequest::getAllResponseHeaders() { QDeclarativeEngine engine; // Avoid cookie contamination @@ -903,7 +903,7 @@ void tst_qmlxmlhttprequest::getAllResponseHeaders() } // Test getAllResponseHeaders throws an exception in an invalid state -void tst_qmlxmlhttprequest::getAllResponseHeaders_unsent() +void tst_qdeclarativexmlhttprequest::getAllResponseHeaders_unsent() { QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders_unsent.qml")); QObject *object = component.create(); @@ -915,7 +915,7 @@ void tst_qmlxmlhttprequest::getAllResponseHeaders_unsent() } // Test getAllResponseHeaders throws an exception in an invalid state -void tst_qmlxmlhttprequest::getAllResponseHeaders_sent() +void tst_qdeclarativexmlhttprequest::getAllResponseHeaders_sent() { QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders_sent.qml")); QObject *object = component.create(); @@ -927,7 +927,7 @@ void tst_qmlxmlhttprequest::getAllResponseHeaders_sent() } // Invalid arg count throws exception -void tst_qmlxmlhttprequest::getAllResponseHeaders_args() +void tst_qdeclarativexmlhttprequest::getAllResponseHeaders_args() { QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders_args.qml")); QObject *object = component.create(); @@ -938,7 +938,7 @@ void tst_qmlxmlhttprequest::getAllResponseHeaders_args() delete object; } -void tst_qmlxmlhttprequest::status() +void tst_qdeclarativexmlhttprequest::status() { { TestHTTPServer server(SERVER_PORT); @@ -995,7 +995,7 @@ void tst_qmlxmlhttprequest::status() } } -void tst_qmlxmlhttprequest::statusText() +void tst_qdeclarativexmlhttprequest::statusText() { { TestHTTPServer server(SERVER_PORT); @@ -1052,7 +1052,7 @@ void tst_qmlxmlhttprequest::statusText() } } -void tst_qmlxmlhttprequest::responseText() +void tst_qdeclarativexmlhttprequest::responseText() { { TestHTTPServer server(SERVER_PORT); @@ -1138,7 +1138,7 @@ void tst_qmlxmlhttprequest::responseText() // Test that calling hte XMLHttpRequest methods on a non-XMLHttpRequest object // throws an exception -void tst_qmlxmlhttprequest::invalidMethodUsage() +void tst_qdeclarativexmlhttprequest::invalidMethodUsage() { QDeclarativeComponent component(&engine, TEST_FILE("invalidMethodUsage.qml")); QObject *object = component.create(); @@ -1162,7 +1162,7 @@ void tst_qmlxmlhttprequest::invalidMethodUsage() } // Test that XMLHttpRequest transparently redirects -void tst_qmlxmlhttprequest::redirects() +void tst_qdeclarativexmlhttprequest::redirects() { { TestHTTPServer server(SERVER_PORT); @@ -1227,7 +1227,7 @@ void tst_qmlxmlhttprequest::redirects() } } -void tst_qmlxmlhttprequest::responseXML_invalid() +void tst_qdeclarativexmlhttprequest::responseXML_invalid() { QDeclarativeComponent component(&engine, TEST_FILE("responseXML_invalid.qml")); QObject *object = component.create(); @@ -1241,7 +1241,7 @@ void tst_qmlxmlhttprequest::responseXML_invalid() } // Test the Document DOM element -void tst_qmlxmlhttprequest::document() +void tst_qdeclarativexmlhttprequest::document() { QDeclarativeComponent component(&engine, TEST_FILE("document.qml")); QObject *object = component.create(); @@ -1255,7 +1255,7 @@ void tst_qmlxmlhttprequest::document() } // Test the Element DOM element -void tst_qmlxmlhttprequest::element() +void tst_qdeclarativexmlhttprequest::element() { QDeclarativeComponent component(&engine, TEST_FILE("element.qml")); QObject *object = component.create(); @@ -1269,7 +1269,7 @@ void tst_qmlxmlhttprequest::element() } // Test the Attr DOM element -void tst_qmlxmlhttprequest::attr() +void tst_qdeclarativexmlhttprequest::attr() { QDeclarativeComponent component(&engine, TEST_FILE("attr.qml")); QObject *object = component.create(); @@ -1283,7 +1283,7 @@ void tst_qmlxmlhttprequest::attr() } // Test the Text DOM element -void tst_qmlxmlhttprequest::text() +void tst_qdeclarativexmlhttprequest::text() { QDeclarativeComponent component(&engine, TEST_FILE("text.qml")); QObject *object = component.create(); @@ -1297,7 +1297,7 @@ void tst_qmlxmlhttprequest::text() } // Test the CDataSection DOM element -void tst_qmlxmlhttprequest::cdata() +void tst_qdeclarativexmlhttprequest::cdata() { QDeclarativeComponent component(&engine, TEST_FILE("cdata.qml")); QObject *object = component.create(); @@ -1310,6 +1310,6 @@ void tst_qmlxmlhttprequest::cdata() delete object; } -QTEST_MAIN(tst_qmlxmlhttprequest) +QTEST_MAIN(tst_qdeclarativexmlhttprequest) #include "tst_qdeclarativexmlhttprequest.moc" diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp index 9ef1298..e19e03d 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp +++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp @@ -54,12 +54,12 @@ typedef QList<QVariantList> QDeclarativeXmlModelData; Q_DECLARE_METATYPE(QList<QDeclarativeXmlListRange>) Q_DECLARE_METATYPE(QDeclarativeXmlModelData) -class tst_qmlxmllistmodel : public QObject +class tst_qdeclarativexmllistmodel : public QObject { Q_OBJECT public: - tst_qmlxmllistmodel() {} + tst_qdeclarativexmllistmodel() {} private slots: void buildModel(); @@ -113,7 +113,7 @@ private: QDeclarativeEngine engine; }; -void tst_qmlxmllistmodel::buildModel() +void tst_qdeclarativexmllistmodel::buildModel() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml")); QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create()); @@ -132,7 +132,7 @@ void tst_qmlxmllistmodel::buildModel() delete listModel; } -void tst_qmlxmllistmodel::missingFields() +void tst_qdeclarativexmllistmodel::missingFields() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model2.qml")); QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create()); @@ -153,7 +153,7 @@ void tst_qmlxmllistmodel::missingFields() delete listModel; } -void tst_qmlxmllistmodel::cdata() +void tst_qdeclarativexmllistmodel::cdata() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/recipes.qml")); QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create()); @@ -169,7 +169,7 @@ void tst_qmlxmllistmodel::cdata() delete listModel; } -void tst_qmlxmllistmodel::attributes() +void tst_qdeclarativexmllistmodel::attributes() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/recipes.qml")); QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create()); @@ -185,7 +185,7 @@ void tst_qmlxmllistmodel::attributes() delete listModel; } -void tst_qmlxmllistmodel::roles() +void tst_qdeclarativexmllistmodel::roles() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml")); QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create()); @@ -202,7 +202,7 @@ void tst_qmlxmllistmodel::roles() delete listModel; } -void tst_qmlxmllistmodel::roleErrors() +void tst_qdeclarativexmllistmodel::roleErrors() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleErrors.qml")); QTest::ignoreMessage(QtWarningMsg, QString("QML XmlRole (" + QUrl::fromLocalFile(SRCDIR "/data/roleErrors.qml").toString() + ":6:5) An XmlRole query must not start with '/'").toUtf8().constData()); @@ -227,7 +227,7 @@ void tst_qmlxmllistmodel::roleErrors() delete listModel; } -void tst_qmlxmllistmodel::uniqueRoleNames() +void tst_qdeclarativexmllistmodel::uniqueRoleNames() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/unique.qml")); QTest::ignoreMessage(QtWarningMsg, QString("QML XmlRole (" + QUrl::fromLocalFile(SRCDIR "/data/unique.qml").toString() + ":7:5) \"name\" duplicates a previous role name and will be disabled.").toUtf8().constData()); @@ -241,7 +241,7 @@ void tst_qmlxmllistmodel::uniqueRoleNames() delete listModel; } -void tst_qmlxmllistmodel::useKeys() +void tst_qdeclarativexmllistmodel::useKeys() { // If using incremental updates through keys, the model should only // insert & remove some of the items, instead of throwing everything @@ -294,7 +294,7 @@ void tst_qmlxmllistmodel::useKeys() } } -void tst_qmlxmllistmodel::useKeys_data() +void tst_qdeclarativexmllistmodel::useKeys_data() { QTest::addColumn<QString>("oldXml"); QTest::addColumn<int>("oldCount"); @@ -376,7 +376,7 @@ void tst_qmlxmllistmodel::useKeys_data() << (QList<QDeclarativeXmlListRange>() << qMakePair(0, 1) << qMakePair(2,2)); } -void tst_qmlxmllistmodel::noKeysValueChanges() +void tst_qdeclarativexmllistmodel::noKeysValueChanges() { // The 'key' roles are 'name' and 'age', as defined in roleKeys.qml. // If a 'sport' value is changed, the model should not be reloaded, @@ -414,7 +414,7 @@ void tst_qmlxmllistmodel::noKeysValueChanges() QCOMPARE(model->count(), 2); } -void tst_qmlxmllistmodel::keysChanged() +void tst_qdeclarativexmllistmodel::keysChanged() { // If the key roles change, the next time the data is reloaded, it should // delete all its data and build a clean model (i.e. same behaviour as @@ -448,7 +448,7 @@ void tst_qmlxmllistmodel::keysChanged() QCOMPARE(spyCount.count(), 0); } -QTEST_MAIN(tst_qmlxmllistmodel) +QTEST_MAIN(tst_qdeclarativexmllistmodel) #include "tst_qdeclarativexmllistmodel.moc" diff --git a/tests/auto/declarative/shared/debugutil.cpp b/tests/auto/declarative/shared/debugutil.cpp index c12df4f..66f04e5 100644 --- a/tests/auto/declarative/shared/debugutil.cpp +++ b/tests/auto/declarative/shared/debugutil.cpp @@ -105,7 +105,7 @@ QByteArray QDeclarativeDebugTestClient::waitForResponse() lastMsg.clear(); QDeclarativeDebugTest::waitForSignal(this, SIGNAL(serverMessage(QByteArray))); if (lastMsg.isEmpty()) { - qWarning() << "tst_QmlDebugClient: no response from server!"; + qWarning() << "tst_QDeclarativeDebugClient: no response from server!"; return QByteArray(); } return lastMsg; @@ -118,12 +118,12 @@ void QDeclarativeDebugTestClient::messageReceived(const QByteArray &ba) } -tst_QmlDebug_Thread::tst_QmlDebug_Thread(QDeclarativeDebugTestData *data, QDeclarativeTestFactory *factory) +tst_QDeclarativeDebug_Thread::tst_QDeclarativeDebug_Thread(QDeclarativeDebugTestData *data, QDeclarativeTestFactory *factory) : m_data(data), m_factory(factory) { } -void tst_QmlDebug_Thread::run() +void tst_QDeclarativeDebug_Thread::run() { bool ok = false; @@ -153,7 +153,7 @@ int QDeclarativeDebugTest::runTests(QDeclarativeTestFactory *factory, const QLis QEventLoop loop; QDeclarativeDebugTestData data(&loop); - tst_QmlDebug_Thread thread(&data, factory); + tst_QDeclarativeDebug_Thread thread(&data, factory); QObject::connect(&thread, SIGNAL(testsFinished(int)), &data, SLOT(testsFinished(int))); QDeclarativeDebugService::notifyOnServerStart(&thread, "start"); diff --git a/tests/auto/declarative/shared/debugutil_p.h b/tests/auto/declarative/shared/debugutil_p.h index 3aaa9db..c152b5a 100644 --- a/tests/auto/declarative/shared/debugutil_p.h +++ b/tests/auto/declarative/shared/debugutil_p.h @@ -131,11 +131,11 @@ private: QByteArray lastMsg; }; -class tst_QmlDebug_Thread : public QThread +class tst_QDeclarativeDebug_Thread : public QThread { Q_OBJECT public: - tst_QmlDebug_Thread(QDeclarativeDebugTestData *data, QDeclarativeTestFactory *factory); + tst_QDeclarativeDebug_Thread(QDeclarativeDebugTestData *data, QDeclarativeTestFactory *factory); void run(); |