Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-10-02 03:00:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix font picker collision test on macOS: Use the bundled Noto Sans KR font for both the managed and copied external font fixtures. This guarantees matching family metadata without relying on platform-specific system font collections or face aliases.

Browse Source
This commit is contained in:
Martín Lucas Golini
2026-08-11 13:47:44 -03:00
parent cd3df721a8
commit a71e062dfb
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/unit_tests/uifontpickerdialog_tests.cpp
+11 -14
View File
@@ -98,17 +98,14 @@ UTEST( UIFontPickerDialog, PreselectsExternalFontPath ) {
} }
UTEST( UIFontPickerDialog, ExternalFontKeepsSeparateFamilyEntryOnNameCollision ) { UTEST( UIFontPickerDialog, ExternalFontKeepsSeparateFamilyEntryOnNameCollision ) {
std::vector<FontDesc> fonts = SystemFontResolver::instance()->enumerate(); const std::string managedFontPath =
auto fontIt = std::find_if( fonts.begin(), fonts.end(), []( const FontDesc& font ) { Sys::getProcessPath() + "assets/fonts/NotoSansKR-Regular.ttf";
return !font.family.empty() && !font.path.empty() && FileSystem::fileExists( font.path ); ASSERT_TRUE( FileSystem::fileExists( managedFontPath ) );
} );
if ( fontIt == fonts.end() )
UTEST_SKIP( "no system font available" );
const std::string externalPath = Sys::getTempPath() + "UIFontPickerDialogExternal-" + const std::string externalPath = Sys::getTempPath() + "UIFontPickerDialogExternal-" +
String::toString( Sys::getProcessID() ) + "." + String::toString( Sys::getProcessID() ) + "." +
FileSystem::fileExtension( fontIt->path ); FileSystem::fileExtension( managedFontPath );
ASSERT_TRUE( FileSystem::fileCopy( fontIt->path, externalPath ) ); ASSERT_TRUE( FileSystem::fileCopy( managedFontPath, externalPath ) );
UIApplication app( UIApplication app(
WindowSettings( 320, 240, "eepp - UIFontPickerDialog Test", WindowStyle::Default, WindowSettings( 320, 240, "eepp - UIFontPickerDialog Test", WindowStyle::Default,
@@ -118,18 +115,18 @@ UTEST( UIFontPickerDialog, ExternalFontKeepsSeparateFamilyEntryOnNameCollision )
ResourceScope& resourceScope = *app.getUI()->getResourceScope(); ResourceScope& resourceScope = *app.getUI()->getResourceScope();
const std::string externalName( const std::string externalName(
FileSystem::fileRemoveExtension( FileSystem::fileNameFromPath( externalPath ) ) ); FileSystem::fileRemoveExtension( FileSystem::fileNameFromPath( externalPath ) ) );
const std::string managedFontPath =
Sys::getProcessPath() + "assets/fonts/NotoSansKR-Regular.ttf";
FontTrueTypePtr managedFont = FontTrueType::New( externalName, managedFontPath, resourceScope ); FontTrueTypePtr managedFont = FontTrueType::New( externalName, managedFontPath, resourceScope );
ASSERT_TRUE( managedFont && managedFont->loaded() ); ASSERT_TRUE( managedFont && managedFont->loaded() );
const std::string family = managedFont->getInfo().family;
ASSERT_FALSE( family.empty() );
TestFontPickerDialog* dialog = TestFontPickerDialog::New(); TestFontPickerDialog* dialog = TestFontPickerDialog::New();
dialog->setSelectedFont( externalPath, fontIt->faceIndex ); dialog->setSelectedFont( externalPath );
pumpUntil( app.getUI(), [dialog] { return dialog->getButtonOK()->isEnabled(); } ); pumpUntil( app.getUI(), [dialog] { return dialog->getButtonOK()->isEnabled(); } );
EXPECT_STDSTREQ( externalPath, dialog->getSelection().font.path ); EXPECT_STDSTREQ( externalPath, dialog->getSelection().font.path );
EXPECT_FALSE( dialog->getFamilyList()->getSelection().isEmpty() ); EXPECT_FALSE( dialog->getFamilyList()->getSelection().isEmpty() );
EXPECT_STDSTREQ( fontIt->family + " [External]", EXPECT_STDSTREQ( family + " [External]",
dialog->getFamilyList()->getSelection().first().data().toString() ); dialog->getFamilyList()->getSelection().first().data().toString() );
bool foundSystemFamily = false; bool foundSystemFamily = false;
@@ -138,8 +135,8 @@ UTEST( UIFontPickerDialog, ExternalFontKeepsSeparateFamilyEntryOnNameCollision )
ASSERT_TRUE( familyModel != nullptr ); ASSERT_TRUE( familyModel != nullptr );
for ( size_t row = 0; row < familyModel->rowCount(); row++ ) { for ( size_t row = 0; row < familyModel->rowCount(); row++ ) {
const std::string label = familyModel->index( row ).data().toString(); const std::string label = familyModel->index( row ).data().toString();
foundSystemFamily |= label == fontIt->family; foundSystemFamily |= label == family;
foundExternalFamily |= label == fontIt->family + " [External]"; foundExternalFamily |= label == family + " [External]";
} }
EXPECT_TRUE( foundSystemFamily ); EXPECT_TRUE( foundSystemFamily );
EXPECT_TRUE( foundExternalFamily ); EXPECT_TRUE( foundExternalFamily );