diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-09-10 22:22:07 +1000 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-09-19 12:11:53 +0200 |
commit | 9e7715dbc4e3c09d9be8a6f3c5ca0e4910651fec (patch) | |
tree | a760fef9057b93ae5fa906e80437c66d0e3e3a53 /vcl/qa | |
parent | a6bccaf72f69428bffd6688917491ef921383456 (diff) |
vcl: test PhysicalFontFamily and move to vcl::font namespace
- Adds a series of unit tests for PhysicalFontFamily
- Moves PhysicalFontFamily into vcl::font
- Move PhysicalFontFamily.hxx into vcl/inc/font
This is part of a series of patches where I also move font files into
the relevant font directories, and into the vcl::font namespace.
Change-Id: I9e8d7ceb5ec3494bf3ab6560645e52e88223ee69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121903
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'vcl/qa')
-rw-r--r-- | vcl/qa/cppunit/fontmocks.hxx | 64 | ||||
-rw-r--r-- | vcl/qa/cppunit/physicalfontfacecollection.cxx | 49 | ||||
-rw-r--r-- | vcl/qa/cppunit/physicalfontfamily.cxx | 153 |
3 files changed, 218 insertions, 48 deletions
diff --git a/vcl/qa/cppunit/fontmocks.hxx b/vcl/qa/cppunit/fontmocks.hxx new file mode 100644 index 000000000000..703f03957de6 --- /dev/null +++ b/vcl/qa/cppunit/fontmocks.hxx @@ -0,0 +1,64 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <sal/config.h> + +#include <PhysicalFontFace.hxx> +#include <font/PhysicalFontFaceCollection.hxx> +#include <fontattributes.hxx> +#include <fontinstance.hxx> +#include <fontselect.hxx> + +class TestFontInstance : public LogicalFontInstance +{ +public: + TestFontInstance(PhysicalFontFace const& rFontFace, FontSelectPattern const& rFontSelectPattern) + : LogicalFontInstance(rFontFace, rFontSelectPattern) + { + } + + bool GetGlyphOutline(sal_GlyphId, basegfx::B2DPolyPolygon&, bool) const override + { + return true; + } + +protected: + bool ImplGetGlyphBoundRect(sal_GlyphId, tools::Rectangle&, bool) const override { return true; } +}; + +class TestFontFace : public PhysicalFontFace +{ +public: + TestFontFace(sal_uIntPtr nId) + : PhysicalFontFace(FontAttributes()) + , mnFontId(nId) + { + } + + TestFontFace(FontAttributes const& rFontAttributes, sal_uIntPtr nId) + : PhysicalFontFace(rFontAttributes) + , mnFontId(nId) + { + } + + rtl::Reference<LogicalFontInstance> + CreateFontInstance(FontSelectPattern const& rFontSelectPattern) const override + { + return new TestFontInstance(*this, rFontSelectPattern); + } + + sal_IntPtr GetFontId() const override { return mnFontId; } + FontCharMapRef GetFontCharMap() const override { return FontCharMap::GetDefaultMap(false); } + bool GetFontCapabilities(vcl::FontCapabilities&) const override { return true; } + +private: + sal_IntPtr mnFontId; +}; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/qa/cppunit/physicalfontfacecollection.cxx b/vcl/qa/cppunit/physicalfontfacecollection.cxx index 829729c3a185..56f44d2b39b9 100644 --- a/vcl/qa/cppunit/physicalfontfacecollection.cxx +++ b/vcl/qa/cppunit/physicalfontfacecollection.cxx @@ -20,11 +20,7 @@ #include <vcl/glyphitem.hxx> #include <vcl/virdev.hxx> -#include <PhysicalFontFace.hxx> -#include <font/PhysicalFontFaceCollection.hxx> -#include <fontattributes.hxx> -#include <fontinstance.hxx> -#include <fontselect.hxx> +#include "fontmocks.hxx" class VclPhysicalFontFaceCollectionTest : public test::BootstrapFixture { @@ -41,49 +37,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -namespace -{ -class TestFontInstance : public LogicalFontInstance -{ -public: - TestFontInstance(PhysicalFontFace const& rFontFace, FontSelectPattern const& rFontSelectPattern) - : LogicalFontInstance(rFontFace, rFontSelectPattern) - { - } - - bool GetGlyphOutline(sal_GlyphId, basegfx::B2DPolyPolygon&, bool) const override - { - return true; - } - -protected: - bool ImplGetGlyphBoundRect(sal_GlyphId, tools::Rectangle&, bool) const override { return true; } -}; - -class TestFontFace : public PhysicalFontFace -{ -public: - TestFontFace(sal_uIntPtr nId) - : PhysicalFontFace(FontAttributes()) - , mnFontId(nId) - { - } - - rtl::Reference<LogicalFontInstance> - CreateFontInstance(FontSelectPattern const& rFontSelectPattern) const override - { - return new TestFontInstance(*this, rFontSelectPattern); - } - - sal_IntPtr GetFontId() const override { return mnFontId; } - FontCharMapRef GetFontCharMap() const override { return FontCharMap::GetDefaultMap(false); } - bool GetFontCapabilities(vcl::FontCapabilities&) const override { return true; } - -private: - sal_IntPtr mnFontId; -}; -} - void VclPhysicalFontFaceCollectionTest::testShouldGetFontId() { vcl::font::PhysicalFontFaceCollection aCollection; diff --git a/vcl/qa/cppunit/physicalfontfamily.cxx b/vcl/qa/cppunit/physicalfontfamily.cxx new file mode 100644 index 000000000000..b90ee4ec0e71 --- /dev/null +++ b/vcl/qa/cppunit/physicalfontfamily.cxx @@ -0,0 +1,153 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <sal/config.h> + +#include <test/bootstrapfixture.hxx> +#include <cppunit/TestAssert.h> + +#include <tools/fontenum.hxx> +#include <unotools/fontcfg.hxx> +#include <o3tl/sorted_vector.hxx> + +#include <vcl/virdev.hxx> + +#include <font/PhysicalFontFamily.hxx> + +#include "fontmocks.hxx" + +using namespace vcl::font; + +class VclPhysicalFontFamilyTest : public test::BootstrapFixture +{ +public: + VclPhysicalFontFamilyTest() + : BootstrapFixture(true, false) + { + } + + void testCreateFontFamily(); + void testAddFontFace_Default(); + void testAddOneFontFace(); + void testAddTwoFontFaces(); + + CPPUNIT_TEST_SUITE(VclPhysicalFontFamilyTest); + CPPUNIT_TEST(testCreateFontFamily); + CPPUNIT_TEST(testAddFontFace_Default); + CPPUNIT_TEST(testAddOneFontFace); + CPPUNIT_TEST(testAddTwoFontFaces); + CPPUNIT_TEST_SUITE_END(); +}; + +void VclPhysicalFontFamilyTest::testCreateFontFamily() +{ + PhysicalFontFamily aFamily("Test font face"); + + CPPUNIT_ASSERT_EQUAL_MESSAGE("Family name", OUString(""), aFamily.GetFamilyName()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Search name", OUString("Test font face"), + aFamily.GetSearchName()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Alias names", OUString(""), aFamily.GetAliasNames()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Min quality", -1, aFamily.GetMinQuality()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Type faces", FontTypeFaces::NONE, aFamily.GetTypeFaces()); + + o3tl::sorted_vector<int> aHeights; + aFamily.GetFontHeights(aHeights); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Number font heights", static_cast<size_t>(0), aHeights.size()); + + CPPUNIT_ASSERT_EQUAL_MESSAGE("Match family name", OUString(""), aFamily.GetMatchFamilyName()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Match type", ImplFontAttrs::None, aFamily.GetMatchType()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Match weight", WEIGHT_DONTKNOW, aFamily.GetMatchWeight()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Match width", WIDTH_DONTKNOW, aFamily.GetMatchWidth()); +} + +void VclPhysicalFontFamilyTest::testAddFontFace_Default() +{ + PhysicalFontFamily aFamily("Test font face"); + + aFamily.AddFontFace(new TestFontFace(1)); + + CPPUNIT_ASSERT_EQUAL_MESSAGE("Family name", OUString(""), aFamily.GetFamilyName()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Search name", OUString("Test font face"), + aFamily.GetSearchName()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Alias names", OUString(""), aFamily.GetAliasNames()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Min quality", 0, aFamily.GetMinQuality()); + FontTypeFaces eTypeFace + = FontTypeFaces::Scalable | FontTypeFaces::NoneSymbol | FontTypeFaces::NoneItalic; + CPPUNIT_ASSERT_EQUAL_MESSAGE("Type faces", eTypeFace, aFamily.GetTypeFaces()); +} + +void VclPhysicalFontFamilyTest::testAddOneFontFace() +{ + PhysicalFontFamily aFamily("Test font face"); + + FontAttributes aFontAttrs; + aFontAttrs.SetFamilyName("Test font face"); + aFontAttrs.AddMapName("Alias name"); + aFontAttrs.SetFamilyType(FontFamily::FAMILY_ROMAN); + aFontAttrs.SetPitch(FontPitch::PITCH_VARIABLE); + aFontAttrs.SetItalic(FontItalic::ITALIC_NONE); + aFontAttrs.SetQuality(10); + aFontAttrs.SetWeight(FontWeight::WEIGHT_BOLD); + aFontAttrs.SetWidthType(FontWidth::WIDTH_EXPANDED); + + aFamily.AddFontFace(new TestFontFace(aFontAttrs, 1)); + + CPPUNIT_ASSERT_EQUAL_MESSAGE("Family name", OUString("Test font face"), + aFamily.GetFamilyName()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Search name", OUString("Test font face"), + aFamily.GetSearchName()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Alias names", OUString("Alias name"), aFamily.GetAliasNames()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Min quality", 10, aFamily.GetMinQuality()); + FontTypeFaces eTypeFace = FontTypeFaces::Scalable | FontTypeFaces::NoneSymbol + | FontTypeFaces::Bold | FontTypeFaces::NoneItalic; + CPPUNIT_ASSERT_EQUAL_MESSAGE("Type faces", eTypeFace, aFamily.GetTypeFaces()); +} + +void VclPhysicalFontFamilyTest::testAddTwoFontFaces() +{ + PhysicalFontFamily aFamily("Test font face"); + + FontAttributes aFontAttrs; + aFontAttrs.SetFamilyName("Test font face"); + aFontAttrs.AddMapName("Alias name"); + aFontAttrs.SetFamilyType(FontFamily::FAMILY_ROMAN); + aFontAttrs.SetPitch(FontPitch::PITCH_VARIABLE); + aFontAttrs.SetItalic(FontItalic::ITALIC_NONE); + aFontAttrs.SetQuality(10); + aFontAttrs.SetWeight(FontWeight::WEIGHT_THIN); + aFontAttrs.SetWidthType(FontWidth::WIDTH_EXPANDED); + + aFamily.AddFontFace(new TestFontFace(aFontAttrs, 1)); + + aFontAttrs.SetFamilyName("Test font face"); + aFontAttrs.AddMapName("Alias name 2"); + aFontAttrs.SetFamilyType(FontFamily::FAMILY_ROMAN); + aFontAttrs.SetPitch(FontPitch::PITCH_VARIABLE); + aFontAttrs.SetItalic(FontItalic::ITALIC_NORMAL); + aFontAttrs.SetQuality(5); + aFontAttrs.SetWeight(FontWeight::WEIGHT_BOLD); + aFontAttrs.SetWidthType(FontWidth::WIDTH_CONDENSED); + + aFamily.AddFontFace(new TestFontFace(aFontAttrs, 2)); + + CPPUNIT_ASSERT_EQUAL_MESSAGE("Family name", OUString("Test font face"), + aFamily.GetFamilyName()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Search name", OUString("Test font face"), + aFamily.GetSearchName()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Alias names", OUString("Alias name"), aFamily.GetAliasNames()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Min quality", 5, aFamily.GetMinQuality()); + FontTypeFaces eTypeFace = FontTypeFaces::Scalable | FontTypeFaces::NoneSymbol + | FontTypeFaces::Light | FontTypeFaces::Bold + | FontTypeFaces::NoneItalic | FontTypeFaces::Italic; + CPPUNIT_ASSERT_EQUAL_MESSAGE("Type faces", eTypeFace, aFamily.GetTypeFaces()); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(VclPhysicalFontFamilyTest); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |