74cade1ee4
This patch fixes an issue when a font that was added with QFontDatabase::addApplicationFont can not be removed any more. The reason for that is that QFontconfigDatabase::addApplicationFont adds the font to the FontConfig application set from where it cannot be removed any more and is picked up every time the font database is repopulated (e.g. after a call to QFontDatabase::removeApplicationFont). This also fixes the QFontDatabase autotest which unfortunately does not fail on linux, because it tries to add "FreeMono" (which in most cases is already there as a system font). So this patch removes FreeMono and adds LED_REAL as test font. Change-Id: I70fc823075923aa426da1eb3e052affcc416e399 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
290 lines
7.9 KiB
C++
290 lines
7.9 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/legal
|
|
**
|
|
** This file is part of the test suite of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:LGPL$
|
|
** 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 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.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, 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, Digia gives you certain additional
|
|
** rights. These rights are described in the Digia 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.
|
|
**
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <QtTest/QtTest>
|
|
|
|
#include <qfontdatabase.h>
|
|
#include <qfontinfo.h>
|
|
#include <qfontmetrics.h>
|
|
#include <qpa/qplatformfontdatabase.h>
|
|
|
|
class tst_QFontDatabase : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
tst_QFontDatabase();
|
|
virtual ~tst_QFontDatabase();
|
|
|
|
public slots:
|
|
void initTestCase();
|
|
void init();
|
|
void cleanup();
|
|
private slots:
|
|
void styles_data();
|
|
void styles();
|
|
|
|
void fixedPitch_data();
|
|
void fixedPitch();
|
|
|
|
#ifdef Q_OS_MAC
|
|
void trickyFonts_data();
|
|
void trickyFonts();
|
|
#endif
|
|
|
|
void widthTwoTimes_data();
|
|
void widthTwoTimes();
|
|
|
|
void addAppFont_data();
|
|
void addAppFont();
|
|
|
|
void aliases();
|
|
|
|
private:
|
|
const QString m_testFont;
|
|
};
|
|
|
|
tst_QFontDatabase::tst_QFontDatabase()
|
|
: m_testFont(QFINDTESTDATA("LED_REAL.TTF"))
|
|
{
|
|
}
|
|
|
|
tst_QFontDatabase::~tst_QFontDatabase()
|
|
{
|
|
|
|
}
|
|
|
|
void tst_QFontDatabase::initTestCase()
|
|
{
|
|
QVERIFY(!m_testFont.isEmpty());
|
|
}
|
|
|
|
void tst_QFontDatabase::init()
|
|
{
|
|
// TODO: Add initialization code here.
|
|
// This will be executed immediately before each test is run.
|
|
}
|
|
|
|
void tst_QFontDatabase::cleanup()
|
|
{
|
|
// TODO: Add cleanup code here.
|
|
// This will be executed immediately after each test is run.
|
|
}
|
|
|
|
void tst_QFontDatabase::styles_data()
|
|
{
|
|
QTest::addColumn<QString>("font");
|
|
|
|
QTest::newRow( "data0" ) << QString( "Times New Roman" );
|
|
}
|
|
|
|
void tst_QFontDatabase::styles()
|
|
{
|
|
QFETCH( QString, font );
|
|
|
|
QFontDatabase fdb;
|
|
QStringList styles = fdb.styles( font );
|
|
QStringList::Iterator it = styles.begin();
|
|
while ( it != styles.end() ) {
|
|
QString style = *it;
|
|
QString trimmed = style.trimmed();
|
|
++it;
|
|
|
|
QCOMPARE(style, trimmed);
|
|
}
|
|
}
|
|
|
|
void tst_QFontDatabase::fixedPitch_data()
|
|
{
|
|
QTest::addColumn<QString>("font");
|
|
QTest::addColumn<bool>("fixedPitch");
|
|
|
|
QTest::newRow( "Times New Roman" ) << QString( "Times New Roman" ) << false;
|
|
QTest::newRow( "Arial" ) << QString( "Arial" ) << false;
|
|
QTest::newRow( "Andale Mono" ) << QString( "Andale Mono" ) << true;
|
|
QTest::newRow( "Courier" ) << QString( "Courier" ) << true;
|
|
QTest::newRow( "Courier New" ) << QString( "Courier New" ) << true;
|
|
#ifndef Q_OS_MAC
|
|
QTest::newRow( "Script" ) << QString( "Script" ) << false;
|
|
QTest::newRow( "Lucida Console" ) << QString( "Lucida Console" ) << true;
|
|
QTest::newRow( "DejaVu Sans" ) << QString( "DejaVu Sans" ) << false;
|
|
QTest::newRow( "DejaVu Sans Mono" ) << QString( "DejaVu Sans Mono" ) << true;
|
|
#else
|
|
QTest::newRow( "Menlo" ) << QString( "Menlo" ) << true;
|
|
QTest::newRow( "Monaco" ) << QString( "Monaco" ) << true;
|
|
#endif
|
|
}
|
|
|
|
void tst_QFontDatabase::fixedPitch()
|
|
{
|
|
QFETCH(QString, font);
|
|
QFETCH(bool, fixedPitch);
|
|
|
|
QFontDatabase fdb;
|
|
if (!fdb.families().contains(font))
|
|
QSKIP("Font not installed");
|
|
|
|
QCOMPARE(fdb.isFixedPitch(font), fixedPitch);
|
|
|
|
QFont qfont(font);
|
|
QFontInfo fi(qfont);
|
|
QCOMPARE(fi.fixedPitch(), fixedPitch);
|
|
}
|
|
|
|
#ifdef Q_OS_MAC
|
|
void tst_QFontDatabase::trickyFonts_data()
|
|
{
|
|
QTest::addColumn<QString>("font");
|
|
|
|
QTest::newRow( "Geeza Pro" ) << QString( "Geeza Pro" );
|
|
}
|
|
|
|
void tst_QFontDatabase::trickyFonts()
|
|
{
|
|
QFETCH(QString, font);
|
|
|
|
QFontDatabase fdb;
|
|
if (!fdb.families().contains(font))
|
|
QSKIP( "Font not installed");
|
|
|
|
QFont qfont(font);
|
|
QFontInfo fi(qfont);
|
|
QCOMPARE(fi.family(), font);
|
|
}
|
|
#endif
|
|
|
|
void tst_QFontDatabase::widthTwoTimes_data()
|
|
{
|
|
QTest::addColumn<QString>("font");
|
|
QTest::addColumn<int>("pixelSize");
|
|
QTest::addColumn<QString>("text");
|
|
|
|
QTest::newRow("Arial") << QString("Arial") << 1000 << QString("Some text");
|
|
}
|
|
|
|
void tst_QFontDatabase::widthTwoTimes()
|
|
{
|
|
QFETCH(QString, font);
|
|
QFETCH(int, pixelSize);
|
|
QFETCH(QString, text);
|
|
|
|
QFont f;
|
|
f.setFamily(font);
|
|
f.setPixelSize(pixelSize);
|
|
|
|
QFontMetrics fm(f);
|
|
int w1 = fm.charWidth(text, 0);
|
|
int w2 = fm.charWidth(text, 0);
|
|
|
|
QCOMPARE(w1, w2);
|
|
}
|
|
|
|
void tst_QFontDatabase::addAppFont_data()
|
|
{
|
|
QTest::addColumn<bool>("useMemoryFont");
|
|
QTest::newRow("font file") << false;
|
|
QTest::newRow("memory font") << true;
|
|
}
|
|
|
|
void tst_QFontDatabase::addAppFont()
|
|
{
|
|
QFETCH(bool, useMemoryFont);
|
|
QSignalSpy fontDbChangedSpy(QGuiApplication::instance(), SIGNAL(fontDatabaseChanged()));
|
|
|
|
QFontDatabase db;
|
|
|
|
const QStringList oldFamilies = db.families();
|
|
QVERIFY(!oldFamilies.isEmpty());
|
|
|
|
fontDbChangedSpy.clear();
|
|
|
|
int id;
|
|
if (useMemoryFont) {
|
|
QFile fontfile(m_testFont);
|
|
fontfile.open(QIODevice::ReadOnly);
|
|
QByteArray fontdata = fontfile.readAll();
|
|
QVERIFY(!fontdata.isEmpty());
|
|
id = QFontDatabase::addApplicationFontFromData(fontdata);
|
|
} else {
|
|
id = QFontDatabase::addApplicationFont(m_testFont);
|
|
}
|
|
#if defined(Q_OS_HPUX) && defined(QT_NO_FONTCONFIG)
|
|
// Documentation says that X11 systems that don't have fontconfig
|
|
// don't support application fonts.
|
|
QCOMPARE(id, -1);
|
|
return;
|
|
#endif
|
|
QCOMPARE(fontDbChangedSpy.count(), 1);
|
|
if (id == -1)
|
|
QSKIP("Skip the test since app fonts are not supported on this system");
|
|
|
|
const QStringList addedFamilies = QFontDatabase::applicationFontFamilies(id);
|
|
QVERIFY(!addedFamilies.isEmpty());
|
|
|
|
const QStringList newFamilies = db.families();
|
|
QVERIFY(!newFamilies.isEmpty());
|
|
QVERIFY(newFamilies.count() >= oldFamilies.count());
|
|
|
|
for (int i = 0; i < addedFamilies.count(); ++i)
|
|
QVERIFY(newFamilies.contains(addedFamilies.at(i)));
|
|
|
|
QVERIFY(QFontDatabase::removeApplicationFont(id));
|
|
QCOMPARE(fontDbChangedSpy.count(), 2);
|
|
|
|
QCOMPARE(db.families(), oldFamilies);
|
|
}
|
|
|
|
void tst_QFontDatabase::aliases()
|
|
{
|
|
QFontDatabase db;
|
|
const QStringList families = db.families();
|
|
QVERIFY(!families.isEmpty());
|
|
const QString firstFont = families.front();
|
|
QVERIFY(db.hasFamily(firstFont));
|
|
const QString alias = QStringLiteral("AliasToFirstFont") + firstFont;
|
|
QVERIFY(!db.hasFamily(alias));
|
|
QPlatformFontDatabase::registerAliasToFontFamily(firstFont, alias);
|
|
QVERIFY(db.hasFamily(alias));
|
|
}
|
|
|
|
QTEST_MAIN(tst_QFontDatabase)
|
|
#include "tst_qfontdatabase.moc"
|