diff options
Diffstat (limited to 'tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp')
| -rw-r--r-- | tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp | 42 |
1 files changed, 33 insertions, 9 deletions
diff --git a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp index 21e020404b..efb343cf85 100644 --- a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp +++ b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -48,7 +48,8 @@ #define Q_XDG_PLATFORM #endif -static const int MaxStandardLocation = QStandardPaths::AppDataLocation; +// Update this when adding new enum values; update enumNames too +static const int MaxStandardLocation = QStandardPaths::AppConfigLocation; class tst_qstandardpaths : public QObject { @@ -61,6 +62,7 @@ private slots: void enableTestMode(); void testLocateAll(); void testDataLocation(); + void testAppConfigLocation(); void testFindExecutable_data(); void testFindExecutable(); void testFindExecutableLinkToDirectory(); @@ -122,7 +124,8 @@ static const char * const enumNames[MaxStandardLocation + 1 - int(QStandardPaths "DownloadLocation", "GenericCacheLocation", "GenericConfigLocation", - "AppDataLocation" + "AppDataLocation", + "AppConfigLocation" }; void tst_qstandardpaths::dump() @@ -305,6 +308,27 @@ void tst_qstandardpaths::testDataLocation() QCOMPARE(appDataDirs.at(1), QString::fromLatin1("/usr/local/share/Qt/QtTest")); QCOMPARE(appDataDirs.at(2), QString::fromLatin1("/usr/share/Qt/QtTest")); #endif + + // reset for other tests + QCoreApplication::setOrganizationName(QString()); + QCoreApplication::setApplicationName(QString()); +} + +void tst_qstandardpaths::testAppConfigLocation() +{ + // On all platforms where applications are not sandboxed, + // AppConfigLocation should be GenericConfigLocation / organization name / app name +#if !defined(Q_OS_BLACKBERRY) && !defined(Q_OS_ANDROID) && !defined(Q_OS_WINRT) + const QString base = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation); + QCOMPARE(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation), base + "/tst_qstandardpaths"); + QCoreApplication::setOrganizationName("Qt"); + QCOMPARE(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation), base + "/Qt/tst_qstandardpaths"); + QCoreApplication::setApplicationName("QtTest"); + QCOMPARE(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation), base + "/Qt/QtTest"); + // reset for other tests + QCoreApplication::setOrganizationName(QString()); + QCoreApplication::setApplicationName(QString()); +#endif } #ifndef Q_OS_WIN |