From 4b541b5b2916d88540a3f0b5bf0c7947d8187c40 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 19 Jul 2022 21:06:52 +0200 Subject: [PATCH] [locale] Fix test -- needs translation languages, old style --- src/modules/locale/Tests.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp index 1a6887dc1..69a6a9258 100644 --- a/src/modules/locale/Tests.cpp +++ b/src/modules/locale/Tests.cpp @@ -11,6 +11,7 @@ #include "LocaleConfiguration.h" #include "timezonewidget/TimeZoneImage.h" +#include "CalamaresVersion.h" #include "Settings.h" #include "locale/TimeZone.h" #include "locale/TranslationsModel.h" @@ -59,6 +60,7 @@ private Q_SLOTS: private: QStringList m_KDEneonLocales; QStringList m_FreeBSDLocales; + QStringList m_availableLanguages; }; QTEST_MAIN( LocaleTests ) @@ -77,6 +79,7 @@ LocaleTests::initTestCase() { (void)new Calamares::Settings( true ); } + m_availableLanguages = QString( CALAMARES_TRANSLATION_LANGUAGES ).split( ';' ); } void @@ -461,7 +464,7 @@ LocaleTests::testLanguageMappingNeon() QFETCH( QString, KDEneonLanguage ); QFETCH( QString, FreeBSDLanguage ); - QVERIFY( Calamares::Locale::availableLanguages().contains( selectedLanguage ) ); + QVERIFY( m_availableLanguages.contains( selectedLanguage ) ); const auto neon = LocaleConfiguration::fromLanguageAndLocation( ( selectedLanguage ), m_KDEneonLocales, QStringLiteral( "NL" ) ); @@ -477,7 +480,7 @@ LocaleTests::testLanguageMappingFreeBSD() QFETCH( QString, KDEneonLanguage ); QFETCH( QString, FreeBSDLanguage ); - QVERIFY( Calamares::Locale::availableLanguages().contains( selectedLanguage ) ); + QVERIFY( m_availableLanguages.contains( selectedLanguage ) ); const auto bsd = LocaleConfiguration::fromLanguageAndLocation( ( selectedLanguage ), m_FreeBSDLocales, QStringLiteral( "NL" ) );