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

QmlDesigner: Fix tests

Browse Source 
We do not allow rect as id, since it is also a QML type.

Change-Id: I348071b9b1f6c3e72d3934770196421ce72d36b5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2022-07-12 20:33:07 +02:00
parent 57413c6703
commit 7354d8a462
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7336,7 +7336,7 @@ void tst_TestCore::testRewriterChangeId()
void tst_TestCore::testRewriterRemoveId() void tst_TestCore::testRewriterRemoveId()
{ {
const char* qmlString = "import QtQuick 2.1\nRectangle { id: rect }"; const char* qmlString = "import QtQuick 2.1\nRectangle { id: myRect }";
QPlainTextEdit textEdit; QPlainTextEdit textEdit;
textEdit.setPlainText(QString::fromUtf8(qmlString)); textEdit.setPlainText(QString::fromUtf8(qmlString));
@@ -7355,7 +7355,7 @@ void tst_TestCore::testRewriterRemoveId()
ModelNode rootModelNode(view->rootModelNode()); ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid()); QVERIFY(rootModelNode.isValid());
QCOMPARE(rootModelNode.id(), QString("rect")); QCOMPARE(rootModelNode.id(), QString("myRect"));
// //
// remove id in text // remove id in text
@@ -8518,7 +8518,7 @@ void tst_TestCore::loadTestFiles()
QCOMPARE(rootModelNode.directSubModelNodes().count(), 4); QCOMPARE(rootModelNode.directSubModelNodes().count(), 4);
QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 200); QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 200);
QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 200); QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 200);
QCOMPARE(rootModelNode.id(), QLatin1String("rect")); QCOMPARE(rootModelNode.id(), QLatin1String("myRect"));
QVERIFY(rootModelNode.hasProperty("data")); QVERIFY(rootModelNode.hasProperty("data"));
QVERIFY(rootModelNode.property("data").isDefaultProperty()); QVERIFY(rootModelNode.property("data").isDefaultProperty());

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

@@ -26,7 +26,7 @@
import QtQuick 2.0 import QtQuick 2.0
Rectangle { Rectangle {
id: rect id: myRect
width: 200 width: 200
height: 200 height: 200
Text { Text {
@@ -39,7 +39,7 @@ Rectangle {
State { State {
name: "State1" name: "State1"
PropertyChanges { PropertyChanges {
target: rect target: myRect
color: "blue" color: "blue"
} }
PropertyChanges { PropertyChanges {
@@ -50,7 +50,7 @@ Rectangle {
State { State {
name: "State2" name: "State2"
PropertyChanges { PropertyChanges {
target: rect target: myRect
color: "gray" color: "gray"
} }
PropertyChanges { PropertyChanges {