Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

16 files changed, 707 insertions, 621 deletions

diff --git a/tests/auto/declarative/debugger/debugger.pro b/tests/auto/declarative/debugger/debugger.pro
new file mode 100644
index 0000000..f4a4476
--- /dev/null
+++ b/tests/auto/declarative/debugger/debugger.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+SUBDIRS += qmldebug \
+           qmldebugclient \
+           qmldebugservice
diff --git a/tests/auto/declarative/debugger/debuggerutil.cpp b/tests/auto/declarative/debugger/debuggerutil.cpp
new file mode 100644
index 0000000..8e93407
--- /dev/null
+++ b/tests/auto/declarative/debugger/debuggerutil.cpp
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QSignalSpy>
+#include <QEventLoop>
+#include <QTimer>
+
+#include <private/qmldebugclient_p.h>
+#include <private/qmldebugservice_p.h>
+
+#include "debuggerutil_p.h"
+
+namespace QmlDebuggerTest {
+
+    void waitForSignal(QObject *receiver, const char *member) {
+        QEventLoop loop;
+        QTimer timer;
+        QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
+        QObject::connect(receiver, member, &loop, SLOT(quit()));
+        timer.start(5000);
+        loop.exec();
+    }
+
+}
+
+
+EchoService::EchoService(const QString &s, QObject *parent)
+    : QmlDebugService(s, parent), enabled(false)
+{
+}
+
+void EchoService::messageReceived(const QByteArray &ba)
+{
+    sendMessage(ba);
+}
+
+void EchoService::enabledChanged(bool e)
+{
+    emit enabledStateChanged();
+    enabled = e;
+}
+
+
+MyQmlDebugClient::MyQmlDebugClient(const QString &s, QmlDebugConnection *c)
+    : QmlDebugClient(s, c)
+{
+}
+
+QByteArray MyQmlDebugClient::waitForResponse()
+{
+    QSignalSpy spy(this, SIGNAL(serverMessage(QByteArray)));
+    QmlDebuggerTest::waitForSignal(this, SIGNAL(serverMessage(QByteArray)));
+    if (spy.count() == 0) {
+        qWarning() << "tst_QmlDebugClient: no response from server!";
+        return QByteArray();
+    }
+    return spy.at(0).at(0).value<QByteArray>();
+}
+
+void MyQmlDebugClient::messageReceived(const QByteArray &ba)
+{
+    emit serverMessage(ba);
+}
+
+
diff --git a/tests/auto/declarative/debugger/debuggerutil_p.h b/tests/auto/declarative/debugger/debuggerutil_p.h
new file mode 100644
index 0000000..155d550
--- /dev/null
+++ b/tests/auto/declarative/debugger/debuggerutil_p.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QSignalSpy>
+#include <QEventLoop>
+#include <QTimer>
+
+#include <private/qmldebugclient_p.h>
+#include <private/qmldebugservice_p.h>
+
+namespace QmlDebuggerTest {
+
+    void waitForSignal(QObject *receiver, const char *member);
+}
+
+class EchoService : public QmlDebugService
+{
+    Q_OBJECT
+public:
+    EchoService(const QString &s, QObject *parent = 0);
+    bool enabled;
+
+signals:
+    void enabledStateChanged();
+
+protected:
+    virtual void messageReceived(const QByteArray &ba);
+
+    virtual void enabledChanged(bool e);
+};
+
+class MyQmlDebugClient : public QmlDebugClient
+{
+    Q_OBJECT
+public:
+    MyQmlDebugClient(const QString &s, QmlDebugConnection *c);
+
+    QByteArray waitForResponse();
+
+signals:
+    void serverMessage(const QByteArray &);
+
+protected:
+    virtual void messageReceived(const QByteArray &ba);
+};
+
+
diff --git a/tests/auto/declarative/qmldebug/qmldebug.pro b/tests/auto/declarative/debugger/qmldebugclient/qmldebugclient.pro
index 61f821e..6e68cd5 100644
--- a/tests/auto/declarative/qmldebug/qmldebug.pro
+++ b/tests/auto/declarative/debugger/qmldebugclient/qmldebugclient.pro
@@ -2,4 +2,6 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += network declarative
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmldebug.cpp
+HEADERS += ../debuggerutil_p.h
+SOURCES += tst_qmldebugclient.cpp \
+           ../debuggerutil.cpp
diff --git a/tests/auto/declarative/debugger/qmldebugclient/tst_qmldebugclient.cpp b/tests/auto/declarative/debugger/qmldebugclient/tst_qmldebugclient.cpp
new file mode 100644
index 0000000..db33061
--- /dev/null
+++ b/tests/auto/declarative/debugger/qmldebugclient/tst_qmldebugclient.cpp
@@ -0,0 +1,190 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QSignalSpy>
+#include <QTimer>
+#include <QHostAddress>
+#include <QDebug>
+#include <QThread>
+
+#include <QtDeclarative/qmlengine.h>
+
+#include <private/qmldebug_p.h>
+#include <private/qmlenginedebug_p.h>
+#include <private/qmldebugclient_p.h>
+#include <private/qmldebugservice_p.h>
+
+#include "../debuggerutil_p.h"
+
+class tst_QmlDebugClient : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QmlDebugClient(QmlDebugConnection *conn, QmlEngine *engine)
+        : m_conn(conn), m_engine(engine) {}
+
+    QmlDebugConnection *m_conn;
+    QmlEngine *m_engine;
+
+private slots:
+    void name();
+    void isEnabled();
+    void setEnabled();
+    void isConnected();
+    void sendMessage();
+};
+
+void tst_QmlDebugClient::name()
+{
+    QString name = "tst_QmlDebugClient::name()";
+
+    QmlDebugClient client(name, m_conn);
+    QCOMPARE(client.name(), name);
+}
+
+void tst_QmlDebugClient::isEnabled()
+{
+    QmlDebugClient client("tst_QmlDebugClient::isEnabled()", m_conn);
+    QCOMPARE(client.isEnabled(), false);
+}
+
+void tst_QmlDebugClient::setEnabled()
+{
+    EchoService service("tst_QmlDebugClient::setEnabled()");
+    MyQmlDebugClient client("tst_QmlDebugClient::setEnabled()", m_conn);
+
+    QCOMPARE(service.isEnabled(), false);
+
+    client.setEnabled(true);
+    QCOMPARE(client.isEnabled(), true);
+    QmlDebuggerTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
+    QCOMPARE(service.isEnabled(), true);
+
+    client.setEnabled(false);
+    QCOMPARE(client.isEnabled(), false);
+    QmlDebuggerTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
+    QCOMPARE(service.isEnabled(), false);
+}
+
+void tst_QmlDebugClient::isConnected()
+{
+    QmlDebugClient client1("tst_QmlDebugClient::isConnected() A", m_conn);
+    QCOMPARE(client1.isConnected(), true);
+
+    QmlDebugConnection conn;
+    QmlDebugClient client2("tst_QmlDebugClient::isConnected() B", &conn);
+    QCOMPARE(client2.isConnected(), false);
+
+    QmlDebugClient client3("tst_QmlDebugClient::isConnected() C", 0);
+    QCOMPARE(client3.isConnected(), false);
+
+    // duplicate plugin name
+    QTest::ignoreMessage(QtWarningMsg, "QmlDebugClient: Conflicting plugin name \"tst_QmlDebugClient::isConnected() A\" ");
+    QmlDebugClient client4("tst_QmlDebugClient::isConnected() A", m_conn);
+    QCOMPARE(client4.isConnected(), false);
+}
+
+void tst_QmlDebugClient::sendMessage()
+{
+    EchoService service("tst_QmlDebugClient::sendMessage()");
+    MyQmlDebugClient client("tst_QmlDebugClient::sendMessage()", m_conn);
+
+    QByteArray msg = "hello!";
+
+    client.sendMessage(msg);
+    QByteArray resp = client.waitForResponse();
+    QCOMPARE(resp, msg);
+}
+
+
+
+class tst_QmlDebugClient_Thread : public QThread
+{
+    Q_OBJECT
+public:
+    void run() {
+        QTest::qWait(1000);
+        connectToEngine();
+    }
+
+    QPointer<QmlEngine> m_engine;
+
+signals:
+    void testsFinished();
+
+public slots:
+
+    void connectToEngine()
+    {
+        QmlDebugConnection conn;
+        conn.connectToHost("127.0.0.1", 3768);
+        bool ok = conn.waitForConnected(5000);
+        Q_ASSERT(ok);
+        while (!m_engine)
+            QTest::qWait(50);
+
+        tst_QmlDebugClient test(&conn, m_engine);
+        QTest::qExec(&test); 
+        emit testsFinished();
+    }
+};
+
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    qputenv("QML_DEBUG_SERVER_PORT", "3768");
+
+    tst_QmlDebugClient_Thread thread;
+    QObject::connect(&thread, SIGNAL(testsFinished()), qApp, SLOT(quit()));
+    thread.start();
+
+    QmlEngine engine;  // blocks until client connects
+
+    // start the test
+    thread.m_engine = &engine;
+
+    return app.exec();
+
+}
+
+#include "tst_qmldebugclient.moc"
diff --git a/tests/auto/declarative/debugger/qmldebugservice/qmldebugservice.pro b/tests/auto/declarative/debugger/qmldebugservice/qmldebugservice.pro
new file mode 100644
index 0000000..1b6762c
--- /dev/null
+++ b/tests/auto/declarative/debugger/qmldebugservice/qmldebugservice.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += network declarative
+macx:CONFIG -= app_bundle
+
+HEADERS += ../debuggerutil_p.h
+SOURCES += tst_qmldebugservice.cpp \
+           ../debuggerutil.cpp
diff --git a/tests/auto/declarative/debugger/qmldebugservice/tst_qmldebugservice.cpp b/tests/auto/declarative/debugger/qmldebugservice/tst_qmldebugservice.cpp
new file mode 100644
index 0000000..224e7e1
--- /dev/null
+++ b/tests/auto/declarative/debugger/qmldebugservice/tst_qmldebugservice.cpp
@@ -0,0 +1,222 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QSignalSpy>
+#include <QTimer>
+#include <QHostAddress>
+#include <QDebug>
+#include <QThread>
+
+#include <QtDeclarative/qmlengine.h>
+
+#include <private/qmldebug_p.h>
+#include <private/qmlenginedebug_p.h>
+#include <private/qmldebugclient_p.h>
+#include <private/qmldebugservice_p.h>
+
+#include "../debuggerutil_p.h"
+
+class tst_QmlDebugService : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QmlDebugService(QmlDebugConnection *conn, QmlEngine *engine)
+        : m_conn(conn), m_engine(engine) {}
+
+    QmlDebugConnection *m_conn;
+    QmlEngine *m_engine;
+
+private slots:
+    void name();
+    void isEnabled();
+    void enabledChanged();
+    void sendMessage();
+    void idForObject();
+    void objectForId();
+    void objectToString();
+};
+
+void tst_QmlDebugService::name()
+{
+    QString name = "tst_QmlDebugService::name()";
+
+    QmlDebugService service(name);
+    QCOMPARE(service.name(), name);
+}
+
+void tst_QmlDebugService::isEnabled()
+{
+    EchoService service("tst_QmlDebugService::isEnabled()", m_conn);
+    QCOMPARE(service.isEnabled(), false);
+
+    MyQmlDebugClient client("tst_QmlDebugService::isEnabled()", m_conn);
+    client.setEnabled(true);
+    QmlDebuggerTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
+    QCOMPARE(service.isEnabled(), true);
+
+    QTest::ignoreMessage(QtWarningMsg, "QmlDebugService: Conflicting plugin name \"tst_QmlDebugService::isEnabled()\" ");
+    QmlDebugService duplicate("tst_QmlDebugService::isEnabled()", m_conn);
+    QCOMPARE(duplicate.isEnabled(), false);
+}
+
+void tst_QmlDebugService::enabledChanged()
+{
+    EchoService service("tst_QmlDebugService::enabledChanged()");
+    MyQmlDebugClient client("tst_QmlDebugService::enabledChanged()", m_conn);
+
+    QCOMPARE(service.enabled, false);
+
+    client.setEnabled(true);
+    QmlDebuggerTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
+    QCOMPARE(service.enabled, true);
+}
+
+void tst_QmlDebugService::sendMessage()
+{
+    EchoService service("tst_QmlDebugService::sendMessage()");
+    MyQmlDebugClient client("tst_QmlDebugService::sendMessage()", m_conn);
+
+    QByteArray msg = "hello!";
+
+    client.sendMessage(msg);
+    QByteArray resp = client.waitForResponse();
+    QCOMPARE(resp, msg);
+}
+
+void tst_QmlDebugService::idForObject()
+{
+    QCOMPARE(QmlDebugService::idForObject(0), -1);
+
+    QObject *objA = new QObject;
+
+    int idA = QmlDebugService::idForObject(objA);
+    QVERIFY(idA >= 0);
+    QCOMPARE(QmlDebugService::objectForId(idA), objA);
+
+    int idAA = QmlDebugService::idForObject(objA);
+    QCOMPARE(idAA, idA);
+
+    QObject *objB = new QObject;
+    int idB = QmlDebugService::idForObject(objB);
+    QVERIFY(idB != idA);
+    QCOMPARE(QmlDebugService::objectForId(idB), objB);
+ 
+    delete objA;
+    delete objB;
+}
+
+void tst_QmlDebugService::objectForId()
+{
+    QCOMPARE(QmlDebugService::objectForId(-1), static_cast<QObject*>(0));
+    QCOMPARE(QmlDebugService::objectForId(1), static_cast<QObject*>(0));
+
+    QObject *obj = new QObject;
+    int id = QmlDebugService::idForObject(obj);
+    QCOMPARE(QmlDebugService::objectForId(id), obj);
+
+    delete obj;
+    QCOMPARE(QmlDebugService::objectForId(id), static_cast<QObject*>(0));
+}
+
+void tst_QmlDebugService::objectToString()
+{
+    QCOMPARE(QmlDebugService::objectToString(0), QString("NULL"));
+
+    QObject *obj = new QObject;
+    QCOMPARE(QmlDebugService::objectToString(obj), QString("QObject: <unnamed>"));
+
+    obj->setObjectName("Hello");
+    QCOMPARE(QmlDebugService::objectToString(obj), QString("QObject: Hello"));
+}
+
+
+class tst_QmlDebugService_Thread : public QThread
+{
+    Q_OBJECT
+public:
+    void run() {
+        QTest::qWait(1000);
+        connectToEngine();
+    }
+
+    QPointer<QmlEngine> m_engine;
+
+signals:
+    void testsFinished();
+
+public slots:
+
+    void connectToEngine()
+    {
+        QmlDebugConnection conn;
+        conn.connectToHost("127.0.0.1", 3768);
+        bool ok = conn.waitForConnected(5000);
+        Q_ASSERT(ok);
+        while (!m_engine)
+            QTest::qWait(50);
+
+        tst_QmlDebugService test(&conn, m_engine);
+        QTest::qExec(&test); 
+        emit testsFinished();
+    }
+};
+
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    qputenv("QML_DEBUG_SERVER_PORT", "3768");
+
+    tst_QmlDebugService_Thread thread;
+    QObject::connect(&thread, SIGNAL(testsFinished()), qApp, SLOT(quit()));
+    thread.start();
+
+    QmlEngine engine;  // blocks until client connects
+
+    // start the test
+    thread.m_engine = &engine;
+
+    return app.exec();
+
+}
+
+#include "tst_qmldebugservice.moc"
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 930eb09..3106f90 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -5,6 +5,7 @@ SUBDIRS += \
            animations \             # Cover
            behaviors \              # Cover
            datetimeformatter \      # Cover
+           debugger \               # Cover
            examples \
            layouts \                # Cover
            qmlgraphicslistview \    # Cover
@@ -12,12 +13,11 @@ SUBDIRS += \
            numberformatter \        # Cover
            parserstress \           # Cover
            pathview \               # Cover
-           qfxloader \              # Cover
+           qmlgraphicsloader \      # Cover
            qmetaobjectbuilder \     # Cover
            qmlbinding \             # Cover
            qmlconnection \          # Cover
            qmlcontext \             # Cover
-           qmldebug \               # Cover
            qmldom \                 # Cover
            qmlecmascript \          # Cover
            qmlerror \               # Cover
diff --git a/tests/auto/declarative/qmldebug/tst_qmldebug.cpp b/tests/auto/declarative/qmldebug/tst_qmldebug.cpp
deleted file mode 100644
index 0890557..0000000
--- a/tests/auto/declarative/qmldebug/tst_qmldebug.cpp
+++ /dev/null
@@ -1,590 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QSignalSpy>
-#include <QTimer>
-#include <QHostAddress>
-#include <QDebug>
-#include <QThread>
-#include <QProcessEnvironment>
-#include <QProcess>
-
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlexpression.h>
-#include <QtDeclarative/qmlmetatype.h>
-#include <QtDeclarative/qmlmetaproperty.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qmlbinding.h>
-
-#include <private/qmldebug_p.h>
-#include <private/qmlenginedebug_p.h>
-#include <private/qmldebugclient_p.h>
-#include <private/qmldebugservice_p.h>
-#include <private/qmlgraphicsrectangle_p.h>
-#include <private/qmlgraphicstext_p.h>
-#include <private/qmldeclarativedata_p.h>
-
-
-class tst_QmlDebug : public QObject
-{
-    Q_OBJECT
-
-public:
-    tst_QmlDebug(QmlDebugConnection *conn, QmlEngine *engine, QmlGraphicsItem *rootItem)
-        : m_conn(conn), m_dbg(0), m_engine(engine), m_rootItem(rootItem) {}
-
-protected slots:
-    void saveValueChange(const QByteArray &ba, const QVariant &v)
-    {
-        m_savedValueChanges[ba] = v;
-    }
-
-private:
-    QmlDebugObjectReference findRootObject();
-    QmlDebugPropertyReference findProperty(const QList<QmlDebugPropertyReference> &props, const QString &name);
-    QObject *findObjectWithId(const QObjectList &objects, int id);
-    void waitForQuery(QmlDebugQuery *query);
-    void recursiveObjectTest(QObject *o, const QmlDebugObjectReference &oref, bool recursive);
-    
-    QmlDebugConnection *m_conn;
-    QmlEngineDebug *m_dbg;
-    QmlEngine *m_engine;
-    QmlGraphicsItem *m_rootItem;
-    QHash<QByteArray, QVariant> m_savedValueChanges;
-
-private slots:
-    void initTestCase();
-
-    void watch_property();
-    void watch_object();
-    void watch_expression();
-    void watch_expression_data();
-
-    void queryAvailableEngines();
-    void queryRootContexts();
-    void queryObject();
-    void queryObject_data();
-    void queryExpressionResult();
-    void queryExpressionResult_data();
-};
-
-QmlDebugObjectReference tst_QmlDebug::findRootObject()
-{
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
-    waitForQuery(q_engines);
-    
-    if (q_engines->engines().count() == 0)
-        return QmlDebugObjectReference();
-    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
-    waitForQuery(q_context);
-
-    if (q_context->rootContext().objects().count() == 0)
-        return QmlDebugObjectReference();
-    QmlDebugObjectQuery *q_obj = m_dbg->queryObject(q_context->rootContext().objects()[0], this);
-    waitForQuery(q_obj);
-
-    QmlDebugObjectReference result = q_obj->object();
-
-    delete q_engines;
-    delete q_context;
-    delete q_obj;
-
-    return result;
-}
-
-QmlDebugPropertyReference tst_QmlDebug::findProperty(const QList<QmlDebugPropertyReference> &props, const QString &name)
-{
-    foreach(const QmlDebugPropertyReference &p, props) {
-        if (p.name() == name)
-            return p;
-    }
-    return QmlDebugPropertyReference();
-}
-
-QObject *tst_QmlDebug::findObjectWithId(const QObjectList &objects, int id)
-{
-    foreach (QObject *o, objects) {
-        if (id == QmlDebugService::idForObject(o))
-            return o;
-    }
-    return 0;
-}
-
-void tst_QmlDebug::waitForQuery(QmlDebugQuery *query)
-{
-    QVERIFY(query);
-    QCOMPARE(query->parent(), this);
-    QEventLoop loop;
-    QTimer timer;
-    QVERIFY(query->state() == QmlDebugQuery::Waiting);
-    connect(query, SIGNAL(stateChanged(State)), &loop, SLOT(quit()));
-    connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
-    timer.start(5000);
-    loop.exec();
-    if (!timer.isActive())
-        QFAIL("query timed out");
-}
-
-void tst_QmlDebug::recursiveObjectTest(QObject *o, const QmlDebugObjectReference &oref, bool recursive)
-{
-    const QMetaObject *meta = o->metaObject();
-
-    QmlType *type = QmlMetaType::qmlType(o->metaObject());
-    QString className = type ? type->qmlTypeName() : QString();
-    className = className.mid(className.lastIndexOf(QLatin1Char('/'))+1);
-
-    QCOMPARE(oref.debugId(), QmlDebugService::idForObject(o));
-    QCOMPARE(oref.name(), o->objectName());
-    QCOMPARE(oref.className(), className);
-    QCOMPARE(oref.contextDebugId(), QmlDebugService::idForObject(qmlContext(o)));
-
-    foreach (const QmlDebugObjectReference &cref, oref.children()) {
-        // ignore children with no context
-        if (cref.contextDebugId() < 0)
-            continue;
-
-        QObject *childObject = findObjectWithId(o->children(), cref.debugId());
-        QVERIFY2(childObject, qPrintable(QString("Can't find QObject* for %1").arg(cref.className())));
-
-        if (recursive)
-            recursiveObjectTest(childObject, cref, true);
-    }
-
-    foreach (const QmlDebugPropertyReference &p, oref.properties()) {
-        QMetaProperty pmeta = meta->property(meta->indexOfProperty(p.name().toUtf8().constData()));
-        QVERIFY(pmeta.isValid());
-
-        QCOMPARE(p.name(), QString::fromUtf8(pmeta.name()));
-
-        if (pmeta.type() < QVariant::UserType) // TODO test complex types
-            QCOMPARE(p.value(), pmeta.read(o));
-
-        if (p.name() == "parent")
-            QVERIFY(p.valueTypeName() == "QGraphicsObject*" || p.valueTypeName() == "QmlGraphicsItem*");
-        else
-            QCOMPARE(p.valueTypeName(), QString::fromUtf8(pmeta.typeName()));
-
-        QmlAbstractBinding *binding = QmlMetaProperty(o, p.name()).binding();
-        if (binding)
-            QCOMPARE(binding->expression(), p.binding());
-
-        QCOMPARE(p.hasNotifySignal(), pmeta.hasNotifySignal());
-    }
-}
-
-void tst_QmlDebug::initTestCase()
-{
-    m_dbg = new QmlEngineDebug(m_conn, this);
-}
-
-void tst_QmlDebug::watch_property()
-{
-    QmlDebugObjectReference obj = findRootObject();
-    QmlDebugPropertyReference prop = findProperty(obj.properties(), "width");
-
-    QmlDebugPropertyWatch *watch = m_dbg->addWatch(prop, this);
-    QCOMPARE(watch->state(), QmlDebugWatch::Waiting);
-    QCOMPARE(watch->objectDebugId(), obj.debugId());
-    QCOMPARE(watch->name(), prop.name());
-
-    QSignalSpy spy(watch, SIGNAL(valueChanged(QByteArray,QVariant)));
-    QEventLoop loop;
-    QTimer timer;
-    connect(watch, SIGNAL(valueChanged(QByteArray,QVariant)), &loop, SLOT(quit()));
-    connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
-
-    int origWidth = m_rootItem->property("width").toInt();
-    timer.start(5000);
-    m_rootItem->setProperty("width", origWidth*2);
-    loop.exec();
-
-    if (!timer.isActive())
-        QFAIL("Did not receive valueChanged() for property");
-
-    m_dbg->removeWatch(watch);
-    delete watch;
-
-    // restore original value and verify spy doesn't get a signal since watch has been removed
-    m_rootItem->setProperty("width", origWidth);
-    QTest::qWait(100);
-    QCOMPARE(spy.count(), 1);
-
-    QCOMPARE(spy.at(0).at(0).value<QByteArray>(), prop.name().toUtf8());
-    QCOMPARE(spy.at(0).at(1).value<QVariant>(), qVariantFromValue(origWidth*2));
-}
-
-void tst_QmlDebug::watch_object()
-{
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
-    waitForQuery(q_engines);
-    
-    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
-    waitForQuery(q_context);
-
-    QmlDebugObjectQuery *q_obj = m_dbg->queryObject(q_context->rootContext().objects()[0], this);
-    waitForQuery(q_obj);
-
-    QmlDebugObjectReference obj = q_obj->object();
-
-    delete q_engines;
-    delete q_context;
-    delete q_obj;
-
-    QmlDebugWatch *watch = m_dbg->addWatch(obj, this);
-    QCOMPARE(watch->state(), QmlDebugWatch::Waiting);
-    QCOMPARE(watch->objectDebugId(), obj.debugId());
-
-    m_savedValueChanges.clear();
-    connect(watch, SIGNAL(valueChanged(QByteArray,QVariant)),
-            SLOT(saveValueChange(QByteArray,QVariant)));
-
-    int origWidth = m_rootItem->property("width").toInt();
-    int origHeight = m_rootItem->property("height").toInt();
-    m_rootItem->setProperty("width", origWidth*2);
-    m_rootItem->setProperty("height", origHeight*2);
-
-    QEventLoop loop;
-    QTimer timer;
-    timer.start(5000);
-    while (timer.isActive() &&
-            (!m_savedValueChanges.contains("width") || !m_savedValueChanges.contains("height"))) {
-        loop.processEvents(QEventLoop::AllEvents, 50);
-    }
-
-    QVariant newWidth = m_savedValueChanges["width"];
-    QVariant newHeight = m_savedValueChanges["height"];
-
-    m_dbg->removeWatch(watch);
-    delete watch;
-
-    // since watch has been removed, restoring the original values should not trigger a valueChanged()
-    m_savedValueChanges.clear();
-    m_rootItem->setProperty("width", origWidth);
-    m_rootItem->setProperty("height", origHeight);
-    QTest::qWait(100);
-    QCOMPARE(m_savedValueChanges.count(), 0);
-
-    if (newWidth.isNull() || newHeight.isNull()) {
-        QString s = QString("Did not receive both width and height changes (width=%1, height=%2)")
-                .arg(newWidth.toString()).arg(newHeight.toString());
-        QFAIL(qPrintable(s));
-    }
-
-    QCOMPARE(newWidth, qVariantFromValue(origWidth*2));
-    QCOMPARE(newHeight, qVariantFromValue(origHeight*2));
-}
-
-void tst_QmlDebug::watch_expression()
-{
-    QFETCH(QString, expr);
-    QFETCH(int, increment);
-    QFETCH(int, incrementCount);
-
-    int origWidth = m_rootItem->property("width").toInt();
-    
-    QmlDebugObjectReference obj = findRootObject();
-    QmlDebugPropertyReference prop;
-
-    QmlDebugObjectExpressionWatch *watch = m_dbg->addWatch(obj, expr, this);
-    QCOMPARE(watch->state(), QmlDebugWatch::Waiting);
-    QCOMPARE(watch->objectDebugId(), obj.debugId());
-    QCOMPARE(watch->expression(), expr);
-
-    QSignalSpy spy(watch, SIGNAL(valueChanged(QByteArray,QVariant)));
-    int expectedSpyCount = incrementCount + 1;  // should also get signal with expression's initial value
-
-    int width = origWidth;
-    for (int i=0; i<incrementCount+1; i++) {
-        QTimer timer;
-        timer.start(5000);
-        if (i > 0) {
-            width += increment;
-            m_rootItem->setProperty("width", width);
-        }
-        QEventLoop loop;
-        connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
-        connect(watch, SIGNAL(valueChanged(QByteArray,QVariant)), &loop, SLOT(quit()));
-        loop.exec();
-        if (!timer.isActive())
-            QFAIL("Did not receive valueChanged() signal for expression");
-    }
-
-    m_dbg->removeWatch(watch);
-    delete watch;
-
-    // restore original value and verify spy doesn't get a signal since watch has been removed
-    m_rootItem->setProperty("width", origWidth); 
-    QTest::qWait(100);
-    QCOMPARE(spy.count(), expectedSpyCount);
-
-    width = origWidth + increment;
-    for (int i=0; i<spy.count(); i++) {
-        QCOMPARE(spy.at(i).at(1).value<QVariant>().toInt(), width);
-        width += increment;
-    }
-}
-
-void tst_QmlDebug::watch_expression_data()
-{
-    QTest::addColumn<QString>("expr");
-    QTest::addColumn<int>("increment");
-    QTest::addColumn<int>("incrementCount");
-
-    QTest::newRow("width") << "width" << 0 << 0;
-    QTest::newRow("width+10") << "width + 10" << 10 << 5;
-}
-
-void tst_QmlDebug::queryAvailableEngines()
-{
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
-    waitForQuery(q_engines);
-
-    // TODO test multiple engines
-    QList<QmlDebugEngineReference> engines = q_engines->engines();
-    QCOMPARE(engines.count(), 1);
-
-    foreach(const QmlDebugEngineReference &e, engines) {
-        QCOMPARE(e.debugId(), QmlDebugService::idForObject(m_engine));
-        QCOMPARE(e.name(), m_engine->objectName());
-    }
-
-    delete q_engines;
-}
-
-void tst_QmlDebug::queryRootContexts()
-{
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
-    waitForQuery(q_engines);
-    
-    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
-    waitForQuery(q_context);
-
-    QmlContext *actualContext = m_engine->rootContext();
-    QmlDebugContextReference context = q_context->rootContext();
-    QCOMPARE(context.debugId(), QmlDebugService::idForObject(actualContext));
-    QCOMPARE(context.name(), actualContext->objectName());
-
-    QCOMPARE(context.objects().count(), 2); // 2 objects created for engine in main()
-
-    // root context query sends only root object data - it doesn't fill in
-    // the children or property info
-    QCOMPARE(context.objects()[0].properties().count(), 0);
-    QCOMPARE(context.objects()[0].children().count(), 0);
-
-    // TODO have multiple contexts
-    QCOMPARE(context.contexts().count(), 0);
-
-    delete q_engines;
-    delete q_context;
-}
-
-void tst_QmlDebug::queryObject()
-{
-    QFETCH(bool, recursive);
-
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
-    waitForQuery(q_engines);
-    
-    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
-    waitForQuery(q_context);
-
-    QmlDebugObjectQuery *q_obj = 0;
-    if (recursive)
-        q_obj = m_dbg->queryObjectRecursive(q_context->rootContext().objects()[0], this);
-    else
-        q_obj = m_dbg->queryObject(q_context->rootContext().objects()[0], this);
-    waitForQuery(q_obj);
-
-    QmlDebugObjectReference obj = q_obj->object();
-
-    delete q_engines;
-    delete q_context;
-    delete q_obj;
-
-    // check source as defined in main()
-    QmlDebugFileReference source = obj.source();
-    QCOMPARE(source.url(), QUrl("file://"));
-    QCOMPARE(source.lineNumber(), 2);
-    QCOMPARE(source.columnNumber(), 1);
-
-    // generically test all properties, children and childrens' properties
-    recursiveObjectTest(m_rootItem, obj, recursive);
-
-    if (recursive) {
-        foreach(const QmlDebugObjectReference &child, obj.children())
-            QVERIFY(child.properties().count() > 0);
-
-        QmlDebugObjectReference rect;
-        QmlDebugObjectReference text;
-        foreach (const QmlDebugObjectReference &child, obj.children()) {
-            if (child.className() == "Rectangle")
-                rect = child;
-            else if (child.className() == "Text")
-                text = child;
-        }
-
-        // test specific property values
-        QCOMPARE(findProperty(rect.properties(), "width").value(), qVariantFromValue(500));
-        QCOMPARE(findProperty(rect.properties(), "height").value(), qVariantFromValue(600));
-        QCOMPARE(findProperty(rect.properties(), "color").value(), qVariantFromValue(QColor("blue")));
-
-        QCOMPARE(findProperty(text.properties(), "color").value(), qVariantFromValue(QColor("blue")));
-
-    } else {
-        foreach(const QmlDebugObjectReference &child, obj.children())
-            QCOMPARE(child.properties().count(), 0);
-    }
-}
-
-void tst_QmlDebug::queryObject_data()
-{
-    QTest::addColumn<bool>("recursive");
-
-    QTest::newRow("non-recursive") << false;
-    QTest::newRow("recursive") << true;
-}
-
-void tst_QmlDebug::queryExpressionResult()
-{
-    QFETCH(QString, expr);
-    QFETCH(QVariant, result);
-
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
-    waitForQuery(q_engines);
-    
-    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
-    waitForQuery(q_context);
-
-    QmlDebugExpressionQuery *q_expr = m_dbg->queryExpressionResult(q_context->rootContext().objects()[0].debugId(), expr, this);
-    QCOMPARE(q_expr->expression(), expr);
-    waitForQuery(q_expr);
-
-    QCOMPARE(q_expr->result(), result);
-
-    delete q_engines;
-    delete q_context;
-    delete q_expr;
-}
-
-void tst_QmlDebug::queryExpressionResult_data()
-{
-    QTest::addColumn<QString>("expr");
-    QTest::addColumn<QVariant>("result");
-
-    QTest::newRow("width + 50") << "width + 50" << qVariantFromValue(60);
-    QTest::newRow("blueRect.width") << "blueRect.width" << qVariantFromValue(500);
-    QTest::newRow("bad expr") << "aeaef" << qVariantFromValue(QString("<undefined>"));
-}
-
-
-class TestRunnerThread : public QThread
-{
-    Q_OBJECT
-public:
-    void run() {
-        QTest::qWait(1000);
-        connectToEngine();
-    }
-
-    QPointer<QmlEngine> m_engine;
-    QPointer<QmlGraphicsItem> m_item;
-
-signals:
-    void testsFinished();
-
-public slots:
-
-    void connectToEngine()
-    {
-        QmlDebugConnection conn;
-        conn.connectToHost("127.0.0.1", 3768);
-        bool ok = conn.waitForConnected(5000);
-        Q_ASSERT(ok);
-        while (!m_engine && !m_item)
-            QTest::qWait(50);
-
-        tst_QmlDebug test(&conn, m_engine, m_item);
-        QTest::qExec(&test); 
-        emit testsFinished();
-    }
-};
-
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    qputenv("QML_DEBUG_SERVER_PORT", "3768");
-
-    TestRunnerThread thread;
-    QObject::connect(&thread, SIGNAL(testsFinished()), qApp, SLOT(quit()));
-    thread.start();
-
-    QmlEngine engine;  // blocks until client connects
-
-    QmlComponent component(&engine,
-                "import Qt 4.6\n"
-                    "Item {\n"
-                        "width: 10; height: 20;\n"
-                        "Rectangle { id: blueRect; width: 500; height: 600; color: \"blue\"; }"
-                        "Text { color: blueRect.color; }"
-                    "}\n",
-            QUrl("file://"));
-    Q_ASSERT(component.isReady());
-    QObject *o = component.create();
-    QObject::connect(&thread, SIGNAL(testsFinished()), o, SLOT(deleteLater()));
-
-    // allows us to test that multiple contexts can be detected
-    QObject *o2 = component.create();
-    QObject::connect(&thread, SIGNAL(testsFinished()), o2, SLOT(deleteLater()));
-
-    // start the test
-    thread.m_engine = &engine;
-    thread.m_item = qobject_cast<QmlGraphicsItem*>(o);
-
-    return app.exec();
-
-}
-
-//QTEST_MAIN(tst_QmlDebug)
-
-#include "tst_qmldebug.moc"
diff --git a/tests/auto/declarative/qfxloader/NoResize.qml b/tests/auto/declarative/qmlgraphicsloader/NoResize.qml
index cfbb55a..cfbb55a 100644
--- a/tests/auto/declarative/qfxloader/NoResize.qml
+++ b/tests/auto/declarative/qmlgraphicsloader/NoResize.qml
diff --git a/tests/auto/declarative/qfxloader/Rect120x60.qml b/tests/auto/declarative/qmlgraphicsloader/Rect120x60.qml
index aa4b0c2..aa4b0c2 100644
--- a/tests/auto/declarative/qfxloader/Rect120x60.qml
+++ b/tests/auto/declarative/qmlgraphicsloader/Rect120x60.qml
diff --git a/tests/auto/declarative/qfxloader/SetSourceComponent.qml b/tests/auto/declarative/qmlgraphicsloader/SetSourceComponent.qml
index 1db56c4..1db56c4 100644
--- a/tests/auto/declarative/qfxloader/SetSourceComponent.qml
+++ b/tests/auto/declarative/qmlgraphicsloader/SetSourceComponent.qml
diff --git a/tests/auto/declarative/qfxloader/SizeToItem.qml b/tests/auto/declarative/qmlgraphicsloader/SizeToItem.qml
index b52fa03..b52fa03 100644
--- a/tests/auto/declarative/qfxloader/SizeToItem.qml
+++ b/tests/auto/declarative/qmlgraphicsloader/SizeToItem.qml
diff --git a/tests/auto/declarative/qfxloader/SizeToLoader.qml b/tests/auto/declarative/qmlgraphicsloader/SizeToLoader.qml
index 1a107e1..1a107e1 100644
--- a/tests/auto/declarative/qfxloader/SizeToLoader.qml
+++ b/tests/auto/declarative/qmlgraphicsloader/SizeToLoader.qml
diff --git a/tests/auto/declarative/qfxloader/qfxloader.pro b/tests/auto/declarative/qmlgraphicsloader/qmlgraphicsloader.pro
index aee52cc..8be8cdf 100644
--- a/tests/auto/declarative/qfxloader/qfxloader.pro
+++ b/tests/auto/declarative/qmlgraphicsloader/qmlgraphicsloader.pro
@@ -2,6 +2,6 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative gui
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qfxloader.cpp
+SOURCES += tst_qmlgraphicsloader.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qfxloader/tst_qfxloader.cpp b/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp
index 9a3da90..8fda991 100644
--- a/tests/auto/declarative/qfxloader/tst_qfxloader.cpp
+++ b/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp
@@ -43,15 +43,16 @@
 #include <QtDeclarative/qmlcomponent.h>
 #include <private/qmlgraphicsloader_p.h>
 
-class tst_qfxloader : public QObject
+class tst_QmlGraphicsLoader : public QObject
 
 {
     Q_OBJECT
 public:
-    tst_qfxloader();
+    tst_QmlGraphicsLoader();
 
 private slots:
     void url();
+    void invalidUrl();
     void component();
     void clear();
     void urlToComponent();
@@ -77,23 +78,25 @@ inline QUrl TEST_FILE(const char *filename)
 }
 */
 
-tst_qfxloader::tst_qfxloader()
+tst_QmlGraphicsLoader::tst_QmlGraphicsLoader()
 {
 }
 
-void tst_qfxloader::url()
+void tst_QmlGraphicsLoader::url()
 {
     QmlComponent component(&engine, QByteArray("import Qt 4.6\nLoader { source: \"Rect120x60.qml\" }"), QUrl("file://" SRCDIR "/"));
     QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
     QVERIFY(loader != 0);
     QVERIFY(loader->item());
+    QVERIFY(loader->source() == QUrl("file://" SRCDIR "/Rect120x60.qml"));
     QCOMPARE(loader->progress(), 1.0);
+    QCOMPARE(loader->status(), QmlGraphicsLoader::Ready);
     QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
 
     delete loader;
 }
 
-void tst_qfxloader::component()
+void tst_QmlGraphicsLoader::component()
 {
     QmlComponent component(&engine, QUrl("file://" SRCDIR "/SetSourceComponent.qml"));
     QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
@@ -103,36 +106,75 @@ void tst_qfxloader::component()
     QVERIFY(loader);
     QVERIFY(loader->item());
     QCOMPARE(loader->progress(), 1.0);
+    QCOMPARE(loader->status(), QmlGraphicsLoader::Ready);
     QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
 
     delete loader;
 }
 
-void tst_qfxloader::clear()
+void tst_QmlGraphicsLoader::invalidUrl()
 {
-    QmlComponent component(&engine, QByteArray(
-                "import Qt 4.6\n"
-                " Loader { id: loader\n"
-                "  source: 'Rect120x60.qml'\n"
-                "  Timer { interval: 200; running: true; onTriggered: loader.source = '' }\n"
-                " }")
-            , QUrl("file://" SRCDIR "/"));
+//    QTest::ignoreMessage(QtWarningMsg, "(:-1: File error for URL file://" SRCDIR "/IDontExist.qml)");
+
+    QmlComponent component(&engine, QByteArray("import Qt 4.6\nLoader { source: \"IDontExist.qml\" }"), QUrl("file://" SRCDIR "/"));
     QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
     QVERIFY(loader != 0);
-    QVERIFY(loader->item());
-    QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
-
-    QTest::qWait(500);
-
     QVERIFY(loader->item() == 0);
-    QCOMPARE(loader->progress(), 0.0);
+    QCOMPARE(loader->progress(), 1.0);
+    QCOMPARE(loader->status(), QmlGraphicsLoader::Error);
     QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 0);
 
     delete loader;
 }
 
-void tst_qfxloader::urlToComponent()
+void tst_QmlGraphicsLoader::clear()
+{
+    {
+        QmlComponent component(&engine, QByteArray(
+                    "import Qt 4.6\n"
+                    " Loader { id: loader\n"
+                    "  source: 'Rect120x60.qml'\n"
+                    "  Timer { interval: 200; running: true; onTriggered: loader.source = '' }\n"
+                    " }")
+                , QUrl("file://" SRCDIR "/"));
+        QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
+        QVERIFY(loader != 0);
+        QVERIFY(loader->item());
+        QCOMPARE(loader->progress(), 1.0);
+        QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
+
+        QTest::qWait(500);
+
+        QVERIFY(loader->item() == 0);
+        QCOMPARE(loader->progress(), 0.0);
+        QCOMPARE(loader->status(), QmlGraphicsLoader::Null);
+        QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 0);
+
+        delete loader;
+    }
+    {
+        QmlComponent component(&engine, QUrl("file://" SRCDIR "/SetSourceComponent.qml"));
+        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
+        QVERIFY(item);
+
+        QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(item->QGraphicsObject::children().at(1)); 
+        QVERIFY(loader);
+        QVERIFY(loader->item());
+        QCOMPARE(loader->progress(), 1.0);
+        QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
+
+        loader->setSourceComponent(0);
+
+        QVERIFY(loader->item() == 0);
+        QCOMPARE(loader->progress(), 0.0);
+        QCOMPARE(loader->status(), QmlGraphicsLoader::Null);
+        QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 0);
+
+        delete loader;
+    }
+}
+
+void tst_QmlGraphicsLoader::urlToComponent()
 {
     QmlComponent component(&engine, QByteArray("import Qt 4.6\n"
                 "Loader {\n"
@@ -154,7 +196,7 @@ void tst_qfxloader::urlToComponent()
     delete loader;
 }
 
-void tst_qfxloader::componentToUrl()
+void tst_QmlGraphicsLoader::componentToUrl()
 {
     QmlComponent component(&engine, QUrl("file://" SRCDIR "/SetSourceComponent.qml"));
     QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
@@ -176,20 +218,37 @@ void tst_qfxloader::componentToUrl()
     delete loader;
 }
 
-void tst_qfxloader::sizeLoaderToItem()
+void tst_QmlGraphicsLoader::sizeLoaderToItem()
 {
     QmlComponent component(&engine, QUrl("file://" SRCDIR "/SizeToItem.qml"));
     QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
     QVERIFY(loader != 0);
+    QVERIFY(loader->resizeMode() == QmlGraphicsLoader::SizeLoaderToItem);
     QCOMPARE(loader->width(), 120.0);
     QCOMPARE(loader->height(), 60.0);
+
+    // Check resize
+    QmlGraphicsItem *rect = loader->item();
+    QVERIFY(rect);
+    rect->setWidth(150);
+    rect->setHeight(45);
+    QCOMPARE(loader->width(), 150.0);
+    QCOMPARE(loader->height(), 45.0);
+
+    // Switch mode
+    loader->setResizeMode(QmlGraphicsLoader::SizeItemToLoader);
+    loader->setWidth(180);
+    loader->setHeight(30);
+    QCOMPARE(rect->width(), 180.0);
+    QCOMPARE(rect->height(), 30.0);
 }
 
-void tst_qfxloader::sizeItemToLoader()
+void tst_QmlGraphicsLoader::sizeItemToLoader()
 {
     QmlComponent component(&engine, QUrl("file://" SRCDIR "/SizeToLoader.qml"));
     QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
     QVERIFY(loader != 0);
+    QVERIFY(loader->resizeMode() == QmlGraphicsLoader::SizeItemToLoader);
     QCOMPARE(loader->width(), 200.0);
     QCOMPARE(loader->height(), 80.0);
 
@@ -197,9 +256,15 @@ void tst_qfxloader::sizeItemToLoader()
     QVERIFY(rect);
     QCOMPARE(rect->width(), 200.0);
     QCOMPARE(rect->height(), 80.0);
+
+    // Check resize
+    loader->setWidth(180);
+    loader->setHeight(30);
+    QCOMPARE(rect->width(), 180.0);
+    QCOMPARE(rect->height(), 30.0);
 }
 
-void tst_qfxloader::noResize()
+void tst_QmlGraphicsLoader::noResize()
 {
     QmlComponent component(&engine, QUrl("file://" SRCDIR "/NoResize.qml"));
     QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
@@ -213,6 +278,6 @@ void tst_qfxloader::noResize()
     QCOMPARE(rect->height(), 60.0);
 }
 
-QTEST_MAIN(tst_qfxloader)
+QTEST_MAIN(tst_QmlGraphicsLoader)
 
-#include "tst_qfxloader.moc"
+#include "tst_qmlgraphicsloader.moc"