diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-03-21 14:29:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-21 08:04:33 +0100 |
| commit | 8dbfddff68f98c8854c3ca663db727d2e8c65377 (patch) | |
| tree | 8042d0f94e17a1410b7475b7eba8776fe41ebdad /tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | |
| parent | 1312f4d1fefb3a7b5b8c7b720c45f542981250f3 (diff) | |
Test unregistered local enums in QML methods and signal handlers.
Also make sure valueC and valueD are initialized.
Change-Id: I8ee78b7b779c37ca792300c7771ae9975f43d8bb
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp')
| -rw-r--r-- | tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index 81e5f6b7c4..837a9d2604 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -2308,11 +2308,17 @@ void tst_qqmllanguage::globalEnums() QVERIFY(enum2Class != 0); QVERIFY(enum2Class->getValueA() == -1); QVERIFY(enum2Class->getValueB() == -1); + QVERIFY(enum2Class->getValueC() == 0); + QVERIFY(enum2Class->getValueD() == 0); + QVERIFY(enum2Class->getValueE() == -1); + QVERIFY(enum2Class->getValueE2() == -1); QVERIFY(enum2Class->property("aValue") == 0); QVERIFY(enum2Class->property("bValue") == 0); QVERIFY(enum2Class->property("cValue") == 0); QVERIFY(enum2Class->property("dValue") == 0); + QVERIFY(enum2Class->property("eValue") == 0); + QVERIFY(enum2Class->property("e2Value") == 0); QSignalSpy signalA(enum2Class, SIGNAL(valueAChanged(MyEnum1Class::EnumA))); QSignalSpy signalB(enum2Class, SIGNAL(valueBChanged(MyEnum2Class::EnumB))); @@ -2324,6 +2330,8 @@ void tst_qqmllanguage::globalEnums() QVERIFY(enum2Class->getValueB() == MyEnum2Class::B_37); QVERIFY(enum2Class->getValueC() == Qt::RichText); QVERIFY(enum2Class->getValueD() == Qt::ElideMiddle); + QVERIFY(enum2Class->getValueE() == MyEnum2Class::E_14); + QVERIFY(enum2Class->getValueE2() == MyEnum2Class::E_76); QVERIFY(signalA.count() == 1); QVERIFY(signalB.count() == 1); @@ -2332,6 +2340,8 @@ void tst_qqmllanguage::globalEnums() QVERIFY(enum2Class->property("bValue") == 37); QVERIFY(enum2Class->property("cValue") == 1); QVERIFY(enum2Class->property("dValue") == 2); + QVERIFY(enum2Class->property("eValue") == 14); + QVERIFY(enum2Class->property("e2Value") == 76); delete o; } |