napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Allow en_US locale for tests as well

Browse Source
This commit is contained in:
Adriaan de Groot 2019-08-07 12:31:52 +02:00
parent 6c5d0e9d3d
commit 251e16e72c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcalamares/locale/Tests.cpp
View File

@ -35,6 +35,8 @@ LocaleTests::~LocaleTests() {}
void void
LocaleTests::initTestCase() LocaleTests::initTestCase()
{ {
// Otherwise plain get() is dubious in the TranslatableConfiguration tests
QVERIFY( ( QLocale().name() == "C" ) || ( QLocale().name() == "en_US" ) );
} }
void void
@ -121,7 +123,6 @@ LocaleTests::testTranslatableConfig1()
QVERIFY( ts0.isEmpty() ); QVERIFY( ts0.isEmpty() );
QCOMPARE( ts0.count(), 1 ); // the empty string QCOMPARE( ts0.count(), 1 ); // the empty string
QCOMPARE( QLocale().name(), "C" ); // Otherwise plain get() is dubious
CalamaresUtils::Locale::TranslatedString ts1( "Hello" ); CalamaresUtils::Locale::TranslatedString ts1( "Hello" );
QCOMPARE( ts1.count(), 1 ); QCOMPARE( ts1.count(), 1 );
QVERIFY( !ts1.isEmpty() ); QVERIFY( !ts1.isEmpty() );
@ -144,7 +145,6 @@ LocaleTests::testTranslatableConfig1()
void void
LocaleTests::testTranslatableConfig2() LocaleTests::testTranslatableConfig2()
{ {
QCOMPARE( QLocale().name(), "C" ); // Otherwise plain get() is dubious
QVariantMap map; QVariantMap map;
for ( const auto& language : someLanguages() ) for ( const auto& language : someLanguages() )