From 7f876e46247a218d050400725d565986dba533fa Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Thu, 9 Jun 2011 16:18:05 +1000 Subject: Add QML translation autotests. --- .../qdeclarativetranslation/data/idtranslation.qml | 7 ++ .../qdeclarativetranslation/data/qml_fr.qm | Bin 0 -> 374 bytes .../qdeclarativetranslation/data/qml_fr.ts | 43 ++++++++ .../qdeclarativetranslation/data/qmlid_fr.qm | Bin 0 -> 119 bytes .../qdeclarativetranslation/data/qmlid_fr.ts | 13 +++ .../qdeclarativetranslation/data/translation.qml | 17 ++++ .../qdeclarativetranslation.pro | 17 ++++ .../tst_qdeclarativetranslation.cpp | 113 +++++++++++++++++++++ 8 files changed, 210 insertions(+) create mode 100644 tests/auto/declarative/qdeclarativetranslation/data/idtranslation.qml create mode 100644 tests/auto/declarative/qdeclarativetranslation/data/qml_fr.qm create mode 100644 tests/auto/declarative/qdeclarativetranslation/data/qml_fr.ts create mode 100644 tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.qm create mode 100644 tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.ts create mode 100644 tests/auto/declarative/qdeclarativetranslation/data/translation.qml create mode 100644 tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro create mode 100644 tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp (limited to 'tests') diff --git a/tests/auto/declarative/qdeclarativetranslation/data/idtranslation.qml b/tests/auto/declarative/qdeclarativetranslation/data/idtranslation.qml new file mode 100644 index 0000000000..4a5498281a --- /dev/null +++ b/tests/auto/declarative/qdeclarativetranslation/data/idtranslation.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 + +QtObject { + property string _idTranslation2: QT_TRID_NOOP("qtn_hello_world") + property string idTranslation: qsTrId("qtn_hello_world") + property string idTranslation2: qsTrId(_idTranslation2) +} diff --git a/tests/auto/declarative/qdeclarativetranslation/data/qml_fr.qm b/tests/auto/declarative/qdeclarativetranslation/data/qml_fr.qm new file mode 100644 index 0000000000..252022515a Binary files /dev/null and b/tests/auto/declarative/qdeclarativetranslation/data/qml_fr.qm differ diff --git a/tests/auto/declarative/qdeclarativetranslation/data/qml_fr.ts b/tests/auto/declarative/qdeclarativetranslation/data/qml_fr.ts new file mode 100644 index 0000000000..b003e239bc --- /dev/null +++ b/tests/auto/declarative/qdeclarativetranslation/data/qml_fr.ts @@ -0,0 +1,43 @@ + + + + + CustomContext + + + + goodbye + au revoir + + + + see ya + informal 'goodbye' + à plus tard + + + + translation + + + + hello + bonjour + + + + hi + informal 'hello' + salut + + + + + %n duck(s) + + %n canard + %n canards + + + + diff --git a/tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.qm b/tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.qm new file mode 100644 index 0000000000..265164916f Binary files /dev/null and b/tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.qm differ diff --git a/tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.ts b/tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.ts new file mode 100644 index 0000000000..bff39b80b6 --- /dev/null +++ b/tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.ts @@ -0,0 +1,13 @@ + + + + + + + + + + bonjour tout le monde + + + diff --git a/tests/auto/declarative/qdeclarativetranslation/data/translation.qml b/tests/auto/declarative/qdeclarativetranslation/data/translation.qml new file mode 100644 index 0000000000..89db1d2262 --- /dev/null +++ b/tests/auto/declarative/qdeclarativetranslation/data/translation.qml @@ -0,0 +1,17 @@ +import QtQuick 2.0 + +QtObject { + property string basic: qsTr("hello") + property string basic2: qsTranslate("CustomContext", "goodbye") + + property string disambiguation: qsTr("hi", "informal 'hello'") + property string disambiguation2: qsTranslate("CustomContext", "see ya", "informal 'goodbye'") + + property string _noop: QT_TR_NOOP("hello") + property string _noop2: QT_TRANSLATE_NOOP("CustomContext", "goodbye") + property string noop: qsTr(_noop) + property string noop2: qsTranslate("CustomContext", _noop2) + + property string singular: qsTr("%n duck(s)", "", 1) + property string plural: qsTr("%n duck(s)", "", 2) +} diff --git a/tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro b/tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro new file mode 100644 index 0000000000..c970a0c70e --- /dev/null +++ b/tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro @@ -0,0 +1,17 @@ +load(qttest_p4) +contains(QT_CONFIG,declarative): QT += declarative +macx:CONFIG -= app_bundle + +SOURCES += tst_qdeclarativetranslation.cpp + +symbian: { + importFiles.files = data + importFiles.path = . + DEPLOYMENT += importFiles +} else { + DEFINES += SRCDIR=\\\"$$PWD\\\" +} + +CONFIG += parallel_test + +QT += core-private gui-private declarative-private diff --git a/tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp b/tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp new file mode 100644 index 0000000000..5b88b548c9 --- /dev/null +++ b/tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp @@ -0,0 +1,113 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include +#include +#include + +#ifdef Q_OS_SYMBIAN +// In Symbian OS test data is located in applications private dir +#define SRCDIR "." +#endif + +class tst_qdeclarativetranslation : public QObject +{ + Q_OBJECT +public: + tst_qdeclarativetranslation() {} + +private slots: + void translation(); + void idTranslation(); +}; + +inline QUrl TEST_FILE(const QString &filename) +{ + return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename); +} + +void tst_qdeclarativetranslation::translation() +{ + QTranslator translator; + translator.load(QLatin1String("qml_fr"), QLatin1String(SRCDIR) + QLatin1String("/data")); + QApplication::installTranslator(&translator); + + QDeclarativeEngine engine; + QDeclarativeComponent component(&engine, TEST_FILE("translation.qml")); + QObject *object = component.create(); + QVERIFY(object != 0); + + QCOMPARE(object->property("basic").toString(), QLatin1String("bonjour")); + QCOMPARE(object->property("basic2").toString(), QLatin1String("au revoir")); + QCOMPARE(object->property("disambiguation").toString(), QLatin1String("salut")); + QCOMPARE(object->property("disambiguation2").toString(), QString::fromUtf8("\xc3\xa0 plus tard")); + QCOMPARE(object->property("noop").toString(), QLatin1String("bonjour")); + QCOMPARE(object->property("noop2").toString(), QLatin1String("au revoir")); + QCOMPARE(object->property("singular").toString(), QLatin1String("1 canard")); + QCOMPARE(object->property("plural").toString(), QLatin1String("2 canards")); + + QApplication::removeTranslator(&translator); + delete object; +} + +void tst_qdeclarativetranslation::idTranslation() +{ + QTranslator translator; + translator.load(QLatin1String("qmlid_fr"), QLatin1String(SRCDIR) + QLatin1String("/data")); + QApplication::installTranslator(&translator); + + QDeclarativeEngine engine; + QDeclarativeComponent component(&engine, TEST_FILE("idtranslation.qml")); + QObject *object = component.create(); + QVERIFY(object != 0); + + QCOMPARE(object->property("idTranslation").toString(), QLatin1String("bonjour tout le monde")); + QCOMPARE(object->property("idTranslation2").toString(), QLatin1String("bonjour tout le monde")); + + QApplication::removeTranslator(&translator); + delete object; +} + +QTEST_MAIN(tst_qdeclarativetranslation) + +#include "tst_qdeclarativetranslation.moc" -- cgit v1.2.3 From 50cb4baf0f2a9f8595c372e1172b8849218b6e09 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Fri, 10 Jun 2011 08:46:52 +1000 Subject: Fix QDeclarativeInstruction autotest failure. ccf706d0bb2d9f70f5a8c18e4aab8ee7e6369817 added additional information to dump for StoreScriptString. --- .../declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp index be1f9e05af..c9e8cdfae3 100644 --- a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp +++ b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp @@ -535,7 +535,7 @@ void tst_qdeclarativeinstruction::dump() << "25\t\tSTORE_VARIANT_OBJECT\t22" << "26\t\tSTORE_INTERFACE\t\t23" << "27\t\tSTORE_SIGNAL\t\t2\t3\t\t\"console.log(1921)\"" - << "28\t\tSTORE_SCRIPT_STRING\t24\t3\t1" + << "28\t\tSTORE_SCRIPT_STRING\t24\t3\t1\t3" << "29\t\tASSIGN_SIGNAL_OBJECT\t0\t\t\t\"mySignal\"" << "30\t\tASSIGN_CUSTOMTYPE\t25\t6\t9" << "31\t\tSTORE_BINDING\t26\t3\t2" -- cgit v1.2.3