diff options
Diffstat (limited to 'tests/auto/corelib/text/qcollator')
-rw-r--r-- | tests/auto/corelib/text/qcollator/CMakeLists.txt | 13 | ||||
-rw-r--r-- | tests/auto/corelib/text/qcollator/qcollator.pro | 5 | ||||
-rw-r--r-- | tests/auto/corelib/text/qcollator/tst_qcollator.cpp | 187 |
3 files changed, 157 insertions, 48 deletions
diff --git a/tests/auto/corelib/text/qcollator/CMakeLists.txt b/tests/auto/corelib/text/qcollator/CMakeLists.txt index 105a65310e..c9f5f0e9ca 100644 --- a/tests/auto/corelib/text/qcollator/CMakeLists.txt +++ b/tests/auto/corelib/text/qcollator/CMakeLists.txt @@ -1,14 +1,21 @@ -# Generated from qcollator.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qcollator Test: ##################################################################### -qt_add_test(tst_qcollator +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qcollator LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + +qt_internal_add_test(tst_qcollator SOURCES tst_qcollator.cpp DEFINES QT_NO_CAST_TO_ASCII - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/text/qcollator/qcollator.pro b/tests/auto/corelib/text/qcollator/qcollator.pro deleted file mode 100644 index b7aa256ded..0000000000 --- a/tests/auto/corelib/text/qcollator/qcollator.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase -TARGET = tst_qcollator -QT = core-private testlib -SOURCES = tst_qcollator.cpp -DEFINES += QT_NO_CAST_TO_ASCII diff --git a/tests/auto/corelib/text/qcollator/tst_qcollator.cpp b/tests/auto/corelib/text/qcollator/tst_qcollator.cpp index e0c5cea980..b6da8a3899 100644 --- a/tests/auto/corelib/text/qcollator/tst_qcollator.cpp +++ b/tests/auto/corelib/text/qcollator/tst_qcollator.cpp @@ -1,44 +1,22 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtTest/QtTest> +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + +#include <QTest> #include <qlocale.h> #include <qcollator.h> #include <private/qglobal_p.h> +#include <QScopeGuard> #include <cstring> +#include <iostream> class tst_QCollator : public QObject { Q_OBJECT private Q_SLOTS: + void basics(); void moveSemantics(); void compare_data(); @@ -58,6 +36,37 @@ static bool dpointer_is_null(QCollator &c) return true; } +void tst_QCollator::basics() +{ + const QLocale de_AT(QLocale::German, QLocale::Austria); + + QCollator c1(de_AT); + QCOMPARE(c1.locale(), de_AT); + + QCollator c2(c1); + QCOMPARE(c2.locale(), de_AT); + + QCollator c3; + // Test copy assignment + c3 = c2; + QCOMPARE(c3.locale(), de_AT); + + // posix implementation supports only C and default locale, + // so update it for Android and INTEGRITY builds +#if !QT_CONFIG(icu) && !defined(Q_OS_WIN) && !defined(Q_OS_MACOS) + c3.setLocale(QLocale()); +#endif + QCollatorSortKey key1 = c3.sortKey("test"); + + QCollatorSortKey key2(key1); + QCOMPARE(key1.compare(key2), 0); + + QCollatorSortKey key3 = c3.sortKey("abc"); + // Test copy assignment + key3 = key2; + QCOMPARE(key1.compare(key3), 0); +} + void tst_QCollator::moveSemantics() { const QLocale de_AT(QLocale::German, QLocale::Austria); @@ -75,6 +84,21 @@ void tst_QCollator::moveSemantics() c1 = std::move(c2); QCOMPARE(c1.locale(), de_AT); QVERIFY(dpointer_is_null(c2)); + + // test QCollatorSortKey move assignment + // posix implementation supports only C and default locale, + // so update it for Android and INTEGRITY builds +#if !QT_CONFIG(icu) && !defined(Q_OS_WIN) && !defined(Q_OS_MACOS) + c1.setLocale(QLocale()); +#endif + QCollatorSortKey key1 = c1.sortKey("1"); + QCollatorSortKey key2 = c1.sortKey("2"); + QVERIFY(key1.compare(key2) < 0); + + QCollatorSortKey key3 = c1.sortKey("a"); + // test move assignment + key3 = std::move(key2); + QVERIFY(key1.compare(key3) < 0); } @@ -107,6 +131,12 @@ void tst_QCollator::compare_data() QTest::newRow("english8") << QString("en_US") << QString("test.19") << QString("test,19") << 1 << 1 << true << true << 0; QTest::newRow("en-empty-word") << QString("en_US") << QString() << QString("non-empty") << -1 << -1 << false << true << -1; QTest::newRow("en-empty-number") << QString("en_US") << QString() << QString("42") << -1 << -1 << true << true << -1; + QTest::newRow("en-word-empty") << QString("en_US") << QString("non-empty") << QString() << 1 + << 1 << false << true << 1; + QTest::newRow("en-number-empty") + << QString("en_US") << QString("42") << QString() << 1 << 1 << true << true << 1; + QTest::newRow("en-empty-empty") + << QString("en_US") << QString() << QString() << 0 << 0 << false << true << 0; /* In Swedish, a with ring above (E5) comes before a with @@ -123,7 +153,12 @@ void tst_QCollator::compare_data() QTest::newRow("swedish8") << QString("sv_SE") << QString("test.19") << QString("test,19") << 1 << 1 << true << true << 0; QTest::newRow("sv-empty-word") << QString("sv_SE") << QString() << QString("mett") << -1 << -1 << false << true << -1; QTest::newRow("sv-empty-number") << QString("sv_SE") << QString() << QString("42") << -1 << -1 << true << true << -1; - + QTest::newRow("sv-word-empty") + << QString("sv_SE") << QString("mett") << QString() << 1 << 1 << false << true << 1; + QTest::newRow("sv-number-empty") + << QString("sv_SE") << QString("42") << QString() << 1 << 1 << true << true << 1; + QTest::newRow("sv-empty-empty") + << QString("sv_SE") << QString() << QString() << 0 << 0 << false << true << 0; /* In Norwegian, ae (E6) comes before o with stroke (D8), which @@ -139,6 +174,12 @@ void tst_QCollator::compare_data() QTest::newRow("norwegian8") << QString("no_NO") << QString("test.19") << QString("test,19") << 1 << 1 << true << true << 0; QTest::newRow("nb-empty-word") << QString("nb_NO") << QString() << QString("mett") << -1 << -1 << false << true << -1; QTest::newRow("nb-empty-number") << QString("nb_NO") << QString() << QString("42") << -1 << -1 << true << true << -1; + QTest::newRow("nb-word-empty") + << QString("nb_NO") << QString("mett") << QString() << 1 << 1 << false << true << 1; + QTest::newRow("nb-number-empty") + << QString("nb_NO") << QString("42") << QString() << 1 << 1 << true << true << 1; + QTest::newRow("nb-empty-empty") + << QString("nb_NO") << QString() << QString() << 0 << 0 << false << true << 0; /* In German, z comes *after* a with diaresis (E4), @@ -159,6 +200,12 @@ void tst_QCollator::compare_data() QTest::newRow("german13") << QString("de_DE") << QString("test.19") << QString("test,19") << 1 << 1 << true << true << 0; QTest::newRow("de-empty-word") << QString("de_DE") << QString() << QString("satt") << -1 << -1 << false << true << -1; QTest::newRow("de-empty-number") << QString("de_DE") << QString() << QString("42") << -1 << -1 << true << true << -1; + QTest::newRow("de-word-empty") + << QString("de_DE") << QString("satt") << QString() << 1 << 1 << false << true << 1; + QTest::newRow("de-number-empty") + << QString("de_DE") << QString("42") << QString() << 1 << 1 << true << true << 1; + QTest::newRow("de-empty-empty") + << QString("de_DE") << QString() << QString() << 0 << 0 << false << true << 0; /* French sorting of e and e with acute accent @@ -173,6 +220,12 @@ void tst_QCollator::compare_data() QTest::newRow("french8") << QString("fr_FR") << QString("test.19") << QString("test,19") << 1 << 1 << true << true << 0; QTest::newRow("fr-empty-word") << QString("fr_FR") << QString() << QString("plein") << -1 << -1 << false << true << -1; QTest::newRow("fr-empty-number") << QString("fr_FR") << QString() << QString("42") << -1 << -1 << true << true << -1; + QTest::newRow("fr-word-empty") + << QString("fr_FR") << QString("plein") << QString() << 1 << 1 << false << true << 1; + QTest::newRow("fr-number-empty") + << QString("fr_FR") << QString("42") << QString() << 1 << 1 << true << true << 1; + QTest::newRow("fr-empty-empty") + << QString("fr_FR") << QString() << QString() << 0 << 0 << false << true << 0; // C locale: case sensitive [A-Z] < [a-z] but case insensitive [Aa] < [Bb] <...< [Zz] const QString C = QStringLiteral("C"); @@ -180,6 +233,12 @@ void tst_QCollator::compare_data() QTest::newRow("C:AZa:aAZ") << C << QStringLiteral("AZa") << QStringLiteral("aAZ") << -1 << 1 << false << false << 1; QTest::newRow("C-empty-word") << QString(C) << QString() << QString("non-empty") << -1 << -1 << false << true << -1; QTest::newRow("C-empty-number") << QString(C) << QString() << QString("42") << -1 << -1 << true << true << -1; + QTest::newRow("C-word-empty") << QString(C) << QString("non-empty") << QString() << 1 << 1 + << false << true << 1; + QTest::newRow("C-number-empty") + << QString(C) << QString("42") << QString() << 1 << 1 << true << true << 1; + QTest::newRow("C-empty-empty") + << QString(C) << QString() << QString() << 0 << 0 << false << true << 0; } void tst_QCollator::compare() @@ -190,31 +249,80 @@ void tst_QCollator::compare() QFETCH(int, result); QFETCH(int, caseInsensitiveResult); QFETCH(bool, numericMode); -#if !QT_CONFIG(icu) QFETCH(bool, ignorePunctuation); QFETCH(int, punctuationResult); -#endif QCollator collator((QLocale(locale))); + + // AFTER the QCollator initialization + auto localechanger = qScopeGuard([original = QLocale()] { + QLocale::setDefault(original); // reset back to what it was + }); + QLocale::setDefault(QLocale(locale)); + // Need to canonicalize sign to -1, 0 or 1, as .compare() can produce any -ve for <, any +ve for >. auto asSign = [](int compared) { return compared < 0 ? -1 : compared > 0 ? 1 : 0; }; - -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED) - if (collator.locale() != QLocale()) - QSKIP("Posix implementation of collation only supports default locale"); +#if defined(Q_OS_WASM) + if (strcmp(QTest::currentDataTag(), "english5") == 0 + || strcmp(QTest::currentDataTag(), "english8") == 0) + QSKIP("Some en-us locale tests have issues on WASM"); +#endif // Q_OS_WASM +#if !QT_CONFIG(icu) && !defined(Q_OS_WIN) && !defined(Q_OS_MACOS) + if (collator.locale() != QLocale::c() && collator.locale() != QLocale::system().collation()) + QSKIP("POSIX implementation of collation only supports C and system collation locales"); #endif if (numericMode) collator.setNumericMode(true); + [[maybe_unused]] int keyCompareResult = result; + [[maybe_unused]] int keyCompareCaseInsensitiveResult = caseInsensitiveResult; + [[maybe_unused]] int keyComparePunctuationResultResult = punctuationResult; + + // trying to deal with special behavior of different OS-dependent collators + if (collator.locale() == QLocale("C")) { +#if !QT_CONFIG(icu) && defined(Q_OS_MACOS) + // for MACOS C-locale is not supported, always providing empty string for sortKey() + keyCompareResult = 0; + keyCompareCaseInsensitiveResult = 0; + keyComparePunctuationResultResult = 0; +#else + // for other platforms C-locale strings are not modified by sortKey() anyhow + keyCompareCaseInsensitiveResult = keyCompareResult; + keyComparePunctuationResultResult = keyCompareResult; +#endif + } + + // NOTE: currently QCollatorSortKey::compare is not working + // properly without icu: see QTBUG-88704 for details QCOMPARE(asSign(collator.compare(s1, s2)), result); + if (!numericMode) + QCOMPARE(asSign(QCollator::defaultCompare(s1, s2)), result); +#if QT_CONFIG(icu) + auto key1 = collator.sortKey(s1); + auto key2 = collator.sortKey(s2); + QCOMPARE(asSign(key1.compare(key2)), keyCompareResult); + + key1 = QCollator::defaultSortKey(s1); + key2 = QCollator::defaultSortKey(s2); + if (!numericMode) + QCOMPARE(asSign(key1.compare(key2)), keyCompareResult); +#endif collator.setCaseSensitivity(Qt::CaseInsensitive); QCOMPARE(asSign(collator.compare(s1, s2)), caseInsensitiveResult); -#if !QT_CONFIG(icu) +#if QT_CONFIG(icu) + key1 = collator.sortKey(s1); + key2 = collator.sortKey(s2); + QCOMPARE(asSign(key1.compare(key2)), keyCompareCaseInsensitiveResult); +#endif collator.setIgnorePunctuation(ignorePunctuation); QCOMPARE(asSign(collator.compare(s1, s2)), punctuationResult); +#if QT_CONFIG(icu) + key1 = collator.sortKey(s1); + key2 = collator.sortKey(s2); + QCOMPARE(asSign(key1.compare(key2)), keyComparePunctuationResultResult); #endif } @@ -233,13 +341,12 @@ void tst_QCollator::state() c.setLocale(QLocale::French); c.setNumericMode(true); c.setIgnorePunctuation(true); - c.setLocale(QLocale::Norwegian); + c.setLocale(QLocale::NorwegianBokmal); QCOMPARE(c.caseSensitivity(), Qt::CaseInsensitive); QCOMPARE(c.numericMode(), true); QCOMPARE(c.ignorePunctuation(), true); - QCOMPARE(c.locale(), QLocale(QLocale::Norwegian)); - + QCOMPARE(c.locale(), QLocale(QLocale::NorwegianBokmal)); } QTEST_APPLESS_MAIN(tst_QCollator) |