diff options
| author | Charles Yin <charles.yin@nokia.com> | 2011-07-26 10:47:13 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-29 02:47:11 +0200 |
| commit | b1200f446e611f167a712eb877d60b2b3a9444e6 (patch) | |
| tree | 16319b9d65aae340a284d49f4904a492851ddc87 /tests | |
| parent | ea0cb11dc547c3b8a03618d31e4f7a85304f8fe3 (diff) | |
Add .arg() for Javascript String type
Change-Id: I973032189c40bfa4d5450396f5bad1a7c81ac68b
Task-number:QTBUG-16734
Reviewed-by:Michael Brasser
Reviewed-on: http://codereview.qt.nokia.com/2134
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/data/dynamicString.qml | 16 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | 10 |
2 files changed, 25 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicString.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicString.qml new file mode 100644 index 0000000000..5693794c71 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicString.qml @@ -0,0 +1,16 @@ +import Qt.test 1.0 +import QtQuick 2.0 + +MyTypeObject { + stringProperty:"string:%0 false:%1 true:%2 uint32:%3 int32:%4 double:%5 date:%6!" + Component.onCompleted: { + var date = new Date(); + date.setDate(11); + date.setMonth(1); + date.setFullYear(2011); + date.setHours(5); + date.setMinutes(30); + date.setSeconds(50); + stringProperty = stringProperty.arg("Hello World").arg(false).arg(true).arg(100).arg(-100).arg(3.1415926).arg(Qt.formatDateTime(date, "yyyy-MM-dd hh::mm:ss")); + } +} diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index 2b02ad2d3c..bc33932442 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -184,7 +184,7 @@ private slots: void aliasWritesOverrideBindings(); void aliasToCompositeElement(); void realToInt(); - + void dynamicString(); void include(); void callQtInvokables(); @@ -3644,6 +3644,14 @@ void tst_qdeclarativeecmascript::realToInt() QMetaObject::invokeMethod(object, "test2"); QCOMPARE(object->value(), int(8)); } +void tst_qdeclarativeecmascript::dynamicString() +{ + QDeclarativeComponent component(&engine, TEST_FILE("dynamicString.qml")); + QObject *object = component.create(); + QVERIFY(object != 0); + QCOMPARE(object->property("stringProperty").toString(), + QString::fromLatin1("string:Hello World false:0 true:1 uint32:100 int32:-100 double:3.14159 date:2011-02-11 05::30:50!")); +} QTEST_MAIN(tst_qdeclarativeecmascript) |