diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-06-15 19:00:08 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-06-15 19:00:08 +0200 |
commit | ccb5ea669ee192e93c76e7412bcebfc6810a8eba (patch) | |
tree | ca62db8276c87d53d09d6559c30f990a43b67719 /tests | |
parent | d1bb9e36d0c3497b790fdf1887dcef0567aaad46 (diff) | |
parent | 170b1ddc7931781a70758dc2d206bfdbad6fb3f5 (diff) |
Merge branch 'master' into qtquick2
Conflicts:
src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp
src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
Change-Id: Id2267925c4f77b41f63bbbf555b816ca1f55a0ec
Diffstat (limited to 'tests')
8 files changed, 210 insertions, 0 deletions
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 Binary files differnew file mode 100644 index 0000000000..252022515a --- /dev/null +++ b/tests/auto/declarative/qdeclarativetranslation/data/qml_fr.qm 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0" language="fr" sourcelanguage="en"> +<context> + <name>CustomContext</name> + <message> + <location filename="translation.qml" line="5"/> + <location filename="translation.qml" line="11"/> + <source>goodbye</source> + <translation>au revoir</translation> + </message> + <message> + <location filename="translation.qml" line="8"/> + <source>see ya</source> + <comment>informal 'goodbye'</comment> + <translation>à plus tard</translation> + </message> +</context> +<context> + <name>translation</name> + <message> + <location filename="translation.qml" line="4"/> + <location filename="translation.qml" line="10"/> + <source>hello</source> + <translation>bonjour</translation> + </message> + <message> + <location filename="translation.qml" line="7"/> + <source>hi</source> + <comment>informal 'hello'</comment> + <translation>salut</translation> + </message> + <message numerus="yes"> + <location filename="translation.qml" line="15"/> + <location filename="translation.qml" line="16"/> + <source>%n duck(s)</source> + <translation> + <numerusform>%n canard</numerusform> + <numerusform>%n canards</numerusform> + </translation> + </message> +</context> +</TS> diff --git a/tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.qm b/tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.qm Binary files differnew file mode 100644 index 0000000000..265164916f --- /dev/null +++ b/tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.qm 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0" language="fr"> +<context> + <name></name> + <message id="qtn_hello_world"> + <location filename="idtranslation.qml" line="4"/> + <location filename="idtranslation.qml" line="5"/> + <source></source> + <translation>bonjour tout le monde</translation> + </message> +</context> +</TS> 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 <qtest.h> +#include <QDeclarativeEngine> +#include <QDeclarativeComponent> +#include <QTranslator> +#include <QDebug> + +#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" |