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

[libcalamares] Fix more tests

Browse Source
This commit is contained in:
Adriaan de Groot 2020-02-21 17:58:55 +01:00
parent 39cc43f26b
commit e49fb74847
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,8 +128,8 @@ LocaleTests::testTranslatableConfig1()
QCOMPARE( ts1.count(), 1 ); QCOMPARE( ts1.count(), 1 );
QVERIFY( !ts1.isEmpty() ); QVERIFY( !ts1.isEmpty() );
QCOMPARE( ts1.get(), "Hello" ); QCOMPARE( ts1.get(), QStringLiteral( "Hello" ) );
QCOMPARE( ts1.get( QLocale( "nl" ) ), "Hello" ); QCOMPARE( ts1.get( QLocale( "nl" ) ), QStringLiteral( "Hello" ) );
QVariantMap map; QVariantMap map;
map.insert( "description", "description (no language)" ); map.insert( "description", "description (no language)" );
@ -137,8 +137,8 @@ LocaleTests::testTranslatableConfig1()
QCOMPARE( ts2.count(), 1 ); QCOMPARE( ts2.count(), 1 );
QVERIFY( !ts2.isEmpty() ); QVERIFY( !ts2.isEmpty() );
QCOMPARE( ts2.get(), "description (no language)" ); QCOMPARE( ts2.get(), QStringLiteral( "description (no language)" ) );
QCOMPARE( ts2.get( QLocale( "nl" ) ), "description (no language)" ); QCOMPARE( ts2.get( QLocale( "nl" ) ), QStringLiteral( "description (no language)" ) );
} }
/** @bref Test strings with translations. /** @bref Test strings with translations.
@ -173,8 +173,8 @@ LocaleTests::testTranslatableConfig2()
QCOMPARE( ts1.count(), someLanguages().count() + 1 ); QCOMPARE( ts1.count(), someLanguages().count() + 1 );
QVERIFY( !ts1.isEmpty() ); QVERIFY( !ts1.isEmpty() );
QCOMPARE( ts1.get(), "description (no language)" ); // it wasn't set QCOMPARE( ts1.get(), QStringLiteral( "description (no language)" ) ); // it wasn't set
QCOMPARE( ts1.get( QLocale( "nl" ) ), "description (language nl)" ); QCOMPARE( ts1.get( QLocale( "nl" ) ), QStringLiteral( "description (language nl)" ) );
for ( const auto& language : someLanguages() ) for ( const auto& language : someLanguages() )
{ {
// Skip Serbian (latin) because QLocale() constructed with it // Skip Serbian (latin) because QLocale() constructed with it
@ -188,7 +188,7 @@ LocaleTests::testTranslatableConfig2()
language ); language );
} }
QCOMPARE( ts1.get( QLocale( QLocale::Language::Serbian, QLocale::Script::LatinScript, QLocale::Country::Serbia ) ), QCOMPARE( ts1.get( QLocale( QLocale::Language::Serbian, QLocale::Script::LatinScript, QLocale::Country::Serbia ) ),
"description (language sr@latin)" ); QStringLiteral( "description (language sr@latin)" ) );
CalamaresUtils::Locale::TranslatedString ts2( map, "name" ); CalamaresUtils::Locale::TranslatedString ts2( map, "name" );
// We skipped dutch this time // We skipped dutch this time