diff options
Diffstat (limited to 'tests/auto/gui/text/qtextformat/tst_qtextformat.cpp')
-rw-r--r-- | tests/auto/gui/text/qtextformat/tst_qtextformat.cpp | 89 |
1 files changed, 41 insertions, 48 deletions
diff --git a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp index 7548dbb8e4..6c6145561d 100644 --- a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp +++ b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp @@ -1,37 +1,15 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + + +#include <QTest> +#include <QBuffer> #include <qcoreapplication.h> #include <qdebug.h> +#if QT_CONFIG(settings) #include <qsettings.h> +#endif #include <qtextformat.h> #include <private/qtextformat_p.h> #include <qtextdocument.h> @@ -51,7 +29,9 @@ Q_OBJECT private slots: void getSetCheck(); void defaultAlignment(); +#if QT_CONFIG(settings) void testQTextCharFormat() const; +#endif void testUnderlinePropertyPrecedence(); void toFormat(); void resolveFont(); @@ -71,6 +51,7 @@ private slots: #endif }; +#if QT_CONFIG(settings) /*! \internal This (used to) trigger a crash in: @@ -85,6 +66,7 @@ void tst_QTextFormat::testQTextCharFormat() const settings.value("test", test); } +#endif // Testing get/set functions void tst_QTextFormat::getSetCheck() @@ -211,7 +193,7 @@ void tst_QTextFormat::resolveFont() QTextCursor(&doc).insertText("Test", fmt); QList<QTextFormat> formats = doc.allFormats(); - QCOMPARE(formats.count(), 3); + QCOMPARE(formats.size(), 3); QCOMPARE(formats.at(2).type(), int(QTextFormat::CharFormat)); fmt = formats.at(2).toCharFormat(); @@ -336,8 +318,8 @@ void tst_QTextFormat::getSetTabs() public: Comparator(const QList<QTextOption::Tab> &tabs, const QList<QTextOption::Tab> &tabs2) { - QCOMPARE(tabs.count(), tabs2.count()); - for(int i=0; i < tabs.count(); i++) { + QCOMPARE(tabs.size(), tabs2.size()); + for(int i=0; i < tabs.size(); i++) { QTextOption::Tab t1 = tabs[i]; QTextOption::Tab t2 = tabs2[i]; QCOMPARE(t1.position, t2.position); @@ -388,7 +370,7 @@ void tst_QTextFormat::testTabsUsed() QCOMPARE(line.cursorToX(4), 100.); QTextOption option = layout->textOption(); - QCOMPARE(option.tabs().count(), tabs.count()); + QCOMPARE(option.tabs().size(), tabs.size()); } @@ -535,19 +517,19 @@ void tst_QTextFormat::setFont() QCOMPARE((int)f.font().capitalization(), (int)f.fontCapitalization()); QCOMPARE(f.font().kerning(), f.fontKerning()); - if (overrideAll || (font2.resolve() & QFont::StyleHintResolved)) + if (overrideAll || (font2.resolveMask() & QFont::StyleHintResolved)) QCOMPARE((int)f.font().styleHint(), (int)font2.styleHint()); else QCOMPARE((int)f.font().styleHint(), (int)font1.styleHint()); - if (overrideAll || (font2.resolve() & QFont::StyleStrategyResolved)) + if (overrideAll || (font2.resolveMask() & QFont::StyleStrategyResolved)) QCOMPARE((int)f.font().styleStrategy(), (int)font2.styleStrategy()); else QCOMPARE((int)f.font().styleStrategy(), (int)font1.styleStrategy()); - if (overrideAll || (font2.resolve() & QFont::CapitalizationResolved)) + if (overrideAll || (font2.resolveMask() & QFont::CapitalizationResolved)) QCOMPARE((int)f.font().capitalization(), (int)font2.capitalization()); else QCOMPARE((int)f.font().capitalization(), (int)font1.capitalization()); - if (overrideAll || (font2.resolve() & QFont::KerningResolved)) + if (overrideAll || (font2.resolveMask() & QFont::KerningResolved)) QCOMPARE(f.font().kerning(), font2.kerning()); else QCOMPARE(f.font().kerning(), font1.kerning()); @@ -639,19 +621,19 @@ void tst_QTextFormat::setFont_collection() int formatIndex = collection.indexForFormat(tmp); QTextCharFormat f = collection.charFormat(formatIndex); - if (overrideAll || (font2.resolve() & QFont::StyleHintResolved)) + if (overrideAll || (font2.resolveMask() & QFont::StyleHintResolved)) QCOMPARE((int)f.font().styleHint(), (int)font2.styleHint()); else QCOMPARE((int)f.font().styleHint(), (int)font1.styleHint()); - if (overrideAll || (font2.resolve() & QFont::StyleStrategyResolved)) + if (overrideAll || (font2.resolveMask() & QFont::StyleStrategyResolved)) QCOMPARE((int)f.font().styleStrategy(), (int)font2.styleStrategy()); else QCOMPARE((int)f.font().styleStrategy(), (int)font1.styleStrategy()); - if (overrideAll || (font2.resolve() & QFont::CapitalizationResolved)) + if (overrideAll || (font2.resolveMask() & QFont::CapitalizationResolved)) QCOMPARE((int)f.font().capitalization(), (int)font2.capitalization()); else QCOMPARE((int)f.font().capitalization(), (int)font1.capitalization()); - if (overrideAll || (font2.resolve() & QFont::KerningResolved)) + if (overrideAll || (font2.resolveMask() & QFont::KerningResolved)) QCOMPARE(f.font().kerning(), font2.kerning()); else QCOMPARE(f.font().kerning(), font1.kerning()); @@ -672,16 +654,16 @@ void tst_QTextFormat::clearCollection() charFormat2.setUnderlineStyle(QTextCharFormat::SingleUnderline); int formatIndex2 = collection.indexForFormat(charFormat2); QCOMPARE(formatIndex2, 1); - QCOMPARE(collection.formats.count(), 2); - QCOMPARE(collection.hashes.count(), 2); + QCOMPARE(collection.formats.size(), 2); + QCOMPARE(collection.hashes.size(), 2); QCOMPARE(collection.defaultFont(), f); collection.clear(); - QCOMPARE(collection.formats.count(), 0); - QCOMPARE(collection.hashes.count(), 0); + QCOMPARE(collection.formats.size(), 0); + QCOMPARE(collection.hashes.size(), 0); QCOMPARE(collection.indexForFormat(charFormat2), 0); - QCOMPARE(collection.formats.count(), 1); - QCOMPARE(collection.hashes.count(), 1); + QCOMPARE(collection.formats.size(), 1); + QCOMPARE(collection.hashes.size(), 1); QCOMPARE(collection.defaultFont(), f); // kept, QTextDocument::clear or setPlainText should not reset the font set by setDefaultFont } @@ -693,14 +675,17 @@ void tst_QTextFormat::dataStreamCompatibility() QTextCharFormat format; format.setFontStretch(42); format.setFontLetterSpacingType(QFont::AbsoluteSpacing); + format.setFontFamilies({QLatin1String("Arial")}); // Sanity check { QMap<int, QVariant> properties = format.properties(); QVERIFY(properties.contains(QTextFormat::FontLetterSpacingType)); QVERIFY(properties.contains(QTextFormat::FontStretch)); + QVERIFY(properties.contains(QTextFormat::FontFamilies)); QVERIFY(!properties.contains(QTextFormat::OldFontLetterSpacingType)); QVERIFY(!properties.contains(QTextFormat::OldFontStretch)); + QVERIFY(!properties.contains(QTextFormat::OldFontFamily)); } QByteArray memory; @@ -728,8 +713,10 @@ void tst_QTextFormat::dataStreamCompatibility() QMap<int, QVariant> properties = other.properties(); QVERIFY(properties.contains(QTextFormat::FontLetterSpacingType)); QVERIFY(properties.contains(QTextFormat::FontStretch)); + QVERIFY(properties.contains(QTextFormat::FontFamilies)); QVERIFY(!properties.contains(QTextFormat::OldFontLetterSpacingType)); QVERIFY(!properties.contains(QTextFormat::OldFontStretch)); + QVERIFY(!properties.contains(QTextFormat::OldFontFamily)); } } @@ -746,8 +733,10 @@ void tst_QTextFormat::dataStreamCompatibility() stream >> properties; QVERIFY(properties.contains(QTextFormat::FontLetterSpacingType)); QVERIFY(properties.contains(QTextFormat::FontStretch)); + QVERIFY(properties.contains(QTextFormat::FontFamilies)); QVERIFY(!properties.contains(QTextFormat::OldFontLetterSpacingType)); QVERIFY(!properties.contains(QTextFormat::OldFontStretch)); + QVERIFY(!properties.contains(QTextFormat::OldFontFamily)); } } @@ -777,8 +766,10 @@ void tst_QTextFormat::dataStreamCompatibility() QMap<int, QVariant> properties = other.properties(); QVERIFY(properties.contains(QTextFormat::FontLetterSpacingType)); QVERIFY(properties.contains(QTextFormat::FontStretch)); + QVERIFY(properties.contains(QTextFormat::FontFamilies)); QVERIFY(!properties.contains(QTextFormat::OldFontLetterSpacingType)); QVERIFY(!properties.contains(QTextFormat::OldFontStretch)); + QVERIFY(!properties.contains(QTextFormat::OldFontFamily)); } } @@ -797,8 +788,10 @@ void tst_QTextFormat::dataStreamCompatibility() stream >> properties; QVERIFY(!properties.contains(QTextFormat::FontLetterSpacingType)); QVERIFY(!properties.contains(QTextFormat::FontStretch)); + QVERIFY(!properties.contains(QTextFormat::FontFamilies)); QVERIFY(properties.contains(QTextFormat::OldFontLetterSpacingType)); QVERIFY(properties.contains(QTextFormat::OldFontStretch)); + QVERIFY(properties.contains(QTextFormat::OldFontFamily)); } } |