feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Adjusting tests

Browse Source 
We do not allows ids like "text" and "item" anymore,
since they are ambiguous. This patch adjusts a couple of tests.

Change-Id: I93a1404c052a8f1d302c179141c6feb35e83afc8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2016-12-12 11:24:33 +01:00
parent 5ec8cb437a
commit 003a8985a2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
View File

@@ -3928,7 +3928,7 @@ char qmlString[] = "import QtQuick 2.1\n"
"text: \"Hello World\"\n"
"anchors.centerIn: parent\n"
"Item {\n"
"id: item\n"
"id: item01\n"
"}\n"
"}\n"
"Rectangle {\n"
@@ -3995,7 +3995,7 @@ char qmlString[] = "import QtQuick 2.1\n"
QVERIFY(!textNode1.nodeListProperty("data").toModelNodeList().isEmpty());
ModelNode itemNode = textNode1.nodeListProperty("data").toModelNodeList().first();
QVERIFY(itemNode.isValid());
QCOMPARE(itemNode.id(), QString("item"));
QCOMPARE(itemNode.id(), QString("item01"));
QVERIFY(!itemNode.hasProperty("data"));
ModelNode rectNode = rootModelNode.nodeListProperty("data").toModelNodeList().at(1);
@@ -4184,7 +4184,7 @@ void tst_TestCore::testMetaInfoQtQuick1Vs2()
"text: \"Hello World\"\n"
"anchors.centerIn: parent\n"
"Item {\n"
"id: item\n"
"id: item01\n"
"}\n"
"}\n"
"Rectangle {\n"
@@ -7878,7 +7878,7 @@ void tst_TestCore::loadTestFiles()
ModelNode textNode(rootModelNode.nodeListProperty("data").toModelNodeList().first());
QVERIFY(textNode.isValid());
QCOMPARE(textNode.id(), QLatin1String("text"));
QCOMPARE(textNode.id(), QLatin1String("textElement"));
QCOMPARE(textNode.type(), QmlDesigner::TypeName("QtQuick.Text"));
QCOMPARE(textNode.variantProperty("x").value().toInt(), 66);
QCOMPARE(textNode.variantProperty("y").value().toInt(), 93);

2
tests/auto/qml/qmldesigner/data/fx/states.qml
View File

@@ -30,7 +30,7 @@ Rectangle {
width: 200
height: 200
Text {
id: text
id: textElement
x: 66
y: 93
text: "Base State"