Commit 7ae32b13 authored by Fawzi Mohamed's avatar Fawzi Mohamed
Browse files

qmldesigner: fixing tests



Change-Id: I2d98ea04860dfab083234904aa83f96cf6790472
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent 2f26e24b
......@@ -49,15 +49,23 @@ void QmlWarningDialog::okButtonPressed()
bool QmlWarningDialog::warningsEnabled() const
{
#ifndef QMLDESIGNER_TEST
DesignerSettings settings = BauhausPlugin::pluginInstance()->settings();
return settings.warningsInDesigner;
#else
return false;
#endif
}
void QmlWarningDialog::checkBoxToggled(bool b)
{
#ifndef QMLDESIGNER_TEST
DesignerSettings settings = BauhausPlugin::pluginInstance()->settings();
settings.warningsInDesigner = b;
BauhausPlugin::pluginInstance()->setSettings(settings);
#else
Q_UNUSED(b);
#endif
}
void QmlWarningDialog::linkClicked(const QString &link)
......
......@@ -36,7 +36,7 @@
namespace QmlDesigner {
class CORESHARED_EXPORT ByteArrayModifier: public PlainTextEditModifier
class QMLDESIGNERCORE_EXPORT ByteArrayModifier: public PlainTextEditModifier
{
public:
static ByteArrayModifier* create(const QString& data);
......
......@@ -34,7 +34,7 @@
#include <extensionsystem/iplugin.h>
#include <pluginmanager.h>
#include <extensionsystem/pluginmanager.h>
#include <QWeakPointer>
#include <QStringList>
......@@ -89,7 +89,7 @@ private:
QStringList m_mimeTypes;
DesignModeWidget *m_mainWidget;
QmlDesigner::PluginManager m_pluginManager;
ExtensionSystem::PluginManager m_pluginManager;
static BauhausPlugin *m_pluginInstance;
DesignerSettings m_settings;
DesignModeContext *m_context;
......
......@@ -12,12 +12,20 @@ LIBS += -L$$IDE_LIBRARY_PATH
unix: QMAKE_LFLAGS += \'-Wl,-rpath,$${IDE_LIBRARY_PATH}\' \'-Wl,-rpath,$${IDE_PLUGIN_PATH}/QtProject\'
QT += script \
network \
webkit
network
greaterThan(QT_MAJOR_VERSION, 4) {
QT += printsupport
!isEmpty(QT.webkitwidgets.name): QT += webkitwidgets webkit
else: DEFINES += QT_NO_WEBKIT
} else {
contains(QT_CONFIG, webkit): QT += webkit
}
# DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB
DEFINES+=QTCREATORDIR=\\\"$$IDE_BUILD_TREE\\\"
DEFINES+=QT_CREATOR QTCREATOR_TEST
DEFINES+=QT_CREATOR QTCREATOR_TEST QMLDESIGNER_TEST
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore
......
......@@ -32,6 +32,8 @@
#include <QScopedPointer>
#include <QLatin1String>
#include <QGraphicsObject>
#include <QTest>
#include <QVariant>
#include <metainfo.h>
#include <model.h>
......@@ -64,6 +66,14 @@
#include <QPlainTextEdit>
#if QT_VERSION >= 0x050000
#define MSKIP_SINGLE(x) QSKIP(x)
#define MSKIP_ALL(x) QSKIP(x);
#else
#define MSKIP_SINGLE(x) QSKIP(x, SkipSingle)
#define MSKIP_ALL(x) QSKIP(x, SkipAll)
#endif
//TESTED_COMPONENT=src/plugins/qmldesigner/designercore
using namespace QmlDesigner;
......@@ -1372,7 +1382,7 @@ void tst_TestCore::testBasicStatesQtQuick20()
qDebug() << rootModelNode.nodeListProperty("states").toModelNodeList().first().metaInfo().majorVersion();
qDebug() << rootModelNode.nodeListProperty("states").toModelNodeList().first().metaInfo().typeName();
QSKIP("No qml2puppet", SkipAll);
MSKIP_ALL("No qml2puppet");
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
......@@ -3980,7 +3990,7 @@ void tst_TestCore::testMetaInfoInterface()
// Test type registered with qmlRegisterInterface
//
QSKIP("TODO: Test not implemented yet", SkipAll);
MSKIP_ALL("TODO: Test not implemented yet");
}
void tst_TestCore::testMetaInfoCustomType()
......@@ -6400,7 +6410,7 @@ void tst_TestCore::testModelBindings()
void tst_TestCore::testModelDynamicProperties()
{
QSKIP("Fix rewriter dynamic properties writing", SkipAll);
MSKIP_ALL("Fix rewriter dynamic properties writing");
QScopedPointer<Model> model(createModel("QtQuick.Item", 1, 1));
QVERIFY(model.data());
......@@ -6411,7 +6421,7 @@ void tst_TestCore::testModelDynamicProperties()
ModelNode rootModelNode = rootQmlItemNode.modelNode();
rootModelNode.variantProperty("x") = 10;
rootModelNode.variantProperty("myColor").setDynamicTypeNameAndValue("color", Qt::red);
rootModelNode.variantProperty("myColor").setDynamicTypeNameAndValue("color", QVariant(QColor(Qt::red)));
rootModelNode.variantProperty("myDouble").setDynamicTypeNameAndValue("real", 10);
QVERIFY(!rootModelNode.property("x").isDynamic());
......@@ -6419,7 +6429,7 @@ void tst_TestCore::testModelDynamicProperties()
QVERIFY(rootModelNode.property("myDouble").isDynamic());
QCOMPARE(rootModelNode.property("myColor").dynamicTypeName(), QString("color"));
QCOMPARE(rootModelNode.variantProperty("myColor").value(), QVariant(Qt::red));
QCOMPARE(rootModelNode.variantProperty("myColor").value(), QVariant(QColor(Qt::red)));
//QCOMPARE(rootQmlItemNode.instanceValue("myColor"), QVariant(Qt::red)); //not working yet
QCOMPARE(rootModelNode.property("myDouble").dynamicTypeName(), QString("real"));
QCOMPARE(rootModelNode.variantProperty("myDouble").value(), QVariant(10));
......@@ -6791,7 +6801,7 @@ void tst_TestCore::testRewriterPropertyChanges()
void tst_TestCore::testRewriterListModel()
{
QSKIP("See BAUHAUS-157", SkipAll);
MSKIP_ALL("See BAUHAUS-157");
try {
// ListModel uses a custom parser
......@@ -7760,7 +7770,7 @@ void tst_TestCore::loadTestFiles()
QCOMPARE(rootModelNode.nodeListProperty("states").toModelNodeList().count(), 2);
}
QSKIP("Fails because the text editor model doesn't know about components", SkipAll);
MSKIP_ALL("Fails because the text editor model doesn't know about components");
{ //usingbutton.qml
QFile file(":/fx/usingbutton.qml");
QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment