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

Fixed dynamic property default values.

Browse Source
This commit is contained in:
Erik Verbruggen
2010-03-29 13:00:56 +02:00
parent 4ee8a199af
commit e934ae4a73
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/auto/qml/qmldesigner/coretests/testcore.cpp
+7 -5
View File
@@ -451,13 +451,13 @@ void TestCore::testRewriterDynamicProperties()
QVERIFY(rootModelNode.hasVariantProperty("d"));
QCOMPARE(rootModelNode.variantProperty("d").dynamicTypeName(), QString("double"));
QCOMPARE(rootModelNode.variantProperty("d").value().type(), QVariant::Double);
QCOMPARE(testRewriterView1->rootModelNode().variantProperty("b").value().toDouble(), 0.0);
QCOMPARE(testRewriterView1->rootModelNode().variantProperty("d").value().toDouble(), 0.0);
QVERIFY(rootModelNode.hasVariantProperty("dd"));
QCOMPARE(testRewriterView1->rootModelNode().variantProperty("dd").value().toDouble(), 1.1);
QVERIFY(rootModelNode.hasVariantProperty("r"));
QCOMPARE(rootModelNode.variantProperty("r").dynamicTypeName(), QString("double"));
QCOMPARE(rootModelNode.variantProperty("r").dynamicTypeName(), QString("real"));
QCOMPARE(rootModelNode.variantProperty("r").value().type(), QVariant::Double);
QCOMPARE(testRewriterView1->rootModelNode().variantProperty("r").value().toDouble(), 0.0);
@@ -490,7 +490,7 @@ void TestCore::testRewriterDynamicProperties()
QVERIFY(rootModelNode.hasVariantProperty("t"));
QCOMPARE(rootModelNode.variantProperty("t").dynamicTypeName(), QString("date"));
QCOMPARE(rootModelNode.variantProperty("t").value().type(), QVariant::Color);
QCOMPARE(rootModelNode.variantProperty("t").value().type(), QVariant::Date);
QCOMPARE(testRewriterView1->rootModelNode().variantProperty("t").value().value<QDate>(), QDate());
QVERIFY(rootModelNode.hasVariantProperty("tt"));
@@ -498,10 +498,12 @@ void TestCore::testRewriterDynamicProperties()
QVERIFY(rootModelNode.hasVariantProperty("v"));
QCOMPARE(rootModelNode.variantProperty("v").dynamicTypeName(), QString("var"));
QCOMPARE(rootModelNode.variantProperty("v").value().type(), QVariant::Invalid);
const int type = rootModelNode.variantProperty("v").value().type();
QCOMPARE(type, QMetaType::type("QVariant"));
QVERIFY(rootModelNode.hasVariantProperty("vv"));
QCOMPARE(testRewriterView1->rootModelNode().variantProperty("vv").value().value<QString>(), QString("hello"));
const QString inThere = testRewriterView1->rootModelNode().variantProperty("vv").value().value<QString>();
QCOMPARE(inThere, QString("Hello"));
// test model2text
// QPlainTextEdit textEdit2;