12 files changed, 16 insertions, 335 deletions
diff --git a/tests/auto/declarative/debugger/debugger.pro b/tests/auto/declarative/debugger/debugger.pro
deleted file mode 100644
index a341ca9..0000000
--- a/tests/auto/declarative/debugger/debugger.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += qmldebug \
-           qmldebugclient \
-           qmldebugservice \
-           qpacketprotocol
diff --git a/tests/auto/declarative/debugger/debugutil.cpp b/tests/auto/declarative/debugger/debugutil.cpp
deleted file mode 100644
index 7008529..0000000
--- a/tests/auto/declarative/debugger/debugutil.cpp
+++ /dev/null
@@ -1,173 +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 <QSignalSpy>
-#include <QEventLoop>
-#include <QTimer>
-
-#include <private/qmldebugclient_p.h>
-#include <private/qmldebugservice_p.h>
-
-#include "debugutil_p.h"
-
-bool QmlDebugTest::waitForSignal(QObject *receiver, const char *member, int timeout) {
-    QEventLoop loop;
-    QTimer timer;
-    QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
-    QObject::connect(receiver, member, &loop, SLOT(quit()));
-    timer.start(timeout);
-    loop.exec();
-    return timer.isActive();
-}
-
-
-QmlDebugTestData::QmlDebugTestData(QEventLoop *el)
-    : exitCode(-1), loop(el)
-{
-}
-
-QmlDebugTestData::~QmlDebugTestData()
-{
-    qDeleteAll(items);
-}
-
-void QmlDebugTestData::testsFinished(int code)
-{
-    exitCode = code;
-    loop->quit();
-}
-
-
-
-QmlDebugTestService::QmlDebugTestService(const QString &s, QObject *parent)
-    : QmlDebugService(s, parent), enabled(false)
-{
-}
-
-void QmlDebugTestService::messageReceived(const QByteArray &ba)
-{
-    sendMessage(ba);
-}
-
-void QmlDebugTestService::enabledChanged(bool e)
-{
-    emit enabledStateChanged();
-    enabled = e;
-}
-
-
-QmlDebugTestClient::QmlDebugTestClient(const QString &s, QmlDebugConnection *c)
-    : QmlDebugClient(s, c)
-{
-}
-
-QByteArray QmlDebugTestClient::waitForResponse()
-{
-    QSignalSpy spy(this, SIGNAL(serverMessage(QByteArray)));
-    QmlDebugTest::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 QmlDebugTestClient::messageReceived(const QByteArray &ba)
-{
-    emit serverMessage(ba);
-}
-
-
-tst_QmlDebug_Thread::tst_QmlDebug_Thread(QmlDebugTestData *data, QmlTestFactory *factory)
-    : m_ready(false), m_data(data), m_factory(factory)
-{
-}
-
-void tst_QmlDebug_Thread::run()
-{
-    QTest::qWait(1000);
-
-    QmlDebugConnection conn;
-    conn.connectToHost("127.0.0.1", 3768);
-    bool ok = conn.waitForConnected(5000);
-    Q_ASSERT(ok);
-
-    while (!m_ready)
-        QTest::qWait(100);
-
-    m_data->conn = &conn;
-
-    Q_ASSERT(m_factory);
-    QObject *test = m_factory->createTest(m_data);
-    Q_ASSERT(test);
-    int code = QTest::qExec(test); 
-    emit testsFinished(code);
-}
-
-
-int QmlDebugTest::runTests(QmlTestFactory *factory, const QList<QByteArray> &qml)
-{
-    qputenv("QML_DEBUG_SERVER_PORT", "3768");
-
-    QEventLoop loop;
-    QmlDebugTestData data(&loop);
-
-    tst_QmlDebug_Thread thread(&data, factory);
-    QObject::connect(&thread, SIGNAL(testsFinished(int)), &data, SLOT(testsFinished(int)));
-    thread.start();
-
-    QmlEngine engine;  // blocks until client connects
-
-    foreach (const QByteArray &code, qml) {
-        QmlComponent c(&engine, code, QUrl("file://"));
-        Q_ASSERT(c.isReady());  // fails if bad syntax
-        data.items << qobject_cast<QmlGraphicsItem*>(c.create());
-    }
-
-    // start the test
-    data.engine = &engine;
-    thread.m_ready = true;
-
-    loop.exec();
-
-    return data.exitCode;
-}
-
-
diff --git a/tests/auto/declarative/debugger/debugutil_p.h b/tests/auto/declarative/debugger/debugutil_p.h
deleted file mode 100644
index 665aeda..0000000
--- a/tests/auto/declarative/debugger/debugutil_p.h
+++ /dev/null
@@ -1,142 +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 <QSignalSpy>
-#include <QEventLoop>
-#include <QPointer>
-#include <QTimer>
-#include <QThread>
-#include <QTest>
-
-#include <QtDeclarative/qmlengine.h>
-
-#include <private/qmldebugclient_p.h>
-#include <private/qmldebugservice_p.h>
-#include <private/qmlgraphicsitem_p.h>
-
-
-class QmlDebugTestData : public QObject
-{
-    Q_OBJECT
-public:
-    QmlDebugTestData(QEventLoop *el);
-
-    ~QmlDebugTestData();
-
-    QmlEngine *engine;
-    QmlDebugConnection *conn;
-
-    int exitCode;
-    QEventLoop *loop;
-
-    QList<QmlGraphicsItem *> items;
-
-public slots:
-    void testsFinished(int code);
-};
-
-
-class QmlTestFactory
-{
-public:
-    QmlTestFactory() {}
-    virtual ~QmlTestFactory() {}
-
-    virtual QObject *createTest(QmlDebugTestData *data) = 0;
-};
-
-
-namespace QmlDebugTest {
-
-    bool waitForSignal(QObject *receiver, const char *member, int timeout = 5000);
-
-    int runTests(QmlTestFactory *factory, const QList<QByteArray> &qml = QList<QByteArray>());
-}
-
-class QmlDebugTestService : public QmlDebugService
-{
-    Q_OBJECT
-public:
-    QmlDebugTestService(const QString &s, QObject *parent = 0);
-    bool enabled;
-
-signals:
-    void enabledStateChanged();
-
-protected:
-    virtual void messageReceived(const QByteArray &ba);
-
-    virtual void enabledChanged(bool e);
-};
-
-class QmlDebugTestClient : public QmlDebugClient
-{
-    Q_OBJECT
-public:
-    QmlDebugTestClient(const QString &s, QmlDebugConnection *c);
-
-    QByteArray waitForResponse();
-
-signals:
-    void serverMessage(const QByteArray &);
-
-protected:
-    virtual void messageReceived(const QByteArray &ba);
-};
-
-class tst_QmlDebug_Thread : public QThread
-{
-    Q_OBJECT
-public:
-    tst_QmlDebug_Thread(QmlDebugTestData *data, QmlTestFactory *factory);
-
-    void run();
-
-    bool m_ready;
-
-signals:
-    void testsFinished(int);
-
-private:
-    QmlDebugTestData *m_data;
-    QmlTestFactory *m_factory;
-};
-
-
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index ec2c7d0..c45a05e 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -2,10 +2,7 @@ TEMPLATE = subdirs
 SUBDIRS += \
            anchors \                # Cover
            animatedimage \          # Cover
-           animations \             # Cover
-           behaviors \              # Cover
            datetimeformatter \      # Cover
-           debugger \               # Cover
            examples \
            layouts \                # Cover
            numberformatter \        # Cover
@@ -15,6 +12,9 @@ SUBDIRS += \
            qmlbinding \             # Cover
            qmlconnection \          # Cover
            qmlcontext \             # Cover
+           qmldebug \               # Cover
+           qmldebugclient \         # Cover
+           qmldebugservice \        # Cover
            qmldom \                 # Cover
            qmleasefollow \          # Cover
            qmlecmascript \          # Cover
@@ -49,6 +49,7 @@ SUBDIRS += \
            qmlsystempalette \       # Cover
            qmltimer \               # Cover
            qmlxmllistmodel \        # Cover
+           qpacketprotocol \        # Cover
            repeater \               # Cover
            sql \                    # Cover
            states \                 # Cover
diff --git a/tests/auto/declarative/debugger/qmldebug/qmldebug.pro b/tests/auto/declarative/qmldebug/qmldebug.pro
index 0af30e1..f79829d 100644
--- a/tests/auto/declarative/debugger/qmldebug/qmldebug.pro
+++ b/tests/auto/declarative/qmldebug/qmldebug.pro
@@ -2,6 +2,6 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += network declarative
 macx:CONFIG -= app_bundle
 
-HEADERS += ../debugutil_p.h
+HEADERS += ../shared/debugutil_p.h
 SOURCES += tst_qmldebug.cpp \
-           ../debugutil.cpp
+           ../shared/debugutil.cpp
diff --git a/tests/auto/declarative/debugger/qmldebug/tst_qmldebug.cpp b/tests/auto/declarative/qmldebug/tst_qmldebug.cpp
index 70404f6..6916cc9 100644
--- a/tests/auto/declarative/debugger/qmldebug/tst_qmldebug.cpp
+++ b/tests/auto/declarative/qmldebug/tst_qmldebug.cpp
@@ -59,7 +59,7 @@
 #include <private/qmldebugservice_p.h>
 #include <private/qmlgraphicsrectangle_p.h>
 
-#include "../debugutil_p.h"
+#include "../shared/debugutil_p.h"
 
 Q_DECLARE_METATYPE(QmlDebugWatch::State)
 
diff --git a/tests/auto/declarative/debugger/qmldebugclient/qmldebugclient.pro b/tests/auto/declarative/qmldebugclient/qmldebugclient.pro
index c0aa7b2..36aa818 100644
--- a/tests/auto/declarative/debugger/qmldebugclient/qmldebugclient.pro
+++ b/tests/auto/declarative/qmldebugclient/qmldebugclient.pro
@@ -2,6 +2,6 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += network declarative
 macx:CONFIG -= app_bundle
 
-HEADERS += ../debugutil_p.h
+HEADERS += ../shared/debugutil_p.h
 SOURCES += tst_qmldebugclient.cpp \
-           ../debugutil.cpp
+           ../shared/debugutil.cpp
diff --git a/tests/auto/declarative/debugger/qmldebugclient/tst_qmldebugclient.cpp b/tests/auto/declarative/qmldebugclient/tst_qmldebugclient.cpp
index 6c4a1a3..8325731 100644
--- a/tests/auto/declarative/debugger/qmldebugclient/tst_qmldebugclient.cpp
+++ b/tests/auto/declarative/qmldebugclient/tst_qmldebugclient.cpp
@@ -52,7 +52,7 @@
 #include <private/qmldebugclient_p.h>
 #include <private/qmldebugservice_p.h>
 
-#include "../debugutil_p.h"
+#include "../shared/debugutil_p.h"
 
 class tst_QmlDebugClient : public QObject
 {
diff --git a/tests/auto/declarative/debugger/qmldebugservice/qmldebugservice.pro b/tests/auto/declarative/qmldebugservice/qmldebugservice.pro
index cce277a..9995f1f 100644
--- a/tests/auto/declarative/debugger/qmldebugservice/qmldebugservice.pro
+++ b/tests/auto/declarative/qmldebugservice/qmldebugservice.pro
@@ -2,6 +2,6 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += network declarative
 macx:CONFIG -= app_bundle
 
-HEADERS += ../debugutil_p.h
+HEADERS += ../shared/debugutil_p.h
 SOURCES += tst_qmldebugservice.cpp \
-           ../debugutil.cpp
+           ../shared/debugutil.cpp
diff --git a/tests/auto/declarative/debugger/qmldebugservice/tst_qmldebugservice.cpp b/tests/auto/declarative/qmldebugservice/tst_qmldebugservice.cpp
index 0c02929..625d1f5 100644
--- a/tests/auto/declarative/debugger/qmldebugservice/tst_qmldebugservice.cpp
+++ b/tests/auto/declarative/qmldebugservice/tst_qmldebugservice.cpp
@@ -52,7 +52,7 @@
 #include <private/qmldebugclient_p.h>
 #include <private/qmldebugservice_p.h>
 
-#include "../debugutil_p.h"
+#include "../shared/debugutil_p.h"
 
 class tst_QmlDebugService : public QObject
 {
diff --git a/tests/auto/declarative/debugger/qpacketprotocol/qpacketprotocol.pro b/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro
index 800e5e0..f42cecc 100644
--- a/tests/auto/declarative/debugger/qpacketprotocol/qpacketprotocol.pro
+++ b/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro
@@ -2,6 +2,6 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += network declarative
 macx:CONFIG -= app_bundle
 
-HEADERS += ../debugutil_p.h
+HEADERS += ../shared/debugutil_p.h
 SOURCES += tst_qpacketprotocol.cpp \
-           ../debugutil.cpp
+           ../shared/debugutil.cpp
diff --git a/tests/auto/declarative/debugger/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
index 36b6317..b54f133 100644
--- a/tests/auto/declarative/debugger/qpacketprotocol/tst_qpacketprotocol.cpp
+++ b/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
@@ -48,7 +48,7 @@
 
 #include <private/qpacketprotocol_p.h>
 
-#include "../debugutil_p.h"
+#include "../shared/debugutil_p.h"
 
 class tst_QPacketProtocol : public QObject
 {